Commit21b4db5

committed

Improved efficiency of the submodule.update process, improved test

1 parent9f73e8b commit21b4db5Copy full SHA for 21b4db5

File tree

2 files changed

+35

-20

lines changed

lib/git/objects
- submodule.py
test/git
- test_submodule.py

2 files changed

+35

-20

lines changed

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

Lines changed: 27 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ def __hash__(self):`
`144`	`144`	`"""Hash this instance using its logical id, not the sha"""`
`145`	`145`	`returnhash(self._name)`
`146`	`146`
	`147`	`+def__str__(self):`
	`148`	`+returnself._name`
	`149`	`+`
`147`	`150`	`@classmethod`
`148`	`151`	`def_config_parser(cls,repo,parent_commit,read_only):`
`149`	`152`	`""":return: Config Parser constrained to our submodule in read or write mode`
`@@ -250,20 +253,24 @@ def update(self, recursive=False, init=True):`
`250`	`253`	`remote_branch=mrepo.remotes.origin.refs[self.branch]`
`251`	`254`	`local_branch=git.Head(mrepo,git.Head.to_full_path(self.branch))`
`252`	`255`	`ifnotlocal_branch.is_valid():`
`253`		`-mrepo.git.checkout(remote_branch,b=self.branch)`
`254`		`-else:`
`255`		`-# have a valid branch, but no checkout - make sure we can figure`
`256`		`-# that out by marking the commit with a null_sha`
`257`		`-# have to write it directly as .commit = NULLSHA tries to resolve the sha`
`258`		`-ref=mrepo.head.ref`
`259`		`-refpath=join_path_native(mrepo.git_dir,ref.to_full_path(ref.path))`
`260`		`-refdir=os.path.dirname(refpath)`
`261`		`-ifnotos.path.isdir(refdir):`
`262`		`-os.makedirs(refdir)`
`263`		`-#END handle directory`
`264`		`-open(refpath,'w').write(self.NULL_HEX_SHA)`
	`256`	`+# Setup a tracking configuration - branch doesn't need to`
	`257`	`+# exist to do that`
	`258`	`+local_branch.set_tracking_branch(remote_branch)`
	`259`	`+#END handle local branch`
	`260`	`+`
	`261`	`+# have a valid branch, but no checkout - make sure we can figure`
	`262`	`+# that out by marking the commit with a null_sha`
	`263`	`+# have to write it directly as .commit = NULLSHA tries to resolve the sha`
	`264`	`+# This will bring the branch into existance`
	`265`	`+refpath=join_path_native(mrepo.git_dir,local_branch.path)`
	`266`	`+refdir=os.path.dirname(refpath)`
	`267`	`+ifnotos.path.isdir(refdir):`
	`268`	`+os.makedirs(refdir)`
	`269`	`+#END handle directory`
	`270`	`+open(refpath,'w').write(self.NULL_HEX_SHA)`
`265`	`271`	`# END initial checkout + branch creation`
`266`		`-# make sure we are not detached`
	`272`	`+`
	`273`	`+# make sure HEAD is not detached`
`267`	`274`	`mrepo.head.ref=local_branch`
`268`	`275`	`exceptIndexError:`
`269`	`276`	`print>>sys.stderr,"Warning: Failed to checkout tracking branch %s"%self.branch`
`@@ -280,13 +287,14 @@ def update(self, recursive=False, init=True):`
`280`	`287`	`# branch - this should be prevented when setting the branch option`
`281`	`288`	`mrepo.head.reset(self.hexsha,index=True,working_tree=True)`
`282`	`289`	`# END handle checkout`
`283`		`-`
`284`		`-ifrecursive:`
`285`		`-forsubmoduleinself.iter_items(self.module()):`
`286`		`-submodule.update(recursive,init)`
`287`		`-# END handle recursive update`
`288`		`-# END for each submodule`
`289`	`290`	`# END update to new commit only if needed`
	`291`	`+`
	`292`	`+# HANDLE RECURSION`
	`293`	`+ifrecursive:`
	`294`	`+forsubmoduleinself.iter_items(self.module()):`
	`295`	`+submodule.update(recursive,init)`
	`296`	`+# END handle recursive update`
	`297`	`+# END for each submodule`
`290`	`298`
`291`	`299`	`returnself`
`292`	`300`

`‎test/git/test_submodule.py`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,8 @@ def _do_base_tests(self, rwrepo):`
`82`	`82`
`83`	`83`	`# TEST TODO: if a path in the gitmodules file, but not in the index, it raises`
`84`	`84`
	`85`	`+# TEST UPDATE`
	`86`	`+##############`
`85`	`87`	`# module retrieval is not always possible`
`86`	`88`	`ifrwrepo.bare:`
`87`	`89`	`self.failUnlessRaises(InvalidGitRepositoryError,sm.module)`
`@@ -106,6 +108,9 @@ def _do_base_tests(self, rwrepo):`
`106`	`108`	`assertisinstance(sm.module(),git.Repo)`
`107`	`109`	`assertsm.module().working_tree_dir==sm.module_path()`
`108`	`110`
	`111`	`+# we should have setup a tracking branch, which is also active`
	`112`	`+assertsm.module().head.ref.tracking_branch()isnotNone`
	`113`	`+`
`109`	`114`	`# delete the whole directory and re-initialize`
`110`	`115`	`shutil.rmtree(sm.module_path())`
`111`	`116`	`sm.update(recursive=False)`
`@@ -119,10 +124,12 @@ def _do_base_tests(self, rwrepo):`
`119`	`124`	`csm.config_writer().set_value('url',new_csm_path)`
`120`	`125`	`assertcsm.url==new_csm_path`
`121`	`126`
`122`		`-`
`123`	`127`	`# update recuesively again`
`124`	`128`	`sm.update(recursive=True)`
`125`	`129`
	`130`	`+# tracking branch once again`
	`131`	`+csm.module().head.ref.tracking_branch()isnotNone`
	`132`	`+`
`126`	`133`	`# this flushed in a sub-submodule`
`127`	`134`	`assertlen(list(rwrepo.iter_submodules()))==2`
`128`	`135`	`# END handle bare mode`

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!

Commit21b4db5

File tree

2 files changed

2 files changed

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

`‎test/git/test_submodule.py`

0 commit comments