# HG changeset patch # User Marcin Kuzminski # Date 2013-06-15 18:47:41 # Node ID 156cb1cdd7ad380f9ad2eaf1f30e4f15d3d5ffc6 # Parent 267bb347d68cac089197e769bd83e3acebce671f Added handling of copied files diff parsing diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -127,8 +127,9 @@ NEW_FILENODE = 1 DEL_FILENODE = 2 MOD_FILENODE = 3 RENAMED_FILENODE = 4 -CHMOD_FILENODE = 5 -BIN_FILENODE = 6 +COPIED_FILENODE = 5 +CHMOD_FILENODE = 6 +BIN_FILENODE = 7 class DiffLimitExceeded(Exception): @@ -179,6 +180,8 @@ class DiffProcessor(object): (?:^similarity[ ]index[ ](?P\d+)%(?:\n|$))? (?:^rename[ ]from[ ](?P\S+)\n ^rename[ ]to[ ](?P\S+)(?:\n|$))? + (?:^copy[ ]from[ ](?P\S+)\n + ^copy[ ]to[ ](?P\S+)(?:\n|$))? (?:^new[ ]file[ ]mode[ ](?P.+)(?:\n|$))? (?:^deleted[ ]file[ ]mode[ ](?P.+)(?:\n|$))? (?:^index[ ](?P[0-9A-Fa-f]+) @@ -388,7 +391,12 @@ class DiffProcessor(object): stats['binary'] = True stats['ops'][RENAMED_FILENODE] = ('file renamed from %s to %s' % (head['rename_from'], head['rename_to'])) - + # COPY + if head['copy_from'] and head['copy_to']: + op = 'M' + stats['binary'] = True + stats['ops'][COPIED_FILENODE] = ('file copied from %s to %s' + % (head['copy_from'], head['copy_to'])) # FALL BACK: detect missed old style add or remove if op is None: if not head['a_file'] and head['b_file']: diff --git a/rhodecode/tests/fixtures/hg_diff_copy_file.diff b/rhodecode/tests/fixtures/hg_diff_copy_file.diff new file mode 100644 --- /dev/null +++ b/rhodecode/tests/fixtures/hg_diff_copy_file.diff @@ -0,0 +1,3 @@ +diff --git a/file1 b/file2 +copy from file1 +copy to file2 diff --git a/rhodecode/tests/models/test_diff_parsers.py b/rhodecode/tests/models/test_diff_parsers.py --- a/rhodecode/tests/models/test_diff_parsers.py +++ b/rhodecode/tests/models/test_diff_parsers.py @@ -2,7 +2,7 @@ from __future__ import with_statement import os from rhodecode.tests import * from rhodecode.lib.diffs import DiffProcessor, NEW_FILENODE, DEL_FILENODE, \ - MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE + MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE dn = os.path.dirname FIXTURES = os.path.join(dn(dn(os.path.abspath(__file__))), 'fixtures') @@ -217,6 +217,13 @@ DIFF_FIXTURES = { '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'}}), + ] # 'large_diff.diff': [ # ('.hgignore', 'A', {'deleted': 0, 'binary': False, 'added': 3, 'ops': {1: 'new file 100644'}}), # ('MANIFEST.in', 'A', {'deleted': 0, 'binary': False, 'added': 3, 'ops': {1: 'new file 100644'}}),