[PATCH 2 of 2 v3] revlog: descendants(*revs) becomes descendants(revs)
Bryan O'Sullivan
bos at serpentine.com
Fri Jun 1 16:03:42 CDT 2012
# HG changeset patch
# User Bryan O'Sullivan <bryano at fb.com>
# Date 1338579916 25200
# Node ID d22f1f65675fca981b8aaafb8eddb7b8dac0cb05
# Parent 06f90e0125bf8b49447ee2383f90f85ee2ebe032
revlog: descendants(*revs) becomes descendants(revs)
Once again making the API more rational, as with ancestors.
diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -259,7 +259,7 @@ class mercurial_source(converter_source)
% startnode)
startrev = self.repo.changelog.rev(startnode)
children = {startnode: 1}
- for rev in self.repo.changelog.descendants(startrev):
+ for rev in self.repo.changelog.descendants([startrev]):
children[self.repo.changelog.node(rev)] = 1
self.keep = children.__contains__
else:
diff --git a/hgext/mq.py b/hgext/mq.py
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -2963,7 +2963,7 @@ def strip(ui, repo, *revs, **opts):
if not revs:
raise util.Abort(_('empty revision set'))
- descendants = set(cl.descendants(*revs))
+ descendants = set(cl.descendants(revs))
strippedrevs = revs.union(descendants)
roots = revs.difference(descendants)
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -321,7 +321,7 @@ def rebase(ui, repo, **opts):
# Remove no more useful revisions
rebased = [rev for rev in state if state[rev] != nullmerge]
if rebased:
- if set(repo.changelog.descendants(min(rebased))) - set(state):
+ if set(repo.changelog.descendants([min(rebased)])) - set(state):
ui.warn(_("warning: new changesets detected "
"on source branch, not stripping\n"))
else:
@@ -575,7 +575,7 @@ def abort(repo, originalwd, target, stat
descendants = set()
if dstates:
- descendants = set(repo.changelog.descendants(*dstates))
+ descendants = set(repo.changelog.descendants(dstates))
if descendants - set(dstates):
repo.ui.warn(_("warning: new changesets detected on target branch, "
"can't abort\n"))
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -227,7 +227,7 @@ class changectx(object):
yield changectx(self._repo, a)
def descendants(self):
- for d in self._repo.changelog.descendants(self._rev):
+ for d in self._repo.changelog.descendants([self._rev]):
yield changectx(self._repo, d)
def _fileinfo(self, path):
diff --git a/mercurial/phases.py b/mercurial/phases.py
--- a/mercurial/phases.py
+++ b/mercurial/phases.py
@@ -189,7 +189,7 @@ class phasecache(object):
if roots:
for rev in roots:
revs[rev] = phase
- for rev in repo.changelog.descendants(*roots):
+ for rev in repo.changelog.descendants(roots):
revs[rev] = phase
self._phaserevs = revs
return self._phaserevs
diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -74,7 +74,7 @@ def strip(ui, repo, nodelist, backup="al
# base = revision in the set that has no ancestor in the set)
tostrip = set(striplist)
for rev in striplist:
- for desc in cl.descendants(rev):
+ for desc in cl.descendants([rev]):
tostrip.add(desc)
files = _collectfiles(repo, striprev)
@@ -91,7 +91,7 @@ def strip(ui, repo, nodelist, backup="al
# compute base nodes
if saverevs:
- descendants = set(cl.descendants(*saverevs))
+ descendants = set(cl.descendants(saverevs))
saverevs.difference_update(descendants)
savebases = [cl.node(r) for r in saverevs]
stripbases = [cl.node(r) for r in tostrip]
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -398,7 +398,7 @@ class revlog(object):
seen.add(parent)
yield parent
- def descendants(self, *revs):
+ def descendants(self, revs):
"""Generate the descendants of 'revs' in revision order.
Yield a sequence of revision numbers starting with a child of
@@ -700,7 +700,7 @@ class revlog(object):
def descendant(self, start, end):
if start == nullrev:
return True
- for i in self.descendants(start):
+ for i in self.descendants([start]):
if i == end:
return True
elif i > end:
diff --git a/tests/test-revlog-ancestry.py b/tests/test-revlog-ancestry.py
--- a/tests/test-revlog-ancestry.py
+++ b/tests/test-revlog-ancestry.py
@@ -60,14 +60,14 @@ if __name__ == '__main__':
# Descendants
print '\n\nDescendants of 5'
- for r in repo.changelog.descendants(5):
+ for r in repo.changelog.descendants([5]):
print r,
print '\nDescendants of 5 and 3'
- for r in repo.changelog.descendants(5, 3):
+ for r in repo.changelog.descendants([5, 3]):
print r,
print '\nDescendants of 5 and 4'
- for r in repo.changelog.descendants(5, 4):
+ for r in repo.changelog.descendants([5, 4]):
print r,
More information about the Mercurial-devel
mailing list