Commit21e2c45

committed

try fixing up test fixtures and implementation

1 parent90a6e1c commit21e2c45Copy full SHA for 21e2c45

File tree

2 files changed

+10

-6

lines changed

git
- diff.py
test
- test_diff.py

2 files changed

+10

-6

lines changed

`‎git/diff.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -511,11 +511,11 @@ def handle_diff_line(line):`
`511`	`511`	`new_file=True`
`512`	`512`	`elifchange_type=='C':`
`513`	`513`	`copied_file=True`
`514`		`-a_path,b_path=path.split('\t',1)`
	`514`	`+a_path,b_path=path.split('\x00',1)`
`515`	`515`	`a_path=a_path.encode(defenc)`
`516`	`516`	`b_path=b_path.encode(defenc)`
`517`	`517`	`elifchange_type=='R':`
`518`		`-a_path,b_path=path.split('\t',1)`
	`518`	`+a_path,b_path=path.split('\x00',1)`
`519`	`519`	`a_path=a_path.encode(defenc)`
`520`	`520`	`b_path=b_path.encode(defenc)`
`521`	`521`	`rename_from,rename_to=a_path,b_path`

`‎test/test_diff.py`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,10 @@`
`26`	`26`	`importos.pathasosp`
`27`	`27`
`28`	`28`
	`29`	`+defto_raw(input):`
	`30`	`+returninput.replace(b'\t',b'\x00')`
	`31`	`+`
	`32`	`+`
`29`	`33`	`@ddt.ddt`
`30`	`34`	`classTestDiff(TestBase):`
`31`	`35`
`@@ -112,7 +116,7 @@ def test_diff_with_rename(self):`
`112`	`116`	`self.assertEqual(diff.raw_rename_to,b'm\xc3\xbcller')`
`113`	`117`	`assertisinstance(str(diff),str)`
`114`	`118`
`115`		`-output=StringProcessAdapter(fixture('diff_rename_raw'))`
	`119`	`+output=StringProcessAdapter(to_raw(fixture('diff_rename_raw')))`
`116`	`120`	`diffs=Diff._index_from_raw_format(self.rorepo,output)`
`117`	`121`	`self.assertEqual(len(diffs),1)`
`118`	`122`	`diff=diffs[0]`
`@@ -137,7 +141,7 @@ def test_diff_with_copied_file(self):`
`137`	`141`	`self.assertTrue(diff.b_path,'test2.txt')`
`138`	`142`	`assertisinstance(str(diff),str)`
`139`	`143`
`140`		`-output=StringProcessAdapter(fixture('diff_copied_mode_raw'))`
	`144`	`+output=StringProcessAdapter(to_raw(fixture('diff_copied_mode_raw')))`
`141`	`145`	`diffs=Diff._index_from_raw_format(self.rorepo,output)`
`142`	`146`	`self.assertEqual(len(diffs),1)`
`143`	`147`	`diff=diffs[0]`
`@@ -165,7 +169,7 @@ def test_diff_with_change_in_type(self):`
`165`	`169`	`self.assertIsNotNone(diff.new_file)`
`166`	`170`	`assertisinstance(str(diff),str)`
`167`	`171`
`168`		`-output=StringProcessAdapter(fixture('diff_change_in_type_raw'))`
	`172`	`+output=StringProcessAdapter(to_raw(fixture('diff_change_in_type_raw')))`
`169`	`173`	`diffs=Diff._index_from_raw_format(self.rorepo,output)`
`170`	`174`	`self.assertEqual(len(diffs),1)`
`171`	`175`	`diff=diffs[0]`
`@@ -175,7 +179,7 @@ def test_diff_with_change_in_type(self):`
`175`	`179`	`self.assertEqual(len(list(diffs.iter_change_type('T'))),1)`
`176`	`180`
`177`	`181`	`deftest_diff_of_modified_files_not_added_to_the_index(self):`
`178`		`-output=StringProcessAdapter(fixture('diff_abbrev-40_full-index_M_raw_no-color'))`
	`182`	`+output=StringProcessAdapter(to_raw(fixture('diff_abbrev-40_full-index_M_raw_no-color')))`
`179`	`183`	`diffs=Diff._index_from_raw_format(self.rorepo,output)`
`180`	`184`
`181`	`185`	`self.assertEqual(len(diffs),1,'one modification')`

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!

Uh oh!

Commit21e2c45

File tree

2 files changed

2 files changed

`‎git/diff.py`

`‎test/test_diff.py`

0 commit comments