revset: fix sorting key of wdir revision

It would go wrong on Python 2, and would crash on Python 3.

mercurial/revset.py

@@ -1,2753 +1,2753 b''
 # revset.py - revision set queries for mercurial
 #
 # Copyright 2010 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 import re
 
 from .i18n import _
 from .pycompat import getattr
 from . import (
     dagop,
     destutil,
     diffutil,
     encoding,
     error,
     hbisect,
     match as matchmod,
     node,
     obsolete as obsmod,
     obsutil,
     pathutil,
     phases,
     pycompat,
     registrar,
     repoview,
     revsetlang,
     scmutil,
     smartset,
     stack as stackmod,
     util,
 )
 from .utils import (
     dateutil,
     stringutil,
 )
 
 # helpers for processing parsed tree
 getsymbol = revsetlang.getsymbol
 getstring = revsetlang.getstring
 getinteger = revsetlang.getinteger
 getboolean = revsetlang.getboolean
 getlist = revsetlang.getlist
 getintrange = revsetlang.getintrange
 getargs = revsetlang.getargs
 getargsdict = revsetlang.getargsdict
 
 baseset = smartset.baseset
 generatorset = smartset.generatorset
 spanset = smartset.spanset
 fullreposet = smartset.fullreposet
 
 # revisions not included in all(), but populated if specified
 _virtualrevs = (node.nullrev, node.wdirrev)
 
 # Constants for ordering requirement, used in getset():
 #
 # If 'define', any nested functions and operations MAY change the ordering of
 # the entries in the set (but if changes the ordering, it MUST ALWAYS change
 # it). If 'follow', any nested functions and operations MUST take the ordering
 # specified by the first operand to the '&' operator.
 #
 # For instance,
 #
 #   X & (Y | Z)
 #   ^   ^^^^^^^
 #   |   follow
 #   define
 #
 # will be evaluated as 'or(y(x()), z(x()))', where 'x()' can change the order
 # of the entries in the set, but 'y()', 'z()' and 'or()' shouldn't.
 #
 # 'any' means the order doesn't matter. For instance,
 #
 #   (X & !Y) | ancestors(Z)
 #         ^              ^
 #         any            any
 #
 # For 'X & !Y', 'X' decides the order and 'Y' is subtracted from 'X', so the
 # order of 'Y' does not matter. For 'ancestors(Z)', Z's order does not matter
 # since 'ancestors' does not care about the order of its argument.
 #
 # Currently, most revsets do not care about the order, so 'define' is
 # equivalent to 'follow' for them, and the resulting order is based on the
 # 'subset' parameter passed down to them:
 #
 #   m = revset.match(...)
 #   m(repo, subset, order=defineorder)
 #           ^^^^^^
 #      For most revsets, 'define' means using the order this subset provides
 #
 # There are a few revsets that always redefine the order if 'define' is
 # specified: 'sort(X)', 'reverse(X)', 'x:y'.
 anyorder = b'any'  # don't care the order, could be even random-shuffled
 defineorder = b'define'  # ALWAYS redefine, or ALWAYS follow the current order
 followorder = b'follow'  # MUST follow the current order
 
 # helpers
 
 
 def getset(repo, subset, x, order=defineorder):
     if not x:
         raise error.ParseError(_(b"missing argument"))
     return methods[x[0]](repo, subset, *x[1:], order=order)
 
 
 def _getrevsource(repo, r):
     extra = repo[r].extra()
     for label in (b'source', b'transplant_source', b'rebase_source'):
         if label in extra:
             try:
                 return repo[extra[label]].rev()
             except error.RepoLookupError:
                 pass
     return None
 
 
 def _sortedb(xs):
     return sorted(pycompat.rapply(pycompat.maybebytestr, xs))
 
 
 # operator methods
 
 
 def stringset(repo, subset, x, order):
     if not x:
         raise error.ParseError(_(b"empty string is not a valid revision"))
     x = scmutil.intrev(scmutil.revsymbol(repo, x))
     if x in subset or x in _virtualrevs and isinstance(subset, fullreposet):
         return baseset([x])
     return baseset()
 
 
 def rawsmartset(repo, subset, x, order):
     """argument is already a smartset, use that directly"""
     if order == followorder:
         return subset & x
     else:
         return x & subset
 
 
 def rangeset(repo, subset, x, y, order):
     m = getset(repo, fullreposet(repo), x)
     n = getset(repo, fullreposet(repo), y)
 
     if not m or not n:
         return baseset()
     return _makerangeset(repo, subset, m.first(), n.last(), order)
 
 
 def rangeall(repo, subset, x, order):
     assert x is None
     return _makerangeset(repo, subset, 0, repo.changelog.tiprev(), order)
 
 
 def rangepre(repo, subset, y, order):
     # ':y' can't be rewritten to '0:y' since '0' may be hidden
     n = getset(repo, fullreposet(repo), y)
     if not n:
         return baseset()
     return _makerangeset(repo, subset, 0, n.last(), order)
 
 
 def rangepost(repo, subset, x, order):
     m = getset(repo, fullreposet(repo), x)
     if not m:
         return baseset()
     return _makerangeset(
         repo, subset, m.first(), repo.changelog.tiprev(), order
     )
 
 
 def _makerangeset(repo, subset, m, n, order):
     if m == n:
         r = baseset([m])
     elif n == node.wdirrev:
         r = spanset(repo, m, len(repo)) + baseset([n])
     elif m == node.wdirrev:
         r = baseset([m]) + spanset(repo, repo.changelog.tiprev(), n - 1)
     elif m < n:
         r = spanset(repo, m, n + 1)
     else:
         r = spanset(repo, m, n - 1)
 
     if order == defineorder:
         return r & subset
     else:
         # carrying the sorting over when possible would be more efficient
         return subset & r
 
 
 def dagrange(repo, subset, x, y, order):
     r = fullreposet(repo)
     xs = dagop.reachableroots(
         repo, getset(repo, r, x), getset(repo, r, y), includepath=True
     )
     return subset & xs
 
 
 def andset(repo, subset, x, y, order):
     if order == anyorder:
         yorder = anyorder
     else:
         yorder = followorder
     return getset(repo, getset(repo, subset, x, order), y, yorder)
 
 
 def andsmallyset(repo, subset, x, y, order):
     # 'andsmally(x, y)' is equivalent to 'and(x, y)', but faster when y is small
     if order == anyorder:
         yorder = anyorder
     else:
         yorder = followorder
     return getset(repo, getset(repo, subset, y, yorder), x, order)
 
 
 def differenceset(repo, subset, x, y, order):
     return getset(repo, subset, x, order) - getset(repo, subset, y, anyorder)
 
 
 def _orsetlist(repo, subset, xs, order):
     assert xs
     if len(xs) == 1:
         return getset(repo, subset, xs[0], order)
     p = len(xs) // 2
     a = _orsetlist(repo, subset, xs[:p], order)
     b = _orsetlist(repo, subset, xs[p:], order)
     return a + b
 
 
 def orset(repo, subset, x, order):
     xs = getlist(x)
     if not xs:
         return baseset()
     if order == followorder:
         # slow path to take the subset order
         return subset & _orsetlist(repo, fullreposet(repo), xs, anyorder)
     else:
         return _orsetlist(repo, subset, xs, order)
 
 
 def notset(repo, subset, x, order):
     return subset - getset(repo, subset, x, anyorder)
 
 
 def relationset(repo, subset, x, y, order):
     # this is pretty basic implementation of 'x#y' operator, still
     # experimental so undocumented. see the wiki for further ideas.
     # https://www.mercurial-scm.org/wiki/RevsetOperatorPlan
     rel = getsymbol(y)
     if rel in relations:
         return relations[rel](repo, subset, x, rel, order)
 
     relnames = [r for r in relations.keys() if len(r) > 1]
     raise error.UnknownIdentifier(rel, relnames)
 
 
 def _splitrange(a, b):
     """Split range with bounds a and b into two ranges at 0 and return two
     tuples of numbers for use as startdepth and stopdepth arguments of
     revancestors and revdescendants.
 
     >>> _splitrange(-10, -5)     # [-10:-5]
     ((5, 11), (None, None))
     >>> _splitrange(5, 10)       # [5:10]
     ((None, None), (5, 11))
     >>> _splitrange(-10, 10)     # [-10:10]
     ((0, 11), (0, 11))
     >>> _splitrange(-10, 0)      # [-10:0]
     ((0, 11), (None, None))
     >>> _splitrange(0, 10)       # [0:10]
     ((None, None), (0, 11))
     >>> _splitrange(0, 0)        # [0:0]
     ((0, 1), (None, None))
     >>> _splitrange(1, -1)       # [1:-1]
     ((None, None), (None, None))
     """
     ancdepths = (None, None)
     descdepths = (None, None)
     if a == b == 0:
         ancdepths = (0, 1)
     if a < 0:
         ancdepths = (-min(b, 0), -a + 1)
     if b > 0:
         descdepths = (max(a, 0), b + 1)
     return ancdepths, descdepths
 
 
 def generationsrel(repo, subset, x, rel, order):
     z = (b'rangeall', None)
     return generationssubrel(repo, subset, x, rel, z, order)
 
 
 def generationssubrel(repo, subset, x, rel, z, order):
     # TODO: rewrite tests, and drop startdepth argument from ancestors() and
     # descendants() predicates
     a, b = getintrange(
         z,
         _(b'relation subscript must be an integer or a range'),
         _(b'relation subscript bounds must be integers'),
         deffirst=-(dagop.maxlogdepth - 1),
         deflast=+(dagop.maxlogdepth - 1),
     )
     (ancstart, ancstop), (descstart, descstop) = _splitrange(a, b)
 
     if ancstart is None and descstart is None:
         return baseset()
 
     revs = getset(repo, fullreposet(repo), x)
     if not revs:
         return baseset()
 
     if ancstart is not None and descstart is not None:
         s = dagop.revancestors(repo, revs, False, ancstart, ancstop)
         s += dagop.revdescendants(repo, revs, False, descstart, descstop)
     elif ancstart is not None:
         s = dagop.revancestors(repo, revs, False, ancstart, ancstop)
     elif descstart is not None:
         s = dagop.revdescendants(repo, revs, False, descstart, descstop)
 
     return subset & s
 
 
 def relsubscriptset(repo, subset, x, y, z, order):
     # this is pretty basic implementation of 'x#y[z]' operator, still
     # experimental so undocumented. see the wiki for further ideas.
     # https://www.mercurial-scm.org/wiki/RevsetOperatorPlan
     rel = getsymbol(y)
     if rel in subscriptrelations:
         return subscriptrelations[rel](repo, subset, x, rel, z, order)
 
     relnames = [r for r in subscriptrelations.keys() if len(r) > 1]
     raise error.UnknownIdentifier(rel, relnames)
 
 
 def subscriptset(repo, subset, x, y, order):
     raise error.ParseError(_(b"can't use a subscript in this context"))
 
 
 def listset(repo, subset, *xs, **opts):
     raise error.ParseError(
         _(b"can't use a list in this context"),
         hint=_(b'see \'hg help "revsets.x or y"\''),
     )
 
 
 def keyvaluepair(repo, subset, k, v, order):
     raise error.ParseError(_(b"can't use a key-value pair in this context"))
 
 
 def func(repo, subset, a, b, order):
     f = getsymbol(a)
     if f in symbols:
         func = symbols[f]
         if getattr(func, '_takeorder', False):
             return func(repo, subset, b, order)
         return func(repo, subset, b)
 
     keep = lambda fn: getattr(fn, '__doc__', None) is not None
 
     syms = [s for (s, fn) in symbols.items() if keep(fn)]
     raise error.UnknownIdentifier(f, syms)
 
 
 # functions
 
 # symbols are callables like:
 #   fn(repo, subset, x)
 # with:
 #   repo - current repository instance
 #   subset - of revisions to be examined
 #   x - argument in tree form
 symbols = revsetlang.symbols
 
 # symbols which can't be used for a DoS attack for any given input
 # (e.g. those which accept regexes as plain strings shouldn't be included)
 # functions that just return a lot of changesets (like all) don't count here
 safesymbols = set()
 
 predicate = registrar.revsetpredicate()
 
 
 @predicate(b'_destupdate')
 def _destupdate(repo, subset, x):
     # experimental revset for update destination
     args = getargsdict(x, b'limit', b'clean')
     return subset & baseset(
         [destutil.destupdate(repo, **pycompat.strkwargs(args))[0]]
     )
 
 
 @predicate(b'_destmerge')
 def _destmerge(repo, subset, x):
     # experimental revset for merge destination
     sourceset = None
     if x is not None:
         sourceset = getset(repo, fullreposet(repo), x)
     return subset & baseset([destutil.destmerge(repo, sourceset=sourceset)])
 
 
 @predicate(b'adds(pattern)', safe=True, weight=30)
 def adds(repo, subset, x):
     """Changesets that add a file matching pattern.
 
     The pattern without explicit kind like ``glob:`` is expected to be
     relative to the current directory and match against a file or a
     directory.
     """
     # i18n: "adds" is a keyword
     pat = getstring(x, _(b"adds requires a pattern"))
     return checkstatus(repo, subset, pat, 'added')
 
 
 @predicate(b'ancestor(*changeset)', safe=True, weight=0.5)
 def ancestor(repo, subset, x):
     """A greatest common ancestor of the changesets.
 
     Accepts 0 or more changesets.
     Will return empty list when passed no args.
     Greatest common ancestor of a single changeset is that changeset.
     """
     reviter = iter(orset(repo, fullreposet(repo), x, order=anyorder))
     try:
         anc = repo[next(reviter)]
     except StopIteration:
         return baseset()
     for r in reviter:
         anc = anc.ancestor(repo[r])
 
     r = scmutil.intrev(anc)
     if r in subset:
         return baseset([r])
     return baseset()
 
 
 def _ancestors(
     repo, subset, x, followfirst=False, startdepth=None, stopdepth=None
 ):
     heads = getset(repo, fullreposet(repo), x)
     if not heads:
         return baseset()
     s = dagop.revancestors(repo, heads, followfirst, startdepth, stopdepth)
     return subset & s
 
 
 @predicate(b'ancestors(set[, depth])', safe=True)
 def ancestors(repo, subset, x):
     """Changesets that are ancestors of changesets in set, including the
     given changesets themselves.
 
     If depth is specified, the result only includes changesets up to
     the specified generation.
     """
     # startdepth is for internal use only until we can decide the UI
     args = getargsdict(x, b'ancestors', b'set depth startdepth')
     if b'set' not in args:
         # i18n: "ancestors" is a keyword
         raise error.ParseError(_(b'ancestors takes at least 1 argument'))
     startdepth = stopdepth = None
     if b'startdepth' in args:
         n = getinteger(
             args[b'startdepth'], b"ancestors expects an integer startdepth"
         )
         if n < 0:
             raise error.ParseError(b"negative startdepth")
         startdepth = n
     if b'depth' in args:
         # i18n: "ancestors" is a keyword
         n = getinteger(args[b'depth'], _(b"ancestors expects an integer depth"))
         if n < 0:
             raise error.ParseError(_(b"negative depth"))
         stopdepth = n + 1
     return _ancestors(
         repo, subset, args[b'set'], startdepth=startdepth, stopdepth=stopdepth
     )
 
 
 @predicate(b'_firstancestors', safe=True)
 def _firstancestors(repo, subset, x):
     # ``_firstancestors(set)``
     # Like ``ancestors(set)`` but follows only the first parents.
     return _ancestors(repo, subset, x, followfirst=True)
 
 
 def _childrenspec(repo, subset, x, n, order):
     """Changesets that are the Nth child of a changeset
     in set.
     """
     cs = set()
     for r in getset(repo, fullreposet(repo), x):
         for i in range(n):
             c = repo[r].children()
             if len(c) == 0:
                 break
             if len(c) > 1:
                 raise error.RepoLookupError(
                     _(b"revision in set has more than one child")
                 )
             r = c[0].rev()
         else:
             cs.add(r)
     return subset & cs
 
 
 def ancestorspec(repo, subset, x, n, order):
     """``set~n``
     Changesets that are the Nth ancestor (first parents only) of a changeset
     in set.
     """
     n = getinteger(n, _(b"~ expects a number"))
     if n < 0:
         # children lookup
         return _childrenspec(repo, subset, x, -n, order)
     ps = set()
     cl = repo.changelog
     for r in getset(repo, fullreposet(repo), x):
         for i in range(n):
             try:
                 r = cl.parentrevs(r)[0]
             except error.WdirUnsupported:
                 r = repo[r].p1().rev()
         ps.add(r)
     return subset & ps
 
 
 @predicate(b'author(string)', safe=True, weight=10)
 def author(repo, subset, x):
     """Alias for ``user(string)``.
     """
     # i18n: "author" is a keyword
     n = getstring(x, _(b"author requires a string"))
     kind, pattern, matcher = _substringmatcher(n, casesensitive=False)
     return subset.filter(
         lambda x: matcher(repo[x].user()), condrepr=(b'<user %r>', n)
     )
 
 
 @predicate(b'bisect(string)', safe=True)
 def bisect(repo, subset, x):
     """Changesets marked in the specified bisect status:
 
     - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
     - ``goods``, ``bads``      : csets topologically good/bad
     - ``range``              : csets taking part in the bisection
     - ``pruned``             : csets that are goods, bads or skipped
     - ``untested``           : csets whose fate is yet unknown
     - ``ignored``            : csets ignored due to DAG topology
     - ``current``            : the cset currently being bisected
     """
     # i18n: "bisect" is a keyword
     status = getstring(x, _(b"bisect requires a string")).lower()
     state = set(hbisect.get(repo, status))
     return subset & state
 
 
 # Backward-compatibility
 # - no help entry so that we do not advertise it any more
 @predicate(b'bisected', safe=True)
 def bisected(repo, subset, x):
     return bisect(repo, subset, x)
 
 
 @predicate(b'bookmark([name])', safe=True)
 def bookmark(repo, subset, x):
     """The named bookmark or all bookmarks.
 
     Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
     """
     # i18n: "bookmark" is a keyword
     args = getargs(x, 0, 1, _(b'bookmark takes one or no arguments'))
     if args:
         bm = getstring(
             args[0],
             # i18n: "bookmark" is a keyword
             _(b'the argument to bookmark must be a string'),
         )
         kind, pattern, matcher = stringutil.stringmatcher(bm)
         bms = set()
         if kind == b'literal':
             if bm == pattern:
                 pattern = repo._bookmarks.expandname(pattern)
             bmrev = repo._bookmarks.get(pattern, None)
             if not bmrev:
                 raise error.RepoLookupError(
                     _(b"bookmark '%s' does not exist") % pattern
                 )
             bms.add(repo[bmrev].rev())
         else:
             matchrevs = set()
             for name, bmrev in pycompat.iteritems(repo._bookmarks):
                 if matcher(name):
                     matchrevs.add(bmrev)
             for bmrev in matchrevs:
                 bms.add(repo[bmrev].rev())
     else:
         bms = {repo[r].rev() for r in repo._bookmarks.values()}
     bms -= {node.nullrev}
     return subset & bms
 
 
 @predicate(b'branch(string or set)', safe=True, weight=10)
 def branch(repo, subset, x):
     """
     All changesets belonging to the given branch or the branches of the given
     changesets.
 
     Pattern matching is supported for `string`. See
     :hg:`help revisions.patterns`.
     """
     getbi = repo.revbranchcache().branchinfo
 
     def getbranch(r):
         try:
             return getbi(r)[0]
         except error.WdirUnsupported:
             return repo[r].branch()
 
     try:
         b = getstring(x, b'')
     except error.ParseError:
         # not a string, but another revspec, e.g. tip()
         pass
     else:
         kind, pattern, matcher = stringutil.stringmatcher(b)
         if kind == b'literal':
             # note: falls through to the revspec case if no branch with
             # this name exists and pattern kind is not specified explicitly
             if repo.branchmap().hasbranch(pattern):
                 return subset.filter(
                     lambda r: matcher(getbranch(r)),
                     condrepr=(b'<branch %r>', b),
                 )
             if b.startswith(b'literal:'):
                 raise error.RepoLookupError(
                     _(b"branch '%s' does not exist") % pattern
                 )
         else:
             return subset.filter(
                 lambda r: matcher(getbranch(r)), condrepr=(b'<branch %r>', b)
             )
 
     s = getset(repo, fullreposet(repo), x)
     b = set()
     for r in s:
         b.add(getbranch(r))
     c = s.__contains__
     return subset.filter(
         lambda r: c(r) or getbranch(r) in b,
         condrepr=lambda: b'<branch %r>' % _sortedb(b),
     )
 
 
 @predicate(b'phasedivergent()', safe=True)
 def phasedivergent(repo, subset, x):
     """Mutable changesets marked as successors of public changesets.
 
     Only non-public and non-obsolete changesets can be `phasedivergent`.
     (EXPERIMENTAL)
     """
     # i18n: "phasedivergent" is a keyword
     getargs(x, 0, 0, _(b"phasedivergent takes no arguments"))
     phasedivergent = obsmod.getrevs(repo, b'phasedivergent')
     return subset & phasedivergent
 
 
 @predicate(b'bundle()', safe=True)
 def bundle(repo, subset, x):
     """Changesets in the bundle.
 
     Bundle must be specified by the -R option."""
 
     try:
         bundlerevs = repo.changelog.bundlerevs
     except AttributeError:
         raise error.Abort(_(b"no bundle provided - specify with -R"))
     return subset & bundlerevs
 
 
 def checkstatus(repo, subset, pat, field):
     """Helper for status-related revsets (adds, removes, modifies).
     The field parameter says which kind is desired.
     """
     hasset = matchmod.patkind(pat) == b'set'
 
     mcache = [None]
 
     def matches(x):
         c = repo[x]
         if not mcache[0] or hasset:
             mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
         m = mcache[0]
         fname = None
 
         assert m is not None  # help pytype
         if not m.anypats() and len(m.files()) == 1:
             fname = m.files()[0]
         if fname is not None:
             if fname not in c.files():
                 return False
         else:
             if not any(m(f) for f in c.files()):
                 return False
         files = getattr(repo.status(c.p1().node(), c.node()), field)
         if fname is not None:
             if fname in files:
                 return True
         else:
             if any(m(f) for f in files):
                 return True
 
     return subset.filter(
         matches, condrepr=(b'<status.%s %r>', pycompat.sysbytes(field), pat)
     )
 
 
 def _children(repo, subset, parentset):
     if not parentset:
         return baseset()
     cs = set()
     pr = repo.changelog.parentrevs
     minrev = parentset.min()
     nullrev = node.nullrev
     for r in subset:
         if r <= minrev:
             continue
         p1, p2 = pr(r)
         if p1 in parentset:
             cs.add(r)
         if p2 != nullrev and p2 in parentset:
             cs.add(r)
     return baseset(cs)
 
 
 @predicate(b'children(set)', safe=True)
 def children(repo, subset, x):
     """Child changesets of changesets in set.
     """
     s = getset(repo, fullreposet(repo), x)
     cs = _children(repo, subset, s)
     return subset & cs
 
 
 @predicate(b'closed()', safe=True, weight=10)
 def closed(repo, subset, x):
     """Changeset is closed.
     """
     # i18n: "closed" is a keyword
     getargs(x, 0, 0, _(b"closed takes no arguments"))
     return subset.filter(
         lambda r: repo[r].closesbranch(), condrepr=b'<branch closed>'
     )
 
 
 # for internal use
 @predicate(b'_commonancestorheads(set)', safe=True)
 def _commonancestorheads(repo, subset, x):
     # This is an internal method is for quickly calculating "heads(::x and
     # ::y)"
 
     # These greatest common ancestors are the same ones that the consensus bid
     # merge will find.
     startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
 
     ancs = repo.changelog._commonancestorsheads(*list(startrevs))
     return subset & baseset(ancs)
 
 
 @predicate(b'commonancestors(set)', safe=True)
 def commonancestors(repo, subset, x):
     """Changesets that are ancestors of every changeset in set.
     """
     startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
     if not startrevs:
         return baseset()
     for r in startrevs:
         subset &= dagop.revancestors(repo, baseset([r]))
     return subset
 
 
 @predicate(b'conflictlocal()', safe=True)
 def conflictlocal(repo, subset, x):
     """The local side of the merge, if currently in an unresolved merge.
 
     "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
     """
     getargs(x, 0, 0, _(b"conflictlocal takes no arguments"))
     from . import mergestate as mergestatemod
 
     mergestate = mergestatemod.mergestate.read(repo)
     if mergestate.active() and repo.changelog.hasnode(mergestate.local):
         return subset & {repo.changelog.rev(mergestate.local)}
 
     return baseset()
 
 
 @predicate(b'conflictother()', safe=True)
 def conflictother(repo, subset, x):
     """The other side of the merge, if currently in an unresolved merge.
 
     "merge" here includes merge conflicts from e.g. 'hg rebase' or 'hg graft'.
     """
     getargs(x, 0, 0, _(b"conflictother takes no arguments"))
     from . import mergestate as mergestatemod
 
     mergestate = mergestatemod.mergestate.read(repo)
     if mergestate.active() and repo.changelog.hasnode(mergestate.other):
         return subset & {repo.changelog.rev(mergestate.other)}
 
     return baseset()
 
 
 @predicate(b'contains(pattern)', weight=100)
 def contains(repo, subset, x):
     """The revision's manifest contains a file matching pattern (but might not
     modify it). See :hg:`help patterns` for information about file patterns.
 
     The pattern without explicit kind like ``glob:`` is expected to be
     relative to the current directory and match against a file exactly
     for efficiency.
     """
     # i18n: "contains" is a keyword
     pat = getstring(x, _(b"contains requires a pattern"))
 
     def matches(x):
         if not matchmod.patkind(pat):
             pats = pathutil.canonpath(repo.root, repo.getcwd(), pat)
             if pats in repo[x]:
                 return True
         else:
             c = repo[x]
             m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
             for f in c.manifest():
                 if m(f):
                     return True
         return False
 
     return subset.filter(matches, condrepr=(b'<contains %r>', pat))
 
 
 @predicate(b'converted([id])', safe=True)
 def converted(repo, subset, x):
     """Changesets converted from the given identifier in the old repository if
     present, or all converted changesets if no identifier is specified.
     """
 
     # There is exactly no chance of resolving the revision, so do a simple
     # string compare and hope for the best
 
     rev = None
     # i18n: "converted" is a keyword
     l = getargs(x, 0, 1, _(b'converted takes one or no arguments'))
     if l:
         # i18n: "converted" is a keyword
         rev = getstring(l[0], _(b'converted requires a revision'))
 
     def _matchvalue(r):
         source = repo[r].extra().get(b'convert_revision', None)
         return source is not None and (rev is None or source.startswith(rev))
 
     return subset.filter(
         lambda r: _matchvalue(r), condrepr=(b'<converted %r>', rev)
     )
 
 
 @predicate(b'date(interval)', safe=True, weight=10)
 def date(repo, subset, x):
     """Changesets within the interval, see :hg:`help dates`.
     """
     # i18n: "date" is a keyword
     ds = getstring(x, _(b"date requires a string"))
     dm = dateutil.matchdate(ds)
     return subset.filter(
         lambda x: dm(repo[x].date()[0]), condrepr=(b'<date %r>', ds)
     )
 
 
 @predicate(b'desc(string)', safe=True, weight=10)
 def desc(repo, subset, x):
     """Search commit message for string. The match is case-insensitive.
 
     Pattern matching is supported for `string`. See
     :hg:`help revisions.patterns`.
     """
     # i18n: "desc" is a keyword
     ds = getstring(x, _(b"desc requires a string"))
 
     kind, pattern, matcher = _substringmatcher(ds, casesensitive=False)
 
     return subset.filter(
         lambda r: matcher(repo[r].description()), condrepr=(b'<desc %r>', ds)
     )
 
 
 def _descendants(
     repo, subset, x, followfirst=False, startdepth=None, stopdepth=None
 ):
     roots = getset(repo, fullreposet(repo), x)
     if not roots:
         return baseset()
     s = dagop.revdescendants(repo, roots, followfirst, startdepth, stopdepth)
     return subset & s
 
 
 @predicate(b'descendants(set[, depth])', safe=True)
 def descendants(repo, subset, x):
     """Changesets which are descendants of changesets in set, including the
     given changesets themselves.
 
     If depth is specified, the result only includes changesets up to
     the specified generation.
     """
     # startdepth is for internal use only until we can decide the UI
     args = getargsdict(x, b'descendants', b'set depth startdepth')
     if b'set' not in args:
         # i18n: "descendants" is a keyword
         raise error.ParseError(_(b'descendants takes at least 1 argument'))
     startdepth = stopdepth = None
     if b'startdepth' in args:
         n = getinteger(
             args[b'startdepth'], b"descendants expects an integer startdepth"
         )
         if n < 0:
             raise error.ParseError(b"negative startdepth")
         startdepth = n
     if b'depth' in args:
         # i18n: "descendants" is a keyword
         n = getinteger(
             args[b'depth'], _(b"descendants expects an integer depth")
         )
         if n < 0:
             raise error.ParseError(_(b"negative depth"))
         stopdepth = n + 1
     return _descendants(
         repo, subset, args[b'set'], startdepth=startdepth, stopdepth=stopdepth
     )
 
 
 @predicate(b'_firstdescendants', safe=True)
 def _firstdescendants(repo, subset, x):
     # ``_firstdescendants(set)``
     # Like ``descendants(set)`` but follows only the first parents.
     return _descendants(repo, subset, x, followfirst=True)
 
 
 @predicate(b'destination([set])', safe=True, weight=10)
 def destination(repo, subset, x):
     """Changesets that were created by a graft, transplant or rebase operation,
     with the given revisions specified as the source.  Omitting the optional set
     is the same as passing all().
     """
     if x is not None:
         sources = getset(repo, fullreposet(repo), x)
     else:
         sources = fullreposet(repo)
 
     dests = set()
 
     # subset contains all of the possible destinations that can be returned, so
     # iterate over them and see if their source(s) were provided in the arg set.
     # Even if the immediate src of r is not in the arg set, src's source (or
     # further back) may be.  Scanning back further than the immediate src allows
     # transitive transplants and rebases to yield the same results as transitive
     # grafts.
     for r in subset:
         src = _getrevsource(repo, r)
         lineage = None
 
         while src is not None:
             if lineage is None:
                 lineage = list()
 
             lineage.append(r)
 
             # The visited lineage is a match if the current source is in the arg
             # set.  Since every candidate dest is visited by way of iterating
             # subset, any dests further back in the lineage will be tested by a
             # different iteration over subset.  Likewise, if the src was already
             # selected, the current lineage can be selected without going back
             # further.
             if src in sources or src in dests:
                 dests.update(lineage)
                 break
 
             r = src
             src = _getrevsource(repo, r)
 
     return subset.filter(
         dests.__contains__,
         condrepr=lambda: b'<destination %r>' % _sortedb(dests),
     )
 
 
 @predicate(b'contentdivergent()', safe=True)
 def contentdivergent(repo, subset, x):
     """
     Final successors of changesets with an alternative set of final
     successors. (EXPERIMENTAL)
     """
     # i18n: "contentdivergent" is a keyword
     getargs(x, 0, 0, _(b"contentdivergent takes no arguments"))
     contentdivergent = obsmod.getrevs(repo, b'contentdivergent')
     return subset & contentdivergent
 
 
 @predicate(b'expectsize(set[, size])', safe=True, takeorder=True)
 def expectsize(repo, subset, x, order):
     """Return the given revset if size matches the revset size.
     Abort if the revset doesn't expect given size.
     size can either be an integer range or an integer.
 
     For example, ``expectsize(0:1, 3:5)`` will abort as revset size is 2 and
     2 is not between 3 and 5 inclusive."""
 
     args = getargsdict(x, b'expectsize', b'set size')
     minsize = 0
     maxsize = len(repo) + 1
     err = b''
     if b'size' not in args or b'set' not in args:
         raise error.ParseError(_(b'invalid set of arguments'))
     minsize, maxsize = getintrange(
         args[b'size'],
         _(b'expectsize requires a size range or a positive integer'),
         _(b'size range bounds must be integers'),
         minsize,
         maxsize,
     )
     if minsize < 0 or maxsize < 0:
         raise error.ParseError(_(b'negative size'))
     rev = getset(repo, fullreposet(repo), args[b'set'], order=order)
     if minsize != maxsize and (len(rev) < minsize or len(rev) > maxsize):
         err = _(b'revset size mismatch. expected between %d and %d, got %d') % (
             minsize,
             maxsize,
             len(rev),
         )
     elif minsize == maxsize and len(rev) != minsize:
         err = _(b'revset size mismatch. expected %d, got %d') % (
             minsize,
             len(rev),
         )
     if err:
         raise error.RepoLookupError(err)
     if order == followorder:
         return subset & rev
     else:
         return rev & subset
 
 
 @predicate(b'extdata(source)', safe=False, weight=100)
 def extdata(repo, subset, x):
     """Changesets in the specified extdata source. (EXPERIMENTAL)"""
     # i18n: "extdata" is a keyword
     args = getargsdict(x, b'extdata', b'source')
     source = getstring(
         args.get(b'source'),
         # i18n: "extdata" is a keyword
         _(b'extdata takes at least 1 string argument'),
     )
     data = scmutil.extdatasource(repo, source)
     return subset & baseset(data)
 
 
 @predicate(b'extinct()', safe=True)
 def extinct(repo, subset, x):
     """Obsolete changesets with obsolete descendants only. (EXPERIMENTAL)
     """
     # i18n: "extinct" is a keyword
     getargs(x, 0, 0, _(b"extinct takes no arguments"))
     extincts = obsmod.getrevs(repo, b'extinct')
     return subset & extincts
 
 
 @predicate(b'extra(label, [value])', safe=True)
 def extra(repo, subset, x):
     """Changesets with the given label in the extra metadata, with the given
     optional value.
 
     Pattern matching is supported for `value`. See
     :hg:`help revisions.patterns`.
     """
     args = getargsdict(x, b'extra', b'label value')
     if b'label' not in args:
         # i18n: "extra" is a keyword
         raise error.ParseError(_(b'extra takes at least 1 argument'))
     # i18n: "extra" is a keyword
     label = getstring(
         args[b'label'], _(b'first argument to extra must be a string')
     )
     value = None
 
     if b'value' in args:
         # i18n: "extra" is a keyword
         value = getstring(
             args[b'value'], _(b'second argument to extra must be a string')
         )
         kind, value, matcher = stringutil.stringmatcher(value)
 
     def _matchvalue(r):
         extra = repo[r].extra()
         return label in extra and (value is None or matcher(extra[label]))
 
     return subset.filter(
         lambda r: _matchvalue(r), condrepr=(b'<extra[%r] %r>', label, value)
     )
 
 
 @predicate(b'filelog(pattern)', safe=True)
 def filelog(repo, subset, x):
     """Changesets connected to the specified filelog.
 
     For performance reasons, visits only revisions mentioned in the file-level
     filelog, rather than filtering through all changesets (much faster, but
     doesn't include deletes or duplicate changes). For a slower, more accurate
     result, use ``file()``.
 
     The pattern without explicit kind like ``glob:`` is expected to be
     relative to the current directory and match against a file exactly
     for efficiency.
     """
 
     # i18n: "filelog" is a keyword
     pat = getstring(x, _(b"filelog requires a pattern"))
     s = set()
     cl = repo.changelog
 
     if not matchmod.patkind(pat):
         f = pathutil.canonpath(repo.root, repo.getcwd(), pat)
         files = [f]
     else:
         m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None])
         files = (f for f in repo[None] if m(f))
 
     for f in files:
         fl = repo.file(f)
         known = {}
         scanpos = 0
         for fr in list(fl):
             fn = fl.node(fr)
             if fn in known:
                 s.add(known[fn])
                 continue
 
             lr = fl.linkrev(fr)
             if lr in cl:
                 s.add(lr)
             elif scanpos is not None:
                 # lowest matching changeset is filtered, scan further
                 # ahead in changelog
                 start = max(lr, scanpos) + 1
                 scanpos = None
                 for r in cl.revs(start):
                     # minimize parsing of non-matching entries
                     if f in cl.revision(r) and f in cl.readfiles(r):
                         try:
                             # try to use manifest delta fastpath
                             n = repo[r].filenode(f)
                             if n not in known:
                                 if n == fn:
                                     s.add(r)
                                     scanpos = r
                                     break
                                 else:
                                     known[n] = r
                         except error.ManifestLookupError:
                             # deletion in changelog
                             continue
 
     return subset & s
 
 
 @predicate(b'first(set, [n])', safe=True, takeorder=True, weight=0)
 def first(repo, subset, x, order):
     """An alias for limit().
     """
     return limit(repo, subset, x, order)
 
 
 def _follow(repo, subset, x, name, followfirst=False):
     args = getargsdict(x, name, b'file startrev')
     revs = None
     if b'startrev' in args:
         revs = getset(repo, fullreposet(repo), args[b'startrev'])
     if b'file' in args:
         x = getstring(args[b'file'], _(b"%s expected a pattern") % name)
         if revs is None:
             revs = [None]
         fctxs = []
         for r in revs:
             ctx = mctx = repo[r]
             if r is None:
                 ctx = repo[b'.']
             m = matchmod.match(
                 repo.root, repo.getcwd(), [x], ctx=mctx, default=b'path'
             )
             fctxs.extend(ctx[f].introfilectx() for f in ctx.manifest().walk(m))
         s = dagop.filerevancestors(fctxs, followfirst)
     else:
         if revs is None:
             revs = baseset([repo[b'.'].rev()])
         s = dagop.revancestors(repo, revs, followfirst)
 
     return subset & s
 
 
 @predicate(b'follow([file[, startrev]])', safe=True)
 def follow(repo, subset, x):
     """
     An alias for ``::.`` (ancestors of the working directory's first parent).
     If file pattern is specified, the histories of files matching given
     pattern in the revision given by startrev are followed, including copies.
     """
     return _follow(repo, subset, x, b'follow')
 
 
 @predicate(b'_followfirst', safe=True)
 def _followfirst(repo, subset, x):
     # ``followfirst([file[, startrev]])``
     # Like ``follow([file[, startrev]])`` but follows only the first parent
     # of every revisions or files revisions.
     return _follow(repo, subset, x, b'_followfirst', followfirst=True)
 
 
 @predicate(
     b'followlines(file, fromline:toline[, startrev=., descend=False])',
     safe=True,
 )
 def followlines(repo, subset, x):
     """Changesets modifying `file` in line range ('fromline', 'toline').
 
     Line range corresponds to 'file' content at 'startrev' and should hence be
     consistent with file size. If startrev is not specified, working directory's
     parent is used.
 
     By default, ancestors of 'startrev' are returned. If 'descend' is True,
     descendants of 'startrev' are returned though renames are (currently) not
     followed in this direction.
     """
     args = getargsdict(x, b'followlines', b'file *lines startrev descend')
     if len(args[b'lines']) != 1:
         raise error.ParseError(_(b"followlines requires a line range"))
 
     rev = b'.'
     if b'startrev' in args:
         revs = getset(repo, fullreposet(repo), args[b'startrev'])
         if len(revs) != 1:
             raise error.ParseError(
                 # i18n: "followlines" is a keyword
                 _(b"followlines expects exactly one revision")
             )
         rev = revs.last()
 
     pat = getstring(args[b'file'], _(b"followlines requires a pattern"))
     # i18n: "followlines" is a keyword
     msg = _(b"followlines expects exactly one file")
     fname = scmutil.parsefollowlinespattern(repo, rev, pat, msg)
     fromline, toline = util.processlinerange(
         *getintrange(
             args[b'lines'][0],
             # i18n: "followlines" is a keyword
             _(b"followlines expects a line number or a range"),
             _(b"line range bounds must be integers"),
         )
     )
 
     fctx = repo[rev].filectx(fname)
     descend = False
     if b'descend' in args:
         descend = getboolean(
             args[b'descend'],
             # i18n: "descend" is a keyword
             _(b"descend argument must be a boolean"),
         )
     if descend:
         rs = generatorset(
             (
                 c.rev()
                 for c, _linerange in dagop.blockdescendants(
                     fctx, fromline, toline
                 )
             ),
             iterasc=True,
         )
     else:
         rs = generatorset(
             (
                 c.rev()
                 for c, _linerange in dagop.blockancestors(
                     fctx, fromline, toline
                 )
             ),
             iterasc=False,
         )
     return subset & rs
 
 
 @predicate(b'all()', safe=True)
 def getall(repo, subset, x):
     """All changesets, the same as ``0:tip``.
     """
     # i18n: "all" is a keyword
     getargs(x, 0, 0, _(b"all takes no arguments"))
     return subset & spanset(repo)  # drop "null" if any
 
 
 @predicate(b'grep(regex)', weight=10)
 def grep(repo, subset, x):
     """Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
     to ensure special escape characters are handled correctly. Unlike
     ``keyword(string)``, the match is case-sensitive.
     """
     try:
         # i18n: "grep" is a keyword
         gr = re.compile(getstring(x, _(b"grep requires a string")))
     except re.error as e:
         raise error.ParseError(
             _(b'invalid match pattern: %s') % stringutil.forcebytestr(e)
         )
 
     def matches(x):
         c = repo[x]
         for e in c.files() + [c.user(), c.description()]:
             if gr.search(e):
                 return True
         return False
 
     return subset.filter(matches, condrepr=(b'<grep %r>', gr.pattern))
 
 
 @predicate(b'_matchfiles', safe=True)
 def _matchfiles(repo, subset, x):
     # _matchfiles takes a revset list of prefixed arguments:
     #
     #   [p:foo, i:bar, x:baz]
     #
     # builds a match object from them and filters subset. Allowed
     # prefixes are 'p:' for regular patterns, 'i:' for include
     # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass
     # a revision identifier, or the empty string to reference the
     # working directory, from which the match object is
     # initialized. Use 'd:' to set the default matching mode, default
     # to 'glob'. At most one 'r:' and 'd:' argument can be passed.
 
     l = getargs(x, 1, -1, b"_matchfiles requires at least one argument")
     pats, inc, exc = [], [], []
     rev, default = None, None
     for arg in l:
         s = getstring(arg, b"_matchfiles requires string arguments")
         prefix, value = s[:2], s[2:]
         if prefix == b'p:':
             pats.append(value)
         elif prefix == b'i:':
             inc.append(value)
         elif prefix == b'x:':
             exc.append(value)
         elif prefix == b'r:':
             if rev is not None:
                 raise error.ParseError(
                     b'_matchfiles expected at most one revision'
                 )
             if value == b'':  # empty means working directory
                 rev = node.wdirrev
             else:
                 rev = value
         elif prefix == b'd:':
             if default is not None:
                 raise error.ParseError(
                     b'_matchfiles expected at most one default mode'
                 )
             default = value
         else:
             raise error.ParseError(b'invalid _matchfiles prefix: %s' % prefix)
     if not default:
         default = b'glob'
     hasset = any(matchmod.patkind(p) == b'set' for p in pats + inc + exc)
 
     mcache = [None]
 
     # This directly read the changelog data as creating changectx for all
     # revisions is quite expensive.
     getfiles = repo.changelog.readfiles
     wdirrev = node.wdirrev
 
     def matches(x):
         if x == wdirrev:
             files = repo[x].files()
         else:
             files = getfiles(x)
 
         if not mcache[0] or (hasset and rev is None):
             r = x if rev is None else rev
             mcache[0] = matchmod.match(
                 repo.root,
                 repo.getcwd(),
                 pats,
                 include=inc,
                 exclude=exc,
                 ctx=repo[r],
                 default=default,
             )
         m = mcache[0]
 
         for f in files:
             if m(f):
                 return True
         return False
 
     return subset.filter(
         matches,
         condrepr=(
             b'<matchfiles patterns=%r, include=%r '
             b'exclude=%r, default=%r, rev=%r>',
             pats,
             inc,
             exc,
             default,
             rev,
         ),
     )
 
 
 @predicate(b'file(pattern)', safe=True, weight=10)
 def hasfile(repo, subset, x):
     """Changesets affecting files matched by pattern.
 
     For a faster but less accurate result, consider using ``filelog()``
     instead.
 
     This predicate uses ``glob:`` as the default kind of pattern.
     """
     # i18n: "file" is a keyword
     pat = getstring(x, _(b"file requires a pattern"))
     return _matchfiles(repo, subset, (b'string', b'p:' + pat))
 
 
 @predicate(b'head()', safe=True)
 def head(repo, subset, x):
     """Changeset is a named branch head.
     """
     # i18n: "head" is a keyword
     getargs(x, 0, 0, _(b"head takes no arguments"))
     hs = set()
     cl = repo.changelog
     for ls in repo.branchmap().iterheads():
         hs.update(cl.rev(h) for h in ls)
     return subset & baseset(hs)
 
 
 @predicate(b'heads(set)', safe=True, takeorder=True)
 def heads(repo, subset, x, order):
     """Members of set with no children in set.
     """
     # argument set should never define order
     if order == defineorder:
         order = followorder
     inputset = getset(repo, fullreposet(repo), x, order=order)
     wdirparents = None
     if node.wdirrev in inputset:
         # a bit slower, but not common so good enough for now
         wdirparents = [p.rev() for p in repo[None].parents()]
         inputset = set(inputset)
         inputset.discard(node.wdirrev)
     heads = repo.changelog.headrevs(inputset)
     if wdirparents is not None:
         heads.difference_update(wdirparents)
         heads.add(node.wdirrev)
     heads = baseset(heads)
     return subset & heads
 
 
 @predicate(b'hidden()', safe=True)
 def hidden(repo, subset, x):
     """Hidden changesets.
     """
     # i18n: "hidden" is a keyword
     getargs(x, 0, 0, _(b"hidden takes no arguments"))
     hiddenrevs = repoview.filterrevs(repo, b'visible')
     return subset & hiddenrevs
 
 
 @predicate(b'keyword(string)', safe=True, weight=10)
 def keyword(repo, subset, x):
     """Search commit message, user name, and names of changed files for
     string. The match is case-insensitive.
 
     For a regular expression or case sensitive search of these fields, use
     ``grep(regex)``.
     """
     # i18n: "keyword" is a keyword
     kw = encoding.lower(getstring(x, _(b"keyword requires a string")))
 
     def matches(r):
         c = repo[r]
         return any(
             kw in encoding.lower(t)
             for t in c.files() + [c.user(), c.description()]
         )
 
     return subset.filter(matches, condrepr=(b'<keyword %r>', kw))
 
 
 @predicate(b'limit(set[, n[, offset]])', safe=True, takeorder=True, weight=0)
 def limit(repo, subset, x, order):
     """First n members of set, defaulting to 1, starting from offset.
     """
     args = getargsdict(x, b'limit', b'set n offset')
     if b'set' not in args:
         # i18n: "limit" is a keyword
         raise error.ParseError(_(b"limit requires one to three arguments"))
     # i18n: "limit" is a keyword
     lim = getinteger(args.get(b'n'), _(b"limit expects a number"), default=1)
     if lim < 0:
         raise error.ParseError(_(b"negative number to select"))
     # i18n: "limit" is a keyword
     ofs = getinteger(
         args.get(b'offset'), _(b"limit expects a number"), default=0
     )
     if ofs < 0:
         raise error.ParseError(_(b"negative offset"))
     os = getset(repo, fullreposet(repo), args[b'set'])
     ls = os.slice(ofs, ofs + lim)
     if order == followorder and lim > 1:
         return subset & ls
     return ls & subset
 
 
 @predicate(b'last(set, [n])', safe=True, takeorder=True)
 def last(repo, subset, x, order):
     """Last n members of set, defaulting to 1.
     """
     # i18n: "last" is a keyword
     l = getargs(x, 1, 2, _(b"last requires one or two arguments"))
     lim = 1
     if len(l) == 2:
         # i18n: "last" is a keyword
         lim = getinteger(l[1], _(b"last expects a number"))
     if lim < 0:
         raise error.ParseError(_(b"negative number to select"))
     os = getset(repo, fullreposet(repo), l[0])
     os.reverse()
     ls = os.slice(0, lim)
     if order == followorder and lim > 1:
         return subset & ls
     ls.reverse()
     return ls & subset
 
 
 @predicate(b'max(set)', safe=True)
 def maxrev(repo, subset, x):
     """Changeset with highest revision number in set.
     """
     os = getset(repo, fullreposet(repo), x)
     try:
         m = os.max()
         if m in subset:
             return baseset([m], datarepr=(b'<max %r, %r>', subset, os))
     except ValueError:
         # os.max() throws a ValueError when the collection is empty.
         # Same as python's max().
         pass
     return baseset(datarepr=(b'<max %r, %r>', subset, os))
 
 
 @predicate(b'merge()', safe=True)
 def merge(repo, subset, x):
     """Changeset is a merge changeset.
     """
     # i18n: "merge" is a keyword
     getargs(x, 0, 0, _(b"merge takes no arguments"))
     cl = repo.changelog
     nullrev = node.nullrev
 
     def ismerge(r):
         try:
             return cl.parentrevs(r)[1] != nullrev
         except error.WdirUnsupported:
             return bool(repo[r].p2())
 
     return subset.filter(ismerge, condrepr=b'<merge>')
 
 
 @predicate(b'branchpoint()', safe=True)
 def branchpoint(repo, subset, x):
     """Changesets with more than one child.
     """
     # i18n: "branchpoint" is a keyword
     getargs(x, 0, 0, _(b"branchpoint takes no arguments"))
     cl = repo.changelog
     if not subset:
         return baseset()
     # XXX this should be 'parentset.min()' assuming 'parentset' is a smartset
     # (and if it is not, it should.)
     baserev = min(subset)
     parentscount = [0] * (len(repo) - baserev)
     for r in cl.revs(start=baserev + 1):
         for p in cl.parentrevs(r):
             if p >= baserev:
                 parentscount[p - baserev] += 1
     return subset.filter(
         lambda r: parentscount[r - baserev] > 1, condrepr=b'<branchpoint>'
     )
 
 
 @predicate(b'min(set)', safe=True)
 def minrev(repo, subset, x):
     """Changeset with lowest revision number in set.
     """
     os = getset(repo, fullreposet(repo), x)
     try:
         m = os.min()
         if m in subset:
             return baseset([m], datarepr=(b'<min %r, %r>', subset, os))
     except ValueError:
         # os.min() throws a ValueError when the collection is empty.
         # Same as python's min().
         pass
     return baseset(datarepr=(b'<min %r, %r>', subset, os))
 
 
 @predicate(b'modifies(pattern)', safe=True, weight=30)
 def modifies(repo, subset, x):
     """Changesets modifying files matched by pattern.
 
     The pattern without explicit kind like ``glob:`` is expected to be
     relative to the current directory and match against a file or a
     directory.
     """
     # i18n: "modifies" is a keyword
     pat = getstring(x, _(b"modifies requires a pattern"))
     return checkstatus(repo, subset, pat, 'modified')
 
 
 @predicate(b'named(namespace)')
 def named(repo, subset, x):
     """The changesets in a given namespace.
 
     Pattern matching is supported for `namespace`. See
     :hg:`help revisions.patterns`.
     """
     # i18n: "named" is a keyword
     args = getargs(x, 1, 1, _(b'named requires a namespace argument'))
 
     ns = getstring(
         args[0],
         # i18n: "named" is a keyword
         _(b'the argument to named must be a string'),
     )
     kind, pattern, matcher = stringutil.stringmatcher(ns)
     namespaces = set()
     if kind == b'literal':
         if pattern not in repo.names:
             raise error.RepoLookupError(
                 _(b"namespace '%s' does not exist") % ns
             )
         namespaces.add(repo.names[pattern])
     else:
         for name, ns in pycompat.iteritems(repo.names):
             if matcher(name):
                 namespaces.add(ns)
 
     names = set()
     for ns in namespaces:
         for name in ns.listnames(repo):
             if name not in ns.deprecated:
                 names.update(repo[n].rev() for n in ns.nodes(repo, name))
 
     names -= {node.nullrev}
     return subset & names
 
 
 @predicate(b'id(string)', safe=True)
 def node_(repo, subset, x):
     """Revision non-ambiguously specified by the given hex string prefix.
     """
     # i18n: "id" is a keyword
     l = getargs(x, 1, 1, _(b"id requires one argument"))
     # i18n: "id" is a keyword
     n = getstring(l[0], _(b"id requires a string"))
     if len(n) == 40:
         try:
             rn = repo.changelog.rev(node.bin(n))
         except error.WdirUnsupported:
             rn = node.wdirrev
         except (LookupError, TypeError):
             rn = None
     else:
         rn = None
         try:
             pm = scmutil.resolvehexnodeidprefix(repo, n)
             if pm is not None:
                 rn = repo.changelog.rev(pm)
         except LookupError:
             pass
         except error.WdirUnsupported:
             rn = node.wdirrev
 
     if rn is None:
         return baseset()
     result = baseset([rn])
     return result & subset
 
 
 @predicate(b'none()', safe=True)
 def none(repo, subset, x):
     """No changesets.
     """
     # i18n: "none" is a keyword
     getargs(x, 0, 0, _(b"none takes no arguments"))
     return baseset()
 
 
 @predicate(b'obsolete()', safe=True)
 def obsolete(repo, subset, x):
     """Mutable changeset with a newer version. (EXPERIMENTAL)"""
     # i18n: "obsolete" is a keyword
     getargs(x, 0, 0, _(b"obsolete takes no arguments"))
     obsoletes = obsmod.getrevs(repo, b'obsolete')
     return subset & obsoletes
 
 
 @predicate(b'only(set, [set])', safe=True)
 def only(repo, subset, x):
     """Changesets that are ancestors of the first set that are not ancestors
     of any other head in the repo. If a second set is specified, the result
     is ancestors of the first set that are not ancestors of the second set
     (i.e. ::<set1> - ::<set2>).
     """
     cl = repo.changelog
     # i18n: "only" is a keyword
     args = getargs(x, 1, 2, _(b'only takes one or two arguments'))
     include = getset(repo, fullreposet(repo), args[0])
     if len(args) == 1:
         if not include:
             return baseset()
 
         descendants = set(dagop.revdescendants(repo, include, False))
         exclude = [
             rev
             for rev in cl.headrevs()
             if not rev in descendants and not rev in include
         ]
     else:
         exclude = getset(repo, fullreposet(repo), args[1])
 
     results = set(cl.findmissingrevs(common=exclude, heads=include))
     # XXX we should turn this into a baseset instead of a set, smartset may do
     # some optimizations from the fact this is a baseset.
     return subset & results
 
 
 @predicate(b'origin([set])', safe=True)
 def origin(repo, subset, x):
     """
     Changesets that were specified as a source for the grafts, transplants or
     rebases that created the given revisions.  Omitting the optional set is the
     same as passing all().  If a changeset created by these operations is itself
     specified as a source for one of these operations, only the source changeset
     for the first operation is selected.
     """
     if x is not None:
         dests = getset(repo, fullreposet(repo), x)
     else:
         dests = fullreposet(repo)
 
     def _firstsrc(rev):
         src = _getrevsource(repo, rev)
         if src is None:
             return None
 
         while True:
             prev = _getrevsource(repo, src)
 
             if prev is None:
                 return src
             src = prev
 
     o = {_firstsrc(r) for r in dests}
     o -= {None}
     # XXX we should turn this into a baseset instead of a set, smartset may do
     # some optimizations from the fact this is a baseset.
     return subset & o
 
 
 @predicate(b'outgoing([path])', safe=False, weight=10)
 def outgoing(repo, subset, x):
     """Changesets not found in the specified destination repository, or the
     default push location.
     """
     # Avoid cycles.
     from . import (
         discovery,
         hg,
     )
 
     # i18n: "outgoing" is a keyword
     l = getargs(x, 0, 1, _(b"outgoing takes one or no arguments"))
     # i18n: "outgoing" is a keyword
     dest = (
         l and getstring(l[0], _(b"outgoing requires a repository path")) or b''
     )
     if not dest:
         # ui.paths.getpath() explicitly tests for None, not just a boolean
         dest = None
     path = repo.ui.paths.getpath(dest, default=(b'default-push', b'default'))
     if not path:
         raise error.Abort(
             _(b'default repository not configured!'),
             hint=_(b"see 'hg help config.paths'"),
         )
     dest = path.pushloc or path.loc
     branches = path.branch, []
 
     revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
     if revs:
         revs = [repo.lookup(rev) for rev in revs]
     other = hg.peer(repo, {}, dest)
     repo.ui.pushbuffer()
     outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
     repo.ui.popbuffer()
     cl = repo.changelog
     o = {cl.rev(r) for r in outgoing.missing}
     return subset & o
 
 
 @predicate(b'p1([set])', safe=True)
 def p1(repo, subset, x):
     """First parent of changesets in set, or the working directory.
     """
     if x is None:
         p = repo[x].p1().rev()
         if p >= 0:
             return subset & baseset([p])
         return baseset()
 
     ps = set()
     cl = repo.changelog
     for r in getset(repo, fullreposet(repo), x):
         try:
             ps.add(cl.parentrevs(r)[0])
         except error.WdirUnsupported:
             ps.add(repo[r].p1().rev())
     ps -= {node.nullrev}
     # XXX we should turn this into a baseset instead of a set, smartset may do
     # some optimizations from the fact this is a baseset.
     return subset & ps
 
 
 @predicate(b'p2([set])', safe=True)
 def p2(repo, subset, x):
     """Second parent of changesets in set, or the working directory.
     """
     if x is None:
         ps = repo[x].parents()
         try:
             p = ps[1].rev()
             if p >= 0:
                 return subset & baseset([p])
             return baseset()
         except IndexError:
             return baseset()
 
     ps = set()
     cl = repo.changelog
     for r in getset(repo, fullreposet(repo), x):
         try:
             ps.add(cl.parentrevs(r)[1])
         except error.WdirUnsupported:
             parents = repo[r].parents()
             if len(parents) == 2:
                 ps.add(parents[1])
     ps -= {node.nullrev}
     # XXX we should turn this into a baseset instead of a set, smartset may do
     # some optimizations from the fact this is a baseset.
     return subset & ps
 
 
 def parentpost(repo, subset, x, order):
     return p1(repo, subset, x)
 
 
 @predicate(b'parents([set])', safe=True)
 def parents(repo, subset, x):
     """
     The set of all parents for all changesets in set, or the working directory.
     """
     if x is None:
         ps = {p.rev() for p in repo[x].parents()}
     else:
         ps = set()
         cl = repo.changelog
         up = ps.update
         parentrevs = cl.parentrevs
         for r in getset(repo, fullreposet(repo), x):
             try:
                 up(parentrevs(r))
             except error.WdirUnsupported:
                 up(p.rev() for p in repo[r].parents())
     ps -= {node.nullrev}
     return subset & ps
 
 
 def _phase(repo, subset, *targets):
     """helper to select all rev in <targets> phases"""
     return repo._phasecache.getrevset(repo, targets, subset)
 
 
 @predicate(b'_phase(idx)', safe=True)
 def phase(repo, subset, x):
     l = getargs(x, 1, 1, b"_phase requires one argument")
     target = getinteger(l[0], b"_phase expects a number")
     return _phase(repo, subset, target)
 
 
 @predicate(b'draft()', safe=True)
 def draft(repo, subset, x):
     """Changeset in draft phase."""
     # i18n: "draft" is a keyword
     getargs(x, 0, 0, _(b"draft takes no arguments"))
     target = phases.draft
     return _phase(repo, subset, target)
 
 
 @predicate(b'secret()', safe=True)
 def secret(repo, subset, x):
     """Changeset in secret phase."""
     # i18n: "secret" is a keyword
     getargs(x, 0, 0, _(b"secret takes no arguments"))
     target = phases.secret
     return _phase(repo, subset, target)
 
 
 @predicate(b'stack([revs])', safe=True)
 def stack(repo, subset, x):
     """Experimental revset for the stack of changesets or working directory
     parent. (EXPERIMENTAL)
     """
     if x is None:
         stacks = stackmod.getstack(repo)
     else:
         stacks = smartset.baseset([])
         for revision in getset(repo, fullreposet(repo), x):
             currentstack = stackmod.getstack(repo, revision)
             stacks = stacks + currentstack
 
     return subset & stacks
 
 
 def parentspec(repo, subset, x, n, order):
     """``set^0``
     The set.
     ``set^1`` (or ``set^``), ``set^2``
     First or second parent, respectively, of all changesets in set.
     """
     try:
         n = int(n[1])
         if n not in (0, 1, 2):
             raise ValueError
     except (TypeError, ValueError):
         raise error.ParseError(_(b"^ expects a number 0, 1, or 2"))
     ps = set()
     cl = repo.changelog
     for r in getset(repo, fullreposet(repo), x):
         if n == 0:
             ps.add(r)
         elif n == 1:
             try:
                 ps.add(cl.parentrevs(r)[0])
             except error.WdirUnsupported:
                 ps.add(repo[r].p1().rev())
         else:
             try:
                 parents = cl.parentrevs(r)
                 if parents[1] != node.nullrev:
                     ps.add(parents[1])
             except error.WdirUnsupported:
                 parents = repo[r].parents()
                 if len(parents) == 2:
                     ps.add(parents[1].rev())
     return subset & ps
 
 
 @predicate(b'present(set)', safe=True, takeorder=True)
 def present(repo, subset, x, order):
     """An empty set, if any revision in set isn't found; otherwise,
     all revisions in set.
 
     If any of specified revisions is not present in the local repository,
     the query is normally aborted. But this predicate allows the query
     to continue even in such cases.
     """
     try:
         return getset(repo, subset, x, order)
     except error.RepoLookupError:
         return baseset()
 
 
 # for internal use
 @predicate(b'_notpublic', safe=True)
 def _notpublic(repo, subset, x):
     getargs(x, 0, 0, b"_notpublic takes no arguments")
     return _phase(repo, subset, phases.draft, phases.secret)
 
 
 # for internal use
 @predicate(b'_phaseandancestors(phasename, set)', safe=True)
 def _phaseandancestors(repo, subset, x):
     # equivalent to (phasename() & ancestors(set)) but more efficient
     # phasename could be one of 'draft', 'secret', or '_notpublic'
     args = getargs(x, 2, 2, b"_phaseandancestors requires two arguments")
     phasename = getsymbol(args[0])
     s = getset(repo, fullreposet(repo), args[1])
 
     draft = phases.draft
     secret = phases.secret
     phasenamemap = {
         b'_notpublic': draft,
         b'draft': draft,  # follow secret's ancestors
         b'secret': secret,
     }
     if phasename not in phasenamemap:
         raise error.ParseError(b'%r is not a valid phasename' % phasename)
 
     minimalphase = phasenamemap[phasename]
     getphase = repo._phasecache.phase
 
     def cutfunc(rev):
         return getphase(repo, rev) < minimalphase
 
     revs = dagop.revancestors(repo, s, cutfunc=cutfunc)
 
     if phasename == b'draft':  # need to remove secret changesets
         revs = revs.filter(lambda r: getphase(repo, r) == draft)
     return subset & revs
 
 
 @predicate(b'public()', safe=True)
 def public(repo, subset, x):
     """Changeset in public phase."""
     # i18n: "public" is a keyword
     getargs(x, 0, 0, _(b"public takes no arguments"))
     return _phase(repo, subset, phases.public)
 
 
 @predicate(b'remote([id [,path]])', safe=False)
 def remote(repo, subset, x):
     """Local revision that corresponds to the given identifier in a
     remote repository, if present. Here, the '.' identifier is a
     synonym for the current local branch.
     """
 
     from . import hg  # avoid start-up nasties
 
     # i18n: "remote" is a keyword
     l = getargs(x, 0, 2, _(b"remote takes zero, one, or two arguments"))
 
     q = b'.'
     if len(l) > 0:
         # i18n: "remote" is a keyword
         q = getstring(l[0], _(b"remote requires a string id"))
     if q == b'.':
         q = repo[b'.'].branch()
 
     dest = b''
     if len(l) > 1:
         # i18n: "remote" is a keyword
         dest = getstring(l[1], _(b"remote requires a repository path"))
     dest = repo.ui.expandpath(dest or b'default')
     dest, branches = hg.parseurl(dest)
 
     other = hg.peer(repo, {}, dest)
     n = other.lookup(q)
     if n in repo:
         r = repo[n].rev()
         if r in subset:
             return baseset([r])
     return baseset()
 
 
 @predicate(b'removes(pattern)', safe=True, weight=30)
 def removes(repo, subset, x):
     """Changesets which remove files matching pattern.
 
     The pattern without explicit kind like ``glob:`` is expected to be
     relative to the current directory and match against a file or a
     directory.
     """
     # i18n: "removes" is a keyword
     pat = getstring(x, _(b"removes requires a pattern"))
     return checkstatus(repo, subset, pat, 'removed')
 
 
 @predicate(b'rev(number)', safe=True)
 def rev(repo, subset, x):
     """Revision with the given numeric identifier."""
     try:
         return _rev(repo, subset, x)
     except error.RepoLookupError:
         return baseset()
 
 
 @predicate(b'_rev(number)', safe=True)
 def _rev(repo, subset, x):
     # internal version of "rev(x)" that raise error if "x" is invalid
     # i18n: "rev" is a keyword
     l = getargs(x, 1, 1, _(b"rev requires one argument"))
     try:
         # i18n: "rev" is a keyword
         l = int(getstring(l[0], _(b"rev requires a number")))
     except (TypeError, ValueError):
         # i18n: "rev" is a keyword
         raise error.ParseError(_(b"rev expects a number"))
     if l not in _virtualrevs:
         try:
             repo.changelog.node(l)  # check that the rev exists
         except IndexError:
             raise error.RepoLookupError(_(b"unknown revision '%d'") % l)
     return subset & baseset([l])
 
 
 @predicate(b'revset(set)', safe=True, takeorder=True)
 def revsetpredicate(repo, subset, x, order):
     """Strictly interpret the content as a revset.
 
     The content of this special predicate will be strictly interpreted as a
     revset. For example, ``revset(id(0))`` will be interpreted as "id(0)"
     without possible ambiguity with a "id(0)" bookmark or tag.
     """
     return getset(repo, subset, x, order)
 
 
 @predicate(b'matching(revision [, field])', safe=True)
 def matching(repo, subset, x):
     """Changesets in which a given set of fields match the set of fields in the
     selected revision or set.
 
     To match more than one field pass the list of fields to match separated
     by spaces (e.g. ``author description``).
 
     Valid fields are most regular revision fields and some special fields.
 
     Regular revision fields are ``description``, ``author``, ``branch``,
     ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``
     and ``diff``.
     Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the
     contents of the revision. Two revisions matching their ``diff`` will
     also match their ``files``.
 
     Special fields are ``summary`` and ``metadata``:
     ``summary`` matches the first line of the description.
     ``metadata`` is equivalent to matching ``description user date``
     (i.e. it matches the main metadata fields).
 
     ``metadata`` is the default field which is used when no fields are
     specified. You can match more than one field at a time.
     """
     # i18n: "matching" is a keyword
     l = getargs(x, 1, 2, _(b"matching takes 1 or 2 arguments"))
 
     revs = getset(repo, fullreposet(repo), l[0])
 
     fieldlist = [b'metadata']
     if len(l) > 1:
         fieldlist = getstring(
             l[1],
             # i18n: "matching" is a keyword
             _(b"matching requires a string as its second argument"),
         ).split()
 
     # Make sure that there are no repeated fields,
     # expand the 'special' 'metadata' field type
     # and check the 'files' whenever we check the 'diff'
     fields = []
     for field in fieldlist:
         if field == b'metadata':
             fields += [b'user', b'description', b'date']
         elif field == b'diff':
             # a revision matching the diff must also match the files
             # since matching the diff is very costly, make sure to
             # also match the files first
             fields += [b'files', b'diff']
         else:
             if field == b'author':
                 field = b'user'
             fields.append(field)
     fields = set(fields)
     if b'summary' in fields and b'description' in fields:
         # If a revision matches its description it also matches its summary
         fields.discard(b'summary')
 
     # We may want to match more than one field
     # Not all fields take the same amount of time to be matched
     # Sort the selected fields in order of increasing matching cost
     fieldorder = [
         b'phase',
         b'parents',
         b'user',
         b'date',
         b'branch',
         b'summary',
         b'files',
         b'description',
         b'substate',
         b'diff',
     ]
 
     def fieldkeyfunc(f):
         try:
             return fieldorder.index(f)
         except ValueError:
             # assume an unknown field is very costly
             return len(fieldorder)
 
     fields = list(fields)
     fields.sort(key=fieldkeyfunc)
 
     # Each field will be matched with its own "getfield" function
     # which will be added to the getfieldfuncs array of functions
     getfieldfuncs = []
     _funcs = {
         b'user': lambda r: repo[r].user(),
         b'branch': lambda r: repo[r].branch(),
         b'date': lambda r: repo[r].date(),
         b'description': lambda r: repo[r].description(),
         b'files': lambda r: repo[r].files(),
         b'parents': lambda r: repo[r].parents(),
         b'phase': lambda r: repo[r].phase(),
         b'substate': lambda r: repo[r].substate,
         b'summary': lambda r: repo[r].description().splitlines()[0],
         b'diff': lambda r: list(
             repo[r].diff(opts=diffutil.diffallopts(repo.ui, {b'git': True}))
         ),
     }
     for info in fields:
         getfield = _funcs.get(info, None)
         if getfield is None:
             raise error.ParseError(
                 # i18n: "matching" is a keyword
                 _(b"unexpected field name passed to matching: %s")
                 % info
             )
         getfieldfuncs.append(getfield)
     # convert the getfield array of functions into a "getinfo" function
     # which returns an array of field values (or a single value if there
     # is only one field to match)
     getinfo = lambda r: [f(r) for f in getfieldfuncs]
 
     def matches(x):
         for rev in revs:
             target = getinfo(rev)
             match = True
             for n, f in enumerate(getfieldfuncs):
                 if target[n] != f(x):
                     match = False
             if match:
                 return True
         return False
 
     return subset.filter(matches, condrepr=(b'<matching%r %r>', fields, revs))
 
 
 @predicate(b'reverse(set)', safe=True, takeorder=True, weight=0)
 def reverse(repo, subset, x, order):
     """Reverse order of set.
     """
     l = getset(repo, subset, x, order)
     if order == defineorder:
         l.reverse()
     return l
 
 
 @predicate(b'roots(set)', safe=True)
 def roots(repo, subset, x):
     """Changesets in set with no parent changeset in set.
     """
     s = getset(repo, fullreposet(repo), x)
     parents = repo.changelog.parentrevs
 
     def filter(r):
         for p in parents(r):
             if 0 <= p and p in s:
                 return False
         return True
 
     return subset & s.filter(filter, condrepr=b'<roots>')
 
 
 _sortkeyfuncs = {
-    b'rev': lambda c: c.rev(),
+    b'rev': scmutil.intrev,
     b'branch': lambda c: c.branch(),
     b'desc': lambda c: c.description(),
     b'user': lambda c: c.user(),
     b'author': lambda c: c.user(),
     b'date': lambda c: c.date()[0],
-    b'node': lambda c: c.node(),
+    b'node': scmutil.binnode,
 }
 
 
 def _getsortargs(x):
     """Parse sort options into (set, [(key, reverse)], opts)"""
     args = getargsdict(x, b'sort', b'set keys topo.firstbranch')
     if b'set' not in args:
         # i18n: "sort" is a keyword
         raise error.ParseError(_(b'sort requires one or two arguments'))
     keys = b"rev"
     if b'keys' in args:
         # i18n: "sort" is a keyword
         keys = getstring(args[b'keys'], _(b"sort spec must be a string"))
 
     keyflags = []
     for k in keys.split():
         fk = k
         reverse = k.startswith(b'-')
         if reverse:
             k = k[1:]
         if k not in _sortkeyfuncs and k != b'topo':
             raise error.ParseError(
                 _(b"unknown sort key %r") % pycompat.bytestr(fk)
             )
         keyflags.append((k, reverse))
 
     if len(keyflags) > 1 and any(k == b'topo' for k, reverse in keyflags):
         # i18n: "topo" is a keyword
         raise error.ParseError(
             _(b'topo sort order cannot be combined with other sort keys')
         )
 
     opts = {}
     if b'topo.firstbranch' in args:
         if any(k == b'topo' for k, reverse in keyflags):
             opts[b'topo.firstbranch'] = args[b'topo.firstbranch']
         else:
             # i18n: "topo" and "topo.firstbranch" are keywords
             raise error.ParseError(
                 _(
                     b'topo.firstbranch can only be used '
                     b'when using the topo sort key'
                 )
             )
 
     return args[b'set'], keyflags, opts
 
 
 @predicate(
     b'sort(set[, [-]key... [, ...]])', safe=True, takeorder=True, weight=10
 )
 def sort(repo, subset, x, order):
     """Sort set by keys. The default sort order is ascending, specify a key
     as ``-key`` to sort in descending order.
 
     The keys can be:
 
     - ``rev`` for the revision number,
     - ``branch`` for the branch name,
     - ``desc`` for the commit message (description),
     - ``user`` for user name (``author`` can be used as an alias),
     - ``date`` for the commit date
     - ``topo`` for a reverse topographical sort
     - ``node`` the nodeid of the revision
 
     The ``topo`` sort order cannot be combined with other sort keys. This sort
     takes one optional argument, ``topo.firstbranch``, which takes a revset that
     specifies what topographical branches to prioritize in the sort.
 
     """
     s, keyflags, opts = _getsortargs(x)
     revs = getset(repo, subset, s, order)
 
     if not keyflags or order != defineorder:
         return revs
     if len(keyflags) == 1 and keyflags[0][0] == b"rev":
         revs.sort(reverse=keyflags[0][1])
         return revs
     elif keyflags[0][0] == b"topo":
         firstbranch = ()
         if b'topo.firstbranch' in opts:
             firstbranch = getset(repo, subset, opts[b'topo.firstbranch'])
         revs = baseset(
             dagop.toposort(revs, repo.changelog.parentrevs, firstbranch),
             istopo=True,
         )
         if keyflags[0][1]:
             revs.reverse()
         return revs
 
     # sort() is guaranteed to be stable
     ctxs = [repo[r] for r in revs]
     for k, reverse in reversed(keyflags):
         ctxs.sort(key=_sortkeyfuncs[k], reverse=reverse)
     return baseset([c.rev() for c in ctxs])
 
 
 @predicate(b'subrepo([pattern])')
 def subrepo(repo, subset, x):
     """Changesets that add, modify or remove the given subrepo.  If no subrepo
     pattern is named, any subrepo changes are returned.
     """
     # i18n: "subrepo" is a keyword
     args = getargs(x, 0, 1, _(b'subrepo takes at most one argument'))
     pat = None
     if len(args) != 0:
         pat = getstring(args[0], _(b"subrepo requires a pattern"))
 
     m = matchmod.exact([b'.hgsubstate'])
 
     def submatches(names):
         k, p, m = stringutil.stringmatcher(pat)
         for name in names:
             if m(name):
                 yield name
 
     def matches(x):
         c = repo[x]
         s = repo.status(c.p1().node(), c.node(), match=m)
 
         if pat is None:
             return s.added or s.modified or s.removed
 
         if s.added:
             return any(submatches(c.substate.keys()))
 
         if s.modified:
             subs = set(c.p1().substate.keys())
             subs.update(c.substate.keys())
 
             for path in submatches(subs):
                 if c.p1().substate.get(path) != c.substate.get(path):
                     return True
 
         if s.removed:
             return any(submatches(c.p1().substate.keys()))
 
         return False
 
     return subset.filter(matches, condrepr=(b'<subrepo %r>', pat))
 
 
 def _mapbynodefunc(repo, s, f):
     """(repo, smartset, [node] -> [node]) -> smartset
 
     Helper method to map a smartset to another smartset given a function only
     talking about nodes. Handles converting between rev numbers and nodes, and
     filtering.
     """
     cl = repo.unfiltered().changelog
     torev = cl.index.get_rev
     tonode = cl.node
     result = {torev(n) for n in f(tonode(r) for r in s)}
     result.discard(None)
     return smartset.baseset(result - repo.changelog.filteredrevs)
 
 
 @predicate(b'successors(set)', safe=True)
 def successors(repo, subset, x):
     """All successors for set, including the given set themselves.
     (EXPERIMENTAL)"""
     s = getset(repo, fullreposet(repo), x)
     f = lambda nodes: obsutil.allsuccessors(repo.obsstore, nodes)
     d = _mapbynodefunc(repo, s, f)
     return subset & d
 
 
 def _substringmatcher(pattern, casesensitive=True):
     kind, pattern, matcher = stringutil.stringmatcher(
         pattern, casesensitive=casesensitive
     )
     if kind == b'literal':
         if not casesensitive:
             pattern = encoding.lower(pattern)
             matcher = lambda s: pattern in encoding.lower(s)
         else:
             matcher = lambda s: pattern in s
     return kind, pattern, matcher
 
 
 @predicate(b'tag([name])', safe=True)
 def tag(repo, subset, x):
     """The specified tag by name, or all tagged revisions if no name is given.
 
     Pattern matching is supported for `name`. See
     :hg:`help revisions.patterns`.
     """
     # i18n: "tag" is a keyword
     args = getargs(x, 0, 1, _(b"tag takes one or no arguments"))
     cl = repo.changelog
     if args:
         pattern = getstring(
             args[0],
             # i18n: "tag" is a keyword
             _(b'the argument to tag must be a string'),
         )
         kind, pattern, matcher = stringutil.stringmatcher(pattern)
         if kind == b'literal':
             # avoid resolving all tags
             tn = repo._tagscache.tags.get(pattern, None)
             if tn is None:
                 raise error.RepoLookupError(
                     _(b"tag '%s' does not exist") % pattern
                 )
             s = {repo[tn].rev()}
         else:
             s = {cl.rev(n) for t, n in repo.tagslist() if matcher(t)}
     else:
         s = {cl.rev(n) for t, n in repo.tagslist() if t != b'tip'}
     return subset & s
 
 
 @predicate(b'tagged', safe=True)
 def tagged(repo, subset, x):
     return tag(repo, subset, x)
 
 
 @predicate(b'orphan()', safe=True)
 def orphan(repo, subset, x):
     """Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL)
     """
     # i18n: "orphan" is a keyword
     getargs(x, 0, 0, _(b"orphan takes no arguments"))
     orphan = obsmod.getrevs(repo, b'orphan')
     return subset & orphan
 
 
 @predicate(b'unstable()', safe=True)
 def unstable(repo, subset, x):
     """Changesets with instabilities. (EXPERIMENTAL)
     """
     # i18n: "unstable" is a keyword
     getargs(x, 0, 0, b'unstable takes no arguments')
     _unstable = set()
     _unstable.update(obsmod.getrevs(repo, b'orphan'))
     _unstable.update(obsmod.getrevs(repo, b'phasedivergent'))
     _unstable.update(obsmod.getrevs(repo, b'contentdivergent'))
     return subset & baseset(_unstable)
 
 
 @predicate(b'user(string)', safe=True, weight=10)
 def user(repo, subset, x):
     """User name contains string. The match is case-insensitive.
 
     Pattern matching is supported for `string`. See
     :hg:`help revisions.patterns`.
     """
     return author(repo, subset, x)
 
 
 @predicate(b'wdir()', safe=True, weight=0)
 def wdir(repo, subset, x):
     """Working directory. (EXPERIMENTAL)"""
     # i18n: "wdir" is a keyword
     getargs(x, 0, 0, _(b"wdir takes no arguments"))
     if node.wdirrev in subset or isinstance(subset, fullreposet):
         return baseset([node.wdirrev])
     return baseset()
 
 
 def _orderedlist(repo, subset, x):
     s = getstring(x, b"internal error")
     if not s:
         return baseset()
     # remove duplicates here. it's difficult for caller to deduplicate sets
     # because different symbols can point to the same rev.
     cl = repo.changelog
     ls = []
     seen = set()
     for t in s.split(b'\0'):
         try:
             # fast path for integer revision
             r = int(t)
             if (b'%d' % r) != t or r not in cl:
                 raise ValueError
             revs = [r]
         except ValueError:
             revs = stringset(repo, subset, t, defineorder)
 
         for r in revs:
             if r in seen:
                 continue
             if (
                 r in subset
                 or r in _virtualrevs
                 and isinstance(subset, fullreposet)
             ):
                 ls.append(r)
             seen.add(r)
     return baseset(ls)
 
 
 # for internal use
 @predicate(b'_list', safe=True, takeorder=True)
 def _list(repo, subset, x, order):
     if order == followorder:
         # slow path to take the subset order
         return subset & _orderedlist(repo, fullreposet(repo), x)
     else:
         return _orderedlist(repo, subset, x)
 
 
 def _orderedintlist(repo, subset, x):
     s = getstring(x, b"internal error")
     if not s:
         return baseset()
     ls = [int(r) for r in s.split(b'\0')]
     s = subset
     return baseset([r for r in ls if r in s])
 
 
 # for internal use
 @predicate(b'_intlist', safe=True, takeorder=True, weight=0)
 def _intlist(repo, subset, x, order):
     if order == followorder:
         # slow path to take the subset order
         return subset & _orderedintlist(repo, fullreposet(repo), x)
     else:
         return _orderedintlist(repo, subset, x)
 
 
 def _orderedhexlist(repo, subset, x):
     s = getstring(x, b"internal error")
     if not s:
         return baseset()
     cl = repo.changelog
     ls = [cl.rev(node.bin(r)) for r in s.split(b'\0')]
     s = subset
     return baseset([r for r in ls if r in s])
 
 
 # for internal use
 @predicate(b'_hexlist', safe=True, takeorder=True)
 def _hexlist(repo, subset, x, order):
     if order == followorder:
         # slow path to take the subset order
         return subset & _orderedhexlist(repo, fullreposet(repo), x)
     else:
         return _orderedhexlist(repo, subset, x)
 
 
 methods = {
     b"range": rangeset,
     b"rangeall": rangeall,
     b"rangepre": rangepre,
     b"rangepost": rangepost,
     b"dagrange": dagrange,
     b"string": stringset,
     b"symbol": stringset,
     b"and": andset,
     b"andsmally": andsmallyset,
     b"or": orset,
     b"not": notset,
     b"difference": differenceset,
     b"relation": relationset,
     b"relsubscript": relsubscriptset,
     b"subscript": subscriptset,
     b"list": listset,
     b"keyvalue": keyvaluepair,
     b"func": func,
     b"ancestor": ancestorspec,
     b"parent": parentspec,
     b"parentpost": parentpost,
     b"smartset": rawsmartset,
 }
 
 relations = {
     b"g": generationsrel,
     b"generations": generationsrel,
 }
 
 subscriptrelations = {
     b"g": generationssubrel,
     b"generations": generationssubrel,
 }
 
 
 def lookupfn(repo):
     return lambda symbol: scmutil.isrevsymbol(repo, symbol)
 
 
 def match(ui, spec, lookup=None):
     """Create a matcher for a single revision spec"""
     return matchany(ui, [spec], lookup=lookup)
 
 
 def matchany(ui, specs, lookup=None, localalias=None):
     """Create a matcher that will include any revisions matching one of the
     given specs
 
     If lookup function is not None, the parser will first attempt to handle
     old-style ranges, which may contain operator characters.
 
     If localalias is not None, it is a dict {name: definitionstring}. It takes
     precedence over [revsetalias] config section.
     """
     if not specs:
 
         def mfunc(repo, subset=None):
             return baseset()
 
         return mfunc
     if not all(specs):
         raise error.ParseError(_(b"empty query"))
     if len(specs) == 1:
         tree = revsetlang.parse(specs[0], lookup)
     else:
         tree = (
             b'or',
             (b'list',) + tuple(revsetlang.parse(s, lookup) for s in specs),
         )
 
     aliases = []
     warn = None
     if ui:
         aliases.extend(ui.configitems(b'revsetalias'))
         warn = ui.warn
     if localalias:
         aliases.extend(localalias.items())
     if aliases:
         tree = revsetlang.expandaliases(tree, aliases, warn=warn)
     tree = revsetlang.foldconcat(tree)
     tree = revsetlang.analyze(tree)
     tree = revsetlang.optimize(tree)
     return makematcher(tree)
 
 
 def makematcher(tree):
     """Create a matcher from an evaluatable tree"""
 
     def mfunc(repo, subset=None, order=None):
         if order is None:
             if subset is None:
                 order = defineorder  # 'x'
             else:
                 order = followorder  # 'subset & x'
         if subset is None:
             subset = fullreposet(repo)
         return getset(repo, subset, tree, order)
 
     return mfunc
 
 
 def loadpredicate(ui, extname, registrarobj):
     """Load revset predicates from specified registrarobj
     """
     for name, func in pycompat.iteritems(registrarobj._table):
         symbols[name] = func
         if func._safe:
             safesymbols.add(name)
 
 
 # load built-in predicates explicitly to setup safesymbols
 loadpredicate(None, None, predicate)
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = symbols.values()

tests/test-revset.t

@@ -1,3084 +1,3107 b''
   $ HGENCODING=utf-8
   $ export HGENCODING
   $ cat > testrevset.py << EOF
   > import mercurial.revset
   > 
   > baseset = mercurial.revset.baseset
   > 
   > def r3232(repo, subset, x):
   >     """"simple revset that return [3,2,3,2]
   > 
   >     revisions duplicated on purpose.
   >     """
   >     if 3 not in subset:
   >        if 2 in subset:
   >            return baseset([2, 2])
   >        return baseset()
   >     return baseset([3, 3, 2, 2])
   > 
   > mercurial.revset.symbols[b'r3232'] = r3232
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]
   > drawdag=$TESTDIR/drawdag.py
   > testrevset=$TESTTMP/testrevset.py
   > EOF
 
   $ try() {
   >   hg debugrevspec --debug "$@"
   > }
 
   $ log() {
   >   hg log --template '{rev}\n' -r "$1"
   > }
 
 extension to build '_intlist()' and '_hexlist()', which is necessary because
 these predicates use '\0' as a separator:
 
   $ cat <<EOF > debugrevlistspec.py
   > from __future__ import absolute_import
   > from mercurial import (
   >     node as nodemod,
   >     registrar,
   >     revset,
   >     revsetlang,
   > )
   > from mercurial.utils import stringutil
   > cmdtable = {}
   > command = registrar.command(cmdtable)
   > @command(b'debugrevlistspec',
   >     [(b'', b'optimize', None, b'print parsed tree after optimizing'),
   >      (b'', b'bin', None, b'unhexlify arguments')])
   > def debugrevlistspec(ui, repo, fmt, *args, **opts):
   >     if opts['bin']:
   >         args = map(nodemod.bin, args)
   >     expr = revsetlang.formatspec(fmt, list(args))
   >     if ui.verbose:
   >         tree = revsetlang.parse(expr, lookup=revset.lookupfn(repo))
   >         ui.note(revsetlang.prettyformat(tree), b"\n")
   >         if opts["optimize"]:
   >             opttree = revsetlang.optimize(revsetlang.analyze(tree))
   >             ui.note(b"* optimized:\n", revsetlang.prettyformat(opttree),
   >                     b"\n")
   >     func = revset.match(ui, expr, lookup=revset.lookupfn(repo))
   >     revs = func(repo)
   >     if ui.verbose:
   >         ui.note(b"* set:\n", stringutil.prettyrepr(revs), b"\n")
   >     for c in revs:
   >         ui.write(b"%d\n" % c)
   > EOF
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > debugrevlistspec = $TESTTMP/debugrevlistspec.py
   > EOF
   $ trylist() {
   >   hg debugrevlistspec --debug "$@"
   > }
 
   $ hg init repo
   $ cd repo
 
   $ echo a > a
   $ hg branch a
   marked working directory as branch a
   (branches are permanent and global, did you want a bookmark?)
   $ hg ci -Aqm0
 
   $ echo b > b
   $ hg branch b
   marked working directory as branch b
   $ hg ci -Aqm1
 
   $ rm a
   $ hg branch a-b-c-
   marked working directory as branch a-b-c-
   $ hg ci -Aqm2 -u Bob
 
   $ hg log -r "extra('branch', 'a-b-c-')" --template '{rev}\n'
   2
   $ hg log -r "extra('branch')" --template '{rev}\n'
   0
   1
   2
   $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n'
   0 a
   2 a-b-c-
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch +a+b+c+
   marked working directory as branch +a+b+c+
   $ hg ci -Aqm3
 
   $ hg co 2  # interleave
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bb > b
   $ hg branch -- -a-b-c-
   marked working directory as branch -a-b-c-
   $ hg ci -Aqm4 -d "May 12 2005"
 
   $ hg co 3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch !a/b/c/
   marked working directory as branch !a/b/c/
   $ hg ci -Aqm"5 bug"
 
   $ hg merge 4
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg branch _a_b_c_
   marked working directory as branch _a_b_c_
   $ hg ci -Aqm"6 issue619"
 
   $ hg branch .a.b.c.
   marked working directory as branch .a.b.c.
   $ hg ci -Aqm7
 
   $ hg branch all
   marked working directory as branch all
 
   $ hg co 4
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg branch é
   marked working directory as branch \xc3\xa9 (esc)
   $ hg ci -Aqm9
 
   $ hg tag -r6 1.0
   $ hg bookmark -r6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
   $ hg clone --quiet -U -r 7 . ../remote1
   $ hg clone --quiet -U -r 8 . ../remote2
   $ echo "[paths]" >> .hg/hgrc
   $ echo "default = ../remote1" >> .hg/hgrc
 
 trivial
 
   $ try 0:1
   (range
     (symbol '0')
     (symbol '1'))
   * set:
   <spanset+ 0:2>
   0
   1
   $ try --optimize :
   (rangeall
     None)
   * optimized:
   (rangeall
     None)
   * set:
   <spanset+ 0:10>
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ try 3::6
   (dagrange
     (symbol '3')
     (symbol '6'))
   * set:
   <baseset+ [3, 5, 6]>
   3
   5
   6
   $ try '0|1|2'
   (or
     (list
       (symbol '0')
       (symbol '1')
       (symbol '2')))
   * set:
   <baseset [0, 1, 2]>
   0
   1
   2
 
 names that should work without quoting
 
   $ try a
   (symbol 'a')
   * set:
   <baseset [0]>
   0
   $ try b-a
   (minus
     (symbol 'b')
     (symbol 'a'))
   * set:
   <filteredset
     <baseset [1]>,
     <not
       <baseset [0]>>>
   1
   $ try _a_b_c_
   (symbol '_a_b_c_')
   * set:
   <baseset [6]>
   6
   $ try _a_b_c_-a
   (minus
     (symbol '_a_b_c_')
     (symbol 'a'))
   * set:
   <filteredset
     <baseset [6]>,
     <not
       <baseset [0]>>>
   6
   $ try .a.b.c.
   (symbol '.a.b.c.')
   * set:
   <baseset [7]>
   7
   $ try .a.b.c.-a
   (minus
     (symbol '.a.b.c.')
     (symbol 'a'))
   * set:
   <filteredset
     <baseset [7]>,
     <not
       <baseset [0]>>>
   7
 
 names that should be caught by fallback mechanism
 
   $ try -- '-a-b-c-'
   (symbol '-a-b-c-')
   * set:
   <baseset [4]>
   4
   $ log -a-b-c-
   4
   $ try '+a+b+c+'
   (symbol '+a+b+c+')
   * set:
   <baseset [3]>
   3
   $ try '+a+b+c+:'
   (rangepost
     (symbol '+a+b+c+'))
   * set:
   <spanset+ 3:10>
   3
   4
   5
   6
   7
   8
   9
   $ try ':+a+b+c+'
   (rangepre
     (symbol '+a+b+c+'))
   * set:
   <spanset+ 0:4>
   0
   1
   2
   3
   $ try -- '-a-b-c-:+a+b+c+'
   (range
     (symbol '-a-b-c-')
     (symbol '+a+b+c+'))
   * set:
   <spanset- 3:5>
   4
   3
   $ log '-a-b-c-:+a+b+c+'
   4
   3
 
   $ try -- -a-b-c--a # complains
   (minus
     (minus
       (minus
         (negate
           (symbol 'a'))
         (symbol 'b'))
       (symbol 'c'))
     (negate
       (symbol 'a')))
   abort: unknown revision '-a'!
   [255]
   $ try é
   (symbol '\xc3\xa9')
   * set:
   <baseset [9]>
   9
 
 no quoting needed
 
   $ log ::a-b-c-
   0
   1
   2
 
 quoting needed
 
   $ try '"-a-b-c-"-a'
   (minus
     (string '-a-b-c-')
     (symbol 'a'))
   * set:
   <filteredset
     <baseset [4]>,
     <not
       <baseset [0]>>>
   4
 
   $ log '1 or 2'
   1
   2
   $ log '1|2'
   1
   2
   $ log '1 and 2'
   $ log '1&2'
   $ try '1&2|3' # precedence - and is higher
   (or
     (list
       (and
         (symbol '1')
         (symbol '2'))
       (symbol '3')))
   * set:
   <addset
     <baseset []>,
     <baseset [3]>>
   3
   $ try '1|2&3'
   (or
     (list
       (symbol '1')
       (and
         (symbol '2')
         (symbol '3'))))
   * set:
   <addset
     <baseset [1]>,
     <baseset []>>
   1
   $ try '1&2&3' # associativity
   (and
     (and
       (symbol '1')
       (symbol '2'))
     (symbol '3'))
   * set:
   <baseset []>
   $ try '1|(2|3)'
   (or
     (list
       (symbol '1')
       (group
         (or
           (list
             (symbol '2')
             (symbol '3'))))))
   * set:
   <addset
     <baseset [1]>,
     <baseset [2, 3]>>
   1
   2
   3
   $ log '1.0' # tag
   6
   $ log 'a' # branch
   0
   $ log '2785f51ee'
   0
   $ log 'date(2005)'
   4
   $ log 'date(this is a test)'
   hg: parse error at 10: unexpected token: symbol
   (date(this is a test)
              ^ here)
   [255]
   $ log 'date()'
   hg: parse error: date requires a string
   [255]
   $ log 'date'
   abort: unknown revision 'date'!
   [255]
   $ log 'date('
   hg: parse error at 5: not a prefix: end
   (date(
         ^ here)
   [255]
   $ log 'date("\xy")'
   hg: parse error: invalid \x escape* (glob)
   [255]
   $ log 'date(tip)'
   hg: parse error: invalid date: 'tip'
   [255]
   $ log '0:date'
   abort: unknown revision 'date'!
   [255]
   $ log '::"date"'
   abort: unknown revision 'date'!
   [255]
   $ hg book date -r 4
   $ log '0:date'
   0
   1
   2
   3
   4
   $ log '::date'
   0
   1
   2
   4
   $ log '::"date"'
   0
   1
   2
   4
   $ log 'date(2005) and 1::'
   4
   $ hg book -d date
 
 function name should be a symbol
 
   $ log '"date"(2005)'
   hg: parse error: not a symbol
   [255]
 
 keyword arguments
 
   $ log 'extra(branch, value=a)'
   0
 
   $ log 'extra(branch, a, b)'
   hg: parse error: extra takes at most 2 positional arguments
   [255]
   $ log 'extra(a, label=b)'
   hg: parse error: extra got multiple values for keyword argument 'label'
   [255]
   $ log 'extra(label=branch, default)'
   hg: parse error: extra got an invalid argument
   [255]
   $ log 'extra(branch, foo+bar=baz)'
   hg: parse error: extra got an invalid argument
   [255]
   $ log 'extra(unknown=branch)'
   hg: parse error: extra got an unexpected keyword argument 'unknown'
   [255]
   $ log 'extra((), x)'
   hg: parse error: first argument to extra must be a string
   [255]
   $ log 'extra(label=x, ())'
   hg: parse error: extra got an invalid argument
   [255]
 
   $ try 'foo=bar|baz'
   (keyvalue
     (symbol 'foo')
     (or
       (list
         (symbol 'bar')
         (symbol 'baz'))))
   hg: parse error: can't use a key-value pair in this context
   [255]
 
  right-hand side should be optimized recursively
 
   $ try --optimize 'foo=(not public())'
   (keyvalue
     (symbol 'foo')
     (group
       (not
         (func
           (symbol 'public')
           None))))
   * optimized:
   (keyvalue
     (symbol 'foo')
     (func
       (symbol '_notpublic')
       None))
   hg: parse error: can't use a key-value pair in this context
   [255]
 
 relation-subscript operator has the highest binding strength (as function call):
 
   $ hg debugrevspec -p parsed 'tip:tip^#generations[-1]'
   * parsed:
   (range
     (symbol 'tip')
     (relsubscript
       (parentpost
         (symbol 'tip'))
       (symbol 'generations')
       (negate
         (symbol '1'))))
   9
   8
   7
   6
   5
   4
 
   $ hg debugrevspec -p parsed --no-show-revs 'not public()#generations[0]'
   * parsed:
   (not
     (relsubscript
       (func
         (symbol 'public')
         None)
       (symbol 'generations')
       (symbol '0')))
 
 left-hand side of relation-subscript operator should be optimized recursively:
 
   $ hg debugrevspec -p analyzed -p optimized --no-show-revs \
   > '(not public())#generations[0]'
   * analyzed:
   (relsubscript
     (not
       (func
         (symbol 'public')
         None))
     (symbol 'generations')
     (symbol '0'))
   * optimized:
   (relsubscript
     (func
       (symbol '_notpublic')
       None)
     (symbol 'generations')
     (symbol '0'))
 
 resolution of subscript and relation-subscript ternary operators:
 
   $ hg debugrevspec -p analyzed 'tip[0]'
   * analyzed:
   (subscript
     (symbol 'tip')
     (symbol '0'))
   hg: parse error: can't use a subscript in this context
   [255]
 
   $ hg debugrevspec -p analyzed 'tip#rel[0]'
   * analyzed:
   (relsubscript
     (symbol 'tip')
     (symbol 'rel')
     (symbol '0'))
   hg: parse error: unknown identifier: rel
   [255]
 
   $ hg debugrevspec -p analyzed '(tip#rel)[0]'
   * analyzed:
   (subscript
     (relation
       (symbol 'tip')
       (symbol 'rel'))
     (symbol '0'))
   hg: parse error: can't use a subscript in this context
   [255]
 
   $ hg debugrevspec -p analyzed 'tip#rel[0][1]'
   * analyzed:
   (subscript
     (relsubscript
       (symbol 'tip')
       (symbol 'rel')
       (symbol '0'))
     (symbol '1'))
   hg: parse error: can't use a subscript in this context
   [255]
 
   $ hg debugrevspec -p analyzed 'tip#rel0#rel1[1]'
   * analyzed:
   (relsubscript
     (relation
       (symbol 'tip')
       (symbol 'rel0'))
     (symbol 'rel1')
     (symbol '1'))
   hg: parse error: unknown identifier: rel1
   [255]
 
   $ hg debugrevspec -p analyzed 'tip#rel0[0]#rel1[1]'
   * analyzed:
   (relsubscript
     (relsubscript
       (symbol 'tip')
       (symbol 'rel0')
       (symbol '0'))
     (symbol 'rel1')
     (symbol '1'))
   hg: parse error: unknown identifier: rel1
   [255]
 
 parse errors of relation, subscript and relation-subscript operators:
 
   $ hg debugrevspec '[0]'
   hg: parse error at 0: not a prefix: [
   ([0]
    ^ here)
   [255]
   $ hg debugrevspec '.#'
   hg: parse error at 2: not a prefix: end
   (.#
      ^ here)
   [255]
   $ hg debugrevspec '#rel'
   hg: parse error at 0: not a prefix: #
   (#rel
    ^ here)
   [255]
   $ hg debugrevspec '.#rel[0'
   hg: parse error at 7: unexpected token: end
   (.#rel[0
           ^ here)
   [255]
   $ hg debugrevspec '.]'
   hg: parse error at 1: invalid token
   (.]
     ^ here)
   [255]
 
   $ hg debugrevspec '.#generations[a]'
   hg: parse error: relation subscript must be an integer or a range
   [255]
   $ hg debugrevspec '.#generations[1-2]'
   hg: parse error: relation subscript must be an integer or a range
   [255]
   $ hg debugrevspec '.#generations[foo:bar]'
   hg: parse error: relation subscript bounds must be integers
   [255]
 
 suggested relations
 
   $ hg debugrevspec '.#generafions[0]'
   hg: parse error: unknown identifier: generafions
   (did you mean generations?)
   [255]
 
   $ hg debugrevspec '.#f[0]'
   hg: parse error: unknown identifier: f
   [255]
 
 parsed tree at stages:
 
   $ hg debugrevspec -p all '()'
   * parsed:
   (group
     None)
   * expanded:
   (group
     None)
   * concatenated:
   (group
     None)
   * analyzed:
   None
   * optimized:
   None
   hg: parse error: missing argument
   [255]
 
   $ hg debugrevspec --no-optimized -p all '()'
   * parsed:
   (group
     None)
   * expanded:
   (group
     None)
   * concatenated:
   (group
     None)
   * analyzed:
   None
   hg: parse error: missing argument
   [255]
 
   $ hg debugrevspec -p parsed -p analyzed -p optimized '(0|1)-1'
   * parsed:
   (minus
     (group
       (or
         (list
           (symbol '0')
           (symbol '1'))))
     (symbol '1'))
   * analyzed:
   (and
     (or
       (list
         (symbol '0')
         (symbol '1')))
     (not
       (symbol '1')))
   * optimized:
   (difference
     (func
       (symbol '_list')
       (string '0\x001'))
     (symbol '1'))
   0
 
   $ hg debugrevspec -p unknown '0'
   abort: invalid stage name: unknown
   [255]
 
   $ hg debugrevspec -p all --optimize '0'
   abort: cannot use --optimize with --show-stage
   [255]
 
 verify optimized tree:
 
   $ hg debugrevspec --verify '0|1'
 
   $ hg debugrevspec --verify -v -p analyzed -p optimized 'r3232() & 2'
   * analyzed:
   (and
     (func
       (symbol 'r3232')
       None)
     (symbol '2'))
   * optimized:
   (andsmally
     (func
       (symbol 'r3232')
       None)
     (symbol '2'))
   * analyzed set:
   <baseset [2]>
   * optimized set:
   <baseset [2, 2]>
   --- analyzed
   +++ optimized
    2
   +2
   [1]
 
   $ hg debugrevspec --no-optimized --verify-optimized '0'
   abort: cannot use --verify-optimized with --no-optimized
   [255]
 
 Test that symbols only get parsed as functions if there's an opening
 parenthesis.
 
   $ hg book only -r 9
   $ log 'only(only)'   # Outer "only" is a function, inner "only" is the bookmark
   8
   9
 
 ':y' behaves like '0:y', but can't be rewritten as such since the revision '0'
 may be hidden (issue5385)
 
   $ try -p parsed -p analyzed ':'
   * parsed:
   (rangeall
     None)
   * analyzed:
   (rangeall
     None)
   * set:
   <spanset+ 0:10>
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ try -p analyzed ':1'
   * analyzed:
   (rangepre
     (symbol '1'))
   * set:
   <spanset+ 0:2>
   0
   1
   $ try -p analyzed ':(1|2)'
   * analyzed:
   (rangepre
     (or
       (list
         (symbol '1')
         (symbol '2'))))
   * set:
   <spanset+ 0:3>
   0
   1
   2
   $ try -p analyzed ':(1&2)'
   * analyzed:
   (rangepre
     (and
       (symbol '1')
       (symbol '2')))
   * set:
   <baseset []>
 
 infix/suffix resolution of ^ operator (issue2884, issue5764):
 
  x^:y means (x^):y
 
   $ try '1^:2'
   (range
     (parentpost
       (symbol '1'))
     (symbol '2'))
   * set:
   <spanset+ 0:3>
   0
   1
   2
 
   $ try '1^::2'
   (dagrange
     (parentpost
       (symbol '1'))
     (symbol '2'))
   * set:
   <baseset+ [0, 1, 2]>
   0
   1
   2
 
   $ try '1^..2'
   (dagrange
     (parentpost
       (symbol '1'))
     (symbol '2'))
   * set:
   <baseset+ [0, 1, 2]>
   0
   1
   2
 
   $ try '9^:'
   (rangepost
     (parentpost
       (symbol '9')))
   * set:
   <spanset+ 8:10>
   8
   9
 
   $ try '9^::'
   (dagrangepost
     (parentpost
       (symbol '9')))
   * set:
   <generatorsetasc+>
   8
   9
 
   $ try '9^..'
   (dagrangepost
     (parentpost
       (symbol '9')))
   * set:
   <generatorsetasc+>
   8
   9
 
  x^:y should be resolved before omitting group operators
 
   $ try '1^(:2)'
   (parent
     (symbol '1')
     (group
       (rangepre
         (symbol '2'))))
   hg: parse error: ^ expects a number 0, 1, or 2
   [255]
 
  x^:y should be resolved recursively
 
   $ try 'sort(1^:2)'
   (func
     (symbol 'sort')
     (range
       (parentpost
         (symbol '1'))
       (symbol '2')))
   * set:
   <spanset+ 0:3>
   0
   1
   2
 
   $ try '(3^:4)^:2'
   (range
     (parentpost
       (group
         (range
           (parentpost
             (symbol '3'))
           (symbol '4'))))
     (symbol '2'))
   * set:
   <spanset+ 0:3>
   0
   1
   2
 
   $ try '(3^::4)^::2'
   (dagrange
     (parentpost
       (group
         (dagrange
           (parentpost
             (symbol '3'))
           (symbol '4'))))
     (symbol '2'))
   * set:
   <baseset+ [0, 1, 2]>
   0
   1
   2
 
   $ try '(9^:)^:'
   (rangepost
     (parentpost
       (group
         (rangepost
           (parentpost
             (symbol '9'))))))
   * set:
   <spanset+ 4:10>
   4
   5
   6
   7
   8
   9
 
  x^ in alias should also be resolved
 
   $ try 'A' --config 'revsetalias.A=1^:2'
   (symbol 'A')
   * expanded:
   (range
     (parentpost
       (symbol '1'))
     (symbol '2'))
   * set:
   <spanset+ 0:3>
   0
   1
   2
 
   $ try 'A:2' --config 'revsetalias.A=1^'
   (range
     (symbol 'A')
     (symbol '2'))
   * expanded:
   (range
     (parentpost
       (symbol '1'))
     (symbol '2'))
   * set:
   <spanset+ 0:3>
   0
   1
   2
 
  but not beyond the boundary of alias expansion, because the resolution should
  be made at the parsing stage
 
   $ try '1^A' --config 'revsetalias.A=:2'
   (parent
     (symbol '1')
     (symbol 'A'))
   * expanded:
   (parent
     (symbol '1')
     (rangepre
       (symbol '2')))
   hg: parse error: ^ expects a number 0, 1, or 2
   [255]
 
 '::' itself isn't a valid expression
 
   $ try '::'
   (dagrangeall
     None)
   hg: parse error: can't use '::' in this context
   [255]
 
 ancestor can accept 0 or more arguments
 
   $ log 'ancestor()'
   $ log 'ancestor(1)'
   1
   $ log 'ancestor(4,5)'
   1
   $ log 'ancestor(4,5) and 4'
   $ log 'ancestor(0,0,1,3)'
   0
   $ log 'ancestor(3,1,5,3,5,1)'
   1
   $ log 'ancestor(0,1,3,5)'
   0
   $ log 'ancestor(1,2,3,4,5)'
   1
 
 test ancestors
 
   $ hg log -G -T '{rev}\n' --config experimental.graphshorten=True
   @  9
   o  8
   | o  7
   | o  6
   |/|
   | o  5
   o |  4
   | o  3
   o |  2
   |/
   o  1
   o  0
 
   $ log 'ancestors(5)'
   0
   1
   3
   5
   $ log 'ancestor(ancestors(5))'
   0
   $ log '::r3232()'
   0
   1
   2
   3
 
 test common ancestors
 
   $ hg log -T '{rev}\n' -r 'commonancestors(7 + 9)'
   0
   1
   2
   4
 
   $ hg log -T '{rev}\n' -r 'commonancestors(heads(all()))'
   0
   1
   2
   4
 
   $ hg log -T '{rev}\n' -r 'commonancestors(9)'
   0
   1
   2
   4
   8
   9
 
   $ hg log -T '{rev}\n' -r 'commonancestors(8 + 9)'
   0
   1
   2
   4
   8
 
 test the specialized implementation of heads(commonancestors(..))
 (2 gcas is tested in test-merge-criss-cross.t)
 
   $ hg log -T '{rev}\n' -r 'heads(commonancestors(7 + 9))'
   4
   $ hg log -T '{rev}\n' -r 'heads(commonancestors(heads(all())))'
   4
   $ hg log -T '{rev}\n' -r 'heads(commonancestors(9))'
   9
   $ hg log -T '{rev}\n' -r 'heads(commonancestors(8 + 9))'
   8
 
 test ancestor variants of empty revision
 
   $ log 'ancestor(none())'
   $ log 'ancestors(none())'
   $ log 'commonancestors(none())'
   $ log 'heads(commonancestors(none()))'
 
 test ancestors with depth limit
 
  (depth=0 selects the node itself)
 
   $ log 'reverse(ancestors(9, depth=0))'
   9
 
  (interleaved: '4' would be missing if heap queue were higher depth first)
 
   $ log 'reverse(ancestors(8:9, depth=1))'
   9
   8
   4
 
  (interleaved: '2' would be missing if heap queue were higher depth first)
 
   $ log 'reverse(ancestors(7+8, depth=2))'
   8
   7
   6
   5
   4
   2
 
  (walk example above by separate queries)
 
   $ log 'reverse(ancestors(8, depth=2)) + reverse(ancestors(7, depth=2))'
   8
   4
   2
   7
   6
   5
 
  (walk 2nd and 3rd ancestors)
 
   $ log 'reverse(ancestors(7, depth=3, startdepth=2))'
   5
   4
   3
   2
 
  (interleaved: '4' would be missing if higher-depth ancestors weren't scanned)
 
   $ log 'reverse(ancestors(7+8, depth=2, startdepth=2))'
   5
   4
   2
 
  (note that 'ancestors(x, depth=y, startdepth=z)' does not identical to
  'ancestors(x, depth=y) - ancestors(x, depth=z-1)' because a node may have
  multiple depths)
 
   $ log 'reverse(ancestors(7+8, depth=2) - ancestors(7+8, depth=1))'
   5
   2
 
 test bad arguments passed to ancestors()
 
   $ log 'ancestors(., depth=-1)'
   hg: parse error: negative depth
   [255]
   $ log 'ancestors(., depth=foo)'
   hg: parse error: ancestors expects an integer depth
   [255]
 
 test descendants
 
   $ hg log -G -T '{rev}\n' --config experimental.graphshorten=True
   @  9
   o  8
   | o  7
   | o  6
   |/|
   | o  5
   o |  4
   | o  3
   o |  2
   |/
   o  1
   o  0
 
  (null is ultimate root and has optimized path)
 
   $ log 'null:4 & descendants(null)'
   -1
   0
   1
   2
   3
   4
 
  (including merge)
 
   $ log ':8 & descendants(2)'
   2
   4
   6
   7
   8
 
  (multiple roots)
 
   $ log ':8 & descendants(2+5)'
   2
   4
   5
   6
   7
   8
 
 test descendants with depth limit
 
  (depth=0 selects the node itself)
 
   $ log 'descendants(0, depth=0)'
   0
   $ log 'null: & descendants(null, depth=0)'
   -1
 
  (p2 = null should be ignored)
 
   $ log 'null: & descendants(null, depth=2)'
   -1
   0
   1
 
  (multiple paths: depth(6) = (2, 3))
 
   $ log 'descendants(1+3, depth=2)'
   1
   2
   3
   4
   5
   6
 
  (multiple paths: depth(5) = (1, 2), depth(6) = (2, 3))
 
   $ log 'descendants(3+1, depth=2, startdepth=2)'
   4
   5
   6
 
  (multiple depths: depth(6) = (0, 2, 4), search for depth=2)
 
   $ log 'descendants(0+3+6, depth=3, startdepth=1)'
   1
   2
   3
   4
   5
   6
   7
 
  (multiple depths: depth(6) = (0, 4), no match)
 
   $ log 'descendants(0+6, depth=3, startdepth=1)'
   1
   2
   3
   4
   5
   7
 
 test ancestors/descendants relation:
 
   $ log 'tip#generations'
   0
   1
   2
   4
   8
   9
 
   $ log '3#g'
   0
   1
   3
   5
   6
   7
 
   $ hg debugrevspec -p parsed 'tip#g'
   * parsed:
   (relation
     (symbol 'tip')
     (symbol 'g'))
   0
   1
   2
   4
   8
   9
 
 test ancestors/descendants relation subscript:
 
   $ log 'tip#generations[0]'
   9
   $ log '.#generations[-1]'
   8
   $ log '.#g[(-1)]'
   8
 
   $ log '6#generations[0:1]'
   6
   7
   $ log '6#generations[-1:1]'
   4
   5
   6
   7
   $ log '6#generations[0:]'
   6
   7
   $ log '5#generations[:0]'
   0
   1
   3
   5
   $ log '3#generations[:]'
   0
   1
   3
   5
   6
   7
   $ log 'tip#generations[1:-1]'
 
   $ hg debugrevspec -p parsed 'roots(:)#g[2]'
   * parsed:
   (relsubscript
     (func
       (symbol 'roots')
       (rangeall
         None))
     (symbol 'g')
     (symbol '2'))
   2
   3
 
 test author
 
   $ log 'author(bob)'
   2
   $ log 'author("re:bob|test")'
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ log 'author(r"re:\S")'
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
   $ log 'branch(é)'
   8
   9
   $ log 'branch(a)'
   0
   $ hg log -r 'branch("re:a")' --template '{rev} {branch}\n'
   0 a
   2 a-b-c-
   3 +a+b+c+
   4 -a-b-c-
   5 !a/b/c/
   6 _a_b_c_
   7 .a.b.c.
   $ log 'children(ancestor(4,5))'
   2
   3
 
   $ log 'children(4)'
   6
   8
   $ log 'children(null)'
   0
 
   $ log 'closed()'
   $ log 'contains(a)'
   0
   1
   3
   5
   $ log 'contains("../repo/a")'
   0
   1
   3
   5
   $ log 'desc(B)'
   5
   $ hg log -r 'desc(r"re:S?u")' --template "{rev} {desc|firstline}\n"
   5 5 bug
   6 6 issue619
   $ log 'descendants(2 or 3)'
   2
   3
   4
   5
   6
   7
   8
   9
   $ log 'file("b*")'
   1
   4
   $ log 'filelog("b")'
   1
   4
   $ log 'filelog("../repo/b")'
   1
   4
   $ log 'follow()'
   0
   1
   2
   4
   8
   9
   $ log 'grep("issue\d+")'
   6
   $ try 'grep("(")' # invalid regular expression
   (func
     (symbol 'grep')
     (string '('))
   hg: parse error: invalid match pattern: (unbalanced parenthesis|missing \),.*) (re)
   [255]
   $ try 'grep("\bissue\d+")'
   (func
     (symbol 'grep')
     (string '\x08issue\\d+'))
   * set:
   <filteredset
     <fullreposet+ 0:10>,
     <grep '\x08issue\\d+'>>
   $ try 'grep(r"\bissue\d+")'
   (func
     (symbol 'grep')
     (string '\\bissue\\d+'))
   * set:
   <filteredset
     <fullreposet+ 0:10>,
     <grep '\\bissue\\d+'>>
   6
   $ try 'grep(r"\")'
   hg: parse error at 7: unterminated string
   (grep(r"\")
           ^ here)
   [255]
   $ log 'head()'
   0
   1
   2
   3
   4
   5
   6
   7
   9
 
 Test heads
 
   $ log 'heads(6::)'
   7
 
  heads() can be computed in subset '9:'
 
   $ hg debugrevspec -s '9: & heads(all())'
   * set:
   <filteredset
     <baseset [9]>,
     <baseset+ [7, 9]>>
   9
 
  but should follow the order of the subset
 
   $ log 'heads(all())'
   7
   9
   $ log 'heads(tip:0)'
   7
   9
   $ log 'tip:0 & heads(all())'
   9
   7
   $ log 'tip:0 & heads(0:tip)'
   9
   7
 
   $ log 'keyword(issue)'
   6
   $ log 'keyword("test a")'
 
 Test first (=limit) and last
 
   $ log 'limit(head(), 1)'
   0
   $ log 'limit(author("re:bob|test"), 3, 5)'
   5
   6
   7
   $ log 'limit(author("re:bob|test"), offset=6)'
   6
   $ log 'limit(author("re:bob|test"), offset=10)'
   $ log 'limit(all(), 1, -1)'
   hg: parse error: negative offset
   [255]
   $ log 'limit(all(), -1)'
   hg: parse error: negative number to select
   [255]
   $ log 'limit(all(), 0)'
 
   $ log 'last(all(), -1)'
   hg: parse error: negative number to select
   [255]
   $ log 'last(all(), 0)'
   $ log 'last(all(), 1)'
   9
   $ log 'last(all(), 2)'
   8
   9
 
 Test smartset.slice() by first/last()
 
  (using unoptimized set, filteredset as example)
 
   $ hg debugrevspec --no-show-revs -s '0:7 & branch("re:")'
   * set:
   <filteredset
     <spanset+ 0:8>,
     <branch 're:'>>
   $ log 'limit(0:7 & branch("re:"), 3, 4)'
   4
   5
   6
   $ log 'limit(7:0 & branch("re:"), 3, 4)'
   3
   2
   1
   $ log 'last(0:7 & branch("re:"), 2)'
   6
   7
 
  (using baseset)
 
   $ hg debugrevspec --no-show-revs -s 0+1+2+3+4+5+6+7
   * set:
   <baseset [0, 1, 2, 3, 4, 5, 6, 7]>
   $ hg debugrevspec --no-show-revs -s 0::7
   * set:
   <baseset+ [0, 1, 2, 3, 4, 5, 6, 7]>
   $ log 'limit(0+1+2+3+4+5+6+7, 3, 4)'
   4
   5
   6
   $ log 'limit(sort(0::7, rev), 3, 4)'
   4
   5
   6
   $ log 'limit(sort(0::7, -rev), 3, 4)'
   3
   2
   1
   $ log 'last(sort(0::7, rev), 2)'
   6
   7
   $ hg debugrevspec -s 'limit(sort(0::7, rev), 3, 6)'
   * set:
   <baseset+ [6, 7]>
   6
   7
   $ hg debugrevspec -s 'limit(sort(0::7, rev), 3, 9)'
   * set:
   <baseset+ []>
   $ hg debugrevspec -s 'limit(sort(0::7, -rev), 3, 6)'
   * set:
   <baseset- [0, 1]>
   1
   0
   $ hg debugrevspec -s 'limit(sort(0::7, -rev), 3, 9)'
   * set:
   <baseset- []>
   $ hg debugrevspec -s 'limit(0::7, 0)'
   * set:
   <baseset+ []>
 
  (using spanset)
 
   $ hg debugrevspec --no-show-revs -s 0:7
   * set:
   <spanset+ 0:8>
   $ log 'limit(0:7, 3, 4)'
   4
   5
   6
   $ log 'limit(7:0, 3, 4)'
   3
   2
   1
   $ log 'limit(0:7, 3, 6)'
   6
   7
   $ log 'limit(7:0, 3, 6)'
   1
   0
   $ log 'last(0:7, 2)'
   6
   7
   $ hg debugrevspec -s 'limit(0:7, 3, 6)'
   * set:
   <spanset+ 6:8>
   6
   7
   $ hg debugrevspec -s 'limit(0:7, 3, 9)'
   * set:
   <spanset+ 8:8>
   $ hg debugrevspec -s 'limit(7:0, 3, 6)'
   * set:
   <spanset- 0:2>
   1
   0
   $ hg debugrevspec -s 'limit(7:0, 3, 9)'
   * set:
   <spanset- 0:0>
   $ hg debugrevspec -s 'limit(0:7, 0)'
   * set:
   <spanset+ 0:0>
 
 Test order of first/last revisions
 
   $ hg debugrevspec -s 'first(4:0, 3) & 3:'
   * set:
   <filteredset
     <spanset- 2:5>,
     <spanset+ 3:10>>
   4
   3
 
   $ hg debugrevspec -s '3: & first(4:0, 3)'
   * set:
   <filteredset
     <spanset+ 3:10>,
     <spanset- 2:5>>
   3
   4
 
   $ hg debugrevspec -s 'last(4:0, 3) & :1'
   * set:
   <filteredset
     <spanset- 0:3>,
     <spanset+ 0:2>>
   1
   0
 
   $ hg debugrevspec -s ':1 & last(4:0, 3)'
   * set:
   <filteredset
     <spanset+ 0:2>,
     <spanset+ 0:3>>
   0
   1
 
 Test scmutil.revsingle() should return the last revision
 
   $ hg debugrevspec -s 'last(0::)'
   * set:
   <baseset slice=0:1
     <generatorsetasc->>
   9
   $ hg identify -r '0::' --num
   9
 
 Test matching
 
   $ log 'matching(6)'
   6
   $ log 'matching(6:7, "phase parents user date branch summary files description substate")'
   6
   7
 
 Testing min and max
 
 max: simple
 
   $ log 'max(contains(a))'
   5
 
 max: simple on unordered set)
 
   $ log 'max((4+0+2+5+7) and contains(a))'
   5
 
 max: no result
 
   $ log 'max(contains(stringthatdoesnotappearanywhere))'
 
 max: no result on unordered set
 
   $ log 'max((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))'
 
 min: simple
 
   $ log 'min(contains(a))'
   0
 
 min: simple on unordered set
 
   $ log 'min((4+0+2+5+7) and contains(a))'
   0
 
 min: empty
 
   $ log 'min(contains(stringthatdoesnotappearanywhere))'
 
 min: empty on unordered set
 
   $ log 'min((4+0+2+5+7) and contains(stringthatdoesnotappearanywhere))'
 
 
   $ log 'merge()'
   6
   $ log 'branchpoint()'
   1
   4
   $ log 'modifies(b)'
   4
   $ log 'modifies("path:b")'
   4
   $ log 'modifies("*")'
   4
   $ log 'modifies("set:modified()")'
   4
   $ log 'id(5)'
   $ log 'only(9)'
   8
   9
   $ log 'only(8)'
   8
   $ log 'only(9, 5)'
   2
   4
   8
   9
   $ log 'only(7 + 9, 5 + 2)'
   4
   6
   7
   8
   9
 
 Test empty set input
   $ log 'only(p2())'
   $ log 'only(p1(), p2())'
   0
   1
   2
   4
   8
   9
 
 Test '%' operator
 
   $ log '9%'
   8
   9
   $ log '9%5'
   2
   4
   8
   9
   $ log '(7 + 9)%(5 + 2)'
   4
   6
   7
   8
   9
 
 Test operand of '%' is optimized recursively (issue4670)
 
   $ try --optimize '8:9-8%'
   (onlypost
     (minus
       (range
         (symbol '8')
         (symbol '9'))
       (symbol '8')))
   * optimized:
   (func
     (symbol 'only')
     (difference
       (range
         (symbol '8')
         (symbol '9'))
       (symbol '8')))
   * set:
   <baseset+ [8, 9]>
   8
   9
   $ try --optimize '(9)%(5)'
   (only
     (group
       (symbol '9'))
     (group
       (symbol '5')))
   * optimized:
   (func
     (symbol 'only')
     (list
       (symbol '9')
       (symbol '5')))
   * set:
   <baseset+ [2, 4, 8, 9]>
   2
   4
   8
   9
 
 Test the order of operations
 
   $ log '7 + 9%5 + 2'
   7
   2
   4
   8
   9
 
 Test explicit numeric revision
   $ log 'rev(-2)'
   $ log 'rev(-1)'
   -1
   $ log 'rev(0)'
   0
   $ log 'rev(9)'
   9
   $ log 'rev(10)'
   $ log 'rev(tip)'
   hg: parse error: rev expects a number
   [255]
 
 Test hexadecimal revision
   $ log 'id(2)'
   $ log 'id(8)'
   3
   $ hg log --template '{rev}\n' -r 'id(x8)'
   3
   $ hg log --template '{rev}\n' -r 'x8'
   3
   $ hg log --template '{rev}\n' -r 'id(x)'
   $ hg log --template '{rev}\n' -r 'x'
   abort: 00changelog.i@: ambiguous identifier!
   [255]
   $ log 'id(23268)'
   4
   $ log 'id(2785f51eece)'
   0
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532c)'
   8
   $ log 'id(d5d0dcbdc4a)'
   $ log 'id(d5d0dcbdc4w)'
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532d)'
   $ log 'id(d5d0dcbdc4d9ff5dbb2d336f32f0bb561c1a532q)'
   $ log 'id(1.0)'
   $ log 'id(xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)'
 
 Test null revision
   $ log '(null)'
   -1
   $ log '(null:0)'
   -1
   0
   $ log '(0:null)'
   0
   -1
   $ log 'null::0'
   -1
   0
   $ log 'null:tip - 0:'
   -1
   $ log 'null: and null::' | head -1
   -1
   $ log 'null: or 0:' | head -2
   -1
   0
   $ log 'ancestors(null)'
   -1
   $ log 'reverse(null:)' | tail -2
   0
   -1
   $ log 'first(null:)'
   -1
   $ log 'min(null:)'
 BROKEN: should be '-1'
   $ log 'tip:null and all()' | tail -2
   1
   0
 
 Test working-directory revision
   $ hg debugrevspec 'wdir()'
   2147483647
   $ hg debugrevspec 'wdir()^'
   9
   $ hg up 7
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugrevspec 'wdir()^'
   7
   $ hg debugrevspec 'wdir()^0'
   2147483647
   $ hg debugrevspec 'wdir()~3'
   5
   $ hg debugrevspec 'ancestors(wdir())'
   0
   1
   2
   3
   4
   5
   6
   7
   2147483647
   $ hg debugrevspec '0:wdir() & ancestor(wdir())'
   2147483647
   $ hg debugrevspec '0:wdir() & ancestor(.:wdir())'
   4
   $ hg debugrevspec '0:wdir() & ancestor(wdir(), wdir())'
   2147483647
   $ hg debugrevspec '0:wdir() & ancestor(wdir(), tip)'
   4
   $ hg debugrevspec 'null:wdir() & ancestor(wdir(), null)'
   -1
   $ hg debugrevspec 'wdir()~0'
   2147483647
   $ hg debugrevspec 'p1(wdir())'
   7
   $ hg debugrevspec 'p2(wdir())'
   $ hg debugrevspec 'parents(wdir())'
   7
   $ hg debugrevspec 'wdir()^1'
   7
   $ hg debugrevspec 'wdir()^2'
   $ hg debugrevspec 'wdir()^3'
   hg: parse error: ^ expects a number 0, 1, or 2
   [255]
 For tests consistency
   $ hg up 9
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugrevspec 'tip or wdir()'
   9
   2147483647
   $ hg debugrevspec '0:tip and wdir()'
   $ log '0:wdir()' | tail -3
   8
   9
   2147483647
   $ log 'wdir():0' | head -3
   2147483647
   9
   8
   $ log 'wdir():wdir()'
   2147483647
   $ log '(all() + wdir()) & min(. + wdir())'
   9
   $ log '(all() + wdir()) & max(. + wdir())'
   2147483647
   $ log 'first(wdir() + .)'
   2147483647
   $ log 'last(. + wdir())'
   2147483647
 
 Test working-directory integer revision and node id
 
   $ hg debugrevspec '2147483647'
   2147483647
   $ hg debugrevspec 'rev(2147483647)'
   2147483647
   $ hg debugrevspec 'ffffffffffffffffffffffffffffffffffffffff'
   2147483647
   $ hg debugrevspec 'ffffffffffff'
   2147483647
   $ hg debugrevspec 'id(ffffffffffffffffffffffffffffffffffffffff)'
   2147483647
   $ hg debugrevspec 'id(ffffffffffff)'
   2147483647
   $ hg debugrevspec 'ffffffffffff+000000000000'
   2147483647
   -1
 
   $ cd ..
 
 Test short 'ff...' hash collision
 
   $ hg init wdir-hashcollision
   $ cd wdir-hashcollision
   $ cat <<EOF >> .hg/hgrc
   > [experimental]
   > evolution.createmarkers=True
   > EOF
   $ echo 0 > a
   $ hg ci -qAm 0
   $ for i in 2463 2961 6726 78127; do
   >   hg up -q 0
   >   echo $i > a
   >   hg ci -qm $i
   > done
   $ hg up -q null
   $ hg log -r '0:wdir()' -T '{rev}:{node} {shortest(node, 3)}\n'
   0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a b4e
   1:fffbae3886c8fbb2114296380d276fd37715d571 fffba
   2:fffb6093b00943f91034b9bdad069402c834e572 fffb6
   3:fff48a9b9de34a4d64120c29548214c67980ade3 fff4
   4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
   2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
   $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
   1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg debugrevspec 'fff'
   abort: 00changelog.i@fff: ambiguous identifier!
   [255]
   $ hg debugrevspec 'ffff'
   abort: 00changelog.i@ffff: ambiguous identifier!
   [255]
   $ hg debugrevspec 'fffb'
   abort: 00changelog.i@fffb: ambiguous identifier!
   [255]
 BROKEN should be '2' (node lookup uses unfiltered repo)
   $ hg debugrevspec 'id(fffb)'
 BROKEN should be '2' (node lookup uses unfiltered repo)
   $ hg debugrevspec 'ffff8'
   4
   $ hg debugrevspec 'fffff'
   2147483647
 
   $ cd ..
 
 Test branch() with wdir()
 
   $ cd repo
 
   $ log '0:wdir() & branch("literal:é")'
   8
   9
   2147483647
   $ log '0:wdir() & branch("re:é")'
   8
   9
   2147483647
   $ log '0:wdir() & branch("re:^a")'
   0
   2
   $ log '0:wdir() & branch(8)'
   8
   9
   2147483647
 
 branch(wdir()) returns all revisions belonging to the working branch. The wdir
 itself isn't returned unless it is explicitly populated.
 
   $ log 'branch(wdir())'
   8
   9
   $ log '0:wdir() & branch(wdir())'
   8
   9
   2147483647
 
   $ log 'outgoing()'
   8
   9
   $ log 'outgoing("../remote1")'
   8
   9
   $ log 'outgoing("../remote2")'
   3
   5
   6
   7
   9
   $ log 'p1(merge())'
   5
   $ log 'p2(merge())'
   4
   $ log 'parents(merge())'
   4
   5
 
   $ hg merge 7
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ log '0:wdir() & merge()'
   6
   2147483647
   $ hg update -qC .
   $ log '0:wdir() & merge()'
   6
 
   $ log 'p1(branchpoint())'
   0
   2
   $ log 'p2(branchpoint())'
   $ log 'parents(branchpoint())'
   0
   2
   $ log 'removes(a)'
   2
   $ log 'roots(all())'
   0
   $ log 'reverse(2 or 3 or 4 or 5)'
   5
   4
   3
   2
   $ log 'reverse(all())'
   9
   8
   7
   6
   5
   4
   3
   2
   1
   0
   $ log 'reverse(all()) & filelog(b)'
   4
   1
   $ log 'rev(5)'
   5
   $ log 'sort(limit(reverse(all()), 3))'
   7
   8
   9
   $ log 'sort(2 or 3 or 4 or 5, date)'
   2
   3
   5
   4
   $ log 'tagged()'
   6
   $ log 'tag()'
   6
   $ log 'tag(1.0)'
   6
   $ log 'tag(tip)'
   9
 
 Test order of revisions in compound expression
 ----------------------------------------------
 
 The general rule is that only the outermost (= leftmost) predicate can
 enforce its ordering requirement. The other predicates should take the
 ordering defined by it.
 
  'A & B' should follow the order of 'A':
 
   $ log '2:0 & 0::2'
   2
   1
   0
 
  'head()' combines sets in right order:
 
   $ log '2:0 & head()'
   2
   1
   0
 
  'x:y' takes ordering parameter into account:
 
   $ try -p optimized '3:0 & 0:3 & not 2:1'
   * optimized:
   (difference
     (and
       (range
         (symbol '3')
         (symbol '0'))
       (range
         (symbol '0')
         (symbol '3')))
     (range
       (symbol '2')
       (symbol '1')))
   * set:
   <filteredset
     <filteredset
       <spanset- 0:4>,
       <spanset+ 0:4>>,
     <not
       <spanset+ 1:3>>>
   3
   0
 
  'a + b', which is optimized to '_list(a b)', should take the ordering of
  the left expression:
 
   $ try --optimize '2:0 & (0 + 1 + 2)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (group
       (or
         (list
           (symbol '0')
           (symbol '1')
           (symbol '2')))))
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_list')
       (string '0\x001\x002')))
   * set:
   <filteredset
     <spanset- 0:3>,
     <baseset [0, 1, 2]>>
   2
   1
   0
 
  'A + B' should take the ordering of the left expression:
 
   $ try --optimize '2:0 & (0:1 + 2)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (group
       (or
         (list
           (range
             (symbol '0')
             (symbol '1'))
           (symbol '2')))))
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (or
       (list
         (range
           (symbol '0')
           (symbol '1'))
         (symbol '2'))))
   * set:
   <filteredset
     <spanset- 0:3>,
     <addset
       <spanset+ 0:2>,
       <baseset [2]>>>
   2
   1
   0
 
  '_intlist(a b)' should behave like 'a + b':
 
   $ trylist --optimize '2:0 & %ld' 0 1 2
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_intlist')
       (string '0\x001\x002')))
   * optimized:
   (andsmally
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_intlist')
       (string '0\x001\x002')))
   * set:
   <filteredset
     <spanset- 0:3>,
     <baseset+ [0, 1, 2]>>
   2
   1
   0
 
   $ trylist --optimize '%ld & 2:0' 0 2 1
   (and
     (func
       (symbol '_intlist')
       (string '0\x002\x001'))
     (range
       (symbol '2')
       (symbol '0')))
   * optimized:
   (and
     (func
       (symbol '_intlist')
       (string '0\x002\x001'))
     (range
       (symbol '2')
       (symbol '0')))
   * set:
   <filteredset
     <baseset [0, 2, 1]>,
     <spanset- 0:3>>
   0
   2
   1
 
  '_hexlist(a b)' should behave like 'a + b':
 
   $ trylist --optimize --bin '2:0 & %ln' `hg log -T '{node} ' -r0:2`
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_hexlist')
       (string '*'))) (glob)
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_hexlist')
       (string '*'))) (glob)
   * set:
   <filteredset
     <spanset- 0:3>,
     <baseset [0, 1, 2]>>
   2
   1
   0
 
   $ trylist --optimize --bin '%ln & 2:0' `hg log -T '{node} ' -r0+2+1`
   (and
     (func
       (symbol '_hexlist')
       (string '*')) (glob)
     (range
       (symbol '2')
       (symbol '0')))
   * optimized:
   (andsmally
     (func
       (symbol '_hexlist')
       (string '*')) (glob)
     (range
       (symbol '2')
       (symbol '0')))
   * set:
   <baseset [0, 2, 1]>
   0
   2
   1
 
  '_list' should not go through the slow follow-order path if order doesn't
  matter:
 
   $ try -p optimized '2:0 & not (0 + 1)'
   * optimized:
   (difference
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol '_list')
       (string '0\x001')))
   * set:
   <filteredset
     <spanset- 0:3>,
     <not
       <baseset [0, 1]>>>
   2
 
   $ try -p optimized '2:0 & not (0:2 & (0 + 1))'
   * optimized:
   (difference
     (range
       (symbol '2')
       (symbol '0'))
     (and
       (range
         (symbol '0')
         (symbol '2'))
       (func
         (symbol '_list')
         (string '0\x001'))))
   * set:
   <filteredset
     <spanset- 0:3>,
     <not
       <baseset [0, 1]>>>
   2
 
  because 'present()' does nothing other than suppressing an error, the
  ordering requirement should be forwarded to the nested expression
 
   $ try -p optimized 'present(2 + 0 + 1)'
   * optimized:
   (func
     (symbol 'present')
     (func
       (symbol '_list')
       (string '2\x000\x001')))
   * set:
   <baseset [2, 0, 1]>
   2
   0
   1
 
   $ try --optimize '2:0 & present(0 + 1 + 2)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol 'present')
       (or
         (list
           (symbol '0')
           (symbol '1')
           (symbol '2')))))
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol 'present')
       (func
         (symbol '_list')
         (string '0\x001\x002'))))
   * set:
   <filteredset
     <spanset- 0:3>,
     <baseset [0, 1, 2]>>
   2
   1
   0
 
  'reverse()' should take effect only if it is the outermost expression:
 
   $ try --optimize '0:2 & reverse(all())'
   (and
     (range
       (symbol '0')
       (symbol '2'))
     (func
       (symbol 'reverse')
       (func
         (symbol 'all')
         None)))
   * optimized:
   (and
     (range
       (symbol '0')
       (symbol '2'))
     (func
       (symbol 'reverse')
       (func
         (symbol 'all')
         None)))
   * set:
   <filteredset
     <spanset+ 0:3>,
     <spanset+ 0:10>>
   0
   1
   2
 
  'sort()' should take effect only if it is the outermost expression:
 
   $ try --optimize '0:2 & sort(all(), -rev)'
   (and
     (range
       (symbol '0')
       (symbol '2'))
     (func
       (symbol 'sort')
       (list
         (func
           (symbol 'all')
           None)
         (negate
           (symbol 'rev')))))
   * optimized:
   (and
     (range
       (symbol '0')
       (symbol '2'))
     (func
       (symbol 'sort')
       (list
         (func
           (symbol 'all')
           None)
         (string '-rev'))))
   * set:
   <filteredset
     <spanset+ 0:3>,
     <spanset+ 0:10>>
   0
   1
   2
 
  invalid argument passed to noop sort():
 
   $ log '0:2 & sort()'
   hg: parse error: sort requires one or two arguments
   [255]
   $ log '0:2 & sort(all(), -invalid)'
   hg: parse error: unknown sort key '-invalid'
   [255]
 
  for 'A & f(B)', 'B' should not be affected by the order of 'A':
 
   $ try --optimize '2:0 & first(1 + 0 + 2)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol 'first')
       (or
         (list
           (symbol '1')
           (symbol '0')
           (symbol '2')))))
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol 'first')
       (func
         (symbol '_list')
         (string '1\x000\x002'))))
   * set:
   <filteredset
     <baseset [1]>,
     <spanset- 0:3>>
   1
 
   $ try --optimize '2:0 & not last(0 + 2 + 1)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (not
       (func
         (symbol 'last')
         (or
           (list
             (symbol '0')
             (symbol '2')
             (symbol '1'))))))
   * optimized:
   (difference
     (range
       (symbol '2')
       (symbol '0'))
     (func
       (symbol 'last')
       (func
         (symbol '_list')
         (string '0\x002\x001'))))
   * set:
   <filteredset
     <spanset- 0:3>,
     <not
       <baseset [1]>>>
   2
   0
 
  for 'A & (op)(B)', 'B' should not be affected by the order of 'A':
 
   $ try --optimize '2:0 & (1 + 0 + 2):(0 + 2 + 1)'
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (range
       (group
         (or
           (list
             (symbol '1')
             (symbol '0')
             (symbol '2'))))
       (group
         (or
           (list
             (symbol '0')
             (symbol '2')
             (symbol '1'))))))
   * optimized:
   (and
     (range
       (symbol '2')
       (symbol '0'))
     (range
       (func
         (symbol '_list')
         (string '1\x000\x002'))
       (func
         (symbol '_list')
         (string '0\x002\x001'))))
   * set:
   <filteredset
     <spanset- 0:3>,
     <baseset [1]>>
   1
 
  'A & B' can be rewritten as 'flipand(B, A)' by weight.
 
   $ try --optimize 'contains("glob:*") & (2 + 0 + 1)'
   (and
     (func
       (symbol 'contains')
       (string 'glob:*'))
     (group
       (or
         (list
           (symbol '2')
           (symbol '0')
           (symbol '1')))))
   * optimized:
   (andsmally
     (func
       (symbol 'contains')
       (string 'glob:*'))
     (func
       (symbol '_list')
       (string '2\x000\x001')))
   * set:
   <filteredset
     <baseset+ [0, 1, 2]>,
     <contains 'glob:*'>>
   0
   1
   2
 
  and in this example, 'A & B' is rewritten as 'B & A', but 'A' overrides
  the order appropriately:
 
   $ try --optimize 'reverse(contains("glob:*")) & (0 + 2 + 1)'
   (and
     (func
       (symbol 'reverse')
       (func
         (symbol 'contains')
         (string 'glob:*')))
     (group
       (or
         (list
           (symbol '0')
           (symbol '2')
           (symbol '1')))))
   * optimized:
   (andsmally
     (func
       (symbol 'reverse')
       (func
         (symbol 'contains')
         (string 'glob:*')))
     (func
       (symbol '_list')
       (string '0\x002\x001')))
   * set:
   <filteredset
     <baseset- [0, 1, 2]>,
     <contains 'glob:*'>>
   2
   1
   0
 
 test sort revset
 --------------------------------------------
 
 test when adding two unordered revsets
 
   $ log 'sort(keyword(issue) or modifies(b))'
   4
   6
 
 test when sorting a reversed collection in the same way it is
 
   $ log 'sort(reverse(all()), -rev)'
   9
   8
   7
   6
   5
   4
   3
   2
   1
   0
 
 test when sorting a reversed collection
 
   $ log 'sort(reverse(all()), rev)'
   0
   1
   2
   3
   4
   5
   6
   7
   8
   9
 
 
 test sorting two sorted collections in different orders
 
   $ log 'sort(outgoing() or reverse(removes(a)), rev)'
   2
   8
   9
 
 test sorting two sorted collections in different orders backwards
 
   $ log 'sort(outgoing() or reverse(removes(a)), -rev)'
   9
   8
   2
 
 test empty sort key which is noop
 
   $ log 'sort(0 + 2 + 1, "")'
   0
   2
   1
 
 test invalid sort keys
 
   $ log 'sort(all(), -invalid)'
   hg: parse error: unknown sort key '-invalid'
   [255]
 
   $ cd ..
 
 test sorting by multiple keys including variable-length strings
 
   $ hg init sorting
   $ cd sorting
   $ cat <<EOF >> .hg/hgrc
   > [ui]
   > logtemplate = '{rev} {branch|p5}{desc|p5}{author|p5}{date|hgdate}\n'
   > [templatealias]
   > p5(s) = pad(s, 5)
   > EOF
   $ hg branch -qf b12
   $ hg ci -m m111 -u u112 -d '111 10800'
   $ hg branch -qf b11
   $ hg ci -m m12 -u u111 -d '112 7200'
   $ hg branch -qf b111
   $ hg ci -m m11 -u u12 -d '111 3600'
   $ hg branch -qf b112
   $ hg ci -m m111 -u u11 -d '120 0'
   $ hg branch -qf b111
   $ hg ci -m m112 -u u111 -d '110 14400'
   created new head
 
  compare revisions (has fast path):
 
   $ hg log -r 'sort(all(), rev)'
   0 b12  m111 u112 111 10800
   1 b11  m12  u111 112 7200
   2 b111 m11  u12  111 3600
   3 b112 m111 u11  120 0
   4 b111 m112 u111 110 14400
 
   $ hg log -r 'sort(all(), -rev)'
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
   2 b111 m11  u12  111 3600
   1 b11  m12  u111 112 7200
   0 b12  m111 u112 111 10800
 
  compare variable-length strings (issue5218):
 
   $ hg log -r 'sort(all(), branch)'
   1 b11  m12  u111 112 7200
   2 b111 m11  u12  111 3600
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
   0 b12  m111 u112 111 10800
 
   $ hg log -r 'sort(all(), -branch)'
   0 b12  m111 u112 111 10800
   3 b112 m111 u11  120 0
   2 b111 m11  u12  111 3600
   4 b111 m112 u111 110 14400
   1 b11  m12  u111 112 7200
 
   $ hg log -r 'sort(all(), desc)'
   2 b111 m11  u12  111 3600
   0 b12  m111 u112 111 10800
   3 b112 m111 u11  120 0
   4 b111 m112 u111 110 14400
   1 b11  m12  u111 112 7200
 
   $ hg log -r 'sort(all(), -desc)'
   1 b11  m12  u111 112 7200
   4 b111 m112 u111 110 14400
   0 b12  m111 u112 111 10800
   3 b112 m111 u11  120 0
   2 b111 m11  u12  111 3600
 
   $ hg log -r 'sort(all(), user)'
   3 b112 m111 u11  120 0
   1 b11  m12  u111 112 7200
   4 b111 m112 u111 110 14400
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
 
   $ hg log -r 'sort(all(), -user)'
   2 b111 m11  u12  111 3600
   0 b12  m111 u112 111 10800
   1 b11  m12  u111 112 7200
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
 
  compare dates (tz offset should have no effect):
 
   $ hg log -r 'sort(all(), date)'
   4 b111 m112 u111 110 14400
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
   1 b11  m12  u111 112 7200
   3 b112 m111 u11  120 0
 
   $ hg log -r 'sort(all(), -date)'
   3 b112 m111 u11  120 0
   1 b11  m12  u111 112 7200
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
   4 b111 m112 u111 110 14400
 
  be aware that 'sort(x, -k)' is not exactly the same as 'reverse(sort(x, k))'
  because '-k' reverses the comparison, not the list itself:
 
   $ hg log -r 'sort(0 + 2, date)'
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
 
   $ hg log -r 'sort(0 + 2, -date)'
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
 
   $ hg log -r 'reverse(sort(0 + 2, date))'
   2 b111 m11  u12  111 3600
   0 b12  m111 u112 111 10800
 
  sort by multiple keys:
 
   $ hg log -r 'sort(all(), "branch -rev")'
   1 b11  m12  u111 112 7200
   4 b111 m112 u111 110 14400
   2 b111 m11  u12  111 3600
   3 b112 m111 u11  120 0
   0 b12  m111 u112 111 10800
 
   $ hg log -r 'sort(all(), "-desc -node")'
   1 b11  m12  u111 112 7200
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
 
   $ hg log -r 'sort(all(), "user -branch date rev")'
   3 b112 m111 u11  120 0
   4 b111 m112 u111 110 14400
   1 b11  m12  u111 112 7200
   0 b12  m111 u112 111 10800
   2 b111 m11  u12  111 3600
 
+ sort including wdir (rev/-rev has fast path):
+
+  $ hg log -r 'sort(. + wdir(), rev)' -T '{rev}\n'
+  4
+  2147483647
+  $ hg log -r 'sort(. + wdir(), -rev)' -T '{rev}\n'
+  2147483647
+  4
+
+  $ hg log -r 'sort(. + wdir(), "branch rev")' -T '{rev}\n'
+  4
+  2147483647
+  $ hg log -r 'sort(. + wdir(), "branch -rev")' -T '{rev}\n'
+  2147483647
+  4
+
+  $ hg log -r 'sort(. + wdir(), node)' -T '{node}\n'
+  ec7c1c90b589ade8603d5fb619dc6c25173a723f
+  ffffffffffffffffffffffffffffffffffffffff
+  $ hg log -r 'sort(. + wdir(), -node)' -T '{node}\n'
+  ffffffffffffffffffffffffffffffffffffffff
+  ec7c1c90b589ade8603d5fb619dc6c25173a723f
+
  toposort prioritises graph branches
 
   $ hg up 2
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ touch a
   $ hg addremove
   adding a
   $ hg ci -m 't1' -u 'tu' -d '130 0'
   created new head
   $ echo 'a' >> a
   $ hg ci -m 't2' -u 'tu' -d '130 0'
   $ hg book book1
   $ hg up 4
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark book1)
   $ touch a
   $ hg addremove
   adding a
   $ hg ci -m 't3' -u 'tu' -d '130 0'
 
   $ hg log -r 'sort(all(), topo)'
   7 b111 t3   tu   130 0
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
   6 b111 t2   tu   130 0
   5 b111 t1   tu   130 0
   2 b111 m11  u12  111 3600
   1 b11  m12  u111 112 7200
   0 b12  m111 u112 111 10800
 
   $ hg log -r 'sort(all(), -topo)'
   0 b12  m111 u112 111 10800
   1 b11  m12  u111 112 7200
   2 b111 m11  u12  111 3600
   5 b111 t1   tu   130 0
   6 b111 t2   tu   130 0
   3 b112 m111 u11  120 0
   4 b111 m112 u111 110 14400
   7 b111 t3   tu   130 0
 
   $ hg log -r 'sort(all(), topo, topo.firstbranch=book1)'
   6 b111 t2   tu   130 0
   5 b111 t1   tu   130 0
   7 b111 t3   tu   130 0
   4 b111 m112 u111 110 14400
   3 b112 m111 u11  120 0
   2 b111 m11  u12  111 3600
   1 b11  m12  u111 112 7200
   0 b12  m111 u112 111 10800
 
 topographical sorting can't be combined with other sort keys, and you can't
 use the topo.firstbranch option when topo sort is not active:
 
   $ hg log -r 'sort(all(), "topo user")'
   hg: parse error: topo sort order cannot be combined with other sort keys
   [255]
 
   $ hg log -r 'sort(all(), user, topo.firstbranch=book1)'
   hg: parse error: topo.firstbranch can only be used when using the topo sort key
   [255]
 
 topo.firstbranch should accept any kind of expressions:
 
   $ hg log -r 'sort(0, topo, topo.firstbranch=(book1))'
   0 b12  m111 u112 111 10800
 
   $ cd ..
   $ cd repo
 
 test multiline revset with errors
 
   $ echo > multiline-revset
   $ echo '. +' >> multiline-revset
   $ echo '.^ +' >> multiline-revset
   $ hg log -r "`cat multiline-revset`"
   hg: parse error at 9: not a prefix: end
   ( . + .^ +
             ^ here)
   [255]
   $ hg debugrevspec -v 'revset(first(rev(0)))' -p all
   * parsed:
   (func
     (symbol 'revset')
     (func
       (symbol 'first')
       (func
         (symbol 'rev')
         (symbol '0'))))
   * expanded:
   (func
     (symbol 'revset')
     (func
       (symbol 'first')
       (func
         (symbol 'rev')
         (symbol '0'))))
   * concatenated:
   (func
     (symbol 'revset')
     (func
       (symbol 'first')
       (func
         (symbol 'rev')
         (symbol '0'))))
   * analyzed:
   (func
     (symbol 'revset')
     (func
       (symbol 'first')
       (func
         (symbol 'rev')
         (symbol '0'))))
   * optimized:
   (func
     (symbol 'revset')
     (func
       (symbol 'first')
       (func
         (symbol 'rev')
         (symbol '0'))))
   * set:
   <baseset+ [0]>
   0
 
 abort if the revset doesn't expect given size
   $ log 'expectsize()'
   hg: parse error: invalid set of arguments
   [255]
   $ log 'expectsize(0:2, a)'
   hg: parse error: expectsize requires a size range or a positive integer
   [255]
   $ log 'expectsize(0:2, 3)'
   0
   1
   2
 
   $ log 'expectsize(2:0, 3)'
   2
   1
   0
   $ log 'expectsize(0:1, 1)'
   abort: revset size mismatch. expected 1, got 2!
   [255]
   $ log 'expectsize(0:4, -1)'
   hg: parse error: negative size
   [255]
   $ log 'expectsize(0:2, 2:4)'
   0
   1
   2
   $ log 'expectsize(0:1, 3:5)'
   abort: revset size mismatch. expected between 3 and 5, got 2!
   [255]
   $ log 'expectsize(0:1, -1:2)'
   hg: parse error: negative size
   [255]
   $ log 'expectsize(0:1, 1:-2)'
   hg: parse error: negative size
   [255]
   $ log 'expectsize(0:2, a:4)'
   hg: parse error: size range bounds must be integers
   [255]
   $ log 'expectsize(0:2, 2:b)'
   hg: parse error: size range bounds must be integers
   [255]
   $ log 'expectsize(0:2, 2:)'
   0
   1
   2
   $ log 'expectsize(0:2, :5)'
   0
   1
   2
   $ log 'expectsize(0:2, :)'
   0
   1
   2
   $ log 'expectsize(0:2, 4:)'
   abort: revset size mismatch. expected between 4 and 11, got 3!
   [255]
   $ log 'expectsize(0:2, :2)'
   abort: revset size mismatch. expected between 0 and 2, got 3!
   [255]