Changeset - 72acb38da217
Parent rev.
Child rev.
[Not reviewed]
default
0 10 0
Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com
diff: minor cleanups

More consistency and preparing for later changes.
10 files changed with 100 insertions and 92 deletions:
kallithea/controllers/changeset.py
3
2
kallithea/controllers/compare.py
6
6
kallithea/controllers/files.py
1
1
kallithea/controllers/pullrequests.py
4
3
kallithea/templates/changeset/changeset.html
18
18
kallithea/templates/changeset/changeset_range.html
3
5
kallithea/templates/changeset/diff_block.html
1
5
kallithea/templates/compare/compare_diff.html
12
12
kallithea/templates/pullrequests/pullrequest_show.html
7
7
kallithea/tests/functional/test_compare_local.py
45
33
0 comments (0 inline, 0 general)
kallithea/controllers/changeset.py
➞
Show inline comments
 
@@ -284,28 +284,29 @@ class ChangesetController(BaseRepoContro
 
                                                 format='gitdiff',
 
                                                 diff_limit=diff_limit)
 
            cs_changes = OrderedDict()
 
            if method == 'show':
 
                _parsed = diff_processor.prepare()
 
                c.limited_diff = False
 
                if isinstance(_parsed, LimitedDiffContainer):
 
                    c.limited_diff = True
 
                for f in _parsed:
 
                    st = f['stats']
 
                    c.lines_added += st['added']
 
                    c.lines_deleted += st['deleted']
 
                    fid = h.FID(changeset.raw_id, f['filename'])
 
                    filename = f['filename']
 
                    fid = h.FID(changeset.raw_id, filename)
 
                    diff = diff_processor.as_html(enable_comments=enable_comments,
 
                                                  parsed_lines=[f])
 
                    cs_changes[fid] = [cs1, cs2, f['operation'], f['filename'],
 
                    cs_changes[fid] = [cs1, cs2, f['operation'], filename,
 
                                       diff, st]
 
            else:
 
                # downloads/raw we only need RAW diff nothing else
 
                diff = diff_processor.as_raw()
 
                cs_changes[''] = [None, None, None, None, diff, None]
 
            c.changes[changeset.raw_id] = cs_changes
 

			




	
	
	
		
 
        #sort comments in creation order

			




	
	
	
		
 
        c.comments = [com for com_id, com in sorted(comments.items())]

			




	
	
	
		
 

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




        

    


    
    

    

        

                

                    kallithea/controllers/compare.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -274,21 +274,21 @@ class CompareController(BaseRepoControll

			




	
	
	
		
 
        _parsed = diff_processor.prepare()

			




	
	
	
		
 

			




	
	
	
		
 
        c.limited_diff = False

			




	
	
	
		
 
        if isinstance(_parsed, LimitedDiffContainer):

			




	
	
	
		
 
            c.limited_diff = True

			




	
	
	
		
 

			




	
	
	
		
 
        c.files = []

			




	
	
	
		
 
        c.changes = {}

			




	
	
	
		
 
        c.lines_added = 0

			




	
	
	
		
 
        c.lines_deleted = 0

			




	
	
	
		
 
        for f in _parsed:

			




	
	
	
		
 
            st = f['stats']

			




	
	
	
		
 
            if not st['binary']:

			




	
	
	
		
 
                c.lines_added += st['added']

			




	
	
	
		
 
                c.lines_deleted += st['deleted']

			




	
	
	
		
 
            fid = h.FID('', f['filename'])

			




	
	
	
		
 
            c.files.append([fid, f['operation'], f['filename'], f['stats']])

			




	
	
	
		
 
            c.lines_added += st['added']

			




	
	
	
		
 
            c.lines_deleted += st['deleted']

			




	
	
	
		
 
            filename = f['filename']

			




	
	
	
		
 
            fid = h.FID('', filename)

			




	
	
	
		
 
            c.files.append([fid, f['operation'], filename, f['stats']])

			




	
	
	
		
 
            htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f])

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], f['filename'], htmldiff]

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], filename, htmldiff]

			




	
	
	
		
 

			




	
	
	
		
 
        return render('compare/compare_diff.html')

			




        

    


    
    

    

        

                

                    kallithea/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -686,25 +686,25 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
            cs1, cs2, op, diff, st = diffs.wrapped_diff(filenode_old=node1,

			




	
	
	
		
 
                                         filenode_new=node2,

			




	
	
	
		
 
                                         cut_off_limit=lim,

			




	
	
	
		
 
                                         ignore_whitespace=ign_whitespace_lcl,

			




	
	
	
		
 
                                         line_context=line_context_lcl,

			




	
	
	
		
 
                                         enable_comments=False)

			




	
	
	
		
 
            filename = node1.path

			




	
	
	
		
 
            cs_changes = {

			




	
	
	
		
 
                'fid': [cs1, cs2, op, filename, diff, st]

			




	
	
	
		
 
            }

			




	
	
	
		
 
            c.changes = cs_changes

			




	
	
	
		
 

			




	
	
	
		
 
        return render('files/file_diff.html')

			




	
	
	
		
 
            return render('files/file_diff.html')

			




	
	
	
		
 

			




	
	
	
		
 
    @LoginRequired()

			




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

			




	
	
	
		
 
                                   'repository.admin')

			




	
	
	
		
 
    def diff_2way(self, repo_name, f_path):

			




	
	
	
		
 
        diff1 = request.GET.get('diff1', '')

			




	
	
	
		
 
        diff2 = request.GET.get('diff2', '')

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]:

			




	
	
	
		
 
                c.changeset_1 = c.db_repo_scm_instance.get_changeset(diff1)

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    node1 = c.changeset_1.get_node(f_path)

			




        

    


    
    

    

        

                

                    kallithea/controllers/pullrequests.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -695,29 +695,30 @@ class PullrequestsController(BaseRepoCon

			




	
	
	
		
 
        if isinstance(_parsed, LimitedDiffContainer):

			




	
	
	
		
 
            c.limited_diff = True

			




	
	
	
		
 

			




	
	
	
		
 
        c.files = []

			




	
	
	
		
 
        c.changes = {}

			




	
	
	
		
 
        c.lines_added = 0

			




	
	
	
		
 
        c.lines_deleted = 0

			




	
	
	
		
 

			




	
	
	
		
 
        for f in _parsed:

			




	
	
	
		
 
            st = f['stats']

			




	
	
	
		
 
            c.lines_added += st['added']

			




	
	
	
		
 
            c.lines_deleted += st['deleted']

			




	
	
	
		
 
            fid = h.FID('', f['filename'])

			




	
	
	
		
 
            c.files.append([fid, f['operation'], f['filename'], f['stats']])

			




	
	
	
		
 
            filename = f['filename']

			




	
	
	
		
 
            fid = h.FID('', filename)

			




	
	
	
		
 
            c.files.append([fid, f['operation'], filename, f['stats']])

			




	
	
	
		
 
            htmldiff = diff_processor.as_html(enable_comments=True,

			




	
	
	
		
 
                                              parsed_lines=[f])

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], f['filename'], htmldiff]

			




	
	
	
		
 
            c.changes[fid] = [f['operation'], filename, htmldiff]

			




	
	
	
		
 

			




	
	
	
		
 
        # inline comments

			




	
	
	
		
 
        c.inline_cnt = 0

			




	
	
	
		
 
        c.inline_comments = cc_model.get_inline_comments(

			




	
	
	
		
 
                                c.db_repo.repo_id,

			




	
	
	
		
 
                                pull_request=pull_request_id)

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for __, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 
        # comments

			




	
	
	
		
 
        c.comments = cc_model.get_comments(c.db_repo.repo_id,

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -151,43 +151,43 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                           if i != len(c.changeset.precursors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                           <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_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:

			




	
	
	
		
 
            ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="cs_files">

			




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

			




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

			




	
	
	
		
 
                        <div class="node">

			




	
	
	
		
 
                            <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                            <a href="#${FID}">${h.safe_unicode(path)}</a>

			




	
	
	
		
 
                        </div>

			




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

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              %endfor

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




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

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files), c.lines_added, c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %for fid, (cs1, cs2, op, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():

			




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

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          <a href="#${fid}">${h.safe_unicode(path)}</a>

			




	
	
	
		
 
                      </div>

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <div class="commentable-diff">

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes[c.changeset.raw_id])}

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -50,43 +50,42 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
                    <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_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">

			




	
	
	
		
 
                %for cs in c.cs_ranges:

			




	
	
	
		
 
                    <div class="cur_cs">${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.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}">

			




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

			




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

			




	
	
	
		
 
                            <div class="node">

			




	
	
	
		
 
                                <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                                <i class="icon-diff-${op}"></i>

			




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

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <div class="h3">

			




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

			




	
	
	
		
 
             ${h.gravatar_div(h.email_or_none(cs.author), size=20)}

			




	
	
	
		
 
             <div class="right">

			




	
	
	
		
 
              <span class="logtags">

			




	
	
	
		
 
                %if len(cs.parents)>1:

			




	
	
	
		
 
                <span class="merge">${_('Merge')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %if h.is_hg(c.db_repo_scm_instance):

			




	
	
	
		
 
                  %for book in cs.bookmarks:

			




	
	
	
		
 
                  <span class="booktag" title="${_('Bookmark %s') % book}">

			




	
	
		
 
@@ -98,16 +97,15 @@ ${self.repo_context_bar('changelog')}

			




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

			




	
	
	
		
 
                    ${h.link_to(tag,h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if cs.branch:

			




	
	
	
		
 
                <span class="branchtag" title="${_('Branch %s') % cs.branch}">

			




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

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
          ${diff_block.diff_block(c.changes[cs.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 
##usage:

			




	
	
	
		
 
## <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
## ${diff_block.diff_block(change)}

			




	
	
	
		
 
##

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block(change)">

			




	
	
	
		
 
<div class="diff-collapse">

			




	
	
	
		
 
    <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('Collapse Diff')} &uarr;</span>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">

			




	
	
	
		
 
%for id_fid, (a_rev, cs_rev, op, filename, diff, stats) in change.iteritems():

			




	
	
	
		
 
    ${diff_block_diffblock(id_fid, h.FID(cs_rev, filename), op, filename, diff,

			




	
	
	
		
 
        c.repo_name, a_rev, 'rev', a_rev,

			




	
	
	
		
 
        c.repo_name, cs_rev, 'rev', cs_rev)}

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
		
 
@@ -33,25 +30,24 @@

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_diffblock(id_fid, url_fid, op, filename, diff,

			




	
	
	
		
 
    a_repo_name, a_rev, a_ref_type, a_ref_name,

			




	
	
	
		
 
    cs_repo_name, cs_rev, cs_ref_type, cs_ref_name)"

			




	
	
	
		
 
>

			




	
	
	
		
 
    <div id="${id_fid}_target" style="clear:both;margin-top:25px"></div>

			




	
	
	
		
 
    <div id="${id_fid}" class="diffblock margined comm">

			




	
	
	
		
 
        <div class="code-header">

			




	
	
	
		
 
            <div class="changeset_header">

			




	
	
	
		
 
                <div class="changeset_file">

			




	
	
	
		
 
                    ${h.safe_unicode(filename)} |

			




	
	
	
		
 
                    ## TODO: link to ancestor and head of other instead of exactly other

			




	
	
	
		
 
                    %if op == 'A':

			




	
	
	
		
 
                      ${_('Added')}

			




	
	
	
		
 
                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>

			




	
	
	
		
 
                    %elif op == 'M':

			




	
	
	
		
 
                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>

			




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

			




	
	
	
		
 
                      <a class="spantag" href="${h.url('files_home', repo_name=cs_repo_name, f_path=filename, revision=cs_rev)}">${h.short_ref(cs_ref_type, cs_ref_name)}</a>

			




	
	
	
		
 
                    %elif op == 'D':

			




	
	
	
		
 
                      ${_('Deleted')}

			




	
	
	
		
 
                      <a class="spantag" href="${h.url('files_home', repo_name=a_repo_name, f_path=filename, revision=a_rev)}">${h.short_ref(a_ref_type, a_ref_name)}</a>

			




	
	
	
		
 
                    %elif op == 'R':

			




	
	
	
		
 
                      ${_('Renamed')}

			




        

    


    
    

    

        

                

                    kallithea/templates/compare/compare_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -48,50 +48,50 @@ ${self.repo_context_bar('changelog')}

			




	
	
	
		
 
         <div style="color:#999;font-size: 18px">${_('Compare revisions, branches, bookmarks, or tags.')}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div id="changeset_compare_view_content">

			




	
	
	
		
 
                ##CS

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
                <%include file="compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
                ## FILES

			




	
	
	
		
 
                <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
                % if c.limited_diff:

			




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

			




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

			




	
	
	
		
 
                % else:

			




	
	
	
		
 
                    ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 

			




	
	
	
		
 
                ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                ${c.context_url(request.GET)}

			




	
	
	
		
 

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="cs_files">

			




	
	
	
		
 
                  %if not c.files:

			




	
	
	
		
 
                     <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                  %for fid, change, f, stat in c.files:

			




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

			




	
	
	
		
 
                         <div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                             ${h.link_to(h.safe_unicode(f), '#' + fid)}

			




	
	
	
		
 
                         </div>

			




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

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                  %for fid, op, f, stat in c.files:

			




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

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(f), '#' + fid)}

			




	
	
	
		
 
                      </div>

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                  %endfor

			




	
	
	
		
 
                  %if c.limited_diff:

			




	
	
	
		
 
                    <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                  %endif

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                % if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                % endif

			




	
	
	
		
 
         </div>

			




	
	
	
		
 

			




	
	
	
		
 
        ## diff block

			




	
	
	
		
 
        <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
        ${diff_block.diff_block_js()}

			




	
	
	
		
 
        ${diff_block.diff_block_simple(c.files, c.changes)}

			




	
	
	
		
 
        % if c.limited_diff:

			




	
	
	
		
 
          <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
        % endif

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -315,47 +315,47 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 
              ${_('Common ancestor')}:

			




	
	
	
		
 
              ${h.link_to(h.short_id(c.a_rev),h.url('changeset_home',repo_name=c.a_repo.repo_name,revision=c.a_rev), class_="changeset_hash")}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




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

			




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

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %if not c.files:

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, change, f, stat in c.files:

			




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

			




	
	
	
		
 
                %for fid, op, f, stat in c.files:

			




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

			




	
	
	
		
 
                      <div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                          <i class="icon-diff-${op}"></i>

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(f),'#' + fid)}

			




	
	
	
		
 
                      </div>

			




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

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if c.limited_diff:

			




	
	
	
		
 
                  <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
    // TODO: switch this to pyroutes

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_compare_local.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,57 +20,69 @@ class TestCompareController(TestControll

			




	
	
	
		
 
        ## outgoing changesets between tags

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/c5ddebc06eaaba3010c2d66ea6ec9d074eb0f678">r112:c5ddebc06eaa</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/70d4cef8a37657ee4cf5aabb3bd9f68879769816">r115:70d4cef8a376</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/9749bfbfc0d2eba208d7947de266303b67c87cda">r116:9749bfbfc0d2</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/41fda979f02fda216374bf8edac4e83f69e7581c">r117:41fda979f02f</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/bb1a3ab98cc45cb934a77dcabf87a5a598b59e97">r118:bb1a3ab98cc4</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/36e0fc9d2808c5022a24f49d6658330383ed8666">r119:36e0fc9d2808</a>''' % HG_REPO)

			




	
	
	
		
 
        response.mustcontain('''<a class="changeset_hash" href="/%s/changeset/17544fbfcd33ffb439e2b728b5d526b1ef30bfcf">r120:17544fbfcd33</a>''' % HG_REPO)

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('11 files changed with 94 insertions and 64 deletions')

			




	
	
	
		
 

			




	
	
	
		
 
        ## files diff

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-A"></i>

			




	
	
	
		
 
                             <a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--c8e92ef85cd1">.hgignore</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--6e08b694d687">.hgtags</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')

			




	
	
	
		
 
        response.mustcontain('''<div class="node">

			




	
	
	
		
 
                             <i class="icon-diff-M"></i>

			




	
	
	
		
 
                             <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-A"></i>

			




	
	
	
		
 
                          <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>

			




	
	
	
		
 
                      </div>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-A"></i>

			




	
	
	
		
 
                          <a href="#C--e3305437df55">test_and_report.sh</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--c8e92ef85cd1">.hgignore</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--6e08b694d687">.hgtags</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--2c14b00f3393">docs/api/index.rst</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''')

			




	
	
	
		
 
        response.mustcontain(

			




	
	
	
		
 
                   '''<div class="node">

			




	
	
	
		
 
                          <i class="icon-diff-M"></i>

			




	
	
	
		
 
                          <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''')

			




	
	
	
		
 

			




	
	
	
		
 
    def test_compare_tag_git(self):

			




	
	
	
		
 
        self.log_user()

			




	
	
	
		
 
        tag1 = 'v0.1.2'

			




	
	
	
		
 
        tag2 = 'v0.1.3'

			




	
	
	
		
 
        response = self.app.get(url('compare_url',

			




	
	
	
		
 
                                    repo_name=GIT_REPO,

			




	
	
	
		
 
                                    org_ref_type="tag",

			




	
	
	
		
 
                                    org_ref_name=tag1,

			




	
	
	
		
 
                                    other_ref_type="tag",

			




	
	
	
		
 
                                    other_ref_name=tag2,

			




	
	
	
		
 
                                    ), status=200)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-26801
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support