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

revlog: use context ancestor instead of changelog ancestor

Browse Source 
We want to move in this direction.
This commit is contained in:
Mads Kiilerich 2014-04-07 23:17:51 +02:00
parent c55887b864
commit b117005b7c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mercurial/revset.py
View File

@ -320,7 +320,7 @@ def adds(repo, subset, x):
def ancestor(repo, subset, x):
"""``ancestor(*changeset)``
Greatest common ancestor of the changesets.
A greatest common ancestor of the changesets.
Accepts 0 or more changesets.
Will return empty list when passed no args.
@ -332,18 +332,15 @@ def ancestor(repo, subset, x):
anc = None
# (getset(repo, rl, i) for i in l) generates a list of lists
rev = repo.changelog.rev
ancestor = repo.changelog.ancestor
node = repo.changelog.node
for revs in (getset(repo, rl, i) for i in l):
for r in revs:
if anc is None:
anc = r
anc = repo[r]
else:
anc = rev(ancestor(node(anc), node(r)))
anc = anc.ancestor(repo[r])
if anc is not None and anc in subset:
return baseset([anc])
if anc is not None and anc.rev() in subset:
return baseset([anc.rev()])
return baseset([])
def _ancestors(repo, subset, x, followfirst=False):