Commit1019d4c

committed

diff: by limiting the splitcount to 5, a subtle bug was introduced as the newline at the end of the split line was not split away automatically. Added test for this, and the trivial fix

Wow, at least two people reviewd the code, but it slipped through anyway :)

1 parent600fcbc commit1019d4cCopy full SHA for 1019d4c

File tree

2 files changed

+16

-1

lines changed

lib/git
- diff.py
test/git
- test_diff.py

2 files changed

+16

-1

lines changed

`‎lib/git/diff.py‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -343,6 +343,7 @@ def _index_from_raw_format(cls, repo, stream):`
`343`	`343`	`continue`
`344`	`344`	`# END its not a valid diff line`
`345`	`345`	`old_mode,new_mode,a_blob_id,b_blob_id,change_type,path=line[1:].split(None,5)`
	`346`	`+path=path.strip()`
`346`	`347`	`a_path=path`
`347`	`348`	`b_path=path`
`348`	`349`	`deleted_file=False`

`‎test/git/test_diff.py‎`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,30 @@`
`8`	`8`	`fromgitimport*`
`9`	`9`
`10`	`10`	`classTestDiff(TestBase):`
	`11`	`+`
	`12`	`+def_assert_diff_format(self,diffs):`
	`13`	`+# verify that the format of the diff is sane`
	`14`	`+fordiffindiffs:`
	`15`	`+ifdiff.a_blob:`
	`16`	`+assertnotdiff.a_blob.path.endswith('\n')`
	`17`	`+ifdiff.b_blob:`
	`18`	`+assertnotdiff.b_blob.path.endswith('\n')`
	`19`	`+# END for each diff`
	`20`	`+returndiffs`
`11`	`21`
`12`	`22`	`deftest_list_from_string_new_mode(self):`
`13`	`23`	`output=ListProcessAdapter(fixture('diff_new_mode'))`
`14`	`24`	`diffs=Diff._index_from_patch_format(self.rorepo,output.stdout)`
	`25`	`+self._assert_diff_format(diffs)`
	`26`	`+`
`15`	`27`	`assert_equal(1,len(diffs))`
`16`	`28`	`assert_equal(10,len(diffs[0].diff.splitlines()))`
`17`	`29`
`18`	`30`	`deftest_diff_with_rename(self):`
`19`	`31`	`output=ListProcessAdapter(fixture('diff_rename'))`
`20`	`32`	`diffs=Diff._index_from_patch_format(self.rorepo,output.stdout)`
`21`		`-`
	`33`	`+self._assert_diff_format(diffs)`
	`34`	`+`
`22`	`35`	`assert_equal(1,len(diffs))`
`23`	`36`
`24`	`37`	`diff=diffs[0]`
`@@ -54,6 +67,7 @@ def test_diff_interface(self):`
`54`	`67`	`assertisinstance(diff_index,DiffIndex)`
`55`	`68`
`56`	`69`	`ifdiff_index:`
	`70`	`+self._assert_diff_format(diff_index)`
`57`	`71`	`forctinDiffIndex.change_type:`
`58`	`72`	`key='ct_%s'%ct`
`59`	`73`	`assertion_map.setdefault(key,0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1019d4c

File tree

2 files changed

2 files changed

`‎lib/git/diff.py‎`

`‎test/git/test_diff.py‎`

0 commit comments