Commitaaa8434

committed

Submodule.move() will auto-rename the submodule if the name was equal to the path

1 parent20863cf commitaaa8434Copy full SHA for aaa8434

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ def move(self, module_path, configuration=True, module=True):`
`675`	`675`
`676`	`676`	`# rename the index entry - have to manipulate the index directly as`
`677`	`677`	`# git-mv cannot be used on submodules ... yeah`
	`678`	`+previous_sm_path=self.path`
`678`	`679`	`try:`
`679`	`680`	`ifconfiguration:`
`680`	`681`	`try:`
`@@ -701,6 +702,11 @@ def move(self, module_path, configuration=True, module=True):`
`701`	`702`	`raise`
`702`	`703`	`# END handle undo rename`
`703`	`704`
	`705`	`+# Auto-rename submodule if it's name was 'default', that is, the checkout directory`
	`706`	`+ifprevious_sm_path==self.name:`
	`707`	`+self.rename(module_checkout_path)`
	`708`	`+# end`
	`709`	`+`
`704`	`710`	`returnself`
`705`	`711`
`706`	`712`	`@unbare_repo`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -707,12 +707,15 @@ def test_git_submodule_compatibility(self, rwdir):`
`707`	`707`	`deftest_rename(self,rwdir):`
`708`	`708`	`parent=git.Repo.init(os.path.join(rwdir,'parent'))`
`709`	`709`	`sm_name='mymodules/myname'`
`710`		`-sm=parent.create_submodule(sm_name,'submodules/intermediate/one',url=self._submodule_url())`
	`710`	`+sm=parent.create_submodule(sm_name,sm_name,url=self._submodule_url())`
`711`	`711`	`parent.index.commit("Added submodule")`
`712`	`712`	`assertsm._parent_commitisnotNone`
`713`	`713`
`714`	`714`	`assertsm.rename(sm_name)issmandsm.name==sm_name`
`715`	`715`
	`716`	`+new_path='renamed/myname'`
	`717`	`+assertsm.move(new_path).name==new_path`
	`718`	`+`
`716`	`719`	`new_sm_name="shortname"`
`717`	`720`	`assertsm.rename(new_sm_name)issm`
`718`	`721`	`assertsm.exists()`

Comments

(0)