facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

transplant: replace incancestors uses with ancestors

Browse Source
This commit is contained in:
Siddharth Agarwal 2012-12-17 15:08:06 -08:00
parent 6d5198a5a3
commit 7a2f9d28dd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hgext/transplant.py
View File

@ -94,7 +94,8 @@ class transplanter(object):
parentrev = repo.changelog.rev(parent)
if hasnode(repo, node):
rev = repo.changelog.rev(node)
reachable = repo.changelog.incancestors([parentrev], rev)
reachable = repo.changelog.ancestors([parentrev], rev,
inclusive=True)
if rev in reachable:
return True
for t in self.transplants.get(node):
@ -103,7 +104,8 @@ class transplanter(object):
self.transplants.remove(t)
return False
lnoderev = repo.changelog.rev(t.lnode)
if lnoderev in repo.changelog.incancestors([parentrev], lnoderev):
if lnoderev in repo.changelog.ancestors([parentrev], lnoderev,
inclusive=True):
return True
return False