Changeset - 1013437c997a
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Thomas De Schampheleire - 10 years ago 2015-10-08 17:45:50
thomas.de.schampheleire@gmail.com
files: support annotation on files larger than cut_off_limit

When requesting the annotation for a file larger than the cut_off_limit
configured in the ini file, the only current option is to click the useless
'show as raw' (which is not an annotation).

Replace it with a link 'Show full annotation anyway' instead.
2 files changed with 8 insertions and 3 deletions:
kallithea/controllers/files.py
1
kallithea/templates/files/files_source.html
7
3
0 comments (0 inline, 0 general)
kallithea/controllers/files.py
➞
Show inline comments
 
@@ -92,96 +92,97 @@ class FilesController(BaseRepoController
 
            h.flash(h.literal(_('There are no files yet. %s') % add_new),
 
                    category='warning')
 
            raise HTTPNotFound()
 
        except(ChangesetDoesNotExistError, LookupError), e:
 
            msg = _('Such revision does not exist for this repository')
 
            h.flash(msg, category='error')
 
            raise HTTPNotFound()
 
        except RepositoryError as e:
 
            h.flash(safe_str(e), category='error')
 
            raise HTTPNotFound()
 

			




	
	
	
		
 
    def __get_filenode(self, cs, path):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Returns file_node or raise HTTP error.

			




	
	
	
		
 

			




	
	
	
		
 
        :param cs: given changeset

			




	
	
	
		
 
        :param path: path to lookup

			




	
	
	
		
 
        """

			




	
	
	
		
 

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            file_node = cs.get_node(path)

			




	
	
	
		
 
            if file_node.is_dir():

			




	
	
	
		
 
                raise RepositoryError('given path is a directory')

			




	
	
	
		
 
        except(ChangesetDoesNotExistError,), e:

			




	
	
	
		
 
            msg = _('Such revision does not exist for this repository')

			




	
	
	
		
 
            h.flash(msg, category='error')

			




	
	
	
		
 
            raise HTTPNotFound()

			




	
	
	
		
 
        except RepositoryError as e:

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
            raise HTTPNotFound()

			




	
	
	
		
 

			




	
	
	
		
 
        return file_node

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




	
	
	
		
 
    @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def index(self, repo_name, revision, f_path, annotate=False):

			




	
	
	
		
 
        # redirect to given revision from form if given

			




	
	
	
		
 
        post_revision = request.POST.get('at_rev', None)

			




	
	
	
		
 
        if post_revision:

			




	
	
	
		
 
            cs = self.__get_cs(post_revision) # FIXME - unused!

			




	
	
	
		
 

			




	
	
	
		
 
        c.revision = revision

			




	
	
	
		
 
        c.changeset = self.__get_cs(revision)

			




	
	
	
		
 
        c.branch = request.GET.get('branch', None)

			




	
	
	
		
 
        c.f_path = f_path

			




	
	
	
		
 
        c.annotate = annotate

			




	
	
	
		
 
        cur_rev = c.changeset.revision

			




	
	
	
		
 
        c.fulldiff = request.GET.get('fulldiff')

			




	
	
	
		
 

			




	
	
	
		
 
        # prev link

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            prev_rev = c.db_repo_scm_instance.get_changeset(cur_rev).prev(c.branch)

			




	
	
	
		
 
            c.url_prev = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                         revision=prev_rev.raw_id, f_path=f_path)

			




	
	
	
		
 
            if c.branch:

			




	
	
	
		
 
                c.url_prev += '?branch=%s' % c.branch

			




	
	
	
		
 
        except (ChangesetDoesNotExistError, VCSError):

			




	
	
	
		
 
            c.url_prev = '#'

			




	
	
	
		
 

			




	
	
	
		
 
        # next link

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            next_rev = c.db_repo_scm_instance.get_changeset(cur_rev).next(c.branch)

			




	
	
	
		
 
            c.url_next = url('files_home', repo_name=c.repo_name,

			




	
	
	
		
 
                     revision=next_rev.raw_id, f_path=f_path)

			




	
	
	
		
 
            if c.branch:

			




	
	
	
		
 
                c.url_next += '?branch=%s' % c.branch

			




	
	
	
		
 
        except (ChangesetDoesNotExistError, VCSError):

			




	
	
	
		
 
            c.url_next = '#'

			




	
	
	
		
 

			




	
	
	
		
 
        # files or dirs

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            c.file = c.changeset.get_node(f_path)

			




	
	
	
		
 

			




	
	
	
		
 
            if c.file.is_file():

			




	
	
	
		
 
                c.load_full_history = False

			




	
	
	
		
 
                file_last_cs = c.file.last_changeset

			




	
	
	
		
 
                c.file_changeset = (c.changeset

			




	
	
	
		
 
                                    if c.changeset.revision < file_last_cs.revision

			




	
	
	
		
 
                                    else file_last_cs)

			




	
	
	
		
 
                #determine if we're on branch head

			




	
	
	
		
 
                _branches = c.db_repo_scm_instance.branches

			




	
	
	
		
 
                c.on_branch_head = revision in _branches.keys() + _branches.values()

			




	
	
	
		
 
                _hist = []

			




	
	
	
		
 
                c.file_history = []

			




	
	
	
		
 
                if c.load_full_history:

			




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

			




	
	
	
		
 

			




	
	
	
		
 
                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 = []

			




	
	
	
		
 
        except RepositoryError as e:

			




	
	
	
		
 
            h.flash(safe_str(e), category='error')

			




	
	
	
		
 
            raise HTTPNotFound()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/files/files_source.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,77 +18,81 @@

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 
    <div class="code-header">

			




	
	
	
		
 
        <div class="stats">

			




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

			




	
	
	
		
 
            <div class="left item"><pre class="tooltip" title="${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">

			




	
	
	
		
 
              %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_="btn btn-mini")}

			




	
	
	
		
 
              %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_="btn btn-mini")}

			




	
	
	
		
 
              %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_="btn btn-mini")}

			




	
	
	
		
 
              ${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_="btn btn-mini")}

			




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

			




	
	
	
		
 
               %if c.on_branch_head and c.changeset.branch and not c.file.is_binary:

			




	
	
	
		
 
                ${h.link_to(_('Edit on Branch:%s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path, anchor='edit'),class_="btn btn-mini")}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")}

			




	
	
	
		
 
               %elif c.on_branch_head and c.changeset.branch and c.file.is_binary:

			




	
	
	
		
 
                ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing binary files not allowed'))}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")}

			




	
	
	
		
 
               %else:

			




	
	
	
		
 
                ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}

			




	
	
	
		
 
                ${h.link_to(_('Delete'), '#', class_="btn btn-mini btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}

			




	
	
	
		
 
               % endif

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="author">

			




	
	
	
		
 
            <div class="gravatar">

			




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

			




	
	
	
		
 
            </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>

			




	
	
	
		
 
    <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.file_changeset.raw_id,f_path=c.f_path)}" class="img-preview"/>

			




	
	
	
		
 
      %elif c.file.is_binary:

			




	
	
	
		
 
        <div style="padding:5px">

			




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

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
      %else:

			




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

			




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

			




	
	
	
		
 
            %if c.annotate:

			




	
	
	
		
 
              ${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))}

			




	
	
	
		
 
            ${_('File is too big to display')}

			




	
	
	
		
 
            %if c.annotate:

			




	
	
	
		
 
              ${h.link_to(_('Show full annotation anyway'), h.url.current(fulldiff=1, **request.GET.mixed()))}

			




	
	
	
		
 
            %else:

			




	
	
	
		
 
              ${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))}

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        %endif

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 
    $(document).ready(function(){

			




	
	
	
		
 
        // fake html5 history state

			




	
	
	
		
 
        var _State = {

			




	
	
	
		
 
           url: "${h.url.current()}",

			




	
	
	
		
 
           data: {

			




	
	
	
		
 
             node_list_url: node_list_url.replace('__REV__',"${c.changeset.raw_id}").replace('__FPATH__', "${h.safe_unicode(c.file.path)}"),

			




	
	
	
		
 
             url_base: url_base.replace('__REV__',"${c.changeset.raw_id}"),

			




	
	
	
		
 
             rev:"${c.changeset.raw_id}",

			




	
	
	
		
 
             f_path: "${h.safe_unicode(c.file.path)}"

			




	
	
	
		
 
           }

			




	
	
	
		
 
        }

			




	
	
	
		
 
        callbacks(_State); // defined in files.html, main callbacks. Triggerd in pjax calls

			




	
	
	
		
 
    });

			




	
	
	
		
 
</script>

			




        

    



    


    



    



      

      





    
    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.