revset: allow repo.revs('%d', wdirrev)

Otherwise we can't write repo.revs('null:%d', subset.max()) to build
a smartset covering the range {null .. tip} + {wdir} if subset includes
wdir.

mercurial/revset.py

@@ -1,2725 +1,2726 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):
     raise error.ParseError(_(b"can't use a relation in this context"))
 
 
 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, 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, 1)
 
 
 @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:
     0: modified
     1: added
     2: removed
     """
     label = {0: 'modified', 1: 'added', 2: 'removed'}[field]
     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()), label)
         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[%r] %r>', 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 merge
 
     mergestate = merge.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 merge
 
     mergestate = merge.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.
     """
     # 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, 0)
 
 
 @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."""
     # 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, 2)
 
 
 @predicate(b'rev(number)', safe=True)
 def rev(repo, subset, x):
     """Revision with the given numeric identifier.
     """
     # 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 repo.changelog and l not in _virtualrevs:
         return baseset()
     return subset & baseset([l])
 
 
 @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"))
-    repo.changelog.node(l)  # check that the rev exists
+    if l not in _virtualrevs:
+        repo.changelog.node(l)  # check that the rev exists
     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'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],
 }
 
 
 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
 
     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"""
     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'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,
 }
 
 subscriptrelations = {
     b"g": generationsrel,
     b"generations": generationsrel,
 }
 
 
 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-template-functions.t

@@ -1,1653 +1,1660 b''
 Test template filters and functions
 ===================================
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg add a
   $ echo line 1 > b
   $ echo line 2 >> b
   $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
 
   $ hg add b
   $ echo other 1 > c
   $ echo other 2 >> c
   $ echo >> c
   $ echo other 3 >> c
   $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
 
   $ hg add c
   $ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
   $ echo c >> c
   $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
 
   $ echo foo > .hg/branch
   $ hg commit -m 'new branch' -d '1400000 0' -u 'person'
 
   $ hg co -q 3
   $ echo other 4 >> d
   $ hg add d
   $ hg commit -m 'new head' -d '1500000 0' -u 'person'
 
   $ hg merge -q foo
   $ hg commit -m 'merge' -d '1500001 0' -u 'person'
 
 Second branch starting at nullrev:
 
   $ hg update null
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo second > second
   $ hg add second
   $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
   created new head
 
   $ echo third > third
   $ hg add third
   $ hg mv second fourth
   $ hg commit -m third -d "2020-01-01 10:01"
 
   $ hg phase -r 5 --public
   $ hg phase -r 7 --secret --force
 
 Filters work:
 
   $ hg log --template '{author|domain}\n'
   
   hostname
   
   
   
   
   place
   place
   hostname
 
   $ hg log --template '{author|person}\n'
   test
   User Name
   person
   person
   person
   person
   other
   A. N. Other
   User Name
 
   $ hg log --template '{author|user}\n'
   test
   user
   person
   person
   person
   person
   other
   other
   user
 
   $ hg log --template '{date|date}\n'
   Wed Jan 01 10:01:00 2020 +0000
   Mon Jan 12 13:46:40 1970 +0000
   Sun Jan 18 08:40:01 1970 +0000
   Sun Jan 18 08:40:00 1970 +0000
   Sat Jan 17 04:53:20 1970 +0000
   Fri Jan 16 01:06:40 1970 +0000
   Wed Jan 14 21:20:00 1970 +0000
   Tue Jan 13 17:33:20 1970 +0000
   Mon Jan 12 13:46:40 1970 +0000
 
   $ hg log --template '{date|isodate}\n'
   2020-01-01 10:01 +0000
   1970-01-12 13:46 +0000
   1970-01-18 08:40 +0000
   1970-01-18 08:40 +0000
   1970-01-17 04:53 +0000
   1970-01-16 01:06 +0000
   1970-01-14 21:20 +0000
   1970-01-13 17:33 +0000
   1970-01-12 13:46 +0000
 
   $ hg log --template '{date|isodatesec}\n'
   2020-01-01 10:01:00 +0000
   1970-01-12 13:46:40 +0000
   1970-01-18 08:40:01 +0000
   1970-01-18 08:40:00 +0000
   1970-01-17 04:53:20 +0000
   1970-01-16 01:06:40 +0000
   1970-01-14 21:20:00 +0000
   1970-01-13 17:33:20 +0000
   1970-01-12 13:46:40 +0000
 
   $ hg log --template '{date|rfc822date}\n'
   Wed, 01 Jan 2020 10:01:00 +0000
   Mon, 12 Jan 1970 13:46:40 +0000
   Sun, 18 Jan 1970 08:40:01 +0000
   Sun, 18 Jan 1970 08:40:00 +0000
   Sat, 17 Jan 1970 04:53:20 +0000
   Fri, 16 Jan 1970 01:06:40 +0000
   Wed, 14 Jan 1970 21:20:00 +0000
   Tue, 13 Jan 1970 17:33:20 +0000
   Mon, 12 Jan 1970 13:46:40 +0000
 
   $ hg log --template '{desc|firstline}\n'
   third
   second
   merge
   new head
   new branch
   no user, no domain
   no person
   other 1
   line 1
 
   $ hg log --template '{node|short}\n'
   95c24699272e
   29114dbae42b
   d41e714fe50d
   13207e5a10d9
   bbe44766e73d
   10e46f2dcbf4
   97054abb4ab8
   b608e9d1a3f0
   1e4e1b8f71e0
 
   $ hg log --template '<changeset author="{author|xmlescape}"/>\n'
   <changeset author="test"/>
   <changeset author="User Name &lt;user@hostname&gt;"/>
   <changeset author="person"/>
   <changeset author="person"/>
   <changeset author="person"/>
   <changeset author="person"/>
   <changeset author="other@place"/>
   <changeset author="A. N. Other &lt;other@place&gt;"/>
   <changeset author="User Name &lt;user@hostname&gt;"/>
 
   $ hg log --template '{rev}: {children}\n'
   8: 
   7: 8:95c24699272e
   6: 
   5: 6:d41e714fe50d
   4: 6:d41e714fe50d
   3: 4:bbe44766e73d 5:13207e5a10d9
   2: 3:10e46f2dcbf4
   1: 2:97054abb4ab8
   0: 1:b608e9d1a3f0
 
 Formatnode filter works:
 
   $ hg -q log -r 0 --template '{node|formatnode}\n'
   1e4e1b8f71e0
 
   $ hg log -r 0 --template '{node|formatnode}\n'
   1e4e1b8f71e0
 
   $ hg -v log -r 0 --template '{node|formatnode}\n'
   1e4e1b8f71e0
 
   $ hg --debug log -r 0 --template '{node|formatnode}\n'
   1e4e1b8f71e05681d422154f5421e385fec3454f
 
 Age filter:
 
   $ hg init unstable-hash
   $ cd unstable-hash
   $ hg log --template '{date|age}\n' > /dev/null || exit 1
 
   >>> from __future__ import absolute_import
   >>> import datetime
   >>> fp = open('a', 'wb')
   >>> n = datetime.datetime.now() + datetime.timedelta(366 * 7)
   >>> fp.write(b'%d-%d-%d 00:00' % (n.year, n.month, n.day)) and None
   >>> fp.close()
   $ hg add a
   $ hg commit -m future -d "`cat a`"
 
   $ hg log -l1 --template '{date|age}\n'
   7 years from now
 
   $ cd ..
   $ rm -rf unstable-hash
 
 Filename filters:
 
   $ hg debugtemplate '{"foo/bar"|basename}|{"foo/"|basename}|{"foo"|basename}|\n'
   bar||foo|
   $ hg debugtemplate '{"foo/bar"|dirname}|{"foo/"|dirname}|{"foo"|dirname}|\n'
   foo|foo||
   $ hg debugtemplate '{"foo/bar"|stripdir}|{"foo/"|stripdir}|{"foo"|stripdir}|\n'
   foo|foo|foo|
 
 commondir() filter:
 
   $ hg debugtemplate '{""|splitlines|commondir}\n'
   
   $ hg debugtemplate '{"foo/bar\nfoo/baz\nfoo/foobar\n"|splitlines|commondir}\n'
   foo
   $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commondir}\n'
   foo
   $ hg debugtemplate '{"/foo/bar\n/foo/bar\n"|splitlines|commondir}\n'
   foo
   $ hg debugtemplate '{"/foo\n/foo\n"|splitlines|commondir}\n'
   
   $ hg debugtemplate '{"foo/bar\nbar/baz"|splitlines|commondir}\n'
   
   $ hg debugtemplate '{"foo/bar\nbar/baz\nbar/foo\n"|splitlines|commondir}\n'
   
   $ hg debugtemplate '{"foo/../bar\nfoo/bar"|splitlines|commondir}\n'
   foo
   $ hg debugtemplate '{"foo\n/foo"|splitlines|commondir}\n'
   
 
   $ hg log -r null -T '{rev|commondir}'
   hg: parse error: argument is not a list of text
   (template filter 'commondir' is not compatible with keyword 'rev')
   [255]
 
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a
   $ hg add a
   $ hg ci -m future
 
 Count filter:
 
   $ hg log -l1 --template '{node|count} {node|short|count}\n'
   40 12
 
   $ hg log -l1 --template '{revset("null^")|count} {revset(".")|count} {revset("0::3")|count}\n'
   0 1 4
 
   $ hg log -G --template '{rev}: children: {children|count}, \
   > tags: {tags|count}, file_adds: {file_adds|count}, \
   > ancestors: {revset("ancestors(%s)", rev)|count}'
   @  9: children: 0, tags: 1, file_adds: 1, ancestors: 3
   |
   o  8: children: 1, tags: 0, file_adds: 2, ancestors: 2
   |
   o  7: children: 1, tags: 0, file_adds: 1, ancestors: 1
   
   o    6: children: 0, tags: 0, file_adds: 0, ancestors: 7
   |\
   | o  5: children: 1, tags: 0, file_adds: 1, ancestors: 5
   | |
   o |  4: children: 1, tags: 0, file_adds: 0, ancestors: 5
   |/
   o  3: children: 2, tags: 0, file_adds: 0, ancestors: 4
   |
   o  2: children: 1, tags: 0, file_adds: 1, ancestors: 3
   |
   o  1: children: 1, tags: 0, file_adds: 1, ancestors: 2
   |
   o  0: children: 1, tags: 0, file_adds: 1, ancestors: 1
   
 
   $ hg log -l1 -T '{termwidth|count}\n'
   hg: parse error: not countable
   (template filter 'count' is not compatible with keyword 'termwidth')
   [255]
 
 Upper/lower filters:
 
   $ hg log -r0 --template '{branch|upper}\n'
   DEFAULT
   $ hg log -r0 --template '{author|lower}\n'
   user name <user@hostname>
   $ hg log -r0 --template '{date|upper}\n'
   1000000.00
 
 Add a commit that does all possible modifications at once
 
   $ echo modify >> third
   $ touch b
   $ hg add b
   $ hg mv fourth fifth
   $ hg rm a
   $ hg ci -m "Modify, add, remove, rename"
 
 Pass generator object created by template function to filter
 
   $ hg log -l 1 --template '{if(author, author)|user}\n'
   test
 
 Test diff function:
 
   $ hg diff -c 8
   diff -r 29114dbae42b -r 95c24699272e fourth
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +second
   diff -r 29114dbae42b -r 95c24699272e second
   --- a/second	Mon Jan 12 13:46:40 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -second
   diff -r 29114dbae42b -r 95c24699272e third
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/third	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +third
 
   $ hg log -r 8 -T "{diff()}"
   diff -r 29114dbae42b -r 95c24699272e fourth
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +second
   diff -r 29114dbae42b -r 95c24699272e second
   --- a/second	Mon Jan 12 13:46:40 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -second
   diff -r 29114dbae42b -r 95c24699272e third
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/third	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +third
 
   $ hg log -r 8 -T "{diff('glob:f*')}"
   diff -r 29114dbae42b -r 95c24699272e fourth
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +second
 
   $ hg log -r 8 -T "{diff('', 'glob:f*')}"
   diff -r 29114dbae42b -r 95c24699272e second
   --- a/second	Mon Jan 12 13:46:40 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -second
   diff -r 29114dbae42b -r 95c24699272e third
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/third	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +third
 
   $ hg log -r 8 -T "{diff('FOURTH'|lower)}"
   diff -r 29114dbae42b -r 95c24699272e fourth
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/fourth	Wed Jan 01 10:01:00 2020 +0000
   @@ -0,0 +1,1 @@
   +second
 
   $ hg --config diff.git=true log -r 8 -T "{diff()}"
   diff --git a/second b/fourth
   rename from second
   rename to fourth
   diff --git a/third b/third
   new file mode 100644
   --- /dev/null
   +++ b/third
   @@ -0,0 +1,1 @@
   +third
 
   $ cd ..
 
 latesttag() function:
 
   $ hg init latesttag
   $ cd latesttag
 
   $ echo a > file
   $ hg ci -Am a -d '0 0'
   adding file
 
   $ echo b >> file
   $ hg ci -m b -d '1 0'
 
   $ echo c >> head1
   $ hg ci -Am h1c -d '2 0'
   adding head1
 
   $ hg update -q 1
   $ echo d >> head2
   $ hg ci -Am h2d -d '3 0'
   adding head2
   created new head
 
   $ echo e >> head2
   $ hg ci -m h2e -d '4 0'
 
   $ hg merge -q
   $ hg ci -m merge -d '5 -3600'
 
   $ hg tag -r 1 -m t1 -d '6 0' t1
   $ hg tag -r 2 -m t2 -d '7 0' t2
   $ hg tag -r 3 -m t3 -d '8 0' t3
   $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
   $ hg tag -r 5 -m t5 -d '9 0' t5
   $ hg tag -r 3 -m at3 -d '10 0' at3
 
   $ hg log -G --template "{rev}: {latesttag('re:^t[13]$') % '{tag}, C: {changes}, D: {distance}'}\n"
   @  11: t3, C: 9, D: 8
   |
   o  10: t3, C: 8, D: 7
   |
   o  9: t3, C: 7, D: 6
   |
   o  8: t3, C: 6, D: 5
   |
   o  7: t3, C: 5, D: 4
   |
   o  6: t3, C: 4, D: 3
   |
   o    5: t3, C: 3, D: 2
   |\
   | o  4: t3, C: 1, D: 1
   | |
   | o  3: t3, C: 0, D: 0
   | |
   o |  2: t1, C: 1, D: 1
   |/
   o  1: t1, C: 0, D: 0
   |
   o  0: null, C: 1, D: 1
   
 
   $ cd ..
 
 Test filter() empty values:
 
   $ hg log -R a -r 1 -T '{filter(desc|splitlines) % "{line}\n"}'
   other 1
   other 2
   other 3
   $ hg log -R a -r 0 -T '{filter(dict(a=0, b=1) % "{ifeq(key, "a", "{value}\n")}")}'
   0
 
  0 should not be falsy
 
   $ hg log -R a -r 0 -T '{filter(revset("0:2"))}\n'
   0 1 2
 
 Test filter() by expression:
 
   $ hg log -R a -r 1 -T '{filter(desc|splitlines, ifcontains("1", line, "t"))}\n'
   other 1
   $ hg log -R a -r 0 -T '{filter(dict(a=0, b=1), ifeq(key, "b", "t"))}\n'
   b=1
 
 Test filter() shouldn't crash:
 
   $ hg log -R a -r 0 -T '{filter(extras)}\n'
   branch=default
   $ hg log -R a -r 0 -T '{filter(files)}\n'
   a
 
 Test filter() unsupported arguments:
 
   $ hg log -R a -r 0 -T '{filter()}\n'
   hg: parse error: filter expects one or two arguments
   [255]
   $ hg log -R a -r 0 -T '{filter(date)}\n'
   hg: parse error: date is not iterable
   [255]
   $ hg log -R a -r 0 -T '{filter(rev)}\n'
   hg: parse error: 0 is not iterable
   [255]
   $ hg log -R a -r 0 -T '{filter(desc|firstline)}\n'
   hg: parse error: 'line 1' is not filterable
   [255]
   $ hg log -R a -r 0 -T '{filter(manifest)}\n'
   hg: parse error: '0:a0c8bcbbb45c' is not filterable
   [255]
   $ hg log -R a -r 0 -T '{filter(succsandmarkers)}\n'
   hg: parse error: not filterable without template
   [255]
   $ hg log -R a -r 0 -T '{filter(desc|splitlines % "{line}", "")}\n'
   hg: parse error: not filterable by expression
   [255]
 
 Test manifest/get() can be join()-ed as string, though it's silly:
 
   $ hg log -R latesttag -r tip -T '{join(manifest, ".")}\n'
   1.1.:.2.b.c.6.e.9.0.0.6.c.e.2
   $ hg log -R latesttag -r tip -T '{join(get(extras, "branch"), ".")}\n'
   d.e.f.a.u.l.t
 
 Test join() over string
 
   $ hg log -R latesttag -r tip -T '{join(rev|stringify, ".")}\n'
   1.1
 
 Test join() over uniterable
 
   $ hg log -R latesttag -r tip -T '{join(rev, "")}\n'
   hg: parse error: 11 is not iterable
   [255]
 
 Test min/max of integers
 
   $ hg log -R latesttag -l1 -T '{min(revset("9:10"))}\n'
   9
   $ hg log -R latesttag -l1 -T '{max(revset("9:10"))}\n'
   10
 
 Test min/max over map operation:
 
   $ hg log -R latesttag -r3 -T '{min(tags % "{tag}")}\n'
   at3
   $ hg log -R latesttag -r3 -T '{max(tags % "{tag}")}\n'
   t3
 
 Test min/max of strings:
 
   $ hg log -R latesttag -l1 -T '{min(desc)}\n'
   3
   $ hg log -R latesttag -l1 -T '{max(desc)}\n'
   t
 
 Test min/max of non-iterable:
 
   $ hg debugtemplate '{min(1)}'
   hg: parse error: 1 is not iterable
   (min first argument should be an iterable)
   [255]
   $ hg debugtemplate '{max(2)}'
   hg: parse error: 2 is not iterable
   (max first argument should be an iterable)
   [255]
 
   $ hg log -R latesttag -l1 -T '{min(date)}'
   hg: parse error: date is not iterable
   (min first argument should be an iterable)
   [255]
   $ hg log -R latesttag -l1 -T '{max(date)}'
   hg: parse error: date is not iterable
   (max first argument should be an iterable)
   [255]
 
 Test min/max of empty sequence:
 
   $ hg debugtemplate '{min("")}'
   hg: parse error: empty string
   (min first argument should be an iterable)
   [255]
   $ hg debugtemplate '{max("")}'
   hg: parse error: empty string
   (max first argument should be an iterable)
   [255]
   $ hg debugtemplate '{min(dict())}'
   hg: parse error: empty sequence
   (min first argument should be an iterable)
   [255]
   $ hg debugtemplate '{max(dict())}'
   hg: parse error: empty sequence
   (max first argument should be an iterable)
   [255]
   $ hg debugtemplate '{min(dict() % "")}'
   hg: parse error: empty sequence
   (min first argument should be an iterable)
   [255]
   $ hg debugtemplate '{max(dict() % "")}'
   hg: parse error: empty sequence
   (max first argument should be an iterable)
   [255]
 
 Test min/max of if() result
 
   $ cd latesttag
   $ hg log -l1 -T '{min(if(true, revset("9:10"), ""))}\n'
   9
   $ hg log -l1 -T '{max(if(false, "", revset("9:10")))}\n'
   10
   $ hg log -l1 -T '{min(ifcontains("a", "aa", revset("9:10"), ""))}\n'
   9
   $ hg log -l1 -T '{max(ifcontains("a", "bb", "", revset("9:10")))}\n'
   10
   $ hg log -l1 -T '{min(ifeq(0, 0, revset("9:10"), ""))}\n'
   9
   $ hg log -l1 -T '{max(ifeq(0, 1, "", revset("9:10")))}\n'
   10
   $ cd ..
 
 Test laziness of if() then/else clause
 
   $ hg debugtemplate '{count(0)}'
   hg: parse error: not countable
   (incompatible use of template filter 'count')
   [255]
   $ hg debugtemplate '{if(true, "", count(0))}'
   $ hg debugtemplate '{if(false, count(0), "")}'
   $ hg debugtemplate '{ifcontains("a", "aa", "", count(0))}'
   $ hg debugtemplate '{ifcontains("a", "bb", count(0), "")}'
   $ hg debugtemplate '{ifeq(0, 0, "", count(0))}'
   $ hg debugtemplate '{ifeq(0, 1, count(0), "")}'
 
 Test search() function:
 
   $ hg log -R a -r2 -T '{desc}\n'
   no person
 
   $ hg log -R a -r2 -T '{search(r"p.*", desc)}\n'
   person
 
  as bool
 
   $ hg log -R a -r2 -T '{if(search(r"p.*", desc), "", "not ")}found\n'
   found
   $ hg log -R a -r2 -T '{if(search(r"q", desc), "", "not ")}found\n'
   not found
 
  match as json
 
   $ hg log -R a -r2 -T '{search(r"(no) p.*", desc)|json}\n'
   {"0": "no person", "1": "no"}
   $ hg log -R a -r2 -T '{search(r"q", desc)|json}\n'
   null
 
  group reference
 
   $ hg log -R a -r2 -T '{search(r"(no) (p.*)", desc) % "{1|upper} {2|hex}"}\n'
   NO 706572736f6e
   $ hg log -R a -r2 -T '{search(r"(?P<foo>[a-z]*)", desc) % "{foo}"}\n'
   no
   $ hg log -R a -r2 -T '{search(r"(?P<foo>[a-z]*)", desc).foo}\n'
   no
 
  group reference with no match
 
   $ hg log -R a -r2 -T '{search(r"q", desc) % "match: {0}"}\n'
   
 
  bad group names
 
   $ hg log -R a -r2 -T '{search(r"(?P<0>.)", desc) % "{0}"}\n'
   hg: parse error: search got an invalid pattern: (?P<0>.)
   [255]
   $ hg log -R a -r2 -T '{search(r"(?P<repo>.)", desc) % "{repo}"}\n'
   hg: parse error: invalid group 'repo' in search pattern: (?P<repo>.)
   [255]
 
 Test the sub function of templating for expansion:
 
   $ hg log -R latesttag -r 10 --template '{sub("[0-9]", "x", "{rev}")}\n'
   xx
 
   $ hg log -R latesttag -r 10 -T '{sub("[", "x", rev)}\n'
   hg: parse error: sub got an invalid pattern: [
   [255]
   $ hg log -R latesttag -r 10 -T '{sub("[0-9]", r"\1", rev)}\n'
   hg: parse error: sub got an invalid replacement: \1
   [255]
 
 Test the strip function with chars specified:
 
   $ hg log -R latesttag --template '{desc}\n'
   at3
   t5
   t4
   t3
   t2
   t1
   merge
   h2e
   h2d
   h1c
   b
   a
 
   $ hg log -R latesttag --template '{strip(desc, "te")}\n'
   at3
   5
   4
   3
   2
   1
   merg
   h2
   h2d
   h1c
   b
   a
 
 Test date format:
 
   $ hg log -R latesttag --template 'date: {date(date, "%y %m %d %S %z")}\n'
   date: 70 01 01 10 +0000
   date: 70 01 01 09 +0000
   date: 70 01 01 04 +0000
   date: 70 01 01 08 +0000
   date: 70 01 01 07 +0000
   date: 70 01 01 06 +0000
   date: 70 01 01 05 +0100
   date: 70 01 01 04 +0000
   date: 70 01 01 03 +0000
   date: 70 01 01 02 +0000
   date: 70 01 01 01 +0000
   date: 70 01 01 00 +0000
 
 Test invalid date:
 
   $ hg log -R latesttag -T '{date(rev)}\n'
   hg: parse error: date expects a date information
   [255]
 
 Set up repository containing template fragments in commit metadata:
 
   $ hg init r
   $ cd r
   $ echo a > a
   $ hg ci -Am '{rev}'
   adding a
 
   $ hg branch -q 'text.{rev}'
   $ echo aa >> aa
   $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
 
 color effect can be specified without quoting:
 
   $ hg log --color=always -l 1 --template '{label(red, "text\n")}'
   \x1b[0;31mtext\x1b[0m (esc)
 
 color effects can be nested (issue5413)
 
   $ hg debugtemplate --color=always \
   > '{label(red, "red{label(magenta, "ma{label(cyan, "cyan")}{label(yellow, "yellow")}genta")}")}\n'
   \x1b[0;31mred\x1b[0;35mma\x1b[0;36mcyan\x1b[0m\x1b[0;31m\x1b[0;35m\x1b[0;33myellow\x1b[0m\x1b[0;31m\x1b[0;35mgenta\x1b[0m (esc)
 
 pad() should interact well with color codes (issue5416)
 
   $ hg debugtemplate --color=always \
   > '{pad(label(red, "red"), 5, label(cyan, "-"))}\n'
   \x1b[0;31mred\x1b[0m\x1b[0;36m-\x1b[0m\x1b[0;36m-\x1b[0m (esc)
 
 pad() with truncate has to strip color codes, though
 
   $ hg debugtemplate --color=always \
   > '{pad(label(red, "scarlet"), 5, truncate=true)}\n'
   scarl
 
 label should be no-op if color is disabled:
 
   $ hg log --color=never -l 1 --template '{label(red, "text\n")}'
   text
   $ hg log --config extensions.color=! -l 1 --template '{label(red, "text\n")}'
   text
 
 Test branches inside if statement:
 
   $ hg log -r 0 --template '{if(branches, "yes", "no")}\n'
   no
 
 Test dict constructor:
 
   $ hg log -r 0 -T '{dict(y=node|short, x=rev)}\n'
   y=f7769ec2ab97 x=0
   $ hg log -r 0 -T '{dict(x=rev, y=node|short) % "{key}={value}\n"}'
   x=0
   y=f7769ec2ab97
   $ hg log -r 0 -T '{dict(x=rev, y=node|short)|json}\n'
   {"x": 0, "y": "f7769ec2ab97"}
   $ hg log -r 0 -T '{dict()|json}\n'
   {}
 
   $ hg log -r 0 -T '{dict(rev, node=node|short)}\n'
   rev=0 node=f7769ec2ab97
   $ hg log -r 0 -T '{dict(rev, node|short)}\n'
   rev=0 node=f7769ec2ab97
 
   $ hg log -r 0 -T '{dict(rev, rev=rev)}\n'
   hg: parse error: duplicated dict key 'rev' inferred
   [255]
   $ hg log -r 0 -T '{dict(node, node|short)}\n'
   hg: parse error: duplicated dict key 'node' inferred
   [255]
   $ hg log -r 0 -T '{dict(1 + 2)}'
   hg: parse error: dict key cannot be inferred
   [255]
 
   $ hg log -r 0 -T '{dict(x=rev, x=node)}'
   hg: parse error: dict got multiple values for keyword argument 'x'
   [255]
 
 Test get function:
 
   $ hg log -r 0 --template '{get(extras, "branch")}\n'
   default
   $ hg log -r 0 --template '{get(extras, "br{"anch"}")}\n'
   default
   $ hg log -r 0 --template '{get(files, "should_fail")}\n'
   hg: parse error: not a dictionary
   (get() expects a dict as first argument)
   [255]
 
 Test json filter applied to wrapped object:
 
   $ hg log -r0 -T '{files|json}\n'
   ["a"]
   $ hg log -r0 -T '{extras|json}\n'
   {"branch": "default"}
   $ hg log -r0 -T '{date|json}\n'
   [0, 0]
 
 Test json filter applied to map result:
 
   $ hg log -r0 -T '{json(extras % "{key}")}\n'
   ["branch"]
 
 Test localdate(date, tz) function:
 
   $ TZ=JST-09 hg log -r0 -T '{date|localdate|isodate}\n'
   1970-01-01 09:00 +0900
   $ TZ=JST-09 hg log -r0 -T '{localdate(date, "UTC")|isodate}\n'
   1970-01-01 00:00 +0000
   $ TZ=JST-09 hg log -r0 -T '{localdate(date, "blahUTC")|isodate}\n'
   hg: parse error: localdate expects a timezone
   [255]
   $ TZ=JST-09 hg log -r0 -T '{localdate(date, "+0200")|isodate}\n'
   1970-01-01 02:00 +0200
   $ TZ=JST-09 hg log -r0 -T '{localdate(date, "0")|isodate}\n'
   1970-01-01 00:00 +0000
   $ TZ=JST-09 hg log -r0 -T '{localdate(date, 0)|isodate}\n'
   1970-01-01 00:00 +0000
   $ hg log -r0 -T '{localdate(date, "invalid")|isodate}\n'
   hg: parse error: localdate expects a timezone
   [255]
   $ hg log -r0 -T '{localdate(date, date)|isodate}\n'
   hg: parse error: localdate expects a timezone
   [255]
 
 Test shortest(node) function:
 
   $ echo b > b
   $ hg ci -qAm b
   $ hg log --template '{shortest(node)}\n'
   e777
   bcc7
   f776
   $ hg log --template '{shortest(node, 10)}\n'
   e777603221
   bcc7ff960b
   f7769ec2ab
   $ hg log --template '{shortest(node, 1)}\n' -r null
   00
   $ hg log --template '{node|shortest}\n' -l1
   e777
 
   $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n'
   f7769ec2ab
   $ hg log -r 0 -T '{shortest(node, "not an int")}\n'
   hg: parse error: shortest() expects an integer minlength
   [255]
 
   $ hg log -r 'wdir()' -T '{node|shortest}\n'
   ffff
 
   $ hg log --template '{shortest("f")}\n' -l1
   f
 
   $ hg log --template '{shortest("0123456789012345678901234567890123456789")}\n' -l1
   0123456789012345678901234567890123456789
 
   $ hg log --template '{shortest("01234567890123456789012345678901234567890123456789")}\n' -l1
   01234567890123456789012345678901234567890123456789
 
   $ hg log --template '{shortest("not a hex string")}\n' -l1
   not a hex string
 
   $ hg log --template '{shortest("not a hex string, but it'\''s 40 bytes long")}\n' -l1
   not a hex string, but it's 40 bytes long
 
   $ hg log --template '{shortest("ffffffffffffffffffffffffffffffffffffffff")}\n' -l1
   ffff
 
   $ hg log --template '{shortest("fffffff")}\n' -l1
   ffff
 
   $ hg log --template '{shortest("ff")}\n' -l1
   ffff
 
   $ cd ..
 
 Test shortest(node) with the repo having short hash collision:
 
   $ hg init hashcollision
   $ cd hashcollision
   $ cat <<EOF >> .hg/hgrc
   > [experimental]
   > evolution.createmarkers=True
   > EOF
   $ echo 0 > a
   $ hg ci -qAm 0
   $ for i in 17 129 248 242 480 580 617 1057 2857 4025; do
   >   hg up -q 0
   >   echo $i > a
   >   hg ci -qm $i
   > done
   $ hg up -q null
   $ hg log -r0: -T '{rev}:{node}\n'
   0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
   1:11424df6dc1dd4ea255eae2b58eaca7831973bbc
   2:11407b3f1b9c3e76a79c1ec5373924df096f0499
   3:11dd92fe0f39dfdaacdaa5f3997edc533875cfc4
   4:10776689e627b465361ad5c296a20a487e153ca4
   5:a00be79088084cb3aff086ab799f8790e01a976b
   6:a0b0acd79b4498d0052993d35a6a748dd51d13e6
   7:a0457b3450b8e1b778f1163b31a435802987fe5d
   8:c56256a09cd28e5764f32e8e2810d0f01e2e357a
   9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
   10:c562ddd9c94164376c20b86b0b4991636a3bf84f
   $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
   1 new obsolescence markers
   obsoleted 1 changesets
 
  nodes starting with '11' (we don't have the revision number '11' though)
 
   $ hg log -r 1:3 -T '{rev}:{shortest(node, 0)}\n'
   1:1142
   2:1140
   3:11d
 
  '5:a00' is hidden, but still we have two nodes starting with 'a0'
 
   $ hg log -r 6:7 -T '{rev}:{shortest(node, 0)}\n'
   6:a0b
   7:a04
 
  node '10' conflicts with the revision number '10' even if it is hidden
  (we could exclude hidden revision numbers, but currently we don't)
 
   $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n'
   4:107
   $ hg log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
   4:107
 
   $ hg --config experimental.revisions.prefixhexnode=yes log -r 4 -T '{rev}:{shortest(node, 0)}\n'
   4:x10
   $ hg --config experimental.revisions.prefixhexnode=yes log -r 4 -T '{rev}:{shortest(node, 0)}\n' --hidden
   4:x10
 
  node 'c562' should be unique if the other 'c562' nodes are hidden
  (but we don't try the slow path to filter out hidden nodes for now)
 
   $ hg log -r 8 -T '{rev}:{node|shortest}\n'
   8:c5625
   $ hg log -r 8:10 -T '{rev}:{node|shortest}\n' --hidden
   8:c5625
   9:c5623
   10:c562d
 
   $ cd ..
 
 Test prefixhexnode when the first character of the hash is 0.
   $ hg init hashcollision2
   $ cd hashcollision2
   $ cat <<EOF >> .hg/hgrc
   > [experimental]
   > evolution.createmarkers=True
   > EOF
   $ echo 0 > a
   $ hg ci -qAm 0
   $ echo 21 > a
   $ hg ci -qm 21
   $ hg up -q null
   $ hg log -r0: -T '{rev}:{node}\n'
   0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
   1:0cf177ba2b1dc3862a00fb81715fec90950201be
 
  we need the 'x' prefix to ensure we aren't colliding with rev0. We identify
  the collision with nullid if we aren't using disambiguatewithin, so we need to set
  that as well.
   $ hg --config experimental.revisions.disambiguatewithin='descendants(0)' \
   >    --config experimental.revisions.prefixhexnode=yes \
   >    log -r 1 -T '{rev}:{shortest(node, 0)}\n'
   1:x0
 
   $ hg debugobsolete 0cf177ba2b1dc3862a00fb81715fec90950201be
   1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up -q 0
   $ echo 61 > a
   $ hg ci -m 61
   $ hg log -r0: -T '{rev}:{node}\n'
   0:b4e73ffab476aa0ee32ed81ca51e07169844bc6a
   2:01384dde84b3a511ae0835f35ac40bd806c99bb8
 
  we still have the 'x' prefix because '0' is still the shortest prefix, since
  rev1's '0c' is hidden.
   $ hg --config experimental.revisions.disambiguatewithin=0:-1-0 \
   >    --config experimental.revisions.prefixhexnode=yes \
   >    log -r 0:-1-0 -T '{rev}:{shortest(node, 0)}\n'
   2:x0
 
  we don't have the 'x' prefix on 2 because '01' is not a synonym for rev1.
   $ hg --config experimental.revisions.disambiguatewithin=0:-1-0 \
   >    --config experimental.revisions.prefixhexnode=yes \
   >    log -r 0:-1-0 -T '{rev}:{shortest(node, 0)}\n' --hidden
   1:0c
   2:01
 
   $ cd ..
 
 Test pad function
 
   $ cd r
 
   $ hg log --template '{pad(rev, 20)} {author|user}\n'
   2                    test
   1                    {node|short}
   0                    test
 
   $ hg log --template '{pad(rev, 20, " ", True)} {author|user}\n'
                      2 test
                      1 {node|short}
                      0 test
 
   $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n'
   2------------------- test
   1------------------- {node|short}
   0------------------- test
 
   $ hg log --template '{pad(author, 5, "-", False, True)}\n'
   test-
   {node
   test-
   $ hg log --template '{pad(author, 5, "-", True, True)}\n'
   -test
   hort}
   -test
 
 Test template string in pad function
 
   $ hg log -r 0 -T '{pad("\{{rev}}", 10)} {author|user}\n'
   {0}        test
 
   $ hg log -r 0 -T '{pad(r"\{rev}", 10)} {author|user}\n'
   \{rev}     test
 
 Test width argument passed to pad function
 
   $ hg log -r 0 -T '{pad(rev, "1{"0"}")} {author|user}\n'
   0          test
   $ hg log -r 0 -T '{pad(rev, "not an int")}\n'
   hg: parse error: pad() expects an integer width
   [255]
 
 Test invalid fillchar passed to pad function
 
   $ hg log -r 0 -T '{pad(rev, 10, "")}\n'
   hg: parse error: pad() expects a single fill character
   [255]
   $ hg log -r 0 -T '{pad(rev, 10, "--")}\n'
   hg: parse error: pad() expects a single fill character
   [255]
 
 Test boolean argument passed to pad function
 
  no crash
 
   $ hg log -r 0 -T '{pad(rev, 10, "-", "f{"oo"}")}\n'
   ---------0
 
  string/literal
 
   $ hg log -r 0 -T '{pad(rev, 10, "-", "false")}\n'
   ---------0
   $ hg log -r 0 -T '{pad(rev, 10, "-", false)}\n'
   0---------
   $ hg log -r 0 -T '{pad(rev, 10, "-", "")}\n'
   0---------
 
  unknown keyword is evaluated to ''
 
   $ hg log -r 0 -T '{pad(rev, 10, "-", unknownkeyword)}\n'
   0---------
 
 Test separate function
 
   $ hg log -r 0 -T '{separate("-", "", "a", "b", "", "", "c", "")}\n'
   a-b-c
   $ hg log -r 0 -T '{separate(" ", "{rev}:{node|short}", author|user, branch)}\n'
   0:f7769ec2ab97 test default
   $ hg log -r 0 --color=always -T '{separate(" ", "a", label(red, "b"), "c", label(red, ""), "d")}\n'
   a \x1b[0;31mb\x1b[0m c d (esc)
 
 Test boolean expression/literal passed to if function
 
   $ hg log -r 0 -T '{if(rev, "rev 0 is True")}\n'
   rev 0 is True
   $ hg log -r 0 -T '{if(0, "literal 0 is True as well")}\n'
   literal 0 is True as well
   $ hg log -r 0 -T '{if(min(revset(r"0")), "0 of hybriditem is also True")}\n'
   0 of hybriditem is also True
   $ hg log -r 0 -T '{if("", "", "empty string is False")}\n'
   empty string is False
   $ hg log -r 0 -T '{if(revset(r"0 - 0"), "", "empty list is False")}\n'
   empty list is False
   $ hg log -r 0 -T '{if(revset(r"0"), "non-empty list is True")}\n'
   non-empty list is True
   $ hg log -r 0 -T '{if(revset(r"0") % "", "list of empty strings is True")}\n'
   list of empty strings is True
   $ hg log -r 0 -T '{if(true, "true is True")}\n'
   true is True
   $ hg log -r 0 -T '{if(false, "", "false is False")}\n'
   false is False
   $ hg log -r 0 -T '{if("false", "non-empty string is True")}\n'
   non-empty string is True
 
 Test ifcontains function
 
   $ hg log --template '{rev} {ifcontains(rev, "2 two 0", "is in the string", "is not")}\n'
   2 is in the string
   1 is not
   0 is in the string
 
   $ hg log -T '{rev} {ifcontains(rev, "2 two{" 0"}", "is in the string", "is not")}\n'
   2 is in the string
   1 is not
   0 is in the string
 
   $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n'
   2 did not add a
   1 did not add a
   0 added a
 
   $ hg log --debug -T '{rev}{ifcontains(1, parents, " is parent of 1")}\n'
   2 is parent of 1
   1
   0
 
   $ hg log -l1 -T '{ifcontains("branch", extras, "t", "f")}\n'
   t
   $ hg log -l1 -T '{ifcontains("branch", extras % "{key}", "t", "f")}\n'
   t
   $ hg log -l1 -T '{ifcontains("branc", extras % "{key}", "t", "f")}\n'
   f
   $ hg log -l1 -T '{ifcontains("branc", stringify(extras % "{key}"), "t", "f")}\n'
   t
 
 Test revset function
 
   $ hg log --template '{rev} {ifcontains(rev, revset("."), "current rev", "not current rev")}\n'
   2 current rev
   1 not current rev
   0 not current rev
 
   $ hg log --template '{rev} {ifcontains(rev, revset(". + .^"), "match rev", "not match rev")}\n'
   2 match rev
   1 match rev
   0 not match rev
 
   $ hg log -T '{ifcontains(desc, revset(":"), "", "type not match")}\n' -l1
   type not match
 
   $ hg log --template '{rev} Parents: {revset("parents(%s)", rev)}\n'
   2 Parents: 1
   1 Parents: 0
   0 Parents: 
 
   $ cat >> .hg/hgrc <<EOF
   > [revsetalias]
   > myparents(\$1) = parents(\$1)
   > EOF
   $ hg log --template '{rev} Parents: {revset("myparents(%s)", rev)}\n'
   2 Parents: 1
   1 Parents: 0
   0 Parents: 
 
   $ hg log --template 'Rev: {rev}\n{revset("::%s", rev) % "Ancestor: {revision}\n"}\n'
   Rev: 2
   Ancestor: 0
   Ancestor: 1
   Ancestor: 2
   
   Rev: 1
   Ancestor: 0
   Ancestor: 1
   
   Rev: 0
   Ancestor: 0
   
   $ hg log --template '{revset("TIP"|lower)}\n' -l1
   2
 
   $ hg log -T '{revset("%s", "t{"ip"}")}\n' -l1
   2
 
  a list template is evaluated for each item of revset/parents
 
   $ hg log -T '{rev} p: {revset("p1(%s)", rev) % "{rev}:{node|short}"}\n'
   2 p: 1:bcc7ff960b8e
   1 p: 0:f7769ec2ab97
   0 p: 
 
   $ hg log --debug -T '{rev} p:{parents % " {rev}:{node|short}"}\n'
   2 p: 1:bcc7ff960b8e -1:000000000000
   1 p: 0:f7769ec2ab97 -1:000000000000
   0 p: -1:000000000000 -1:000000000000
 
  therefore, 'revcache' should be recreated for each rev
 
   $ hg log -T '{rev} {file_adds}\np {revset("p1(%s)", rev) % "{file_adds}"}\n'
   2 aa b
   p 
   1 
   p a
   0 a
   p 
 
   $ hg log --debug -T '{rev} {file_adds}\np {parents % "{file_adds}"}\n'
   2 aa b
   p 
   1 
   p a
   0 a
   p 
 
 a revset item must be evaluated as an integer revision, not an offset from tip
 
   $ hg log -l 1 -T '{revset("null") % "{rev}:{node|short}"}\n'
   -1:000000000000
   $ hg log -l 1 -T '{revset("%s", "null") % "{rev}:{node|short}"}\n'
   -1:000000000000
 
 join() should pick '{rev}' from revset items:
 
   $ hg log -R ../a -T '{join(revset("parents(%d)", rev), ", ")}\n' -r6
   4, 5
 
 on the other hand, parents are formatted as '{rev}:{node|formatnode}' by
 default. join() should agree with the default formatting:
 
   $ hg log -R ../a -T '{join(parents, ", ")}\n' -r6
   5:13207e5a10d9, 4:bbe44766e73d
 
   $ hg log -R ../a -T '{join(parents, ",\n")}\n' -r6 --debug
   5:13207e5a10d9fd28ec424934298e176197f2c67f,
   4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
 
+%d parameter handling:
+
+  $ hg log -T '{revset("%d", rev)}\n' -r'wdir()'
+  2147483647
+  $ hg log -T '{revset("%d", rev)}\n' -r'null'
+  -1
+
 Invalid arguments passed to revset()
 
   $ hg log -T '{revset("%whatever", 0)}\n'
   hg: parse error: unexpected revspec format character w
   [255]
   $ hg log -T '{revset("%lwhatever", files)}\n'
   hg: parse error: unexpected revspec format character w
   [255]
   $ hg log -T '{revset("%s %s", 0)}\n'
   hg: parse error: missing argument for revspec
   [255]
   $ hg log -T '{revset("", 0)}\n'
   hg: parse error: too many revspec arguments specified
   [255]
   $ hg log -T '{revset("%s", 0, 1)}\n'
   hg: parse error: too many revspec arguments specified
   [255]
   $ hg log -T '{revset("%", 0)}\n'
   hg: parse error: incomplete revspec format character
   [255]
   $ hg log -T '{revset("%l", 0)}\n'
   hg: parse error: incomplete revspec format character
   [255]
   $ hg log -T '{revset("%d", 'foo')}\n'
   hg: parse error: invalid argument for revspec
   [255]
   $ hg log -T '{revset("%ld", files)}\n'
   hg: parse error: invalid argument for revspec
   [255]
   $ hg log -T '{revset("%ls", 0)}\n'
   hg: parse error: invalid argument for revspec
   [255]
   $ hg log -T '{revset("%b", 'foo')}\n'
   hg: parse error: invalid argument for revspec
   [255]
   $ hg log -T '{revset("%lb", files)}\n'
   hg: parse error: invalid argument for revspec
   [255]
   $ hg log -T '{revset("%r", 0)}\n'
   hg: parse error: invalid argument for revspec
   [255]
 
 Test files function
 
   $ hg log -T "{rev}\n{join(files('*'), '\n')}\n"
   2
   a
   aa
   b
   1
   a
   0
   a
 
   $ hg log -T "{rev}\n{join(files('aa'), '\n')}\n"
   2
   aa
   1
   
   0
   
 
   $ hg log -l1 -T "{files('aa') % '{file}\n'}"
   aa
   $ hg log -l1 -T "{files('aa') % '{path}\n'}"
   aa
 
   $ hg rm a
   $ hg log -r "wdir()" -T "{rev}\n{join(files('*'), '\n')}\n"
   2147483647
   aa
   b
   $ hg revert a
 
 Test relpath function
 
   $ hg log -r0 -T '{files % "{file|relpath}\n"}'
   a
   $ cd ..
   $ hg log -R r -r0 -T '{files % "{file|relpath}\n"}'
   r/a
 
 Test stringify on sub expressions
 
   $ hg log -R a -r 8 --template '{join(files, if("1", if("1", ", ")))}\n'
   fourth, second, third
   $ hg log -R a -r 8 --template '{strip(if("1", if("1", "-abc-")), if("1", if("1", "-")))}\n'
   abc
 
 Test splitlines
 
   $ hg log -Gv -R a --template "{splitlines(desc) % 'foo {line}\n'}"
   @  foo Modify, add, remove, rename
   |
   o  foo future
   |
   o  foo third
   |
   o  foo second
   
   o    foo merge
   |\
   | o  foo new head
   | |
   o |  foo new branch
   |/
   o  foo no user, no domain
   |
   o  foo no person
   |
   o  foo other 1
   |  foo other 2
   |  foo
   |  foo other 3
   o  foo line 1
      foo line 2
 
   $ hg log -R a -r0 -T '{desc|splitlines}\n'
   line 1 line 2
   $ hg log -R a -r0 -T '{join(desc|splitlines, "|")}\n'
   line 1|line 2
 
 Test startswith
   $ hg log -Gv -R a --template "{startswith(desc)}"
   hg: parse error: startswith expects two arguments
   [255]
 
   $ hg log -Gv -R a --template "{startswith('line', desc)}"
   @
   |
   o
   |
   o
   |
   o
   
   o
   |\
   | o
   | |
   o |
   |/
   o
   |
   o
   |
   o
   |
   o  line 1
      line 2
 
 Test word function (including index out of bounds graceful failure)
 
   $ hg log -Gv -R a --template "{word('1', desc)}"
   @  add,
   |
   o
   |
   o
   |
   o
   
   o
   |\
   | o  head
   | |
   o |  branch
   |/
   o  user,
   |
   o  person
   |
   o  1
   |
   o  1
   
 
 Test word third parameter used as splitter
 
   $ hg log -Gv -R a --template "{word('0', desc, 'o')}"
   @  M
   |
   o  future
   |
   o  third
   |
   o  sec
   
   o    merge
   |\
   | o  new head
   | |
   o |  new branch
   |/
   o  n
   |
   o  n
   |
   o
   |
   o  line 1
      line 2
 
 Test word error messages for not enough and too many arguments
 
   $ hg log -Gv -R a --template "{word('0')}"
   hg: parse error: word expects two or three arguments, got 1
   [255]
 
   $ hg log -Gv -R a --template "{word('0', desc, 'o', 'h', 'b', 'o', 'y')}"
   hg: parse error: word expects two or three arguments, got 7
   [255]
 
 Test word for integer literal
 
   $ hg log -R a --template "{word(2, desc)}\n" -r0
   line
 
 Test word for invalid numbers
 
   $ hg log -Gv -R a --template "{word('a', desc)}"
   hg: parse error: word expects an integer index
   [255]
 
 Test word for out of range
 
   $ hg log -R a --template "{word(10000, desc)}"
   $ hg log -R a --template "{word(-10000, desc)}"
 
 Test indent and not adding to empty lines
 
   $ hg log -T "-----\n{indent(desc, '>> ', ' > ')}\n" -r 0:1 -R a
   -----
    > line 1
   >> line 2
   -----
    > other 1
   >> other 2
   
   >> other 3
 
 Test indent with empty first line
 
   $ hg version -T "{indent('', '>> ')}\n"
   
 
   $ hg version -T "{indent('
   > second', '>> ')}\n"
   
   >> second
 
   $ hg version -T "{indent('
   > second', '>> ', ' > ')}\n"
   
   >> second
 
 Test with non-strings like dates
 
   $ hg log -T "{indent(date, '   ')}\n" -r 2:3 -R a
      1200000.00
      1300000.00
 
 Test cbor filter:
 
   $ cat <<'EOF' > "$TESTTMP/decodecbor.py"
   > from __future__ import absolute_import
   > from mercurial import (
   >     dispatch,
   >     pycompat,
   > )
   > from mercurial.utils import (
   >     cborutil,
   >     stringutil,
   > )
   > dispatch.initstdio()
   > items = cborutil.decodeall(pycompat.stdin.read())
   > pycompat.stdout.write(stringutil.pprint(items, indent=1) + b'\n')
   > EOF
 
   $ hg log -T "{rev|cbor}" -R a -l2 | "$PYTHON" "$TESTTMP/decodecbor.py"
   [
    10,
    9
   ]
 
   $ hg log -T "{extras|cbor}" -R a -l1 | "$PYTHON" "$TESTTMP/decodecbor.py"
   [
    {
     'branch': 'default'
    }
   ]
 
 json filter should escape HTML tags so that the output can be embedded in hgweb:
 
   $ hg log -T "{'<[e-mail]>'|json}\n" -R a -l1
   "\[e-mail]\u003e"
 
 Set up repository for non-ascii encoding tests:
 
   $ hg init nonascii
   $ cd nonascii
   $ "$PYTHON" <<EOF
   > open('latin1', 'wb').write(b'\xe9')
   > open('utf-8', 'wb').write(b'\xc3\xa9')
   > EOF
   $ HGENCODING=utf-8 hg branch -q `cat utf-8`
   $ HGENCODING=utf-8 hg ci -qAm "non-ascii branch: `cat utf-8`" utf-8
 
 json filter should try round-trip conversion to utf-8:
 
   $ HGENCODING=ascii hg log -T "{branch|json}\n" -r0
   "\u00e9"
   $ HGENCODING=ascii hg log -T "{desc|json}\n" -r0
   "non-ascii branch: \u00e9"
 
 json filter should take input as utf-8 if it was converted from utf-8:
 
   $ HGENCODING=latin-1 hg log -T "{branch|json}\n" -r0
   "\u00e9"
   $ HGENCODING=latin-1 hg log -T "{desc|json}\n" -r0
   "non-ascii branch: \u00e9"
 
 json filter takes input as utf-8b:
 
   $ HGENCODING=ascii hg log -T "{'`cat utf-8`'|json}\n" -l1
   "\u00e9"
   $ HGENCODING=ascii hg log -T "{'`cat latin1`'|json}\n" -l1
   "\udce9"
 
 cbor filter is bytes transparent, which should handle bytes subtypes
 as bytes:
 
   $ HGENCODING=ascii hg log -T "{branch|cbor}" -r0 \
   > | "$PYTHON" "$TESTTMP/decodecbor.py"
   [
    '?'
   ]
   $ HGENCODING=latin-1 hg log -T "{branch|cbor}" -r0 \
   > | "$PYTHON" "$TESTTMP/decodecbor.py"
   [
    '\xe9'
   ]
 
 utf8 filter:
 
   $ HGENCODING=ascii hg log -T "round-trip: {branch|utf8|hex}\n" -r0
   round-trip: c3a9
   $ HGENCODING=latin1 hg log -T "decoded: {'`cat latin1`'|utf8|hex}\n" -l1
   decoded: c3a9
   $ HGENCODING=ascii hg log -T "replaced: {'`cat latin1`'|utf8|hex}\n" -l1
   abort: decoding near * (glob)
   [255]
   $ hg log -T "coerced to string: {rev|utf8}\n" -r0
   coerced to string: 0
 
 pad width:
 
   $ HGENCODING=utf-8 hg debugtemplate "{pad('`cat utf-8`', 2, '-')}\n"
   \xc3\xa9- (esc)
 
 read config options:
 
   $ hg log -T "{config('templateconfig', 'knob', 'foo')}\n"
   foo
   $ hg log -T "{config('templateconfig', 'knob', 'foo')}\n" \
   > --config templateconfig.knob=bar
   bar
   $ hg log -T "{configbool('templateconfig', 'knob', True)}\n"
   True
   $ hg log -T "{configbool('templateconfig', 'knob', True)}\n" \
   > --config templateconfig.knob=0
   False
   $ hg log -T "{configint('templateconfig', 'knob', 123)}\n"
   123
   $ hg log -T "{configint('templateconfig', 'knob', 123)}\n" \
   > --config templateconfig.knob=456
   456
   $ hg log -T "{config('templateconfig', 'knob')}\n"
   devel-warn: config item requires an explicit default value: 'templateconfig.knob' at: * (glob)
   
   $ hg log -T "{configbool('ui', 'interactive')}\n"
   False
   $ hg log -T "{configbool('ui', 'interactive')}\n" --config ui.interactive=1
   True
   $ hg log -T "{config('templateconfig', 'knob', if(true, 'foo', 'bar'))}\n"
   foo
 
   $ cd ..