Commita223c7b

committed

Submodule.move() fixed to deal with 'non-gitfile' clones appropriately.

Improved a test to assure multiple update(init=False|True) calls don'tthrow.Fixesgitpython-developers#93

1 parentd4ce247 commita223c7bCopy full SHA for a223c7b

File tree

+15

-5

lines changed

+15

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ def move(self, module_path, configuration=True, module=True):`
`636`	`636`	`os.renames(cur_path,module_checkout_abspath)`
`637`	`637`	`renamed_module=True`
`638`	`638`
`639`		`-ifself._need_gitfile_submodules(self.repo.git):`
	`639`	`+ifos.path.isfile(os.path.join(module_checkout_abspath,'.git')):`
`640`	`640`	`module_abspath=self._module_abspath(self.repo,self.path,self.name)`
`641`	`641`	`self._write_git_file_and_module_config(module_checkout_abspath,module_abspath)`
`642`	`642`	`# end handle git file rewrite`

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,6 @@ def _do_base_tests(self, rwrepo):`
`377`	`377`	`assertnsm.path==pmp`
`378`	`378`	`assertrwrepo.submodules[0].path==pmp`
`379`	`379`
`380`		`-# TODO lowprio: test remaining exceptions ... for now its okay, the code looks right`
`381`		`-`
`382`	`380`	`# REMOVE 'EM ALL`
`383`	`381`	`################`
`384`	`382`	`# if a submodule's repo has no remotes, it can't be added without an explicit url`
`@@ -636,8 +634,20 @@ def test_git_submodules(self, rwdir):`
`636`	`634`
`637`	`635`	`assertsm.exists()andsm.module_exists()`
`638`	`636`
`639`		`-# test move and rename`
`640`		`-# TODO`
	`637`	`+clone=git.Repo.clone_from(self._submodule_url(),`
	`638`	`+os.path.join(parent.working_tree_dir,'existing-subrepository'))`
	`639`	`+sm2=parent.create_submodule('nongit-file-submodule',clone.working_tree_dir)`
	`640`	`+assertlen(parent.submodules)==2`
	`641`	`+`
	`642`	`+for_inrange(2):`
	`643`	`+forinitin (False,True):`
	`644`	`+sm.update(init=init)`
	`645`	`+sm2.update(init=init)`
	`646`	`+# end for each init state`
	`647`	`+# end for each iteration`
	`648`	`+`
	`649`	`+sm.move(sm.path+'_moved')`
	`650`	`+sm2.move(sm2.path+'_moved')`
`641`	`651`
`642`	`652`	`@with_rw_directory`
`643`	`653`	`deftest_git_submodule_compatibility(self,rwdir):`

Comments

(0)