kallithea Changeset - 9740ec3be07a

Changeset - 9740ec3be07a

Parent rev.

Child rev.

[Not reviewed]

default

0 1 1

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

diff: test rename with tab after ---/+++ and bare CR in diff

2 files changed with 25 insertions and 1 deletions:

kallithea/tests/fixtures/hg_diff_rename_space_cr.diff

kallithea/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

kallithea/tests/fixtures/hg_diff_rename_space_cr.diff

➞

Show inline comments

@@ new file 100644 @@
 diff --git a/ohno b/ohyes
 rename from ohno
 rename to ohyes
 --- a/ohno
 +++ b/ohyes
@@ -1,5 +1,6 @@
 -2+ 2
 -3
 +2
 +3
@@ -5,3 +6,4 @@
 +8

kallithea/tests/models/test_diff_parsers.py

➞

Show inline comments

@@ @@ -201,64 +201,71 @@ DIFF_FIXTURES = { @@
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('vcs/backends/hg.py', 'M',
          {'added': 22,
           'deleted': 3,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('vcs/tests/test_git.py', 'M',
          {'added': 5,
           'deleted': 5,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
         ('vcs/tests/test_repository.py', 'M',
          {'added': 174,
           'deleted': 2,
           'binary': False,
           'ops': {MOD_FILENODE: 'modified file'}}),
     ],
     'hg_diff_copy_file.diff': [
         ('file2', 'M',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {COPIED_FILENODE: 'file copied from file1 to file2'}}),
     ],
     'hg_diff_copy_and_modify_file.diff': [
         ('file3', 'M',
          {'added': 1,
           'deleted': 0,
           'binary': False,
           'ops': {COPIED_FILENODE: 'file copied from file2 to file3',
                   MOD_FILENODE: 'modified file'}}),
     ],
     'hg_diff_copy_and_chmod_file.diff': [
         ('file4', 'M',
          {'added': 0,
           'deleted': 0,
           'binary': True,
           'ops': {COPIED_FILENODE: 'file copied from file3 to file4',
                   CHMOD_FILENODE: 'modified file chmod 100644 => 100755'}}),
     ],
     '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': [
         ('ohyes', 'R',
          {'added': 4,
           'deleted': 2,
           'binary': False,
           'ops': {RENAMED_FILENODE: 'file renamed from ohno to ohyes'}}),
     ],
+}
 class DiffLibTest(BaseTestCase):
     @parameterized.expand([(x,) for x in DIFF_FIXTURES])
     def test_diff(self, diff_fixture):
         diff = fixture.load_resource(diff_fixture, strip=False)
         diff_proc = DiffProcessor(diff)
         diff_proc_d = diff_proc.prepare()
         data = [(x['filename'], x['operation'], x['stats']) for x in diff_proc_d]
         expected_data = DIFF_FIXTURES[diff_fixture]
         self.assertListEqual(expected_data, data)

0 comments (0 inline, 0 general)