Commit ee987da

authored

Merge pull request #1918 from kamilkrzyskow/patch-1

Fix iter_change_type diff renamed property to prevent warning

2 parents ca1d031 + e1c660d commit ee987daCopy 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`	`yield diffidx`
`326`	`326`	`elif change_type == "C" and diffidx.copied_file:`
`327`	`327`	`yield diffidx`
`328`		`- elif change_type == "R" and diffidx.renamed:`
	`328`	`+ elif change_type == "R" and diffidx.renamed_file:`
`329`	`329`	`yield diffidx`
`330`	`330`	`elif change_type == "M" and diffidx.a_blob and diffidx.b_blob and diffidx.a_blob != diffidx.b_blob:`
`331`	`331`	`yield diffidx`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`if TYPE_CHECKING:`
`32`	`32`	`from pathlib import Path`
`33`	`33`
`34`		`- from git.diff import Diff`
	`34`	`+ from git.diff import Diff, DiffIndex`
`35`	`35`	`from git.objects.commit import Commit`
`36`	`36`
`37`	`37`	`# ------------------------------------------------------------------------`
`@@ -54,6 +54,12 @@ def diff(commit: "Commit") -> Generator["Diff", None, None]:`
`54`	`54`	`yield diff`
`55`	`55`
`56`	`56`
	`57`	`+@pytest.fixture`
	`58`	`+def diffs(commit: "Commit") -> Generator["DiffIndex", None, None]:`
	`59`	`+ """Fixture to supply a DiffIndex."""`
	`60`	`+ yield commit.diff(NULL_TREE)`
	`61`	`+`
	`62`	`+`
`57`	`63`	`def test_diff_renamed_warns(diff: "Diff") -> None:`
`58`	`64`	`"""The deprecated Diff.renamed property issues a deprecation warning."""`
`59`	`65`	`with pytest.deprecated_call():`
`@@ -122,3 +128,10 @@ def test_iterable_obj_inheriting_does_not_warn() -> None:`
`122`	`128`
`123`	`129`	`class Derived(IterableObj):`
`124`	`130`	`pass`
	`131`	`+`
	`132`	`+`
	`133`	`+def test_diff_iter_change_type(diffs: "DiffIndex") -> None:`
	`134`	`+ """The internal DiffIndex.iter_change_type function issues no deprecation warning."""`
	`135`	`+ with assert_no_deprecation_warning():`
	`136`	`+ for change_type in diffs.change_type:`
	`137`	`+ [*diffs.iter_change_type(change_type=change_type)]`

Comments

(0)