Skip to content

Commit 71b3845

Browse files
thetwojByron
authored andcommitted
Fixed new test for copied files
1 parent 59ad906 commit 71b3845

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

git/diff.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class DiffIndex(list):
167167
# R = Renamed
168168
# M = Modified
169169
# T = Changed in the type
170-
change_type = ("A", "D", "R", "M", "T")
170+
change_type = ("A", "C", "D", "R", "M", "T")
171171

172172
def iter_change_type(self, change_type):
173173
"""
@@ -245,7 +245,9 @@ class Diff(object):
245245
^rename[ ]to[ ](?P<rename_to>.*)(?:\n|$))?
246246
(?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
247247
(?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
248-
(?:^copied[ ]file[ ]mode[ ](?P<copied_file_mode>.+)(?:\n|$))?
248+
(?:^similarity[ ]index[ ]\d+%\n
249+
^copy[ ]from[ ].*\n
250+
^copy[ ]to[ ](?P<copied_file_mode>.*)(?:\n|$))?
249251
(?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
250252
\.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
251253
(?:^---[ ](?P<a_path>[^\t\n\r\f\v]*)[\t\r\f\v]*(?:\n|$))?
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
:100644 100644 cfe9dea cfe9dea C100 test1.txt test2.txt
1+
:100644 100644 cfe9deac6e10683917e80f877566b58644aa21df cfe9deac6e10683917e80f877566b58644aa21df C100 test1.txt test2.txt

git/test/test_diff.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ def test_diff_with_copied_file(self):
120120
assert_equal(1, len(diffs))
121121

122122
diff = diffs[0]
123-
print(diff)
124123
assert_true(diff.copied_file)
125124
assert isinstance(str(diff), str)
126125

0 commit comments

Comments
 (0)