# HG changeset patch # User Anton Shestakov # Date 2019-09-22 07:33:56 # Node ID 763028fc6a69a772cfa03c85262e2b6a439de5ab # Parent af2b5562fcafd12c8825c124df6fcf2c4380a33f stack: use repo.revs() instead of revsetlang.formatspec() + scmutil.revrange() Using scmutil.revrange() it's possible to use multiple revsets at the same time, but we're not using that functionality in stack. I thought maybe that function could be used to make stack definition customizable (by combining various parts into one set), but scmutil.revrange() gives the union of all provided revsets, which is not very useful in stack's case (we want "and" between parts, not "or"). diff --git a/mercurial/stack.py b/mercurial/stack.py --- a/mercurial/stack.py +++ b/mercurial/stack.py @@ -7,11 +7,6 @@ from __future__ import absolute_import -from . import ( - revsetlang, - scmutil, -) - def getstack(repo, rev=None): """return a sorted smartrev of the stack containing either rev if it is not None or the current working directory parent. @@ -23,7 +18,6 @@ def getstack(repo, rev=None): rev = '.' revspec = 'only(%s) and not public() and not ::merge()' - revset = revsetlang.formatspec(revspec, rev) - revisions = scmutil.revrange(repo, [revset]) + revisions = repo.revs(revspec, rev) revisions.sort() return revisions