Commitee987da

authored

Merge pull request#1918 from kamilkrzyskow/patch-1

Fix iter_change_type diff renamed property to prevent warning

2 parentsca1d031 +e1c660d commitee987daCopy full SHA for ee987da

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ def iter_change_type(self, change_type: Lit_change_type) -> Iterator[T_Diff]:`
`325`	`325`	`yielddiffidx`
`326`	`326`	`elifchange_type=="C"anddiffidx.copied_file:`
`327`	`327`	`yielddiffidx`
`328`		`-elifchange_type=="R"anddiffidx.renamed:`
	`328`	`+elifchange_type=="R"anddiffidx.renamed_file:`
`329`	`329`	`yielddiffidx`
`330`	`330`	`elifchange_type=="M"anddiffidx.a_blobanddiffidx.b_blobanddiffidx.a_blob!=diffidx.b_blob:`
`331`	`331`	`yielddiffidx`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`ifTYPE_CHECKING:`
`32`	`32`	`frompathlibimportPath`
`33`	`33`
`34`		`-fromgit.diffimportDiff`
	`34`	`+fromgit.diffimportDiff,DiffIndex`
`35`	`35`	`fromgit.objects.commitimportCommit`
`36`	`36`
`37`	`37`	`# ------------------------------------------------------------------------`
`@@ -54,6 +54,12 @@ def diff(commit: "Commit") -> Generator["Diff", None, None]:`
`54`	`54`	`yielddiff`
`55`	`55`
`56`	`56`
	`57`	`+@pytest.fixture`
	`58`	`+defdiffs(commit:"Commit")->Generator["DiffIndex",None,None]:`
	`59`	`+"""Fixture to supply a DiffIndex."""`
	`60`	`+yieldcommit.diff(NULL_TREE)`
	`61`	`+`
	`62`	`+`
`57`	`63`	`deftest_diff_renamed_warns(diff:"Diff")->None:`
`58`	`64`	`"""The deprecated Diff.renamed property issues a deprecation warning."""`
`59`	`65`	`withpytest.deprecated_call():`
`@@ -122,3 +128,10 @@ def test_iterable_obj_inheriting_does_not_warn() -> None:`
`122`	`128`
`123`	`129`	`classDerived(IterableObj):`
`124`	`130`	`pass`
	`131`	`+`
	`132`	`+`
	`133`	`+deftest_diff_iter_change_type(diffs:"DiffIndex")->None:`
	`134`	`+"""The internal DiffIndex.iter_change_type function issues no deprecation warning."""`
	`135`	`+withassert_no_deprecation_warning():`
	`136`	`+forchange_typeindiffs.change_type:`
	`137`	`+ [*diffs.iter_change_type(change_type=change_type)]`

Comments

(0)