Commitab27827

committed

Fix remaining old Commit_ish annotations in git.refs

(This also improves the sorting of imports where they are alreadybeing changed, and fixes a typo in a comment.)

1 parentfe7f9f2 commitab27827Copy full SHA for ab27827

File tree

+10

-14

lines changed

+10

-14

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@`
`15`	`15`
`16`	`16`	`# typing ---------------------------------------------------`
`17`	`17`
`18`		`-fromtypingimportAny,Sequence,Union,TYPE_CHECKING`
	`18`	`+fromtypingimportAny,Sequence,TYPE_CHECKING,Union`
`19`	`19`
`20`		`-fromgit.typesimportPathLike,Old_commit_ish`
	`20`	`+fromgit.typesimportCommit_ish,PathLike`
`21`	`21`
`22`	`22`	`ifTYPE_CHECKING:`
`23`		`-fromgit.repoimportRepo`
`24`	`23`	`fromgit.objectsimportCommit`
`25`	`24`	`fromgit.refsimportRemoteReference`
	`25`	`+fromgit.repoimportRepo`
`26`	`26`
`27`	`27`	`# -------------------------------------------------------------------`
`28`	`28`
`@@ -62,7 +62,7 @@ def orig_head(self) -> SymbolicReference:`
`62`	`62`
`63`	`63`	`defreset(`
`64`	`64`	`self,`
`65`		`-commit:Union[Old_commit_ish,SymbolicReference,str]="HEAD",`
	`65`	`+commit:Union[Commit_ish,SymbolicReference,str]="HEAD",`
`66`	`66`	`index:bool=True,`
`67`	`67`	`working_tree:bool=False,`
`68`	`68`	`paths:Union[PathLike,Sequence[PathLike],None]=None,`
`@@ -99,7 +99,7 @@ def reset(`
`99`	`99`	`ifindex:`
`100`	`100`	`mode="--mixed"`
`101`	`101`
`102`		`-#Tt appears some git versions declare mixed and paths deprecated.`
	`102`	`+#It appears some git versions declare mixed and paths deprecated.`
`103`	`103`	`# See http://github.com/Byron/GitPython/issues#issue/2.`
`104`	`104`	`ifpaths:`
`105`	`105`	`mode=None`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,20 @@`
`1`	`1`	`# This module is part of GitPython and is released under the`
`2`	`2`	`# 3-Clause BSD License: https://opensource.org/license/bsd-3-clause/`
`3`	`3`
`4`		`-fromgit.utilimport (`
`5`		`-LazyMixin,`
`6`		`-IterableObj,`
`7`		`-)`
	`4`	`+fromgit.utilimportIterableObj,LazyMixin`
`8`	`5`	`from .symbolicimportSymbolicReference,T_References`
`9`	`6`
`10`		`-`
`11`	`7`	`# typing ------------------------------------------------------------------`
`12`	`8`
`13`		`-fromtypingimportAny,Callable,Iterator,Type,Union,TYPE_CHECKING`
`14`		`-fromgit.typesimportOld_commit_ish,PathLike,_T`
	`9`	`+fromtypingimportAny,Callable,Iterator,TYPE_CHECKING,Type,Union`
	`10`	`+`
	`11`	`+fromgit.typesimportAnyGitObject,PathLike,_T`
`15`	`12`
`16`	`13`	`ifTYPE_CHECKING:`
`17`	`14`	`fromgit.repoimportRepo`
`18`	`15`
`19`	`16`	`# ------------------------------------------------------------------------------`
`20`	`17`
`21`		`-`
`22`	`18`	`__all__= ["Reference"]`
`23`	`19`
`24`	`20`	`# { Utilities`
`@@ -81,7 +77,7 @@ def __str__(self) -> str:`
`81`	`77`	`# @ReservedAssignment`
`82`	`78`	`defset_object(`
`83`	`79`	`self,`
`84`		`-object:Union[Old_commit_ish,"SymbolicReference",str],`
	`80`	`+object:Union[AnyGitObject,"SymbolicReference",str],`
`85`	`81`	`logmsg:Union[str,None]=None,`
`86`	`82`	`)->"Reference":`
`87`	`83`	`"""Special version which checks if the head-log needs an update as well.`

Comments

(0)