Changeset - 1a659a59be4a
Parent rev.
Child rev.
[Not reviewed]
default
0 13 0
Mads Kiilerich - 12 years ago 2013-12-10 19:30:37
madski@unity3d.com
changesets: don't show SVN style 'rXXX:' revision numbers if show_revision_number is false
13 files changed with 30 insertions and 32 deletions:
kallithea/controllers/files.py
1
1
kallithea/lib/helpers.py
1
2
kallithea/templates/bookmarks/bookmarks_data.html
1
1
kallithea/templates/branches/branches_data.html
2
2
kallithea/templates/changeset/changeset.html
1
1
kallithea/templates/changeset/changeset_range.html
17
17
kallithea/templates/compare/compare_cs.html
1
2
kallithea/templates/files/diff_2way.html
1
1
kallithea/templates/files/file_diff.html
1
1
kallithea/templates/files/files_browser.html
1
1
kallithea/templates/files/files_edit.html
1
1
kallithea/templates/files/files_source.html
1
1
kallithea/templates/tags/tags_data.html
1
1
0 comments (0 inline, 0 general)
kallithea/controllers/files.py
➞
Show inline comments
 
@@ -779,7 +779,7 @@ class FilesController(BaseRepoController
 
        for chs in changesets:
 
            #_branch = '(%s)' % chs.branch if _hg else ''
 
            _branch = chs.branch
 
            n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, _branch)
 
            n_desc = '%s (%s)' % (h.show_id(chs), _branch)
 
            changesets_group[0].append((chs.raw_id, n_desc,))
 
        hist_l.append(changesets_group)
 

			




        

    


    
    

    

        

                

                    kallithea/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -358,8 +358,7 @@ def pygmentize_annotation(repo_name, fil

			




	
	
	
		
 
                            "</b> %s<br/></div>")

			




	
	
	
		
 

			




	
	
	
		
 
            tooltip_html = tooltip_html % (author, date, message)

			




	
	
	
		
 
            lnk_format = '%5s:%s' % ('r%s' % changeset.revision,

			




	
	
	
		
 
                                     short_id(changeset.raw_id))

			




	
	
	
		
 
            lnk_format = show_id(changeset)

			




	
	
	
		
 
            uri = link_to(

			




	
	
	
		
 
                    lnk_format,

			




	
	
	
		
 
                    url('changeset_home', repo_name=repo_name,

			




        

    


    
    

    

        

                

                    kallithea/templates/bookmarks/bookmarks_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -28,7 +28,7 @@

			




	
	
	
		
 
            <td>${book[1].revision}</td>

			




	
	
	
		
 
            <td>

			




	
	
	
		
 
              <div>

			




	
	
	
		
 
                  <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id)}">r${book[1].revision}:${h.short_id(book[1].raw_id)}</a></pre>

			




	
	
	
		
 
                  <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id)}">${h.show_id(book[1])}</a></pre>

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
            <td>

			




        

    


    
    

    

        

                

                    kallithea/templates/branches/branches_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,7 +29,7 @@

			




	
	
	
		
 
            <td>${branch[1].revision}</td>

			




	
	
	
		
 
            <td>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">${h.show_id(branch[1])}</a></pre>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
            <td>

			




	
	
		
 
@@ -56,7 +56,7 @@

			




	
	
	
		
 
              <td>${branch[1].revision}</td>

			




	
	
	
		
 
              <td>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">r${branch[1].revision}:${h.short_id(branch[1].raw_id)}</a></pre>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id)}">${h.show_id(branch[1])}</a></pre>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
              </td>

			




	
	
	
		
 
              <td></td>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -10,7 +10,7 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>

			




	
	
	
		
 
    ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2,7 +2,7 @@

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} &gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
    %if c.site_name:

			




	
	
	
		
 
        &middot; ${c.site_name}

			




	
	
	
		
 
    %endif

			




	
	
		
 
@@ -10,9 +10,9 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('Changesets')} -

			




	
	
	
		
 
    r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[0]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[0]))}</td>

			




	
	
	
		
 
    <i class="icon-arrow-right"></i>

			




	
	
	
		
 
    r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
    ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1]))}</td>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
		
 
@@ -30,9 +30,9 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
        <div id="body" class="diffblock">

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)}

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[0])}

			




	
	
	
		
 
                    <i class="icon-arrow-right"></i>

			




	
	
	
		
 
                    r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
                    ${h.show_id(c.cs_ranges[-1])}

			




	
	
	
		
 
                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-loop"></i> Compare Revisions</a>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
		
 
@@ -58,17 +58,17 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
            </div>

			




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

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
                   %for cs in c.cs_ranges:

			




	
	
	
		
 
                       <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                      %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




	
	
	
		
 
                         <div class="cs_${change}">

			




	
	
	
		
 
                               <div class="node">

			




	
	
	
		
 
                                   ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}

			




	
	
	
		
 
                               </div>

			




	
	
	
		
 
                           <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                      %endfor

			




	
	
	
		
 
                   %endfor

			




	
	
	
		
 
                %for cs in c.cs_ranges:

			




	
	
	
		
 
                    <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                    %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




	
	
	
		
 
                        <div class="cs_${change}">

			




	
	
	
		
 
                            <div class="node">

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
                            <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    %endfor

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
		
 
@@ -79,7 +79,7 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <div class="h3">

			




	
	
	
		
 
          <a class="tooltip" title="${h.tooltip(cs.message)}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</a>

			




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

			




	
	
	
		
 
             <div class="gravatar">

			




	
	
	
		
 
                 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),20)}"/>

			




	
	
	
		
 
             </div>

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_cs.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -23,8 +23,7 @@

			




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

			




	
	
	
		
 
        <td><div class="gravatar" commit_id="${cs.raw_id}"><img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),14)}"/></div></td>

			




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

			




	
	
	
		
 
        <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.other_repo.repo_name,revision=cs.raw_id))}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
        %if cs.branch:

			




	
	
	
		
 
        <span class="branchtag">${cs.branch}</span>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/diff_2way.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -19,7 +19,7 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}

			




	
	
	
		
 
    ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/file_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -8,7 +8,7 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}

			




	
	
	
		
 
    ${_('File diff')} ${h.show_id(c.changeset_1)} &rarr; ${h.show_id(c.changeset_2)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_browser.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -83,7 +83,7 @@

			




	
	
	
		
 
                     <td>

			




	
	
	
		
 
                         %if node.is_file():

			




	
	
	
		
 
                             <div class="tooltip" title="${h.tooltip(node.last_changeset.message)}">

			




	
	
	
		
 
                              <pre>${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</pre>

			




	
	
	
		
 
                              <pre>${h.show_id(node.last_changeset)}</pre>

			




	
	
	
		
 
                             </div>

			




	
	
	
		
 
                         %endif

			




	
	
	
		
 
                     </td>

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_edit.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -45,7 +45,7 @@ ${self.repo_context_bar('files')}

			




	
	
	
		
 
            <div class="code-header">

			




	
	
	
		
 
                <div class="stats">

			




	
	
	
		
 
                    <div class="left"><i class="icon-file"></i></div>

			




	
	
	
		
 
                    <div class="left item">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>

			




	
	
	
		
 
                    <div class="left item">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>

			




	
	
	
		
 
                    <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>

			




	
	
	
		
 
                    <div class="left item last">${c.file.mimetype}</div>

			




	
	
	
		
 
                    <div class="buttons">

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -22,7 +22,7 @@

			




	
	
	
		
 
    <div class="code-header">

			




	
	
	
		
 
        <div class="stats">

			




	
	
	
		
 
            <div class="left img"><i class="icon-file"></i></div>

			




	
	
	
		
 
            <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div>

			




	
	
	
		
 
            <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to(h.show_id(c.file_changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div>

			




	
	
	
		
 
            <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>

			




	
	
	
		
 
            <div class="left item last"><pre>${c.file.mimetype}</pre></div>

			




	
	
	
		
 
            <div class="buttons">

			




        

    


    
    

    

        

                

                    kallithea/templates/tags/tags_data.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,7 +29,7 @@

			




	
	
	
		
 
            <td>${tag[1].revision}</td>

			




	
	
	
		
 
            <td>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">r${tag[1].revision}:${h.short_id(tag[1].raw_id)}</a></pre>

			




	
	
	
		
 
                    <pre><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id)}">${h.show_id(tag[1])}</a></pre>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
            <td>

			




        

    



    


    



    



      

      





    
    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.