diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -98,11 +98,15 @@ def _genrevdescendants(repo, revs, follo if first == nullrev: # Are there nodes with a null first parent and a non-null # second one? Maybe. Do we care? Probably not. + yield first for i in cl: yield i else: seen = set(revs) - for i in cl.revs(first + 1): + for i in cl.revs(first): + if i in seen: + yield i + continue for x in cl.parentrevs(i)[:cut]: if x != nullrev and x in seen: seen.add(i) @@ -110,7 +114,8 @@ def _genrevdescendants(repo, revs, follo break def revdescendants(repo, revs, followfirst): - """Like revlog.descendants() but supports followfirst.""" + """Like revlog.descendants() but supports additional options, includes + the given revs themselves, and returns a smartset""" gen = _genrevdescendants(repo, revs, followfirst) return generatorset(gen, iterasc=True) diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -600,19 +600,7 @@ def _descendants(repo, subset, x, follow if not roots: return baseset() s = dagop.revdescendants(repo, roots, followfirst) - - # Both sets need to be ascending in order to lazily return the union - # in the correct order. - base = subset & roots - desc = subset & s - result = base + desc - if subset.isascending(): - result.sort() - elif subset.isdescending(): - result.sort(reverse=True) - else: - result = subset & result - return result + return subset & s @predicate('descendants(set)', safe=True) def descendants(repo, subset, x): diff --git a/tests/test-revset.t b/tests/test-revset.t --- a/tests/test-revset.t +++ b/tests/test-revset.t @@ -3530,11 +3530,7 @@ test alias recursion ('symbol', 'merge') None)) * set: - , - >, - > + 6 7