Commiteecf148

committed

Rmv root.py types

1 parented58e2f commiteecf148Copy full SHA for eecf148

File tree

2 files changed

+12

-26

lines changed

git/objects/submodule
- base.py
- root.py

2 files changed

+12

-26

lines changed

`‎git/objects/submodule/base.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,7 @@ def set_parent_commit(self, commit: Union[Commit_ish, None], check: bool = True)`
`1015`	`1015`	`# If check is False, we might see a parent-commit that doesn't even contain the submodule anymore.`
`1016`	`1016`	`# in that case, mark our sha as being NULL`
`1017`	`1017`	`try:`
`1018`		`-self.binsha=pctree[self.path].binsha# type: ignore # str()?`
	`1018`	`+self.binsha=pctree[str(self.path)].binsha`
`1019`	`1019`	`exceptKeyError:`
`1020`	`1020`	`self.binsha=self.NULL_BIN_SHA`
`1021`	`1021`	`# end`
`@@ -1080,7 +1080,7 @@ def rename(self, new_name: str) -> 'Submodule':`
`1080`	`1080`	`destination_module_abspath=self._module_abspath(self.repo,self.path,new_name)`
`1081`	`1081`	`source_dir=mod.git_dir`
`1082`	`1082`	`# Let's be sure the submodule name is not so obviously tied to a directory`
`1083`		`-ifdestination_module_abspath.startswith(str(mod.git_dir)):# type: ignore # str()?`
	`1083`	`+ifstr(destination_module_abspath).startswith(str(mod.git_dir)):`
`1084`	`1084`	`tmp_dir=self._module_abspath(self.repo,self.path,str(uuid.uuid4()))`
`1085`	`1085`	`os.renames(source_dir,tmp_dir)`
`1086`	`1086`	`source_dir=tmp_dir`

`‎git/objects/submodule/root.py‎`

Lines changed: 10 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,18 +10,6 @@`
`10`	`10`
`11`	`11`	`importlogging`
`12`	`12`
`13`		`-# typing -------------------------------------------------------------------`
`14`		`-`
`15`		`-fromtypingimportTYPE_CHECKING,Union`
`16`		`-`
`17`		`-fromgit.typesimportCommit_ish`
`18`		`-`
`19`		`-ifTYPE_CHECKING:`
`20`		`-fromgit.repoimportRepo`
`21`		`-fromgit.utilimportIterableList`
`22`		`-`
`23`		`-# ----------------------------------------------------------------------------`
`24`		`-`
`25`	`13`	`__all__= ["RootModule","RootUpdateProgress"]`
`26`	`14`
`27`	`15`	`log=logging.getLogger('git.objects.submodule.root')`
`@@ -54,7 +42,7 @@ class RootModule(Submodule):`
`54`	`42`
`55`	`43`	`k_root_name='__ROOT__'`
`56`	`44`
`57`		`-def__init__(self,repo:'Repo'):`
	`45`	`+def__init__(self,repo):`
`58`	`46`	`# repo, binsha, mode=None, path=None, name = None, parent_commit=None, url=None, ref=None)`
`59`	`47`	`super(RootModule,self).__init__(`
`60`	`48`	`repo,`
`@@ -67,17 +55,15 @@ def __init__(self, repo: 'Repo'):`
`67`	`55`	`branch_path=git.Head.to_full_path(self.k_head_default)`
`68`	`56`	`)`
`69`	`57`
`70`		`-def_clear_cache(self)->None:`
	`58`	`+def_clear_cache(self):`
`71`	`59`	`"""May not do anything"""`
`72`	`60`	`pass`
`73`	`61`
`74`	`62`	`#{ Interface`
`75`	`63`
`76`		`-defupdate(self,previous_commit:Union[Commit_ish,None]=None,# type: ignore[override]`
`77`		`-recursive:bool=True,force_remove:bool=False,init:bool=True,`
`78`		`-to_latest_revision:bool=False,progress:Union[None,'RootUpdateProgress']=None,`
`79`		`-dry_run:bool=False,force_reset:bool=False,keep_going:bool=False`
`80`		`- )->'RootModule':`
	`64`	`+defupdate(self,previous_commit=None,recursive=True,force_remove=False,init=True,`
	`65`	`+to_latest_revision=False,progress=None,dry_run=False,force_reset=False,`
	`66`	`+keep_going=False):`
`81`	`67`	`"""Update the submodules of this repository to the current HEAD commit.`
`82`	`68`	`This method behaves smartly by determining changes of the path of a submodules`
`83`	`69`	`repository, next to changes to the to-be-checked-out commit or the branch to be`
`@@ -142,8 +128,8 @@ def update(self, previous_commit: Union[Commit_ish, None] = None,`
`142`	`128`	`previous_commit=repo.commit(previous_commit)# obtain commit object`
`143`	`129`	`# END handle previous commit`
`144`	`130`
`145`		`-psms:'IterableList[Submodule]'=self.list_items(repo,parent_commit=previous_commit)`
`146`		`-sms:'IterableList[Submodule]'=self.list_items(repo)`
	`131`	`+psms=self.list_items(repo,parent_commit=previous_commit)`
	`132`	`+sms=self.list_items(repo)`
`147`	`133`	`spsms=set(psms)`
`148`	`134`	`ssms=set(sms)`
`149`	`135`
`@@ -176,8 +162,8 @@ def update(self, previous_commit: Union[Commit_ish, None] = None,`
`176`	`162`	`csms= (spsms&ssms)`
`177`	`163`	`len_csms=len(csms)`
`178`	`164`	`fori,csminenumerate(csms):`
`179`		`-psm:'Submodule'=psms[csm.name]`
`180`		`-sm:'Submodule'=sms[csm.name]`
	`165`	`+psm=psms[csm.name]`
	`166`	`+sm=sms[csm.name]`
`181`	`167`
`182`	`168`	`# PATH CHANGES`
`183`	`169`	`##############`
`@@ -357,7 +343,7 @@ def update(self, previous_commit: Union[Commit_ish, None] = None,`
`357`	`343`
`358`	`344`	`returnself`
`359`	`345`
`360`		`-defmodule(self)->'Repo':`
	`346`	`+defmodule(self):`
`361`	`347`	`""":return: the actual repository containing the submodules"""`
`362`	`348`	`returnself.repo`
`363`	`349`	`#} END interface`

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!

Commiteecf148

File tree

2 files changed

2 files changed

`‎git/objects/submodule/base.py‎`

`‎git/objects/submodule/root.py‎`

0 commit comments