Commitfe7f9f2

committed

Fix remaining old Commit_ish annotations in git.repo.fun

Some were replaced in191f4cf (which also included other fixes).The fixes here consist mostly of replacing the remaining uses ofthe old Commit_ish, though some now-unneeded casting is alsoremoved.

1 parente66297a commitfe7f9f2Copy full SHA for fe7f9f2

File tree

1 file changed

+18

-14

lines changed

git/repo
- fun.py

1 file changed

+18

-14

lines changed

`‎git/repo/fun.py`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`
`23`	`23`	`fromtypingimportOptional,TYPE_CHECKING,Union,cast,overload`
`24`	`24`
`25`		`-fromgit.typesimportAnyGitObject,Literal,Old_commit_ish,PathLike`
	`25`	`+fromgit.typesimportAnyGitObject,Literal,PathLike`
`26`	`26`
`27`	`27`	`ifTYPE_CHECKING:`
`28`	`28`	`fromgit.dbimportGitCmdObjectDB`
`29`		`-fromgit.objectsimportCommit,TagObject,Blob,Tree`
	`29`	`+fromgit.objectsimportCommit,TagObject`
`30`	`30`	`fromgit.refs.referenceimportReference`
`31`	`31`	`fromgit.refs.tagimportTag`
`32`	`32`	`from .baseimportRepo`
`@@ -227,12 +227,18 @@ def to_commit(obj: Object) -> "Commit":`
`227`	`227`	`returnobj`
`228`	`228`
`229`	`229`
`230`		`-defrev_parse(repo:"Repo",rev:str)->Union["Commit","Tag","Tree","Blob"]:`
`231`		`-"""`
	`230`	`+defrev_parse(repo:"Repo",rev:str)->AnyGitObject:`
	`231`	+"""Parse a revision string. Like ``git rev-parse``.
	`232`	`+`
`232`	`233`	`:return:`
`233`		- `~git.objects.base.Object` at the given revision, either
`234`		- `~git.objects.commit.Commit`, `~git.refs.tag.Tag`, `~git.objects.tree.Tree` or
`235`		- `~git.objects.blob.Blob`.
	`234`	+ `~git.objects.base.Object` at the given revision.
	`235`	`+`
	`236`	`+ This may be any type of git object:`
	`237`	`+`
	`238`	+ * :class:`Commit <git.objects.commit.Commit>`
	`239`	+ * :class:`TagObject <git.objects.tag.TagObject>`
	`240`	+ * :class:`Tree <git.objects.tree.Tree>`
	`241`	+ * :class:`Blob <git.objects.blob.Blob>`
`236`	`242`
`237`	`243`	`:param rev:`
`238`	`244`	``git rev-parse``-compatible revision specification as string. Please see
`@@ -253,7 +259,7 @@ def rev_parse(repo: "Repo", rev: str) -> Union["Commit", "Tag", "Tree", "Blob"]:`
`253`	`259`	`raiseNotImplementedError("commit by message search (regex)")`
`254`	`260`	`# END handle search`
`255`	`261`
`256`		`-obj:Union[Old_commit_ish,"Reference",None]=None`
	`262`	`+obj:Optional[AnyGitObject]=None`
`257`	`263`	`ref=None`
`258`	`264`	`output_type="commit"`
`259`	`265`	`start=0`
`@@ -275,12 +281,10 @@ def rev_parse(repo: "Repo", rev: str) -> Union["Commit", "Tag", "Tree", "Blob"]:`
`275`	`281`	`iftoken=="@":`
`276`	`282`	`ref=cast("Reference",name_to_object(repo,rev[:start],return_ref=True))`
`277`	`283`	`else:`
`278`		`-obj=cast(Old_commit_ish,name_to_object(repo,rev[:start]))`
	`284`	`+obj=name_to_object(repo,rev[:start])`
`279`	`285`	`# END handle token`
`280`	`286`	`# END handle refname`
`281`	`287`	`else:`
`282`		`-assertobjisnotNone`
`283`		`-`
`284`	`288`	`ifrefisnotNone:`
`285`	`289`	`obj=cast("Commit",ref.commit)`
`286`	`290`	`# END handle ref`
`@@ -300,7 +304,7 @@ def rev_parse(repo: "Repo", rev: str) -> Union["Commit", "Tag", "Tree", "Blob"]:`
`300`	`304`	`pass# Default.`
`301`	`305`	`elifoutput_type=="tree":`
`302`	`306`	`try:`
`303`		`-obj=cast(Old_commit_ish,obj)`
	`307`	`+obj=cast(AnyGitObject,obj)`
`304`	`308`	`obj=to_commit(obj).tree`
`305`	`309`	`except (AttributeError,ValueError):`
`306`	`310`	`pass# Error raised later.`
`@@ -373,7 +377,7 @@ def rev_parse(repo: "Repo", rev: str) -> Union["Commit", "Tag", "Tree", "Blob"]:`
`373`	`377`	`parsed_to=start`
`374`	`378`	`# Handle hierarchy walk.`
`375`	`379`	`try:`
`376`		`-obj=cast(Old_commit_ish,obj)`
	`380`	`+obj=cast(AnyGitObject,obj)`
`377`	`381`	`iftoken=="~":`
`378`	`382`	`obj=to_commit(obj)`
`379`	`383`	`for_inrange(num):`
`@@ -402,7 +406,7 @@ def rev_parse(repo: "Repo", rev: str) -> Union["Commit", "Tag", "Tree", "Blob"]:`
`402`	`406`
`403`	`407`	`# Still no obj? It's probably a simple name.`
`404`	`408`	`ifobjisNone:`
`405`		`-obj=cast(Old_commit_ish,name_to_object(repo,rev))`
	`409`	`+obj=name_to_object(repo,rev)`
`406`	`410`	`parsed_to=lr`
`407`	`411`	`# END handle simple name`
`408`	`412`

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!

Commitfe7f9f2

File tree

1 file changed

1 file changed

`‎git/repo/fun.py`

0 commit comments