kallithea Changeset - cd9bb3e07e68

Changeset - cd9bb3e07e68

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 11 years ago 2014-09-08 13:38:56
madski@unity3d.com

diff: don't group diffs based on the kind of change

We do no longer show the content of deleted files so there is no longer any
reason to put them at the end. Keeping all changes sorted by file name makes it
easier to review.

2 files changed with 34 insertions and 36 deletions:

kallithea/lib/diffs.py

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -470,16 +470,14 @@ class DiffProcessor(object): @@
                 'new_revision':     head['b_blob_id'],
                 'chunks':           chunks,
                 'operation':        op,
                 'stats':            stats,
             })
         sorter = lambda info: {'A': 0, 'M': 1, 'D': 2}.get(info['operation'])
         if not inline_diff:
-            return diff_container(sorted(_files, key=sorter))
             return diff_container(_files)
         # highlight inline changes
         for diff_data in _files:
             for chunk in diff_data['chunks']:
                 lineiter = iter(chunk)
                 try:
@@ @@ -491,13 +489,13 @@ class DiffProcessor(object): @@
                                nextline['action'] == line['action']:
                                 continue
                             self.differ(line, nextline)
                 except StopIteration:
                     pass
-        return diff_container(sorted(_files, key=sorter))
         return diff_container(_files)
     def _parse_udiff(self, inline_diff=True):
         raise NotImplementedError()
     def _parse_lines(self, diff):
         """

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -84,22 +84,33 @@ DIFF_FIXTURES = { @@
         ('img/baseline-10px.png', 'A',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {NEW_FILENODE: 'new file 100644',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('img/baseline-20px.png', 'D',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {DEL_FILENODE: 'deleted file',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('index.html', 'M',
          {'added': 3,
           'deleted': 2,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('js/global.js', 'D',
          {'added': 0,
           'deleted': 75,
           'binary': False,
           'ops': {DEL_FILENODE: 'deleted file'}}),
         ('js/jquery/hashgrid.js', 'A',
          {'added': 340,
           'deleted': 0,
           'binary': False,
           'ops': {NEW_FILENODE: 'new file 100755'}}),
         ('index.html', 'M',
          {'added': 3,
           'deleted': 2,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('less/docs.less', 'M',
          {'added': 34,
           'deleted': 0,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('less/scaffolding.less', 'M',
@@ @@ -109,23 +120,12 @@ DIFF_FIXTURES = { @@
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('readme.markdown', 'M',
          {'added': 1,
           'deleted': 10,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('img/baseline-20px.png', 'D',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {DEL_FILENODE: 'deleted file',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('js/global.js', 'D',
          {'added': 0,
           'deleted': 75,
           'binary': False,
           'ops': {DEL_FILENODE: 'deleted file'}})
     ],
     'git_diff_chmod.diff': [
         ('work-horus.xls', 'M',
          {'added': 0,
           'deleted': 0,
           'binary': True,
@@ @@ -150,22 +150,33 @@ DIFF_FIXTURES = { @@
         ('img/baseline-10px.png', 'A',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {NEW_FILENODE: 'new file 100644',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('img/baseline-20px.png', 'D',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {DEL_FILENODE: 'deleted file',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('index.html', 'M',
          {'added': 3,
           'deleted': 2,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('js/global.js', 'D',
          {'added': 0,
           'deleted': 75,
           'binary': False,
           'ops': {DEL_FILENODE: 'deleted file'}}),
         ('js/jquery/hashgrid.js', 'A',
          {'added': 340,
           'deleted': 0,
           'binary': False,
           'ops': {NEW_FILENODE: 'new file 100755'}}),
         ('index.html', 'M',
          {'added': 3,
           'deleted': 2,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('less/docs.less', 'M',
          {'added': 34,
           'deleted': 0,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('less/scaffolding.less', 'M',
@@ @@ -175,23 +186,12 @@ DIFF_FIXTURES = { @@
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('readme.markdown', 'M',
          {'added': 1,
           'deleted': 10,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('img/baseline-20px.png', 'D',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {DEL_FILENODE: 'deleted file',
                   BIN_FILENODE: 'binary diff not shown'}}),
         ('js/global.js', 'D',
          {'added': 0,
           'deleted': 75,
           'binary': False,
           'ops': {DEL_FILENODE: 'deleted file'}}),
     ],
     'diff_with_diff_data.diff': [
         ('vcs/backends/base.py', 'M',
          {'added': 18,
           'deleted': 2,
           'binary': False,

0 comments (0 inline, 0 general)