Changeset - a01c5994015c
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 13 years ago 2012-10-17 20:46:54
marcin@python-works.com
smarter calculation of showed associated changeset in file source view
- before rhodecode showed TIP changeset when initially displaing file source as description of associated commit
this can be misleading. Now smart calculate last commit of a file, and show specific commits when switching from history view
2 files changed with 13 insertions and 12 deletions:
rhodecode/controllers/files.py
1
rhodecode/templates/files/files_source.html
12
12
0 comments (0 inline, 0 general)
rhodecode/controllers/files.py
➞
Show inline comments
 
@@ -151,12 +151,13 @@ class FilesController(BaseRepoController
 
        # files or dirs
 
        try:
 
            c.file = c.changeset.get_node(f_path)
 

			




	
	
	
		
 
            if c.file.is_file():

			




	
	
	
		
 
                _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path)

			




	
	
	
		
 
                c.file_changeset = c.changeset if c.changeset.revision < _hist[0].revision else _hist[0]

			




	
	
	
		
 
                c.file_history = self._get_node_history(None, f_path, _hist)

			




	
	
	
		
 
                c.authors = []

			




	
	
	
		
 
                for a in set([x.author for x in _hist]):

			




	
	
	
		
 
                    c.authors.append((h.email(a), h.person(a)))

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                c.authors = c.file_history = []

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<dl>

			




	
	
	
		
 
	<dt class="file_history">${_('History')}</dt>

			




	
	
	
		
 
	<dd>

			




	
	
	
		
 
        <div>

			




	
	
	
		
 
    		<div style="float:left">

			




	
	
	
		
 
    		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}

			




	
	
	
		
 
    		${h.hidden('diff2',c.file.changeset.raw_id)}

			




	
	
	
		
 
    		${h.select('diff1',c.file.changeset.raw_id,c.file_history)}

			




	
	
	
		
 
    		${h.hidden('diff2',c.file_changeset.raw_id)}

			




	
	
	
		
 
    		${h.select('diff1',c.file_changeset.raw_id,c.file_history)}

			




	
	
	
		
 
    		${h.submit('diff',_('diff to revision'),class_="ui-btn")}

			




	
	
	
		
 
    		${h.submit('show_rev',_('show at revision'),class_="ui-btn")}

			




	
	
	
		
 
    		${h.end_form()}

			




	
	
	
		
 
    		</div>

			




	
	
	
		
 
            <div class="file_author">

			




	
	
	
		
 
                <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>

			




	
	
		
 
@@ -25,37 +25,37 @@

			




	
	
	
		
 
</dl>

			




	
	
	
		
 

			




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

			




	
	
	
		
 
	<div class="code-header">

			




	
	
	
		
 
        <div class="stats">

			




	
	
	
		
 
            <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></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("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>${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">

			




	
	
	
		
 
              %if c.annotate:

			




	
	
	
		
 
                ${h.link_to(_('show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
                ${h.link_to(_('show source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              %else:

			




	
	
	
		
 
                ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
                ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
              % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

			




	
	
	
		
 
               % if not c.file.is_binary:

			




	
	
	
		
 
                ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
                ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}

			




	
	
	
		
 
               % endif

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="author">

			




	
	
	
		
 
            <div class="gravatar">

			




	
	
	
		
 
                <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file.changeset.author),16)}"/>

			




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

			




	
	
	
		
 
            </div>

			




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

			




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

			




	
	
	
		
 
        </div>

			




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

			




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

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
	<div class="code-body">

			




	
	
	
		
 
	   %if c.file.is_binary:

			




	
	
	
		
 
	       ${_('Binary file (%s)') % c.file.mimetype}

			




	
	
	
		
 
	   %else:

			




	
	
	
		
 
		% if c.file.size < c.cut_off_limit:

			




	
	
		
 
@@ -63,13 +63,13 @@

			




	
	
	
		
 
              ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
			  ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
			${_('File is too big to display')} ${h.link_to(_('show as raw'),

			




	
	
	
		
 
			h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
			h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))}

			




	
	
	
		
 
		%endif

			




	
	
	
		
 
     %endif

			




	
	
	
		
 
	</div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script type="text/javascript">

			




        

    



    


    



    



      

      





    
    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.