Changeset - dc4cb1d4e084
Parent rev.
Child rev.
[Not reviewed]
default
0 6 0
Mads Kiilerich - 9 years ago 2016-09-06 00:51:18
madski@unity3d.com
diff: rework data structure used by diff_block.diff_block (used for changeset diffs)

Make it a pure reusable function that also can replace diff_block_simple.

Improve code clarity by using Python tuples for tuples.

fid and url_fid are just shuffled around - not cleaned up for now.
6 files changed with 32 insertions and 29 deletions:
kallithea/controllers/changeset.py
5
7
kallithea/controllers/files.py
2
6
kallithea/templates/changeset/changeset.html
8
5
kallithea/templates/changeset/changeset_range.html
6
3
kallithea/templates/changeset/diff_block.html
9
7
kallithea/templates/files/file_diff.html
2
1
0 comments (0 inline, 0 general)
kallithea/controllers/changeset.py
➞
Show inline comments
 
@@ -260,59 +260,57 @@ class ChangesetController(BaseRepoContro
 
                # Status change comments - mostly from pull requests
 
                comments.update((st.changeset_comment_id, st.comment)
 
                                for st in ChangesetStatusModel()
 
                                .get_statuses(c.db_repo.repo_id,
 
                                              changeset.raw_id, with_revisions=True)
 
                                if st.changeset_comment_id is not None)
 

			




	
	
	
		
 
                inlines = ChangesetCommentsModel() \

			




	
	
	
		
 
                            .get_inline_comments(c.db_repo.repo_id,

			




	
	
	
		
 
                                                 revision=changeset.raw_id)

			




	
	
	
		
 
                c.inline_comments.extend(inlines)

			




	
	
	
		
 

			




	
	
	
		
 
            c.changes[changeset.raw_id] = []

			




	
	
	
		
 

			




	
	
	
		
 
            cs2 = changeset.raw_id

			




	
	
	
		
 
            cs1 = changeset.parents[0].raw_id if changeset.parents else EmptyChangeset().raw_id

			




	
	
	
		
 
            context_lcl = get_line_ctx('', request.GET)

			




	
	
	
		
 
            ign_whitespace_lcl = get_ignore_ws('', request.GET)

			




	
	
	
		
 

			




	
	
	
		
 
            _diff = c.db_repo_scm_instance.get_diff(cs1, cs2,

			




	
	
	
		
 
                ignore_whitespace=ign_whitespace_lcl, context=context_lcl)

			




	
	
	
		
 
            diff_limit = self.cut_off_limit if not fulldiff else None

			




	
	
	
		
 
            diff_processor = diffs.DiffProcessor(_diff,

			




	
	
	
		
 
                                                 vcs=c.db_repo_scm_instance.alias,

			




	
	
	
		
 
                                                 format='gitdiff',

			




	
	
	
		
 
                                                 diff_limit=diff_limit)

			




	
	
	
		
 
            cs_changes = OrderedDict()

			




	
	
	
		
 
            file_diff_data = 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']

			




	
	
	
		
 
                    filename = f['filename']

			




	
	
	
		
 
                    fid = h.FID(changeset.raw_id, filename)

			




	
	
	
		
 
                    url_fid = h.FID('', filename)

			




	
	
	
		
 
                    diff = diff_processor.as_html(enable_comments=enable_comments,

			




	
	
	
		
 
                                                  parsed_lines=[f])

			




	
	
	
		
 
                    cs_changes[fid] = [cs1, cs2, f['operation'], filename,

			




	
	
	
		
 
                                       diff, st]

			




	
	
	
		
 
                    file_diff_data[fid] = (url_fid, 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

			




	
	
	
		
 
                file_diff_data[''] = (None, None, None, diff, None)

			




	
	
	
		
 
            c.changes[changeset.raw_id] = (cs1, cs2, file_diff_data)

			




	
	
	
		
 

			




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

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 

			




	
	
	
		
 
        if len(c.cs_ranges) == 1:

			




	
	
	
		
 
            c.changeset = c.cs_ranges[0]

			




	
	
	
		
 
            c.parent_tmpl = ''.join(['# Parent  %s\n' % x.raw_id

			




        

    


    
    

    

        

                

                    kallithea/controllers/files.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -674,35 +674,31 @@ class FilesController(BaseRepoController

			




	
	
	
		
 
                                      ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                      context=line_context)

			




	
	
	
		
 
            diff = diffs.DiffProcessor(_diff, format='gitdiff')

			




	
	
	
		
 
            response.content_type = 'text/plain'

			




	
	
	
		
 
            return diff.as_raw()

			




	
	
	
		
 

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            fid = h.FID(diff2, node2.path)

			




	
	
	
		
 
            line_context_lcl = get_line_ctx(fid, request.GET)

			




	
	
	
		
 
            ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

			




	
	
	
		
 

			




	
	
	
		
 
            lim = request.GET.get('fulldiff') or self.cut_off_limit

			




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

			




	
	
	
		
 
            c.a_rev, c.cs_rev, 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

			




	
	
	
		
 
            c.file_diff_data = {fid: (fid, op, node1.path, diff, st)}

			




	
	
	
		
 

			




	
	
	
		
 
            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)

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -151,53 +151,56 @@ ${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">

			




	
	
	
		
 
              <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>

			




	
	
	
		
 
              % if c.limited_diff:

			




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

			




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

			




	
	
	
		
 
              % 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)}:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions', '%s files changed with %s insertions and %s deletions', len(file_diff_data)) % (len(file_diff_data), 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():

			




	
	
	
		
 
                %for fid, (url_fid, op, path, diff, stats) in file_diff_data.iteritems():

			




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

			




	
	
	
		
 
                      <div class="node">

			




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

			




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

			




	
	
	
		
 
                          ${h.link_to(h.safe_unicode(path), '#%s' % fid)}

			




	
	
	
		
 
                      </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])}

			




	
	
	
		
 
    <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %>

			




	
	
	
		
 
    ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,

			




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

			




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

			




	
	
	
		
 
    % endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -50,29 +50,30 @@ ${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, op, path, diff, stats) in c.changes[cs.raw_id].iteritems():

			




	
	
	
		
 
                    <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>

			




	
	
	
		
 
                    %for fid, (url_fid, op, path, diff, stats) in file_diff_data.iteritems():

			




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

			




	
	
	
		
 
                            <div class="node">

			




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

			




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

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(path), '#%s' % 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()}

			




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

			




	
	
	
		
 
                %for tag in cs.tags:

			




	
	
	
		
 
                    <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])}

			




	
	
	
		
 
          <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>

			




	
	
	
		
 
          ${diff_block.diff_block(c.repo_name, 'rev', a_rev, a_rev,

			




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

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




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

			




	
	
	
		
 
<%def name="diff_block(a_repo_name, a_ref_type, a_ref_name, a_rev,

			




	
	
	
		
 
                       cs_repo_name, cs_ref_name, cs_ref_type, cs_rev,

			




	
	
	
		
 
                       file_diff_data)">

			




	
	
	
		
 
<div class="diff-collapse">

			




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

			




	
	
	
		
 
    <span target="${'diff-container-%s' % (id(file_diff_data))}" 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)}

			




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

			




	
	
	
		
 
%for id_fid, (url_fid, op, filename, diff, stats) in file_diff_data.iteritems():

			




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

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_simple(files, changes)">

			




	
	
	
		
 
<div class="diff-collapse">

			




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

			




	
	
	
		
 
</div>

			




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

			




	
	
	
		
 
  %for fid, ch, f, stat in files:

			




	
	
	
		
 
    <%

			




	
	
	
		
 
    op, filename, diff = changes[fid]

			




        

    


    
    

    

        

                

                    kallithea/templates/files/file_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -14,16 +14,17 @@

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
${self.repo_context_bar('changelog')}

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div>

			




	
	
	
		
 
    ## diff block

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes)}

			




	
	
	
		
 
    ${diff_block.diff_block(c.repo_name, 'rev', c.a_rev, c.a_rev,

			




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

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








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