Changeset - c3892e3a6ba3
Parent rev.
Child rev.
[Not reviewed]
default
0 11 0
Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com
helpers: merge urlify_commit into urlify_text

More reuse - they are already almost doing the same.

test_urlify_test is updated to use the new repo_name parameter and urlify
hashes.
11 files changed with 36 insertions and 32 deletions:
kallithea/lib/helpers.py
12
20
kallithea/templates/admin/gists/show.html
1
1
kallithea/templates/changelog/changelog.html
1
1
kallithea/templates/changelog/changelog_summary_data.html
1
1
kallithea/templates/changeset/changeset.html
1
1
kallithea/templates/changeset/changeset_range.html
1
1
kallithea/templates/compare/compare_cs.html
1
1
kallithea/templates/files/files_source.html
1
1
kallithea/templates/pullrequests/pullrequest_show.html
2
2
kallithea/templates/search/search_commit.html
1
1
kallithea/tests/other/test_libs.py
14
2
0 comments (0 inline, 0 general)
kallithea/lib/helpers.py
➞
Show inline comments
 
@@ -1276,22 +1276,32 @@ def _urlify_text_replace(match_obj):
 
def _urlify_text(s):
 
    """
 
    Extract urls from text and make html links out of them
 
    """
 
    return url_re.sub(_urlify_text_replace, s)
 

			




	
	
	
		
 
def urlify_text(s, truncate=None, stylize=False, truncatef=truncate):

			




	
	
	
		
 

			




	
	
	
		
 
def urlify_text(s, repo_name=None, link_=None, truncate=None, stylize=False, truncatef=truncate):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Extract urls from text and make literal html links out of them

			




	
	
	
		
 
    Parses given text message and make literal html with markup.

			




	
	
	
		
 
    The text will be truncated to the specified length.

			




	
	
	
		
 
    Hashes are turned into changeset links to specified repository.

			




	
	
	
		
 
    URLs links to what they say.

			




	
	
	
		
 
    Issues are linked to given issue-server.

			




	
	
	
		
 
    If link_ is provided, all text not already linking somewhere will link there.

			




	
	
	
		
 
    """

			




	
	
	
		
 
    if truncate is not None:

			




	
	
	
		
 
        s = truncatef(s, truncate, whole_word=True)

			




	
	
	
		
 
    s = html_escape(s)

			




	
	
	
		
 
    if repo_name is not None:

			




	
	
	
		
 
        s = urlify_changesets(s, repo_name)

			




	
	
	
		
 
    if stylize:

			




	
	
	
		
 
        s = desc_stylize(s)

			




	
	
	
		
 
    s = _urlify_text(s)

			




	
	
	
		
 
    if repo_name is not None:

			




	
	
	
		
 
        s = urlify_issues(s, repo_name, link_)

			




	
	
	
		
 
    return literal(s)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _urlify_changeset_replace_f(repo_name):

			




	
	
	
		
 
    from pylons import url  # doh, we need to re-import url to mock it later

			




	
	
	
		
 
    def urlify_changeset_replace(match_obj):

			




	
	
		
 
@@ -1325,30 +1335,12 @@ def linkify_others(t, l):

			




	
	
	
		
 
            links.append('<a class="message-link" href="%s">%s</a>' % (l, e))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            links.append(e)

			




	
	
	
		
 

			




	
	
	
		
 
    return ''.join(links)

			




	
	
	
		
 

			




	
	
	
		
 
def urlify_commit(text_, repo_name, link_=None):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    Parses given text message and makes proper links.

			




	
	
	
		
 
    Issues are linked to given issue-server. If link_ is provided, all other

			




	
	
	
		
 
    text will link there.

			




	
	
	
		
 
    """

			




	
	
	
		
 
    newtext = html_escape(text_)

			




	
	
	
		
 

			




	
	
	
		
 
    # urlify changesets - extract revisions and make link out of them

			




	
	
	
		
 
    newtext = urlify_changesets(newtext, repo_name)

			




	
	
	
		
 

			




	
	
	
		
 
    # extract http/https links and make them real urls

			




	
	
	
		
 
    newtext = _urlify_text(newtext)

			




	
	
	
		
 

			




	
	
	
		
 
    newtext = urlify_issues(newtext, repo_name, link_)

			




	
	
	
		
 

			




	
	
	
		
 
    return literal(newtext)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def _urlify_issues_replace_f(repo_name, ISSUE_SERVER_LNK, ISSUE_PREFIX):

			




	
	
	
		
 
    def urlify_issues_replace(match_obj):

			




	
	
	
		
 
        pref = ''

			




	
	
	
		
 
        if match_obj.group().startswith(' '):

			




	
	
	
		
 
            pref = ' '

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/gists/show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -67,13 +67,13 @@

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 

			




	
	
	
		
 
                    <div class="author">

			




	
	
	
		
 
                        ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)}

			




	
	
	
		
 
                        <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)} - ${_('created')} ${h.age(c.file_changeset.date)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                    <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
                    <div class="commit">${h.urlify_text(c.file_changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 

			




	
	
	
		
 
               ## iterate over the files

			




	
	
	
		
 
               % for file in c.files:

			




	
	
	
		
 
               <div style="border: 1px solid #EEE;margin-top:20px">

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -113,13 +113,13 @@ ${self.repo_context_bar('changelog', c.f

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">

			




	
	
	
		
 
                            <i class="icon-align-left" style="color:#999"></i>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td class="mid">

			




	
	
	
		
 
                            <div class="log-container">

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                                <div class="extra-container">

			




	
	
	
		
 
                                    %if c.comments.get(cs.raw_id):

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${_('Changeset has comments')}">

			




	
	
	
		
 
                                                <a href="${c.comments[cs.raw_id][0].url()}">

			




	
	
	
		
 
                                                    ${len(c.comments[cs.raw_id])}

			




        

    


    
    

    

        

                

                    kallithea/templates/changelog/changelog_summary_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -42,13 +42,13 @@

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}" class="revision-link">${h.show_id(cs)}</a>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.urlify_commit(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
            ${h.urlify_text(h.chop_at(cs.message,'\n'),c.repo_name, h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td><span class="tooltip" title="${h.fmt_date(cs.date)}">

			




	
	
	
		
 
                      ${h.age(cs.date)}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td title="${cs.author}">${h.person(cs.author)}</td>

			




	
	
	
		
 
        <td>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -153,13 +153,13 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                           <a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




	
	
	
		
 
                     <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
                     <div class="message">${h.urlify_text(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="changes_txt">

			




	
	
	
		
 
            % if c.limited_diff:

			




	
	
	
		
 
            ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}:

			




	
	
	
		
 
            % else:

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -47,13 +47,13 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                <td><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>

			




	
	
	
		
 
                <td>

			




	
	
	
		
 
                  %if c.statuses:

			




	
	
	
		
 
                    <div title="${_('Changeset status')}" class="changeset-status-ico"><i class="icon-circle changeset-status-${c.statuses[cnt]}"></i></div>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                <td><div class="message">${h.urlify_text(h.wrap_paragraphs(cs.message),c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
            <div class="cs_files">

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -70,13 +70,13 @@

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                        ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
            <div id="C-${cs.raw_id}" class="message">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        </tr>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    </table>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -48,13 +48,13 @@

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="author">

			




	
	
	
		
 
            ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)}

			




	
	
	
		
 
            <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="commit">${h.urlify_commit(c.changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
        <div class="commit">${h.urlify_text(c.changeset.message,c.repo_name)}</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="code-body">

			




	
	
	
		
 
      %if c.file.is_browser_compatible_image():

			




	
	
	
		
 
        <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}" class="img-preview"/>

			




	
	
	
		
 
      %elif c.file.is_binary:

			




	
	
	
		
 
        <div style="padding:5px">

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -40,13 +40,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
            <div style="margin: 5px">

			




	
	
	
		
 
              <a class="btn btn-small" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div class="input">

			




	
	
	
		
 
            <div class="formatted-fixed">${h.urlify_commit(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
            <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        %if editable:

			




	
	
	
		
 
        <div class="pr-do-edit" style="display:none">

			




	
	
	
		
 
          <div class="field">

			




	
	
		
 
@@ -202,13 +202,13 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
                            %for tag in cs.tags:

			




	
	
	
		
 
                              <div class="tagtag" title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                                ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                              </div>

			




	
	
	
		
 
                            %endfor

			




	
	
	
		
 
                          </div>

			




	
	
	
		
 
                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                      %endif

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                </table>

			




	
	
	
		
 
              </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/search/search_commit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,13 +18,13 @@

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                %if sr['message_hl']:

			




	
	
	
		
 
                <div class="search-code-body">

			




	
	
	
		
 
                    <pre>${h.literal(sr['message_hl'])}</pre>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                <div class="message">${h.urlify_commit(sr['message'], sr['repository'])}</div>

			




	
	
	
		
 
                <div class="message">${h.urlify_text(sr['message'], sr['repository'])}</div>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        %if cnt == 0:

			




        

    


    
    

    

        

                

                    kallithea/tests/other/test_libs.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -348,21 +348,33 @@ class TestLibs(TestController):

			




	
	
	
		
 
       """       some text lalala""",

			




	
	
	
		
 
       "https://foo.bar.example.com"),

			




	
	
	
		
 
      ("@mention @someone",

			




	
	
	
		
 
       """@mention @someone""",

			




	
	
	
		
 
       ""),

			




	
	
	
		
 
      ("deadbeefcafe 123412341234",

			




	
	
	
		
 
       """deadbeefcafe 123412341234""",

			




	
	
	
		
 
       """<a class="revision-link" href="/repo_name/changeset/deadbeefcafe">deadbeefcafe</a> <a class="revision-link" href="/repo_name/changeset/123412341234">123412341234</a>""",

			




	
	
	
		
 
       ""),

			




	
	
	
		
 
      # tags are covered by test_tag_extractor

			




	
	
	
		
 
    ])

			




	
	
	
		
 
    def test_urlify_test(self, sample, expected, url_):

			




	
	
	
		
 
        from kallithea.lib.helpers import urlify_text

			




	
	
	
		
 
        expected = self._quick_url(expected,

			




	
	
	
		
 
                                   tmpl="""<a href="%s">%s</a>""", url_=url_)

			




	
	
	
		
 
        assert urlify_text(sample, stylize=True) == expected

			




	
	
	
		
 
        assert urlify_text(sample, 'repo_name', stylize=True) == expected

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize('sample,expected', [

			




	
	
	
		
 
      ("deadbeefcafe @mention, and http://foo.bar/ yo",

			




	
	
	
		
 
       """<a class="message-link" href="#the-link"></a>"""

			




	
	
	
		
 
       """<a class="revision-link" href="/repo_name/changeset/deadbeefcafe">deadbeefcafe</a>"""

			




	
	
	
		
 
       """<a class="message-link" href="#the-link"> @mention, and </a>"""

			




	
	
	
		
 
       """<a href="http://foo.bar/">http://foo.bar/</a>"""

			




	
	
	
		
 
       """<a class="message-link" href="#the-link"> yo</a>"""),

			




	
	
	
		
 
    ])

			




	
	
	
		
 
    def test_urlify_link(self, sample, expected):

			




	
	
	
		
 
        from kallithea.lib.helpers import urlify_text

			




	
	
	
		
 
        assert urlify_text(sample, 'repo_name', link_='#the-link') == expected

			




	
	
	
		
 

			




	
	
	
		
 
    @parametrize('test,expected', [

			




	
	
	
		
 
      ("", None),

			




	
	
	
		
 
      ("/_2", '2'),

			




	
	
	
		
 
      ("_2", '2'),

			




	
	
	
		
 
      ("/_2/", '2'),

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.