Commite00bf79

committed

root submodule: Added parent_commit parameter for convenience. Fixed submodule tests to run

1 parent7076f43 commite00bf79Copy full SHA for e00bf79

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ def __init__(self, repo, binsha, mode=None, path=None, name = None, parent_commi`
`89`	`89`
`90`	`90`	`:param repo: Our parent repository`
`91`	`91`	`:param binsha: binary sha referring to a commit in the remote repository, see url parameter`
`92`		`-:param parent_commit: see set_parent_commit()`
	`92`	`+:param parent_commit:a Commit object instance,see set_parent_commit() for more information`
`93`	`93`	`:param url: The url to the remote repository which is the submodule`
`94`	`94`	`:param branch_path: full (relative) path to ref to checkout when cloning the remote repository"""`
`95`	`95`	`super(Submodule,self).__init__(repo,binsha,mode,path)`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,14 @@ class RootModule(Submodule):`
`37`	`37`
`38`	`38`	`k_root_name='__ROOT__'`
`39`	`39`
`40`		`-def__init__(self,repo):`
`41`		`-# repo, binsha, mode=None, path=None, name = None, parent_commit=None, url=None, ref=None)`
	`40`	`+def__init__(self,repo,parent_commit=None):`
`42`	`41`	`super(RootModule,self).__init__(`
`43`	`42`	`repo,`
`44`	`43`	`binsha=self.NULL_BIN_SHA,`
`45`	`44`	`mode=self.k_default_mode,`
`46`	`45`	`path='',`
`47`	`46`	`name=self.k_root_name,`
`48`		`-parent_commit=repo.head.commit,`
	`47`	`+parent_commit=parent_commitorrepo.head.commit,`
`49`	`48`	`url='',`
`50`	`49`	`branch_path=git.Head.to_full_path(self.k_head_default)`
`51`	`50`	`)`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -394,15 +394,17 @@ def test_base_bare(self, rwrepo):`
`394`	`394`	`@with_rw_repo(k_subm_current,bare=False)`
`395`	`395`	`deftest_root_module(self,rwrepo):`
`396`	`396`	`# Can query everything without problems`
`397`		`-rm=RootModule(self.rorepo)`
`398`		`-assertrm.module()isself.rorepo`
	`397`	`+rm=RootModule(rwrepo)`
	`398`	`+# test new constructor`
	`399`	`+assertrm.parent_commit==RootModule(self.rorepo,self.rorepo.commit(self.k_subm_current)).parent_commit`
	`400`	`+assertrm.module()isrwrepo`
`399`	`401`
`400`	`402`	`# try attributes`
`401`	`403`	`rm.binsha`
`402`	`404`	`rm.mode`
`403`	`405`	`rm.path`
`404`	`406`	`assertrm.name==rm.k_root_name`
`405`		`-assertrm.parent_commit==self.rorepo.head.commit`
	`407`	`+assertrm.parent_commit==self.rorepo.commit(self.k_subm_current)`
`406`	`408`	`rm.url`
`407`	`409`	`rm.branch`
`408`	`410`
`@@ -412,7 +414,7 @@ def test_root_module(self, rwrepo):`
`412`	`414`
`413`	`415`	`# deep traversal git / async`
`414`	`416`	`rsmsp= [sm.pathforsminrm.traverse()]`
`415`		`-assertlen(rsmsp)==2#git, async, smmap, async being a child of git.`
	`417`	`+assertlen(rsmsp)==1#gitdb only - its not yet uptodate so it has no submodule`
`416`	`418`
`417`	`419`	`# cannot set the parent commit as root module's path didn't exist`
`418`	`420`	`self.failUnlessRaises(ValueError,rm.set_parent_commit,'HEAD')`

Comments

(0)