Commit4006c43

committed

fix(diff): use explicit change-type if possible

That way, we do not have to figure the change type out byexamining the diff object.It's implemented in a way that should yield more desireable resultsas we keep the change-type that git is providing us with.Fixes#493

1 parent1ec4389 commit4006c43Copy full SHA for 4006c43

File tree

4 files changed

+25

-5

lines changed

doc/source
- changes.rst
git
- diff.py
- test
  - fixtures
    - diff_abbrev-40_full-index_M_raw_no-color
  - test_diff.py

4 files changed

+25

-5

lines changed

`‎doc/source/changes.rst`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,12 @@`
`2`	`2`	`Changelog`
`3`	`3`	`=========`
`4`	`4`
	`5`	`+2.0.8 - Bugfixes`
	`6`	`+================`
	`7`	`+`
	`8`	+* `DiffIndex.iter_change_type(...)` produces better results when diffing
	`9`	`+ an index against the working tree.`
	`10`	`+`
`5`	`11`	`2.0.7 - New Features`
`6`	`12`	`====================`
`7`	`13`

`‎git/diff.py`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,9 @@ def iter_change_type(self, change_type):`
`183`	`183`	`raiseValueError("Invalid change type: %s"%change_type)`
`184`	`184`
`185`	`185`	`fordiffinself:`
`186`		`-ifchange_type=="A"anddiff.new_file:`
	`186`	`+ifdiff.change_type==change_type:`
	`187`	`+yielddiff`
	`188`	`+elifchange_type=="A"anddiff.new_file:`
`187`	`189`	`yielddiff`
`188`	`190`	`elifchange_type=="D"anddiff.deleted_file:`
`189`	`191`	`yielddiff`
`@@ -247,11 +249,12 @@ class Diff(object):`
`247`	`249`	`NULL_BIN_SHA=b"\0"*20`
`248`	`250`
`249`	`251`	`__slots__= ("a_blob","b_blob","a_mode","b_mode","a_rawpath","b_rawpath",`
`250`		`-"new_file","deleted_file","raw_rename_from","raw_rename_to","diff")`
	`252`	`+"new_file","deleted_file","raw_rename_from","raw_rename_to",`
	`253`	`+"diff","change_type")`
`251`	`254`
`252`	`255`	`def__init__(self,repo,a_rawpath,b_rawpath,a_blob_id,b_blob_id,a_mode,`
`253`	`256`	`b_mode,new_file,deleted_file,raw_rename_from,`
`254`		`-raw_rename_to,diff):`
	`257`	`+raw_rename_to,diff,change_type):`
`255`	`258`
`256`	`259`	`self.a_mode=a_mode`
`257`	`260`	`self.b_mode=b_mode`
`@@ -286,6 +289,7 @@ def __init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode,`
`286`	`289`	`self.raw_rename_to=raw_rename_toorNone`
`287`	`290`
`288`	`291`	`self.diff=diff`
	`292`	`+self.change_type=change_type`
`289`	`293`
`290`	`294`	`def__eq__(self,other):`
`291`	`295`	`fornameinself.__slots__:`
`@@ -435,7 +439,7 @@ def _index_from_patch_format(cls, repo, stream):`
`435`	`439`	`new_file,deleted_file,`
`436`	`440`	`rename_from,`
`437`	`441`	`rename_to,`
`438`		`-None))`
	`442`	`+None,None))`
`439`	`443`
`440`	`444`	`previous_header=header`
`441`	`445`	`# end for each header we parse`
`@@ -483,7 +487,7 @@ def _index_from_raw_format(cls, repo, stream):`
`483`	`487`	`# END add/remove handling`
`484`	`488`
`485`	`489`	`diff=Diff(repo,a_path,b_path,a_blob_id,b_blob_id,old_mode,new_mode,`
`486`		`-new_file,deleted_file,rename_from,rename_to,'')`
	`490`	`+new_file,deleted_file,rename_from,rename_to,'',change_type)`
`487`	`491`	`index.append(diff)`
`488`	`492`	`# END for each line`
`489`	`493`

`‎git/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+:100644 100644 739bc65220ad90e9ebfa2d6af1723b97555569a4 0000000000000000000000000000000000000000 MREADME.md`

`‎git/test/test_diff.py`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,15 @@ def test_diff_with_rename(self):`
`104`	`104`	`assertdiff.rename_to=='that'`
`105`	`105`	`assertlen(list(diffs.iter_change_type('R')))==1`
`106`	`106`
	`107`	`+deftest_diff_of_modified_files_not_added_to_the_index(self):`
	`108`	`+output=StringProcessAdapter(fixture('diff_abbrev-40_full-index_M_raw_no-color'))`
	`109`	`+diffs=Diff._index_from_raw_format(self.rorepo,output.stdout)`
	`110`	`+`
	`111`	`+assertlen(diffs)==1,'one modification'`
	`112`	`+assertlen(list(diffs.iter_change_type('M')))==1,'one modification'`
	`113`	`+assertdiffs[0].change_type=='M'`
	`114`	`+assertdiffs[0].b_blobisNone`
	`115`	`+`
`107`	`116`	`deftest_binary_diff(self):`
`108`	`117`	`formethod,file_namein ((Diff._index_from_patch_format,'diff_patch_binary'),`
`109`	`118`	`(Diff._index_from_raw_format,'diff_raw_binary')):`

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!

Commit4006c43

File tree

4 files changed

4 files changed

`‎doc/source/changes.rst`

`‎git/diff.py`

`‎git/test/fixtures/diff_abbrev-40_full-index_M_raw_no-color`

`‎git/test/test_diff.py`

0 commit comments