kallithea Changeset - 1cf51cd05e36

Changeset - 1cf51cd05e36

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

Mads Kiilerich - 9 years ago 2016-11-10 16:10:41
madski@unity3d.com

diff: use list instead of OrderedDict - keep it simple

9 files changed with 13 insertions and 13 deletions:

kallithea/controllers/changeset.py

kallithea/controllers/compare.py

kallithea/controllers/files.py

kallithea/controllers/pullrequests.py

kallithea/templates/changeset/changeset.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/changeset/diff_block.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -277,13 +277,13 @@ class ChangesetController(BaseRepoContro @@
                 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)
-            file_diff_data = OrderedDict()
+            file_diff_data = []
             if method == 'show':
                 _parsed = diff_processor.prepare()
                 c.limited_diff = False
                 if isinstance(_parsed, LimitedDiffContainer):
                     c.limited_diff = True
                 for f in _parsed:
@@ @@ -292,17 +292,17 @@ class ChangesetController(BaseRepoContro @@
                     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])
-                    file_diff_data[fid] = (url_fid, f['operation'], f['old_filename'], filename, diff, st)
+                    file_diff_data.append((fid, url_fid, f['operation'], f['old_filename'], filename, diff, st))
             else:
                 # downloads/raw we only need RAW diff nothing else
                 diff = diff_processor.as_raw()
-                file_diff_data[''] = (None, None, None, diff, None)
+                file_diff_data.append(('', 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

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -280,20 +280,20 @@ class CompareController(BaseRepoControll @@
         _parsed = diff_processor.prepare()
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
-        c.file_diff_data = OrderedDict()
+        c.file_diff_data = []
         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']
             filename = f['filename']
             fid = h.FID('', filename)
             diff = diff_processor.as_html(enable_comments=False,
                                           parsed_lines=[f])
-            c.file_diff_data[fid] = (None, f['operation'], f['old_filename'], filename, diff, st)
+            c.file_diff_data.append((fid, None, f['operation'], f['old_filename'], filename, diff, st))
         return render('compare/compare_diff.html')

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -687,13 +687,13 @@ class FilesController(BaseRepoController @@
             c.a_rev, c.cs_rev, a_path, diff, st, op = 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)
-            c.file_diff_data = {fid: (fid, op, a_path, node2.path, diff, st)}
+            c.file_diff_data = [(fid, fid, op, a_path, node2.path, diff, st)]
             return render('files/file_diff.html')
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -735,25 +735,25 @@ class PullrequestsController(BaseRepoCon @@
         _parsed = diff_processor.prepare()
         c.limited_diff = False
         if isinstance(_parsed, LimitedDiffContainer):
             c.limited_diff = True
-        c.file_diff_data = OrderedDict()
+        c.file_diff_data = []
         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']
             filename = f['filename']
             fid = h.FID('', filename)
             diff = diff_processor.as_html(enable_comments=True,
                                           parsed_lines=[f])
-            c.file_diff_data[fid] = (None, f['operation'], f['old_filename'], filename, diff, st)
+            c.file_diff_data.append((fid, None, f['operation'], f['old_filename'], filename, diff, st))
         # inline comments
         c.inline_cnt = 0
         c.inline_comments = cc_model.get_inline_comments(
                                 c.db_repo.repo_id,
                                 pull_request=pull_request_id)

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -165,13 +165,13 @@ ${self.repo_context_bar('changelog', c.c @@
                   ${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(file_diff_data)) % (len(file_diff_data), c.lines_added, c.lines_deleted)}:
               %endif
               </div>
               <div class="cs_files">
-                %for fid, (url_fid, op, a_path, path, diff, stats) in file_diff_data.iteritems():
                 %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
                     <div class="cs_${op}">
                       <div class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                       </div>
                       <div class="changes">${h.fancy_file_stats(stats)}</div>

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ ${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(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</div>
                     <% a_rev, cs_rev, file_diff_data = c.changes[cs.raw_id] %>
-                    %for fid, (url_fid, op, a_path, path, diff, stats) in file_diff_data.iteritems():
                     %for fid, url_fid, op, a_path, path, diff, stats in file_diff_data:
                         <div class="cs_${op}">
                             <div class="node">
                                 <i class="icon-diff-${op}"></i>
                                 ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                             </div>
                             <div class="changes">${h.fancy_file_stats(stats)}</div>

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
                        cs_repo_name, cs_ref_name, cs_ref_type, cs_rev,
                        file_diff_data)">
 <div class="diff-collapse">
     <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(file_diff_data))}">
-%for id_fid, (url_fid, op, a_filename, cs_filename, diff, stats) in file_diff_data.iteritems():
 %for id_fid, url_fid, op, a_filename, cs_filename, diff, stats in file_diff_data:
     ${diff_block_diffblock(id_fid, url_fid, op, diff,
         a_repo_name, a_rev, a_ref_type, a_ref_name, a_filename,
         cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename)}
 %endfor
 </div>
 </%def>

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ ${self.repo_context_bar('changelog')} @@
                 </div>
                 <div class="cs_files">
                   %if not c.file_diff_data:
                      <span class="empty_data">${_('No files')}</span>
                   %endif
-                  %for fid, (url_fid, op, a_path, path, diff, stats) in c.file_diff_data.iteritems():
                   %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
                     <div class="cs_${op}">
                       <div class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                       </div>
                       <div class="changes">${h.fancy_file_stats(stats)}</div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -312,13 +312,13 @@ ${self.repo_context_bar('showpullrequest @@
               </div>
               <div class="cs_files">
                 %if not c.file_diff_data:
                    <span class="empty_data">${_('No files')}</span>
                 %endif
-                %for fid, (url_fid, op, a_path, path, diff, stats) in c.file_diff_data.iteritems():
                 %for fid, url_fid, op, a_path, path, diff, stats in c.file_diff_data:
                     <div class="cs_${op}">
                       <div class="node">
                           <i class="icon-diff-${op}"></i>
                           ${h.link_to(h.safe_unicode(path), '#%s' % fid)}
                       </div>
                       <div class="changes">${h.fancy_file_stats(stats)}</div>

0 comments (0 inline, 0 general)