# HG changeset patch # User Bryan O'Sullivan # Date 1338579916 25200 # Node ID 1093ad1e890348078fdffdc0dd0ee5791b16f3e6 # Parent 91f3ac205816a05fdb9880c887a0fde690310023 revlog: descendants(*revs) becomes descendants(revs) (API) Once again making the API more rational, as with ancestors. diff -r 91f3ac205816 -r 1093ad1e8903 hgext/convert/hg.py --- a/hgext/convert/hg.py Fri Jun 01 12:37:18 2012 -0700 +++ b/hgext/convert/hg.py Fri Jun 01 12:45:16 2012 -0700 @@ -259,7 +259,7 @@ % 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 -r 91f3ac205816 -r 1093ad1e8903 hgext/mq.py --- a/hgext/mq.py Fri Jun 01 12:37:18 2012 -0700 +++ b/hgext/mq.py Fri Jun 01 12:45:16 2012 -0700 @@ -2963,7 +2963,7 @@ 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 -r 91f3ac205816 -r 1093ad1e8903 hgext/rebase.py --- a/hgext/rebase.py Fri Jun 01 12:37:18 2012 -0700 +++ b/hgext/rebase.py Fri Jun 01 12:45:16 2012 -0700 @@ -321,7 +321,7 @@ # 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 @@ 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 -r 91f3ac205816 -r 1093ad1e8903 mercurial/context.py --- a/mercurial/context.py Fri Jun 01 12:37:18 2012 -0700 +++ b/mercurial/context.py Fri Jun 01 12:45:16 2012 -0700 @@ -227,7 +227,7 @@ 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 -r 91f3ac205816 -r 1093ad1e8903 mercurial/phases.py --- a/mercurial/phases.py Fri Jun 01 12:37:18 2012 -0700 +++ b/mercurial/phases.py Fri Jun 01 12:45:16 2012 -0700 @@ -189,7 +189,7 @@ 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 -r 91f3ac205816 -r 1093ad1e8903 mercurial/repair.py --- a/mercurial/repair.py Fri Jun 01 12:37:18 2012 -0700 +++ b/mercurial/repair.py Fri Jun 01 12:45:16 2012 -0700 @@ -74,7 +74,7 @@ # 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 @@ # 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 -r 91f3ac205816 -r 1093ad1e8903 mercurial/revlog.py --- a/mercurial/revlog.py Fri Jun 01 12:37:18 2012 -0700 +++ b/mercurial/revlog.py Fri Jun 01 12:45:16 2012 -0700 @@ -398,7 +398,7 @@ 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 @@ 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 -r 91f3ac205816 -r 1093ad1e8903 tests/test-revlog-ancestry.py --- a/tests/test-revlog-ancestry.py Fri Jun 01 12:37:18 2012 -0700 +++ b/tests/test-revlog-ancestry.py Fri Jun 01 12:45:16 2012 -0700 @@ -60,14 +60,14 @@ # 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,