kallithea Changeset - 156cb1cdd7ad

Changeset - 156cb1cdd7ad

Parent rev.

Child rev.

[Not reviewed]

default

0 2 1

Marcin Kuzminski - 12 years ago 2013-06-15 20:47:41
marcin@python-works.com

Grafted from: cd5e579c97e3

Added handling of copied files diff parsing

3 files changed with 22 insertions and 4 deletions:

rhodecode/lib/diffs.py

rhodecode/tests/fixtures/hg_diff_copy_file.diff

rhodecode/tests/models/test_diff_parsers.py

0 comments (0 inline, 0 general)

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -124,14 +124,15 @@ def get_gitdiff(filenode_old, filenode_n @@
     return vcs_gitdiff
 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):
     pass
@@ @@ -176,12 +177,14 @@ class DiffProcessor(object): @@
             [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
         (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
            ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
         (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n|$))?
         (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
            ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
         (?:^copy[ ]from[ ](?P<copy_from>\S+)\n
            ^copy[ ]to[ ](?P<copy_to>\S+)(?:\n|$))?
         (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
         (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
         (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
             \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
         (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+)|/dev/null)(?:\n|$))?
@@ @@ -385,13 +388,18 @@ class DiffProcessor(object): @@
                 if (head['rename_from'] and head['rename_to']
                       and head['rename_from'] != head['rename_to']):
                     op = 'M'
                     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']:
                         op = 'A'
                         stats['binary'] = True
                         stats['ops'][NEW_FILENODE] = 'new file'

rhodecode/tests/fixtures/hg_diff_copy_file.diff

➞

Show inline comments

@@ new file 100644 @@
 diff --git a/file1 b/file2
 copy from file1
 copy to file2

rhodecode/tests/models/test_diff_parsers.py

➞

Show inline comments

 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')
 DIFF_FIXTURES = {
     'hg_diff_add_single_binary_file.diff': [
@@ @@ -214,12 +214,19 @@ DIFF_FIXTURES = { @@
         ('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'}}),
+    ]
 #     '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'}}),
 #         ('README.txt', 'A', {'deleted': 0, 'binary': False, 'added': 19, 'ops': {1: 'new file 100644'}}),
 #         ('development.ini', 'A', {'deleted': 0, 'binary': False, 'added': 116, 'ops': {1: 'new file 100644'}}),
 #         ('docs/index.txt', 'A', {'deleted': 0, 'binary': False, 'added': 19, 'ops': {1: 'new file 100644'}}),

0 comments (0 inline, 0 general)