Commit71b3845

authored and

committed

Fixed new test for copied files

1 parent59ad906 commit71b3845Copy full SHA for 71b3845

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ class DiffIndex(list):`
`167`	`167`	`# R = Renamed`
`168`	`168`	`# M = Modified`
`169`	`169`	`# T = Changed in the type`
`170`		`-change_type= ("A","D","R","M","T")`
	`170`	`+change_type= ("A","C","D","R","M","T")`
`171`	`171`
`172`	`172`	`defiter_change_type(self,change_type):`
`173`	`173`	`"""`
`@@ -245,7 +245,9 @@ class Diff(object):`
`245`	`245`	`^rename[ ]to[ ](?P<rename_to>.*)(?:\n\|$))?`
`246`	`246`	`(?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n\|$))?`
`247`	`247`	`(?:^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\|$))?`
`249`	`251`	`(?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)`
`250`	`252`	`\.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n\|$))?`
`251`	`253`	`(?:^---[ ](?P<a_path>[^\t\n\r\f\v])[\t\r\f\v](?:\n\|$))?`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-:100644 100644cfe9dea cfe9dea C100test1.txttest2.txt`
	`1`	`+:100644 100644cfe9deac6e10683917e80f877566b58644aa21df cfe9deac6e10683917e80f877566b58644aa21df C100test1.txttest2.txt`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,6 @@ def test_diff_with_copied_file(self):`
`120`	`120`	`assert_equal(1,len(diffs))`
`121`	`121`
`122`	`122`	`diff=diffs[0]`
`123`		`-print(diff)`
`124`	`123`	`assert_true(diff.copied_file)`
`125`	`124`	`assertisinstance(str(diff),str)`
`126`	`125`

Comments

(0)