Commit65c07d6

Sandy Carter

committed

Implement is_ancestor

Wrap `git merge-base --is-ancestor` into its own function because it actsas a boolean check unlike base `git merge-base call`

1 parentf360ecd commit65c07d6Copy full SHA for 65c07d6

File tree

+29

-0

lines changed

+29

-0

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,21 @@ def merge_base(self, rev, *kwargs):`
`504`	`504`
`505`	`505`	`returnres`
`506`	`506`
	`507`	`+defis_ancestor(self,ancestor_rev,rev):`
	`508`	`+"""Check if a commit is an ancestor of another`
	`509`	`+`
	`510`	`+ :param ancestor_rev: Rev which should be an ancestor`
	`511`	`+ :param rev: Rev to test against ancestor_rev`
	`512`	+ :return: ``True``, ancestor_rev is an accestor to rev.
	`513`	`+ """`
	`514`	`+try:`
	`515`	`+self.git.merge_base(ancestor_rev,rev,is_ancestor=True)`
	`516`	`+exceptGitCommandErroraserr:`
	`517`	`+iferr.status==1:`
	`518`	`+returnFalse`
	`519`	`+raise`
	`520`	`+returnTrue`
	`521`	`+`
`507`	`522`	`def_get_daemon_export(self):`
`508`	`523`	`filename=join(self.git_dir,self.DAEMON_EXPORT_FILE)`
`509`	`524`	`returnos.path.exists(filename)`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`importsys`
`43`	`43`	`importtempfile`
`44`	`44`	`importshutil`
	`45`	`+importitertools`
`45`	`46`	`fromioimportBytesIO`
`46`	`47`
`47`	`48`
`@@ -765,3 +766,16 @@ def test_merge_base(self):`
`765`	`766`
`766`	`767`	`# Test for no merge base - can't do as we have`
`767`	`768`	`self.failUnlessRaises(GitCommandError,repo.merge_base,c1,'ffffff')`
	`769`	`+`
	`770`	`+deftest_is_ancestor(self):`
	`771`	`+repo=self.rorepo`
	`772`	`+c1='f6aa8d1'`
	`773`	`+c2='763ef75'`
	`774`	`+self.assertTrue(repo.is_ancestor(c1,c1))`
	`775`	`+self.assertTrue(repo.is_ancestor("master","master"))`
	`776`	`+self.assertTrue(repo.is_ancestor(c1,c2))`
	`777`	`+self.assertTrue(repo.is_ancestor(c1,"master"))`
	`778`	`+self.assertFalse(repo.is_ancestor(c2,c1))`
	`779`	`+self.assertFalse(repo.is_ancestor("master",c1))`
	`780`	`+fori,jinitertools.permutations([c1,'ffffff',''],r=2):`
	`781`	`+self.assertRaises(GitCommandError,repo.is_ancestor,i,j)`

Comments

(0)