kallithea Changeset - fbb992c719aa

Changeset - fbb992c719aa

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 11 years ago 2014-12-15 13:47:36
madski@unity3d.com

diff: don't split lines on bare CR as python splitlines do

The line count from the @@ lines and the actual count would get out of sync and
an incomplete diff would be shown.

This is slower than native splitlines ... but that is what it takes to handle
it correctly. (Except that we perhaps could use .split('\n') and patch the
result ...)

3 files changed with 3 insertions and 3 deletions:

kallithea/lib/diffs.py

kallithea/tests/fixtures/hg_diff_rename_space_cr.diff

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -354,25 +354,25 @@ class DiffProcessor(object): @@
         match = None
         if self.vcs == 'git':
             match = self._git_header_re.match(diff_chunk)
         elif self.vcs == 'hg':
             match = self._hg_header_re.match(diff_chunk)
         if match is None:
             raise Exception('VCS type %s is not supported' % self.vcs)
         groups = match.groupdict()
         rest = diff_chunk[match.end():]
         if rest and not rest.startswith('@') and not rest.startswith('literal '):
             raise Exception('cannot parse diff header: %r followed by %r' % (diff_chunk[:match.end()], rest[:1000]))
-        difflines = imap(self._escaper, rest.splitlines(True))
+        difflines = imap(self._escaper, re.findall(r'.*\n|.+$', rest)) # don't split on \r as str.splitlines do
         return groups, difflines
     def _clean_line(self, line, command):
         if command in ['+', '-', ' ']:
             #only modify the line if it's actually a diff thing
             line = line[1:]
         return line
     def _parse_gitdiff(self, inline_diff=True):
         _files = []
         diff_container = lambda arg: arg

kallithea/tests/fixtures/hg_diff_rename_space_cr.diff

➞

Show inline comments

 diff --git a/oh no b/oh yes
 rename from oh no
 rename to oh yes
 --- a/oh no
 +++ b/oh yes
-@@ -1,5 +1,6 @@
+@@ -1,4 +1,4 @@
 -2+ 2
 -3
 +2
 +3
@@ -5,3 +6,4 @@
 +8

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -240,25 +240,25 @@ DIFF_FIXTURES = { @@
     ],
     'hg_diff_copy_chmod_and_edit_file.diff': [
         ('file5', 'M',
          {'added': 2,
           'deleted': 1,
           'binary': False,
           'ops': {COPIED_FILENODE: 'file copied from file4 to file5',
                   CHMOD_FILENODE: 'modified file chmod 100755 => 100644',
                   MOD_FILENODE: 'modified file'}}),
     ],
     'hg_diff_rename_space_cr.diff': [
         ('oh yes', 'R',
-         {'added': 4,
+         {'added': 3,
           'deleted': 2,
           'binary': False,
           'ops': {RENAMED_FILENODE: 'file renamed from oh no to oh yes'}}),
     ],
+}
 class DiffLibTest(BaseTestCase):
     @parameterized.expand([(x,) for x in DIFF_FIXTURES])
     def test_diff(self, diff_fixture):

0 comments (0 inline, 0 general)