Commit28fdd30

committed

Fix SymbolicReference reference typing

1 parent77a7769 commit28fdd30Copy full SHA for 28fdd30

File tree

+14

-8

lines changed

+14

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ def delete(cls, repo: 'Repo', heads: 'Head', *kwargs: Any):`
`142`	`142`	`flag="-D"`
`143`	`143`	`repo.git.branch(flag,*heads)`
`144`	`144`
`145`		`-defset_tracking_branch(self,remote_reference:'RemoteReference')->'Head':`
	`145`	`+defset_tracking_branch(self,remote_reference:Union['RemoteReference',None])->'Head':`
`146`	`146`	`"""`
`147`	`147`	`Configure this branch to track the given remote reference. This will alter`
`148`	`148`	`this branch's configuration accordingly.`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`
`29`	`29`	`ifTYPE_CHECKING:`
`30`	`30`	`fromgit.repoimportRepo`
	`31`	`+fromgit.refsimportReference`
`31`	`32`
`32`	`33`	`T_References=TypeVar('T_References',bound='SymbolicReference')`
`33`	`34`
`@@ -356,8 +357,9 @@ def set_reference(self, ref, logmsg=None):`
`356`	`357`	`returnself`
`357`	`358`
`358`	`359`	`# aliased reference`
`359`		`-reference=property(_get_reference,set_reference,doc="Returns the Reference we point to")`
`360`		`-ref:Union[Commit_ish]=reference# type: ignore # Union[str, Commit_ish, SymbolicReference]`
	`360`	`+reference:Union[Commit_ish,'Reference']=property(# type: ignore`
	`361`	`+_get_reference,set_reference,doc="Returns the Reference we point to")`
	`362`	`+ref=reference`
`361`	`363`
`362`	`364`	`defis_valid(self):`
`363`	`365`	`"""`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ def _to_full_tag_path(path):`
`422`	`422`
`423`	`423`	`defcreate_head(self,path:PathLike,commit:str='HEAD',`
`424`	`424`	`force:bool=False,logmsg:Optional[str]=None`
`425`		`- )->'SymbolicReference':`
	`425`	`+ )->'Head':`
`426`	`426`	`"""Create a new head within the repository.`
`427`	`427`	`For more documentation, please see the Head.create method.`
`428`	`428`
`@@ -788,9 +788,8 @@ def ignored(self, *paths: PathLike) -> List[PathLike]:`
`788`	`788`	`returnproc.replace("\\\\","\\").replace('"',"").split("\n")`
`789`	`789`
`790`	`790`	`@property`
`791`		`-defactive_branch(self)->'SymbolicReference':`
	`791`	`+defactive_branch(self)->'HEAD':`
`792`	`792`	`"""The name of the currently active branch.`
`793`		`-`
`794`	`793`	`:return: Head to the active branch"""`
`795`	`794`	`returnself.head.reference`
`796`	`795`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`# This module is part of GitPython and is released under`
`5`	`5`	`# the BSD License: http://www.opensource.org/licenses/bsd-license.php`
`6`	`6`
	`7`	`+fromgit.repo.baseimportRepo`
`7`	`8`	`fromitertoolsimportchain`
`8`	`9`
`9`	`10`	`fromgitimport (`
`@@ -125,11 +126,15 @@ def test_heads(self, rwrepo):`
`125`	`126`	`gp_tracking_branch=rwrepo.create_head('gp_tracking#123')`
`126`	`127`	`special_name_remote_ref=rwrepo.remotes[0].refs[special_name]# get correct type`
`127`	`128`	`gp_tracking_branch.set_tracking_branch(special_name_remote_ref)`
`128`		`-assertgp_tracking_branch.tracking_branch().path==special_name_remote_ref.path`
	`129`	`+TBranch=gp_tracking_branch.tracking_branch()`
	`130`	`+ifTBranchisnotNone:`
	`131`	`+assertTBranch.path==special_name_remote_ref.path`
`129`	`132`
`130`	`133`	`git_tracking_branch=rwrepo.create_head('git_tracking#123')`
`131`	`134`	`rwrepo.git.branch('-u',special_name_remote_ref.name,git_tracking_branch.name)`
`132`		`-assertgit_tracking_branch.tracking_branch().name==special_name_remote_ref.name`
	`135`	`+TBranch=gp_tracking_branch.tracking_branch()`
	`136`	`+ifTBranchisnotNone:`
	`137`	`+assertTBranch.name==special_name_remote_ref.name`
`133`	`138`	`# END for each head`
`134`	`139`
`135`	`140`	`# verify REFLOG gets altered`

Comments

(0)