logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter

This is a bit slower than the original implementation, but I don't think
that would actually matter. It's still faster than full templating.

  $ hg log -Tjson -r0:5000 --time > /dev/null
  (orig) time: real 1.550 secs (user 1.500+0.000 sys 0.040+0.000)
  (new)  time: real 1.810 secs (user 1.740+0.000 sys 0.070+0.000)

  cf.
  $ hg log -Tdefault -r0:5000 --time > /dev/null
  time: real 4.980 secs (user 4.850+0.000 sys 0.130+0.000)
  $ hg log -r0:5000 --time > /dev/null
  time: real 2.340 secs (user 2.220+0.000 sys 0.100+0.000)
  $ hg log -r0:5000 -q --time > /dev/null
  time: real 0.750 secs (user 0.670+0.000 sys 0.070+0.000)

The test output changes because keys are sorted alphabetically.

mercurial/logcmdutil.py

@@ -1,940 +1,913 b''
 # logcmdutil.py - utility for log-like commands
 #
 # Copyright 2005-2007 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 itertools
 import os
 
 from .i18n import _
 from .node import (
-    hex,
     nullid,
 )
 
 from . import (
     dagop,
-    encoding,
     error,
     formatter,
     graphmod,
     match as matchmod,
     mdiff,
     patch,
     pathutil,
     pycompat,
     revset,
     revsetlang,
     scmutil,
     smartset,
     templatekw,
     templater,
     util,
 )
 from .utils import (
     dateutil,
     stringutil,
 )
 
 def getlimit(opts):
     """get the log limit according to option -l/--limit"""
     limit = opts.get('limit')
     if limit:
         try:
             limit = int(limit)
         except ValueError:
             raise error.Abort(_('limit must be a positive integer'))
         if limit <= 0:
             raise error.Abort(_('limit must be positive'))
     else:
         limit = None
     return limit
 
 def diffordiffstat(ui, repo, diffopts, node1, node2, match,
                    changes=None, stat=False, fp=None, prefix='',
                    root='', listsubrepos=False, hunksfilterfn=None):
     '''show diff or diffstat.'''
     if root:
         relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
     else:
         relroot = ''
     if relroot != '':
         # XXX relative roots currently don't work if the root is within a
         # subrepo
         uirelroot = match.uipath(relroot)
         relroot += '/'
         for matchroot in match.files():
             if not matchroot.startswith(relroot):
                 ui.warn(_('warning: %s not inside relative root %s\n') % (
                     match.uipath(matchroot), uirelroot))
 
     if stat:
         diffopts = diffopts.copy(context=0, noprefix=False)
         width = 80
         if not ui.plain():
             width = ui.termwidth()
 
     chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
                         prefix=prefix, relroot=relroot,
                         hunksfilterfn=hunksfilterfn)
 
     if fp is not None or ui.canwritewithoutlabels():
         out = fp or ui
         if stat:
             chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
         for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
             out.write(chunk)
     else:
         if stat:
             chunks = patch.diffstatui(util.iterlines(chunks), width=width)
         else:
             chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,
                                      opts=diffopts)
         if ui.canbatchlabeledwrites():
             def gen():
                 for chunk, label in chunks:
                     yield ui.label(chunk, label=label)
             for chunk in util.filechunkiter(util.chunkbuffer(gen())):
                 ui.write(chunk)
         else:
             for chunk, label in chunks:
                 ui.write(chunk, label=label)
 
     if listsubrepos:
         ctx1 = repo[node1]
         ctx2 = repo[node2]
         for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
             tempnode2 = node2
             try:
                 if node2 is not None:
                     tempnode2 = ctx2.substate[subpath][1]
             except KeyError:
                 # A subrepo that existed in node1 was deleted between node1 and
                 # node2 (inclusive). Thus, ctx2's substate won't contain that
                 # subpath. The best we can do is to ignore it.
                 tempnode2 = None
             submatch = matchmod.subdirmatcher(subpath, match)
             sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
                      stat=stat, fp=fp, prefix=prefix)
 
 class changesetdiffer(object):
     """Generate diff of changeset with pre-configured filtering functions"""
 
     def _makefilematcher(self, ctx):
         return scmutil.matchall(ctx.repo())
 
     def _makehunksfilter(self, ctx):
         return None
 
     def showdiff(self, ui, ctx, diffopts, stat=False):
         repo = ctx.repo()
         node = ctx.node()
         prev = ctx.p1().node()
         diffordiffstat(ui, repo, diffopts, prev, node,
                        match=self._makefilematcher(ctx), stat=stat,
                        hunksfilterfn=self._makehunksfilter(ctx))
 
 def changesetlabels(ctx):
     labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
     if ctx.obsolete():
         labels.append('changeset.obsolete')
     if ctx.isunstable():
         labels.append('changeset.unstable')
         for instability in ctx.instabilities():
             labels.append('instability.%s' % instability)
     return ' '.join(labels)
 
 class changesetprinter(object):
     '''show changeset information when templating not requested.'''
 
     def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
         self.ui = ui
         self.repo = repo
         self.buffered = buffered
         self._differ = differ or changesetdiffer()
         self.diffopts = diffopts or {}
         self.header = {}
         self.hunk = {}
         self.lastheader = None
         self.footer = None
         self._columns = templatekw.getlogcolumns()
 
     def flush(self, ctx):
         rev = ctx.rev()
         if rev in self.header:
             h = self.header[rev]
             if h != self.lastheader:
                 self.lastheader = h
                 self.ui.write(h)
             del self.header[rev]
         if rev in self.hunk:
             self.ui.write(self.hunk[rev])
             del self.hunk[rev]
 
     def close(self):
         if self.footer:
             self.ui.write(self.footer)
 
     def show(self, ctx, copies=None, **props):
         props = pycompat.byteskwargs(props)
         if self.buffered:
             self.ui.pushbuffer(labeled=True)
             self._show(ctx, copies, props)
             self.hunk[ctx.rev()] = self.ui.popbuffer()
         else:
             self._show(ctx, copies, props)
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
         changenode = ctx.node()
         rev = ctx.rev()
 
         if self.ui.quiet:
             self.ui.write("%s\n" % scmutil.formatchangeid(ctx),
                           label='log.node')
             return
 
         columns = self._columns
         self.ui.write(columns['changeset'] % scmutil.formatchangeid(ctx),
                       label=changesetlabels(ctx))
 
         # branches are shown first before any other names due to backwards
         # compatibility
         branch = ctx.branch()
         # don't show the default branch name
         if branch != 'default':
             self.ui.write(columns['branch'] % branch, label='log.branch')
 
         for nsname, ns in self.repo.names.iteritems():
             # branches has special logic already handled above, so here we just
             # skip it
             if nsname == 'branches':
                 continue
             # we will use the templatename as the color name since those two
             # should be the same
             for name in ns.names(self.repo, changenode):
                 self.ui.write(ns.logfmt % name,
                               label='log.%s' % ns.colorname)
         if self.ui.debugflag:
             self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase')
         for pctx in scmutil.meaningfulparents(self.repo, ctx):
             label = 'log.parent changeset.%s' % pctx.phasestr()
             self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx),
                           label=label)
 
         if self.ui.debugflag and rev is not None:
             mnode = ctx.manifestnode()
             mrev = self.repo.manifestlog._revlog.rev(mnode)
             self.ui.write(columns['manifest']
                           % scmutil.formatrevnode(self.ui, mrev, mnode),
                           label='ui.debug log.manifest')
         self.ui.write(columns['user'] % ctx.user(), label='log.user')
         self.ui.write(columns['date'] % dateutil.datestr(ctx.date()),
                       label='log.date')
 
         if ctx.isunstable():
             instabilities = ctx.instabilities()
             self.ui.write(columns['instability'] % ', '.join(instabilities),
                           label='log.instability')
 
         elif ctx.obsolete():
             self._showobsfate(ctx)
 
         self._exthook(ctx)
 
         if self.ui.debugflag:
             files = ctx.p1().status(ctx)[:3]
             for key, value in zip(['files', 'files+', 'files-'], files):
                 if value:
                     self.ui.write(columns[key] % " ".join(value),
                                   label='ui.debug log.files')
         elif ctx.files() and self.ui.verbose:
             self.ui.write(columns['files'] % " ".join(ctx.files()),
                           label='ui.note log.files')
         if copies and self.ui.verbose:
             copies = ['%s (%s)' % c for c in copies]
             self.ui.write(columns['copies'] % ' '.join(copies),
                           label='ui.note log.copies')
 
         extra = ctx.extra()
         if extra and self.ui.debugflag:
             for key, value in sorted(extra.items()):
                 self.ui.write(columns['extra']
                               % (key, stringutil.escapestr(value)),
                               label='ui.debug log.extra')
 
         description = ctx.description().strip()
         if description:
             if self.ui.verbose:
                 self.ui.write(_("description:\n"),
                               label='ui.note log.description')
                 self.ui.write(description,
                               label='ui.note log.description')
                 self.ui.write("\n\n")
             else:
                 self.ui.write(columns['summary'] % description.splitlines()[0],
                               label='log.summary')
         self.ui.write("\n")
 
         self._showpatch(ctx)
 
     def _showobsfate(self, ctx):
         # TODO: do not depend on templater
         tres = formatter.templateresources(self.repo.ui, self.repo)
         t = formatter.maketemplater(self.repo.ui, '{join(obsfate, "\n")}',
                                     defaults=templatekw.keywords,
                                     resources=tres)
         obsfate = t.renderdefault({'ctx': ctx}).splitlines()
 
         if obsfate:
             for obsfateline in obsfate:
                 self.ui.write(self._columns['obsolete'] % obsfateline,
                               label='log.obsfate')
 
     def _exthook(self, ctx):
         '''empty method used by extension as a hook point
         '''
 
     def _showpatch(self, ctx):
         stat = self.diffopts.get('stat')
         diff = self.diffopts.get('patch')
         diffopts = patch.diffallopts(self.ui, self.diffopts)
         if stat:
             self._differ.showdiff(self.ui, ctx, diffopts, stat=True)
         if stat and diff:
             self.ui.write("\n")
         if diff:
             self._differ.showdiff(self.ui, ctx, diffopts, stat=False)
         if stat or diff:
             self.ui.write("\n")
 
 class jsonchangeset(changesetprinter):
     '''format changeset information.'''
 
     def __init__(self, ui, repo, differ=None, diffopts=None, buffered=False):
         changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
-        self._first = True
+        self._fm = formatter.jsonformatter(ui, ui, 'log', {})
 
     def close(self):
-        if not self._first:
-            self.ui.write("\n]\n")
-        else:
-            self.ui.write("[]\n")
+        self._fm.end()
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
+        fm = self._fm
+        fm.startitem()
+
+        # TODO: maybe this should be wdirrev/wdirnode?
         rev = ctx.rev()
         if rev is None:
-            jrev = jnode = 'null'
+            hexnode = None
         else:
-            jrev = '%d' % rev
-            jnode = '"%s"' % hex(ctx.node())
-        j = encoding.jsonescape
-
-        if self._first:
-            self.ui.write("[\n {")
-            self._first = False
-        else:
-            self.ui.write(",\n {")
+            hexnode = fm.hexfunc(ctx.node())
+        fm.data(rev=rev,
+                node=hexnode)
 
         if self.ui.quiet:
-            self.ui.write(('\n  "rev": %s') % jrev)
-            self.ui.write((',\n  "node": %s') % jnode)
-            self.ui.write('\n }')
             return
 
-        self.ui.write(('\n  "rev": %s') % jrev)
-        self.ui.write((',\n  "node": %s') % jnode)
-        self.ui.write((',\n  "branch": "%s"') % j(ctx.branch()))
-        self.ui.write((',\n  "phase": "%s"') % ctx.phasestr())
-        self.ui.write((',\n  "user": "%s"') % j(ctx.user()))
-        self.ui.write((',\n  "date": [%d, %d]') % ctx.date())
-        self.ui.write((',\n  "desc": "%s"') % j(ctx.description()))
-
-        self.ui.write((',\n  "bookmarks": [%s]') %
-                      ", ".join('"%s"' % j(b) for b in ctx.bookmarks()))
-        self.ui.write((',\n  "tags": [%s]') %
-                      ", ".join('"%s"' % j(t) for t in ctx.tags()))
-        self.ui.write((',\n  "parents": [%s]') %
-                      ", ".join('"%s"' % c.hex() for c in ctx.parents()))
+        fm.data(branch=ctx.branch(),
+                phase=ctx.phasestr(),
+                user=ctx.user(),
+                date=fm.formatdate(ctx.date()),
+                desc=ctx.description(),
+                bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'),
+                tags=fm.formatlist(ctx.tags(), name='tag'),
+                parents=fm.formatlist([fm.hexfunc(c.node())
+                                       for c in ctx.parents()], name='node'))
 
         if self.ui.debugflag:
             if rev is None:
-                jmanifestnode = 'null'
+                hexnode = None
             else:
-                jmanifestnode = '"%s"' % hex(ctx.manifestnode())
-            self.ui.write((',\n  "manifest": %s') % jmanifestnode)
-
-            self.ui.write((',\n  "extra": {%s}') %
-                          ", ".join('"%s": "%s"' % (j(k), j(v))
-                                    for k, v in ctx.extra().items()))
+                hexnode = fm.hexfunc(ctx.manifestnode())
+            fm.data(manifest=hexnode,
+                    extra=fm.formatdict(ctx.extra()))
 
             files = ctx.p1().status(ctx)
-            self.ui.write((',\n  "modified": [%s]') %
-                          ", ".join('"%s"' % j(f) for f in files[0]))
-            self.ui.write((',\n  "added": [%s]') %
-                          ", ".join('"%s"' % j(f) for f in files[1]))
-            self.ui.write((',\n  "removed": [%s]') %
-                          ", ".join('"%s"' % j(f) for f in files[2]))
+            fm.data(modified=fm.formatlist(files[0], name='file'),
+                    added=fm.formatlist(files[1], name='file'),
+                    removed=fm.formatlist(files[2], name='file'))
 
         elif self.ui.verbose:
-            self.ui.write((',\n  "files": [%s]') %
-                          ", ".join('"%s"' % j(f) for f in ctx.files()))
-
+            fm.data(files=fm.formatlist(ctx.files(), name='file'))
             if copies:
-                self.ui.write((',\n  "copies": {%s}') %
-                              ", ".join('"%s": "%s"' % (j(k), j(v))
-                                                        for k, v in copies))
+                fm.data(copies=fm.formatdict(copies,
+                                             key='name', value='source'))
 
         stat = self.diffopts.get('stat')
         diff = self.diffopts.get('patch')
         diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
         if stat:
             self.ui.pushbuffer()
             self._differ.showdiff(self.ui, ctx, diffopts, stat=True)
-            self.ui.write((',\n  "diffstat": "%s"')
-                          % j(self.ui.popbuffer()))
+            fm.data(diffstat=self.ui.popbuffer())
         if diff:
             self.ui.pushbuffer()
             self._differ.showdiff(self.ui, ctx, diffopts, stat=False)
-            self.ui.write((',\n  "diff": "%s"') % j(self.ui.popbuffer()))
-
-        self.ui.write("\n }")
+            fm.data(diff=self.ui.popbuffer())
 
 class changesettemplater(changesetprinter):
     '''format changeset information.
 
     Note: there are a variety of convenience functions to build a
     changesettemplater for common cases. See functions such as:
     maketemplater, changesetdisplayer, buildcommittemplate, or other
     functions that use changesest_templater.
     '''
 
     # Arguments before "buffered" used to be positional. Consider not
     # adding/removing arguments before "buffered" to not break callers.
     def __init__(self, ui, repo, tmplspec, differ=None, diffopts=None,
                  buffered=False):
         changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
         # tres is shared with _graphnodeformatter()
         self._tresources = tres = formatter.templateresources(ui, repo)
         self.t = formatter.loadtemplater(ui, tmplspec,
                                          defaults=templatekw.keywords,
                                          resources=tres,
                                          cache=templatekw.defaulttempl)
         self._counter = itertools.count()
 
         self._tref = tmplspec.ref
         self._parts = {'header': '', 'footer': '',
                        tmplspec.ref: tmplspec.ref,
                        'docheader': '', 'docfooter': '',
                        'separator': ''}
         if tmplspec.mapfile:
             # find correct templates for current mode, for backward
             # compatibility with 'log -v/-q/--debug' using a mapfile
             tmplmodes = [
                 (True, ''),
                 (self.ui.verbose, '_verbose'),
                 (self.ui.quiet, '_quiet'),
                 (self.ui.debugflag, '_debug'),
             ]
             for mode, postfix in tmplmodes:
                 for t in self._parts:
                     cur = t + postfix
                     if mode and cur in self.t:
                         self._parts[t] = cur
         else:
             partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
             m = formatter.templatepartsmap(tmplspec, self.t, partnames)
             self._parts.update(m)
 
         if self._parts['docheader']:
             self.ui.write(self.t.render(self._parts['docheader'], {}))
 
     def close(self):
         if self._parts['docfooter']:
             if not self.footer:
                 self.footer = ""
             self.footer += self.t.render(self._parts['docfooter'], {})
         return super(changesettemplater, self).close()
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
         props = props.copy()
         props['ctx'] = ctx
         props['index'] = index = next(self._counter)
         props['revcache'] = {'copies': copies}
 
         # write separator, which wouldn't work well with the header part below
         # since there's inherently a conflict between header (across items) and
         # separator (per item)
         if self._parts['separator'] and index > 0:
             self.ui.write(self.t.render(self._parts['separator'], {}))
 
         # write header
         if self._parts['header']:
             h = self.t.render(self._parts['header'], props)
             if self.buffered:
                 self.header[ctx.rev()] = h
             else:
                 if self.lastheader != h:
                     self.lastheader = h
                     self.ui.write(h)
 
         # write changeset metadata, then patch if requested
         key = self._parts[self._tref]
         self.ui.write(self.t.render(key, props))
         self._showpatch(ctx)
 
         if self._parts['footer']:
             if not self.footer:
                 self.footer = self.t.render(self._parts['footer'], props)
 
 def templatespec(tmpl, mapfile):
     if mapfile:
         return formatter.templatespec('changeset', tmpl, mapfile)
     else:
         return formatter.templatespec('', tmpl, None)
 
 def _lookuptemplate(ui, tmpl, style):
     """Find the template matching the given template spec or style
 
     See formatter.lookuptemplate() for details.
     """
 
     # ui settings
     if not tmpl and not style: # template are stronger than style
         tmpl = ui.config('ui', 'logtemplate')
         if tmpl:
             return templatespec(templater.unquotestring(tmpl), None)
         else:
             style = util.expandpath(ui.config('ui', 'style'))
 
     if not tmpl and style:
         mapfile = style
         if not os.path.split(mapfile)[0]:
             mapname = (templater.templatepath('map-cmdline.' + mapfile)
                        or templater.templatepath(mapfile))
             if mapname:
                 mapfile = mapname
         return templatespec(None, mapfile)
 
     if not tmpl:
         return templatespec(None, None)
 
     return formatter.lookuptemplate(ui, 'changeset', tmpl)
 
 def maketemplater(ui, repo, tmpl, buffered=False):
     """Create a changesettemplater from a literal template 'tmpl'
     byte-string."""
     spec = templatespec(tmpl, None)
     return changesettemplater(ui, repo, spec, buffered=buffered)
 
 def changesetdisplayer(ui, repo, opts, differ=None, buffered=False):
     """show one changeset using template or regular display.
 
     Display format will be the first non-empty hit of:
     1. option 'template'
     2. option 'style'
     3. [ui] setting 'logtemplate'
     4. [ui] setting 'style'
     If all of these values are either the unset or the empty string,
     regular display via changesetprinter() is done.
     """
     postargs = (differ, opts, buffered)
     if opts.get('template') == 'json':
         return jsonchangeset(ui, repo, *postargs)
 
     spec = _lookuptemplate(ui, opts.get('template'), opts.get('style'))
 
     if not spec.ref and not spec.tmpl and not spec.mapfile:
         return changesetprinter(ui, repo, *postargs)
 
     return changesettemplater(ui, repo, spec, *postargs)
 
 def _makematcher(repo, revs, pats, opts):
     """Build matcher and expanded patterns from log options
 
     If --follow, revs are the revisions to follow from.
 
     Returns (match, pats, slowpath) where
     - match: a matcher built from the given pats and -I/-X opts
     - pats: patterns used (globs are expanded on Windows)
     - slowpath: True if patterns aren't as simple as scanning filelogs
     """
     # pats/include/exclude are passed to match.match() directly in
     # _matchfiles() revset but walkchangerevs() builds its matcher with
     # scmutil.match(). The difference is input pats are globbed on
     # platforms without shell expansion (windows).
     wctx = repo[None]
     match, pats = scmutil.matchandpats(wctx, pats, opts)
     slowpath = match.anypats() or (not match.always() and opts.get('removed'))
     if not slowpath:
         follow = opts.get('follow') or opts.get('follow_first')
         startctxs = []
         if follow and opts.get('rev'):
             startctxs = [repo[r] for r in revs]
         for f in match.files():
             if follow and startctxs:
                 # No idea if the path was a directory at that revision, so
                 # take the slow path.
                 if any(f not in c for c in startctxs):
                     slowpath = True
                     continue
             elif follow and f not in wctx:
                 # If the file exists, it may be a directory, so let it
                 # take the slow path.
                 if os.path.exists(repo.wjoin(f)):
                     slowpath = True
                     continue
                 else:
                     raise error.Abort(_('cannot follow file not in parent '
                                         'revision: "%s"') % f)
             filelog = repo.file(f)
             if not filelog:
                 # A zero count may be a directory or deleted file, so
                 # try to find matching entries on the slow path.
                 if follow:
                     raise error.Abort(
                         _('cannot follow nonexistent file: "%s"') % f)
                 slowpath = True
 
         # We decided to fall back to the slowpath because at least one
         # of the paths was not a file. Check to see if at least one of them
         # existed in history - in that case, we'll continue down the
         # slowpath; otherwise, we can turn off the slowpath
         if slowpath:
             for path in match.files():
                 if path == '.' or path in repo.store:
                     break
             else:
                 slowpath = False
 
     return match, pats, slowpath
 
 def _fileancestors(repo, revs, match, followfirst):
     fctxs = []
     for r in revs:
         ctx = repo[r]
         fctxs.extend(ctx[f].introfilectx() for f in ctx.walk(match))
 
     # When displaying a revision with --patch --follow FILE, we have
     # to know which file of the revision must be diffed. With
     # --follow, we want the names of the ancestors of FILE in the
     # revision, stored in "fcache". "fcache" is populated as a side effect
     # of the graph traversal.
     fcache = {}
     def filematcher(ctx):
         return scmutil.matchfiles(repo, fcache.get(ctx.rev(), []))
 
     def revgen():
         for rev, cs in dagop.filectxancestors(fctxs, followfirst=followfirst):
             fcache[rev] = [c.path() for c in cs]
             yield rev
     return smartset.generatorset(revgen(), iterasc=False), filematcher
 
 def _makenofollowfilematcher(repo, pats, opts):
     '''hook for extensions to override the filematcher for non-follow cases'''
     return None
 
 _opt2logrevset = {
     'no_merges':        ('not merge()', None),
     'only_merges':      ('merge()', None),
     '_matchfiles':      (None, '_matchfiles(%ps)'),
     'date':             ('date(%s)', None),
     'branch':           ('branch(%s)', '%lr'),
     '_patslog':         ('filelog(%s)', '%lr'),
     'keyword':          ('keyword(%s)', '%lr'),
     'prune':            ('ancestors(%s)', 'not %lr'),
     'user':             ('user(%s)', '%lr'),
 }
 
 def _makerevset(repo, match, pats, slowpath, opts):
     """Return a revset string built from log options and file patterns"""
     opts = dict(opts)
     # follow or not follow?
     follow = opts.get('follow') or opts.get('follow_first')
 
     # branch and only_branch are really aliases and must be handled at
     # the same time
     opts['branch'] = opts.get('branch', []) + opts.get('only_branch', [])
     opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']]
 
     if slowpath:
         # See walkchangerevs() slow path.
         #
         # pats/include/exclude cannot be represented as separate
         # revset expressions as their filtering logic applies at file
         # level. For instance "-I a -X b" matches a revision touching
         # "a" and "b" while "file(a) and not file(b)" does
         # not. Besides, filesets are evaluated against the working
         # directory.
         matchargs = ['r:', 'd:relpath']
         for p in pats:
             matchargs.append('p:' + p)
         for p in opts.get('include', []):
             matchargs.append('i:' + p)
         for p in opts.get('exclude', []):
             matchargs.append('x:' + p)
         opts['_matchfiles'] = matchargs
     elif not follow:
         opts['_patslog'] = list(pats)
 
     expr = []
     for op, val in sorted(opts.iteritems()):
         if not val:
             continue
         if op not in _opt2logrevset:
             continue
         revop, listop = _opt2logrevset[op]
         if revop and '%' not in revop:
             expr.append(revop)
         elif not listop:
             expr.append(revsetlang.formatspec(revop, val))
         else:
             if revop:
                 val = [revsetlang.formatspec(revop, v) for v in val]
             expr.append(revsetlang.formatspec(listop, val))
 
     if expr:
         expr = '(' + ' and '.join(expr) + ')'
     else:
         expr = None
     return expr
 
 def _initialrevs(repo, opts):
     """Return the initial set of revisions to be filtered or followed"""
     follow = opts.get('follow') or opts.get('follow_first')
     if opts.get('rev'):
         revs = scmutil.revrange(repo, opts['rev'])
     elif follow and repo.dirstate.p1() == nullid:
         revs = smartset.baseset()
     elif follow:
         revs = repo.revs('.')
     else:
         revs = smartset.spanset(repo)
         revs.reverse()
     return revs
 
 def getrevs(repo, pats, opts):
     """Return (revs, differ) where revs is a smartset
 
     differ is a changesetdiffer with pre-configured file matcher.
     """
     follow = opts.get('follow') or opts.get('follow_first')
     followfirst = opts.get('follow_first')
     limit = getlimit(opts)
     revs = _initialrevs(repo, opts)
     if not revs:
         return smartset.baseset(), None
     match, pats, slowpath = _makematcher(repo, revs, pats, opts)
     filematcher = None
     if follow:
         if slowpath or match.always():
             revs = dagop.revancestors(repo, revs, followfirst=followfirst)
         else:
             revs, filematcher = _fileancestors(repo, revs, match, followfirst)
         revs.reverse()
     if filematcher is None:
         filematcher = _makenofollowfilematcher(repo, pats, opts)
     if filematcher is None:
         def filematcher(ctx):
             return match
 
     expr = _makerevset(repo, match, pats, slowpath, opts)
     if opts.get('graph') and opts.get('rev'):
         # User-specified revs might be unsorted, but don't sort before
         # _makerevset because it might depend on the order of revs
         if not (revs.isdescending() or revs.istopo()):
             revs.sort(reverse=True)
     if expr:
         matcher = revset.match(None, expr)
         revs = matcher(repo, revs)
     if limit is not None:
         revs = revs.slice(0, limit)
 
     differ = changesetdiffer()
     differ._makefilematcher = filematcher
     return revs, differ
 
 def _parselinerangeopt(repo, opts):
     """Parse --line-range log option and return a list of tuples (filename,
     (fromline, toline)).
     """
     linerangebyfname = []
     for pat in opts.get('line_range', []):
         try:
             pat, linerange = pat.rsplit(',', 1)
         except ValueError:
             raise error.Abort(_('malformatted line-range pattern %s') % pat)
         try:
             fromline, toline = map(int, linerange.split(':'))
         except ValueError:
             raise error.Abort(_("invalid line range for %s") % pat)
         msg = _("line range pattern '%s' must match exactly one file") % pat
         fname = scmutil.parsefollowlinespattern(repo, None, pat, msg)
         linerangebyfname.append(
             (fname, util.processlinerange(fromline, toline)))
     return linerangebyfname
 
 def getlinerangerevs(repo, userrevs, opts):
     """Return (revs, differ).
 
     "revs" are revisions obtained by processing "line-range" log options and
     walking block ancestors of each specified file/line-range.
 
     "differ" is a changesetdiffer with pre-configured file matcher and hunks
     filter.
     """
     wctx = repo[None]
 
     # Two-levels map of "rev -> file ctx -> [line range]".
     linerangesbyrev = {}
     for fname, (fromline, toline) in _parselinerangeopt(repo, opts):
         if fname not in wctx:
             raise error.Abort(_('cannot follow file not in parent '
                                 'revision: "%s"') % fname)
         fctx = wctx.filectx(fname)
         for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
             rev = fctx.introrev()
             if rev not in userrevs:
                 continue
             linerangesbyrev.setdefault(
                 rev, {}).setdefault(
                     fctx.path(), []).append(linerange)
 
     def nofilterhunksfn(fctx, hunks):
         return hunks
 
     def hunksfilter(ctx):
         fctxlineranges = linerangesbyrev.get(ctx.rev())
         if fctxlineranges is None:
             return nofilterhunksfn
 
         def filterfn(fctx, hunks):
             lineranges = fctxlineranges.get(fctx.path())
             if lineranges is not None:
                 for hr, lines in hunks:
                     if hr is None: # binary
                         yield hr, lines
                         continue
                     if any(mdiff.hunkinrange(hr[2:], lr)
                            for lr in lineranges):
                         yield hr, lines
             else:
                 for hunk in hunks:
                     yield hunk
 
         return filterfn
 
     def filematcher(ctx):
         files = list(linerangesbyrev.get(ctx.rev(), []))
         return scmutil.matchfiles(repo, files)
 
     revs = sorted(linerangesbyrev, reverse=True)
 
     differ = changesetdiffer()
     differ._makefilematcher = filematcher
     differ._makehunksfilter = hunksfilter
     return revs, differ
 
 def _graphnodeformatter(ui, displayer):
     spec = ui.config('ui', 'graphnodetemplate')
     if not spec:
         return templatekw.getgraphnode  # fast path for "{graphnode}"
 
     spec = templater.unquotestring(spec)
     if isinstance(displayer, changesettemplater):
         # reuse cache of slow templates
         tres = displayer._tresources
     else:
         tres = formatter.templateresources(ui)
     templ = formatter.maketemplater(ui, spec, defaults=templatekw.keywords,
                                     resources=tres)
     def formatnode(repo, ctx):
         props = {'ctx': ctx, 'repo': repo}
         return templ.renderdefault(props)
     return formatnode
 
 def displaygraph(ui, repo, dag, displayer, edgefn, getrenamed=None, props=None):
     props = props or {}
     formatnode = _graphnodeformatter(ui, displayer)
     state = graphmod.asciistate()
     styles = state['styles']
 
     # only set graph styling if HGPLAIN is not set.
     if ui.plain('graph'):
         # set all edge styles to |, the default pre-3.8 behaviour
         styles.update(dict.fromkeys(styles, '|'))
     else:
         edgetypes = {
             'parent': graphmod.PARENT,
             'grandparent': graphmod.GRANDPARENT,
             'missing': graphmod.MISSINGPARENT
         }
         for name, key in edgetypes.items():
             # experimental config: experimental.graphstyle.*
             styles[key] = ui.config('experimental', 'graphstyle.%s' % name,
                                     styles[key])
             if not styles[key]:
                 styles[key] = None
 
         # experimental config: experimental.graphshorten
         state['graphshorten'] = ui.configbool('experimental', 'graphshorten')
 
     for rev, type, ctx, parents in dag:
         char = formatnode(repo, ctx)
         copies = None
         if getrenamed and ctx.rev():
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, ctx.rev())
                 if rename:
                     copies.append((fn, rename[0]))
         edges = edgefn(type, char, state, rev, parents)
         firstedge = next(edges)
         width = firstedge[2]
         displayer.show(ctx, copies=copies,
                        graphwidth=width, **pycompat.strkwargs(props))
         lines = displayer.hunk.pop(rev).split('\n')
         if not lines[-1]:
             del lines[-1]
         displayer.flush(ctx)
         for type, char, width, coldata in itertools.chain([firstedge], edges):
             graphmod.ascii(ui, state, type, char, lines, coldata)
             lines = []
     displayer.close()
 
 def displaygraphrevs(ui, repo, revs, displayer, getrenamed):
     revdag = graphmod.dagwalker(repo, revs)
     displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges, getrenamed)
 
 def displayrevs(ui, repo, revs, displayer, getrenamed):
     for rev in revs:
         ctx = repo[rev]
         copies = None
         if getrenamed is not None and rev:
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, rev)
                 if rename:
                     copies.append((fn, rename[0]))
         displayer.show(ctx, copies=copies)
         displayer.flush(ctx)
     displayer.close()
 
 def checkunsupportedgraphflags(pats, opts):
     for op in ["newest_first"]:
         if op in opts and opts[op]:
             raise error.Abort(_("-G/--graph option is incompatible with --%s")
                              % op.replace("_", "-"))
 
 def graphrevs(repo, nodes, opts):
     limit = getlimit(opts)
     nodes.reverse()
     if limit is not None:
         nodes = nodes[:limit]
     return graphmod.nodes(repo, nodes)

tests/test-command-template.t

@@ -1,4883 +1,4884 b''
   $ 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'
 
 Test arithmetic operators have the right precedence:
 
   $ hg log -l 1 -T '{date(date, "%Y") + 5 * 10} {date(date, "%Y") - 2 * 3}\n'
   2020 1964
   $ hg log -l 1 -T '{date(date, "%Y") * 5 + 10} {date(date, "%Y") * 3 - 2}\n'
   9860 5908
 
 Test division:
 
   $ hg debugtemplate -r0 -v '{5 / 2} {mod(5, 2)}\n'
   (template
     (/
       (integer '5')
       (integer '2'))
     (string ' ')
     (func
       (symbol 'mod')
       (list
         (integer '5')
         (integer '2')))
     (string '\n'))
   2 1
   $ hg debugtemplate -r0 -v '{5 / -2} {mod(5, -2)}\n'
   (template
     (/
       (integer '5')
       (negate
         (integer '2')))
     (string ' ')
     (func
       (symbol 'mod')
       (list
         (integer '5')
         (negate
           (integer '2'))))
     (string '\n'))
   -3 -1
   $ hg debugtemplate -r0 -v '{-5 / 2} {mod(-5, 2)}\n'
   (template
     (/
       (negate
         (integer '5'))
       (integer '2'))
     (string ' ')
     (func
       (symbol 'mod')
       (list
         (negate
           (integer '5'))
         (integer '2')))
     (string '\n'))
   -3 1
   $ hg debugtemplate -r0 -v '{-5 / -2} {mod(-5, -2)}\n'
   (template
     (/
       (negate
         (integer '5'))
       (negate
         (integer '2')))
     (string ' ')
     (func
       (symbol 'mod')
       (list
         (negate
           (integer '5'))
         (negate
           (integer '2'))))
     (string '\n'))
   2 -1
 
 Filters bind closer than arithmetic:
 
   $ hg debugtemplate -r0 -v '{revset(".")|count - 1}\n'
   (template
     (-
       (|
         (func
           (symbol 'revset')
           (string '.'))
         (symbol 'count'))
       (integer '1'))
     (string '\n'))
   0
 
 But negate binds closer still:
 
   $ hg debugtemplate -r0 -v '{1-3|stringify}\n'
   (template
     (-
       (integer '1')
       (|
         (integer '3')
         (symbol 'stringify')))
     (string '\n'))
   hg: parse error: arithmetic only defined on integers
   [255]
   $ hg debugtemplate -r0 -v '{-3|stringify}\n'
   (template
     (|
       (negate
         (integer '3'))
       (symbol 'stringify'))
     (string '\n'))
   -3
 
 Filters bind as close as map operator:
 
   $ hg debugtemplate -r0 -v '{desc|splitlines % "{line}\n"}'
   (template
     (%
       (|
         (symbol 'desc')
         (symbol 'splitlines'))
       (template
         (symbol 'line')
         (string '\n'))))
   line 1
   line 2
 
 Keyword arguments:
 
   $ hg debugtemplate -r0 -v '{foo=bar|baz}'
   (template
     (keyvalue
       (symbol 'foo')
       (|
         (symbol 'bar')
         (symbol 'baz'))))
   hg: parse error: can't use a key-value pair in this context
   [255]
 
   $ hg debugtemplate '{pad("foo", width=10, left=true)}\n'
          foo
 
 Call function which takes named arguments by filter syntax:
 
   $ hg debugtemplate '{" "|separate}'
   $ hg debugtemplate '{("not", "an", "argument", "list")|separate}'
   hg: parse error: unknown method 'list'
   [255]
 
 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 log --template '{join(file_copies, ",\n")}\n' -r .
   fourth (second)
   $ hg log -T '{file_copies % "{source} -> {name}\n"}' -r .
   second -> fourth
   $ hg log -T '{rev} {ifcontains("fourth", file_copies, "t", "f")}\n' -r .:7
   8 t
   7 f
 
 Working-directory revision has special identifiers, though they are still
 experimental:
 
   $ hg log -r 'wdir()' -T '{rev}:{node}\n'
   2147483647:ffffffffffffffffffffffffffffffffffffffff
 
 Some keywords are invalid for working-directory revision, but they should
 never cause crash:
 
   $ hg log -r 'wdir()' -T '{manifest}\n'
   
 
 Internal resources shouldn't be exposed (issue5699):
 
   $ hg log -r. -T '{cache}{ctx}{repo}{revcache}{templ}{ui}'
 
 Never crash on internal resource not available:
 
   $ hg --cwd .. debugtemplate '{"c0bebeef"|shortest}\n'
   abort: template resource not available: ctx
   [255]
 
   $ hg config -T '{author}'
 
 Quoting for ui.logtemplate
 
   $ hg tip --config "ui.logtemplate={rev}\n"
   8
   $ hg tip --config "ui.logtemplate='{rev}\n'"
   8
   $ hg tip --config 'ui.logtemplate="{rev}\n"'
   8
   $ hg tip --config 'ui.logtemplate=n{rev}\n'
   n8
 
 Make sure user/global hgrc does not affect tests
 
   $ echo '[ui]' > .hg/hgrc
   $ echo 'logtemplate =' >> .hg/hgrc
   $ echo 'style =' >> .hg/hgrc
 
 Add some simple styles to settings
 
   $ cat <<'EOF' >> .hg/hgrc
   > [templates]
   > simple = "{rev}\n"
   > simple2 = {rev}\n
   > rev = "should not precede {rev} keyword\n"
   > EOF
 
   $ hg log -l1 -Tsimple
   8
   $ hg log -l1 -Tsimple2
   8
   $ hg log -l1 -Trev
   should not precede 8 keyword
   $ hg log -l1 -T '{simple}'
   8
 
 Map file shouldn't see user templates:
 
   $ cat <<EOF > tmpl
   > changeset = 'nothing expanded:{simple}\n'
   > EOF
   $ hg log -l1 --style ./tmpl
   nothing expanded:
 
 Test templates and style maps in files:
 
   $ echo "{rev}" > tmpl
   $ hg log -l1 -T./tmpl
   8
   $ hg log -l1 -Tblah/blah
   blah/blah (no-eol)
 
   $ printf 'changeset = "{rev}\\n"\n' > map-simple
   $ hg log -l1 -T./map-simple
   8
 
  a map file may have [templates] and [templatealias] sections:
 
   $ cat <<'EOF' > map-simple
   > [templates]
   > changeset = "{a}\n"
   > [templatealias]
   > a = rev
   > EOF
   $ hg log -l1 -T./map-simple
   8
 
  so it can be included in hgrc
 
   $ cat <<EOF > myhgrc
   > %include $HGRCPATH
   > %include map-simple
   > [templates]
   > foo = "{changeset}"
   > EOF
   $ HGRCPATH=./myhgrc hg log -l1 -Tfoo
   8
   $ HGRCPATH=./myhgrc hg log -l1 -T'{a}\n'
   8
 
 Test template map inheritance
 
   $ echo "__base__ = map-cmdline.default" > map-simple
   $ printf 'cset = "changeset: ***{rev}***\\n"\n' >> map-simple
   $ hg log -l1 -T./map-simple
   changeset: ***8***
   tag:         tip
   user:        test
   date:        Wed Jan 01 10:01:00 2020 +0000
   summary:     third
   
 
 Test docheader, docfooter and separator in template map
 
   $ cat <<'EOF' > map-myjson
   > docheader = '\{\n'
   > docfooter = '\n}\n'
   > separator = ',\n'
   > changeset = ' {dict(rev, node|short)|json}'
   > EOF
   $ hg log -l2 -T./map-myjson
   {
    {"node": "95c24699272e", "rev": 8},
    {"node": "29114dbae42b", "rev": 7}
   }
 
 Test docheader, docfooter and separator in [templates] section
 
   $ cat <<'EOF' >> .hg/hgrc
   > [templates]
   > myjson = ' {dict(rev, node|short)|json}'
   > myjson:docheader = '\{\n'
   > myjson:docfooter = '\n}\n'
   > myjson:separator = ',\n'
   > :docheader = 'should not be selected as a docheader for literal templates\n'
   > EOF
   $ hg log -l2 -Tmyjson
   {
    {"node": "95c24699272e", "rev": 8},
    {"node": "29114dbae42b", "rev": 7}
   }
   $ hg log -l1 -T'{rev}\n'
   8
 
 Template should precede style option
 
   $ hg log -l1 --style default -T '{rev}\n'
   8
 
 Add a commit with empty description, to ensure that the templates
 below will omit the description line.
 
   $ echo c >> c
   $ hg add c
   $ hg commit -qm ' '
 
 Default style is like normal output. Phases style should be the same
 as default style, except for extra phase lines.
 
   $ hg log > log.out
   $ hg log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg log -T phases > phases.out
   $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
 
   $ hg log -v > log.out
   $ hg log -v --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg log -v -T phases > phases.out
   $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
   +phase:       draft
 
   $ hg log -q > log.out
   $ hg log -q --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg log -q -T phases > phases.out
   $ cmp log.out phases.out || diff -u log.out phases.out
 
   $ hg log --debug > log.out
   $ hg log --debug --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg log --debug -T phases > phases.out
   $ cmp log.out phases.out || diff -u log.out phases.out
 
 Default style of working-directory revision should also be the same (but
 date may change while running tests):
 
   $ hg log -r 'wdir()' | sed 's|^date:.*|date:|' > log.out
   $ hg log -r 'wdir()' --style default | sed 's|^date:.*|date:|' > style.out
   $ cmp log.out style.out || diff -u log.out style.out
 
   $ hg log -r 'wdir()' -v | sed 's|^date:.*|date:|' > log.out
   $ hg log -r 'wdir()' -v --style default | sed 's|^date:.*|date:|' > style.out
   $ cmp log.out style.out || diff -u log.out style.out
 
   $ hg log -r 'wdir()' -q > log.out
   $ hg log -r 'wdir()' -q --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
 
   $ hg log -r 'wdir()' --debug | sed 's|^date:.*|date:|' > log.out
   $ hg log -r 'wdir()' --debug --style default \
   > | sed 's|^date:.*|date:|' > style.out
   $ cmp log.out style.out || diff -u log.out style.out
 
 Default style should also preserve color information (issue2866):
 
   $ cp $HGRCPATH $HGRCPATH-bak
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > color=
   > EOF
 
   $ hg --color=debug log > log.out
   $ hg --color=debug log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg --color=debug log -T phases > phases.out
   $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
 
   $ hg --color=debug -v log > log.out
   $ hg --color=debug -v log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg --color=debug -v log -T phases > phases.out
   $ diff -U 0 log.out phases.out | egrep -v '^---|^\+\+\+|^@@'
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
   +[log.phase|phase:       draft]
 
   $ hg --color=debug -q log > log.out
   $ hg --color=debug -q log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg --color=debug -q log -T phases > phases.out
   $ cmp log.out phases.out || diff -u log.out phases.out
 
   $ hg --color=debug --debug log > log.out
   $ hg --color=debug --debug log --style default > style.out
   $ cmp log.out style.out || diff -u log.out style.out
   $ hg --color=debug --debug log -T phases > phases.out
   $ cmp log.out phases.out || diff -u log.out phases.out
 
   $ mv $HGRCPATH-bak $HGRCPATH
 
 Remove commit with empty commit message, so as to not pollute further
 tests.
 
   $ hg --config extensions.strip= strip -q .
 
 Revision with no copies (used to print a traceback):
 
   $ hg tip -v --template '\n'
   
 
 Compact style works:
 
   $ hg log -Tcompact
   8[tip]   95c24699272e   2020-01-01 10:01 +0000   test
     third
   
   7:-1   29114dbae42b   1970-01-12 13:46 +0000   user
     second
   
   6:5,4   d41e714fe50d   1970-01-18 08:40 +0000   person
     merge
   
   5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
     new head
   
   4   bbe44766e73d   1970-01-17 04:53 +0000   person
     new branch
   
   3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
     no user, no domain
   
   2   97054abb4ab8   1970-01-14 21:20 +0000   other
     no person
   
   1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
     other 1
   
   0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
     line 1
   
 
   $ hg log -v --style compact
   8[tip]   95c24699272e   2020-01-01 10:01 +0000   test
     third
   
   7:-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
     second
   
   6:5,4   d41e714fe50d   1970-01-18 08:40 +0000   person
     merge
   
   5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
     new head
   
   4   bbe44766e73d   1970-01-17 04:53 +0000   person
     new branch
   
   3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
     no user, no domain
   
   2   97054abb4ab8   1970-01-14 21:20 +0000   other@place
     no person
   
   1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
     other 1
   other 2
   
   other 3
   
   0   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
     line 1
   line 2
   
 
   $ hg log --debug --style compact
   8[tip]:7,-1   95c24699272e   2020-01-01 10:01 +0000   test
     third
   
   7:-1,-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
     second
   
   6:5,4   d41e714fe50d   1970-01-18 08:40 +0000   person
     merge
   
   5:3,-1   13207e5a10d9   1970-01-18 08:40 +0000   person
     new head
   
   4:3,-1   bbe44766e73d   1970-01-17 04:53 +0000   person
     new branch
   
   3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
     no user, no domain
   
   2:1,-1   97054abb4ab8   1970-01-14 21:20 +0000   other@place
     no person
   
   1:0,-1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
     other 1
   other 2
   
   other 3
   
   0:-1,-1   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
     line 1
   line 2
   
 
 Test xml styles:
 
   $ hg log --style xml -r 'not all()'
   <?xml version="1.0"?>
   <log>
   </log>
 
   $ hg log --style xml
   <?xml version="1.0"?>
   <log>
   <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
   <tag>tip</tag>
   <author email="test">test</author>
   <date>2020-01-01T10:01:00+00:00</date>
   <msg xml:space="preserve">third</msg>
   </logentry>
   <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">second</msg>
   </logentry>
   <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
   <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
   <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:01+00:00</date>
   <msg xml:space="preserve">merge</msg>
   </logentry>
   <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
   <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:00+00:00</date>
   <msg xml:space="preserve">new head</msg>
   </logentry>
   <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
   <branch>foo</branch>
   <author email="person">person</author>
   <date>1970-01-17T04:53:20+00:00</date>
   <msg xml:space="preserve">new branch</msg>
   </logentry>
   <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
   <author email="person">person</author>
   <date>1970-01-16T01:06:40+00:00</date>
   <msg xml:space="preserve">no user, no domain</msg>
   </logentry>
   <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
   <author email="other@place">other</author>
   <date>1970-01-14T21:20:00+00:00</date>
   <msg xml:space="preserve">no person</msg>
   </logentry>
   <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
   <author email="other@place">A. N. Other</author>
   <date>1970-01-13T17:33:20+00:00</date>
   <msg xml:space="preserve">other 1
   other 2
   
   other 3</msg>
   </logentry>
   <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">line 1
   line 2</msg>
   </logentry>
   </log>
 
   $ hg log -v --style xml
   <?xml version="1.0"?>
   <log>
   <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
   <tag>tip</tag>
   <author email="test">test</author>
   <date>2020-01-01T10:01:00+00:00</date>
   <msg xml:space="preserve">third</msg>
   <paths>
   <path action="A">fourth</path>
   <path action="A">third</path>
   <path action="R">second</path>
   </paths>
   <copies>
   <copy source="second">fourth</copy>
   </copies>
   </logentry>
   <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">second</msg>
   <paths>
   <path action="A">second</path>
   </paths>
   </logentry>
   <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
   <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
   <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:01+00:00</date>
   <msg xml:space="preserve">merge</msg>
   <paths>
   </paths>
   </logentry>
   <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
   <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:00+00:00</date>
   <msg xml:space="preserve">new head</msg>
   <paths>
   <path action="A">d</path>
   </paths>
   </logentry>
   <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
   <branch>foo</branch>
   <author email="person">person</author>
   <date>1970-01-17T04:53:20+00:00</date>
   <msg xml:space="preserve">new branch</msg>
   <paths>
   </paths>
   </logentry>
   <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
   <author email="person">person</author>
   <date>1970-01-16T01:06:40+00:00</date>
   <msg xml:space="preserve">no user, no domain</msg>
   <paths>
   <path action="M">c</path>
   </paths>
   </logentry>
   <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
   <author email="other@place">other</author>
   <date>1970-01-14T21:20:00+00:00</date>
   <msg xml:space="preserve">no person</msg>
   <paths>
   <path action="A">c</path>
   </paths>
   </logentry>
   <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
   <author email="other@place">A. N. Other</author>
   <date>1970-01-13T17:33:20+00:00</date>
   <msg xml:space="preserve">other 1
   other 2
   
   other 3</msg>
   <paths>
   <path action="A">b</path>
   </paths>
   </logentry>
   <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">line 1
   line 2</msg>
   <paths>
   <path action="A">a</path>
   </paths>
   </logentry>
   </log>
 
   $ hg log --debug --style xml
   <?xml version="1.0"?>
   <log>
   <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a">
   <tag>tip</tag>
   <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="test">test</author>
   <date>2020-01-01T10:01:00+00:00</date>
   <msg xml:space="preserve">third</msg>
   <paths>
   <path action="A">fourth</path>
   <path action="A">third</path>
   <path action="R">second</path>
   </paths>
   <copies>
   <copy source="second">fourth</copy>
   </copies>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">second</msg>
   <paths>
   <path action="A">second</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="6" node="d41e714fe50d9e4a5f11b4d595d543481b5f980b">
   <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
   <parent revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:01+00:00</date>
   <msg xml:space="preserve">merge</msg>
   <paths>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
   <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="person">person</author>
   <date>1970-01-18T08:40:00+00:00</date>
   <msg xml:space="preserve">new head</msg>
   <paths>
   <path action="A">d</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="4" node="bbe44766e73d5f11ed2177f1838de10c53ef3e74">
   <branch>foo</branch>
   <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="person">person</author>
   <date>1970-01-17T04:53:20+00:00</date>
   <msg xml:space="preserve">new branch</msg>
   <paths>
   </paths>
   <extra key="branch">foo</extra>
   </logentry>
   <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
   <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="person">person</author>
   <date>1970-01-16T01:06:40+00:00</date>
   <msg xml:space="preserve">no user, no domain</msg>
   <paths>
   <path action="M">c</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
   <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="other@place">other</author>
   <date>1970-01-14T21:20:00+00:00</date>
   <msg xml:space="preserve">no person</msg>
   <paths>
   <path action="A">c</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
   <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="other@place">A. N. Other</author>
   <date>1970-01-13T17:33:20+00:00</date>
   <msg xml:space="preserve">other 1
   other 2
   
   other 3</msg>
   <paths>
   <path action="A">b</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <parent revision="-1" node="0000000000000000000000000000000000000000" />
   <author email="user@hostname">User Name</author>
   <date>1970-01-12T13:46:40+00:00</date>
   <msg xml:space="preserve">line 1
   line 2</msg>
   <paths>
   <path action="A">a</path>
   </paths>
   <extra key="branch">default</extra>
   </logentry>
   </log>
 
 
 Test JSON style:
 
   $ hg log -k nosuch -Tjson
-  []
+  [
+  ]
 
   $ hg log -qr . -Tjson
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a"
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "rev": 8
    }
   ]
 
   $ hg log -vpr . -Tjson --stat
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [1577872860, 0],
     "desc": "third",
-    "bookmarks": [],
-    "tags": ["tip"],
+    "diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n",
+    "diffstat": " fourth |  1 +\n second |  1 -\n third  |  1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n",
+    "files": ["fourth", "second", "third"],
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
-    "files": ["fourth", "second", "third"],
-    "diffstat": " fourth |  1 +\n second |  1 -\n third  |  1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n",
-    "diff": "diff -r 29114dbae42b -r 95c24699272e fourth\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/fourth\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+second\ndiff -r 29114dbae42b -r 95c24699272e second\n--- a/second\tMon Jan 12 13:46:40 1970 +0000\n+++ /dev/null\tThu Jan 01 00:00:00 1970 +0000\n@@ -1,1 +0,0 @@\n-second\ndiff -r 29114dbae42b -r 95c24699272e third\n--- /dev/null\tThu Jan 01 00:00:00 1970 +0000\n+++ b/third\tWed Jan 01 10:01:00 2020 +0000\n@@ -0,0 +1,1 @@\n+third\n"
+    "phase": "draft",
+    "rev": 8,
+    "tags": ["tip"],
+    "user": "test"
    }
   ]
 
 honor --git but not format-breaking diffopts
   $ hg --config diff.noprefix=True log --git -vpr . -Tjson
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [1577872860, 0],
     "desc": "third",
-    "bookmarks": [],
-    "tags": ["tip"],
+    "diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n",
+    "files": ["fourth", "second", "third"],
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
-    "files": ["fourth", "second", "third"],
-    "diff": "diff --git a/second b/fourth\nrename from second\nrename to fourth\ndiff --git a/third b/third\nnew file mode 100644\n--- /dev/null\n+++ b/third\n@@ -0,0 +1,1 @@\n+third\n"
+    "phase": "draft",
+    "rev": 8,
+    "tags": ["tip"],
+    "user": "test"
    }
   ]
 
   $ hg log -T json
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [1577872860, 0],
     "desc": "third",
-    "bookmarks": [],
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
+    "phase": "draft",
+    "rev": 8,
     "tags": ["tip"],
-    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"]
+    "user": "test"
    },
    {
-    "rev": 7,
-    "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "User Name <user@hostname>",
     "date": [1000000, 0],
     "desc": "second",
-    "bookmarks": [],
+    "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
+    "parents": ["0000000000000000000000000000000000000000"],
+    "phase": "draft",
+    "rev": 7,
     "tags": [],
-    "parents": ["0000000000000000000000000000000000000000"]
+    "user": "User Name <user@hostname>"
    },
    {
-    "rev": 6,
-    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1500001, 0],
     "desc": "merge",
-    "bookmarks": [],
+    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
+    "phase": "draft",
+    "rev": 6,
     "tags": [],
-    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"]
+    "user": "person"
    },
    {
-    "rev": 5,
-    "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1500000, 0],
     "desc": "new head",
-    "bookmarks": [],
+    "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
+    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "phase": "draft",
+    "rev": 5,
     "tags": [],
-    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"]
+    "user": "person"
    },
    {
-    "rev": 4,
-    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "bookmarks": [],
     "branch": "foo",
-    "phase": "draft",
-    "user": "person",
     "date": [1400000, 0],
     "desc": "new branch",
-    "bookmarks": [],
+    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "phase": "draft",
+    "rev": 4,
     "tags": [],
-    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"]
+    "user": "person"
    },
    {
-    "rev": 3,
-    "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1300000, 0],
     "desc": "no user, no domain",
-    "bookmarks": [],
+    "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
+    "parents": ["97054abb4ab824450e9164180baf491ae0078465"],
+    "phase": "draft",
+    "rev": 3,
     "tags": [],
-    "parents": ["97054abb4ab824450e9164180baf491ae0078465"]
+    "user": "person"
    },
    {
-    "rev": 2,
-    "node": "97054abb4ab824450e9164180baf491ae0078465",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "other@place",
     "date": [1200000, 0],
     "desc": "no person",
-    "bookmarks": [],
+    "node": "97054abb4ab824450e9164180baf491ae0078465",
+    "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
+    "phase": "draft",
+    "rev": 2,
     "tags": [],
-    "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"]
+    "user": "other@place"
    },
    {
-    "rev": 1,
-    "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "A. N. Other <other@place>",
     "date": [1100000, 0],
     "desc": "other 1\nother 2\n\nother 3",
-    "bookmarks": [],
+    "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
+    "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
+    "phase": "draft",
+    "rev": 1,
     "tags": [],
-    "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"]
+    "user": "A. N. Other <other@place>"
    },
    {
-    "rev": 0,
-    "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "User Name <user@hostname>",
     "date": [1000000, 0],
     "desc": "line 1\nline 2",
-    "bookmarks": [],
+    "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
+    "parents": ["0000000000000000000000000000000000000000"],
+    "phase": "draft",
+    "rev": 0,
     "tags": [],
-    "parents": ["0000000000000000000000000000000000000000"]
+    "user": "User Name <user@hostname>"
    }
   ]
 
   $ hg heads -v -Tjson
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [1577872860, 0],
     "desc": "third",
-    "bookmarks": [],
+    "files": ["fourth", "second", "third"],
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
+    "phase": "draft",
+    "rev": 8,
     "tags": ["tip"],
-    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
-    "files": ["fourth", "second", "third"]
+    "user": "test"
    },
    {
-    "rev": 6,
-    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1500001, 0],
     "desc": "merge",
-    "bookmarks": [],
+    "files": [],
+    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
+    "phase": "draft",
+    "rev": 6,
     "tags": [],
-    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
-    "files": []
+    "user": "person"
    },
    {
-    "rev": 4,
-    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "bookmarks": [],
     "branch": "foo",
-    "phase": "draft",
-    "user": "person",
     "date": [1400000, 0],
     "desc": "new branch",
-    "bookmarks": [],
+    "files": [],
+    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "phase": "draft",
+    "rev": 4,
     "tags": [],
-    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
-    "files": []
+    "user": "person"
    }
   ]
 
   $ hg log --debug -Tjson
   [
    {
-    "rev": 8,
-    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "added": ["fourth", "third"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [1577872860, 0],
     "desc": "third",
-    "bookmarks": [],
-    "tags": ["tip"],
-    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
+    "extra": {"branch": "default"},
     "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["fourth", "third"],
-    "removed": ["second"]
+    "node": "95c24699272ef57d062b8bccc32c878bf841784a",
+    "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
+    "phase": "draft",
+    "removed": ["second"],
+    "rev": 8,
+    "tags": ["tip"],
+    "user": "test"
    },
    {
-    "rev": 7,
-    "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
+    "added": ["second"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "User Name <user@hostname>",
     "date": [1000000, 0],
     "desc": "second",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["0000000000000000000000000000000000000000"],
+    "extra": {"branch": "default"},
     "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["second"],
-    "removed": []
+    "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
+    "parents": ["0000000000000000000000000000000000000000"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 7,
+    "tags": [],
+    "user": "User Name <user@hostname>"
    },
    {
-    "rev": 6,
-    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "added": [],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1500001, 0],
     "desc": "merge",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
+    "extra": {"branch": "default"},
     "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": []
+    "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
+    "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 6,
+    "tags": [],
+    "user": "person"
    },
    {
-    "rev": 5,
-    "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
+    "added": ["d"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1500000, 0],
     "desc": "new head",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "extra": {"branch": "default"},
     "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["d"],
-    "removed": []
+    "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
+    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 5,
+    "tags": [],
+    "user": "person"
    },
    {
-    "rev": 4,
-    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "added": [],
+    "bookmarks": [],
     "branch": "foo",
-    "phase": "draft",
-    "user": "person",
     "date": [1400000, 0],
     "desc": "new branch",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "extra": {"branch": "foo"},
     "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
-    "extra": {"branch": "foo"},
     "modified": [],
-    "added": [],
-    "removed": []
+    "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
+    "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 4,
+    "tags": [],
+    "user": "person"
    },
    {
-    "rev": 3,
-    "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
+    "added": [],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "person",
     "date": [1300000, 0],
     "desc": "no user, no domain",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["97054abb4ab824450e9164180baf491ae0078465"],
+    "extra": {"branch": "default"},
     "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
-    "extra": {"branch": "default"},
     "modified": ["c"],
-    "added": [],
-    "removed": []
+    "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
+    "parents": ["97054abb4ab824450e9164180baf491ae0078465"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 3,
+    "tags": [],
+    "user": "person"
    },
    {
-    "rev": 2,
-    "node": "97054abb4ab824450e9164180baf491ae0078465",
+    "added": ["c"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "other@place",
     "date": [1200000, 0],
     "desc": "no person",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
+    "extra": {"branch": "default"},
     "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["c"],
-    "removed": []
+    "node": "97054abb4ab824450e9164180baf491ae0078465",
+    "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 2,
+    "tags": [],
+    "user": "other@place"
    },
    {
-    "rev": 1,
-    "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
+    "added": ["b"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "A. N. Other <other@place>",
     "date": [1100000, 0],
     "desc": "other 1\nother 2\n\nother 3",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
+    "extra": {"branch": "default"},
     "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["b"],
-    "removed": []
+    "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
+    "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 1,
+    "tags": [],
+    "user": "A. N. Other <other@place>"
    },
    {
-    "rev": 0,
-    "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
+    "added": ["a"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "User Name <user@hostname>",
     "date": [1000000, 0],
     "desc": "line 1\nline 2",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["0000000000000000000000000000000000000000"],
+    "extra": {"branch": "default"},
     "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0",
-    "extra": {"branch": "default"},
     "modified": [],
-    "added": ["a"],
-    "removed": []
+    "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
+    "parents": ["0000000000000000000000000000000000000000"],
+    "phase": "draft",
+    "removed": [],
+    "rev": 0,
+    "tags": [],
+    "user": "User Name <user@hostname>"
    }
   ]
 
 Error if style not readable:
 
 #if unix-permissions no-root
   $ touch q
   $ chmod 0 q
   $ hg log --style ./q
   abort: Permission denied: ./q
   [255]
 #endif
 
 Error if no style:
 
   $ hg log --style notexist
   abort: style 'notexist' not found
   (available styles: bisect, changelog, compact, default, phases, show, status, xml)
   [255]
 
   $ hg log -T list
   available styles: bisect, changelog, compact, default, phases, show, status, xml
   abort: specify a template
   [255]
 
 Error if style missing key:
 
   $ echo 'q = q' > t
   $ hg log --style ./t
   abort: "changeset" not in template map
   [255]
 
 Error if style missing value:
 
   $ echo 'changeset =' > t
   $ hg log --style t
   hg: parse error at t:1: missing value
   [255]
 
 Error if include fails:
 
   $ echo 'changeset = q' >> t
 #if unix-permissions no-root
   $ hg log --style ./t
   abort: template file ./q: Permission denied
   [255]
   $ rm -f q
 #endif
 
 Include works:
 
   $ echo '{rev}' > q
   $ hg log --style ./t
   8
   7
   6
   5
   4
   3
   2
   1
   0
 
 Check that recursive reference does not fall into RuntimeError (issue4758):
 
  common mistake:
 
   $ cat << EOF > issue4758
   > changeset = '{changeset}\n'
   > EOF
   $ hg log --style ./issue4758
   abort: recursive reference 'changeset' in template
   [255]
 
  circular reference:
 
   $ cat << EOF > issue4758
   > changeset = '{foo}'
   > foo = '{changeset}'
   > EOF
   $ hg log --style ./issue4758
   abort: recursive reference 'foo' in template
   [255]
 
  buildmap() -> gettemplate(), where no thunk was made:
 
   $ cat << EOF > issue4758
   > changeset = '{files % changeset}\n'
   > EOF
   $ hg log --style ./issue4758
   abort: recursive reference 'changeset' in template
   [255]
 
  not a recursion if a keyword of the same name exists:
 
   $ cat << EOF > issue4758
   > changeset = '{tags % rev}'
   > rev = '{rev} {tag}\n'
   > EOF
   $ hg log --style ./issue4758 -r tip
   8 tip
 
 Check that {phase} works correctly on parents:
 
   $ cat << EOF > parentphase
   > changeset_debug = '{rev} ({phase}):{parents}\n'
   > parent = ' {rev} ({phase})'
   > EOF
   $ hg phase -r 5 --public
   $ hg phase -r 7 --secret --force
   $ hg log --debug -G --style ./parentphase
   @  8 (secret): 7 (secret) -1 (public)
   |
   o  7 (secret): -1 (public) -1 (public)
   
   o    6 (draft): 5 (public) 4 (draft)
   |\
   | o  5 (public): 3 (public) -1 (public)
   | |
   o |  4 (draft): 3 (public) -1 (public)
   |/
   o  3 (public): 2 (public) -1 (public)
   |
   o  2 (public): 1 (public) -1 (public)
   |
   o  1 (public): 0 (public) -1 (public)
   |
   o  0 (public): -1 (public) -1 (public)
   
 
 Missing non-standard names give no error (backward compatibility):
 
   $ echo "changeset = '{c}'" > t
   $ hg log --style ./t
 
 Defining non-standard name works:
 
   $ cat <<EOF > t
   > changeset = '{c}'
   > c = q
   > EOF
   $ hg log --style ./t
   8
   7
   6
   5
   4
   3
   2
   1
   0
 
 ui.style works:
 
   $ echo '[ui]' > .hg/hgrc
   $ echo 'style = t' >> .hg/hgrc
   $ hg log
   8
   7
   6
   5
   4
   3
   2
   1
   0
 
 
 Issue338:
 
   $ hg log --style=changelog > changelog
 
   $ cat changelog
   2020-01-01  test  <test>
   
   	* fourth, second, third:
   	third
   	[95c24699272e] [tip]
   
   1970-01-12  User Name  <user@hostname>
   
   	* second:
   	second
   	[29114dbae42b]
   
   1970-01-18  person  <person>
   
   	* merge
   	[d41e714fe50d]
   
   	* d:
   	new head
   	[13207e5a10d9]
   
   1970-01-17  person  <person>
   
   	* new branch
   	[bbe44766e73d] <foo>
   
   1970-01-16  person  <person>
   
   	* c:
   	no user, no domain
   	[10e46f2dcbf4]
   
   1970-01-14  other  <other@place>
   
   	* c:
   	no person
   	[97054abb4ab8]
   
   1970-01-13  A. N. Other  <other@place>
   
   	* b:
   	other 1 other 2
   
   	other 3
   	[b608e9d1a3f0]
   
   1970-01-12  User Name  <user@hostname>
   
   	* a:
   	line 1 line 2
   	[1e4e1b8f71e0]
   
 
 Issue2130: xml output for 'hg heads' is malformed
 
   $ hg heads --style changelog
   2020-01-01  test  <test>
   
   	* fourth, second, third:
   	third
   	[95c24699272e] [tip]
   
   1970-01-18  person  <person>
   
   	* merge
   	[d41e714fe50d]
   
   1970-01-17  person  <person>
   
   	* new branch
   	[bbe44766e73d] <foo>
   
 
 Keys work:
 
   $ for key in author branch branches date desc file_adds file_dels file_mods \
   >         file_copies file_copies_switch files \
   >         manifest node parents rev tags diffstat extras \
   >         p1rev p2rev p1node p2node; do
   >     for mode in '' --verbose --debug; do
   >         hg log $mode --template "$key$mode: {$key}\n"
   >     done
   > done
   author: test
   author: User Name <user@hostname>
   author: person
   author: person
   author: person
   author: person
   author: other@place
   author: A. N. Other <other@place>
   author: User Name <user@hostname>
   author--verbose: test
   author--verbose: User Name <user@hostname>
   author--verbose: person
   author--verbose: person
   author--verbose: person
   author--verbose: person
   author--verbose: other@place
   author--verbose: A. N. Other <other@place>
   author--verbose: User Name <user@hostname>
   author--debug: test
   author--debug: User Name <user@hostname>
   author--debug: person
   author--debug: person
   author--debug: person
   author--debug: person
   author--debug: other@place
   author--debug: A. N. Other <other@place>
   author--debug: User Name <user@hostname>
   branch: default
   branch: default
   branch: default
   branch: default
   branch: foo
   branch: default
   branch: default
   branch: default
   branch: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: foo
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: foo
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branches: 
   branches: 
   branches: 
   branches: 
   branches: foo
   branches: 
   branches: 
   branches: 
   branches: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: foo
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: foo
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   date: 1577872860.00
   date: 1000000.00
   date: 1500001.00
   date: 1500000.00
   date: 1400000.00
   date: 1300000.00
   date: 1200000.00
   date: 1100000.00
   date: 1000000.00
   date--verbose: 1577872860.00
   date--verbose: 1000000.00
   date--verbose: 1500001.00
   date--verbose: 1500000.00
   date--verbose: 1400000.00
   date--verbose: 1300000.00
   date--verbose: 1200000.00
   date--verbose: 1100000.00
   date--verbose: 1000000.00
   date--debug: 1577872860.00
   date--debug: 1000000.00
   date--debug: 1500001.00
   date--debug: 1500000.00
   date--debug: 1400000.00
   date--debug: 1300000.00
   date--debug: 1200000.00
   date--debug: 1100000.00
   date--debug: 1000000.00
   desc: third
   desc: second
   desc: merge
   desc: new head
   desc: new branch
   desc: no user, no domain
   desc: no person
   desc: other 1
   other 2
   
   other 3
   desc: line 1
   line 2
   desc--verbose: third
   desc--verbose: second
   desc--verbose: merge
   desc--verbose: new head
   desc--verbose: new branch
   desc--verbose: no user, no domain
   desc--verbose: no person
   desc--verbose: other 1
   other 2
   
   other 3
   desc--verbose: line 1
   line 2
   desc--debug: third
   desc--debug: second
   desc--debug: merge
   desc--debug: new head
   desc--debug: new branch
   desc--debug: no user, no domain
   desc--debug: no person
   desc--debug: other 1
   other 2
   
   other 3
   desc--debug: line 1
   line 2
   file_adds: fourth third
   file_adds: second
   file_adds: 
   file_adds: d
   file_adds: 
   file_adds: 
   file_adds: c
   file_adds: b
   file_adds: a
   file_adds--verbose: fourth third
   file_adds--verbose: second
   file_adds--verbose: 
   file_adds--verbose: d
   file_adds--verbose: 
   file_adds--verbose: 
   file_adds--verbose: c
   file_adds--verbose: b
   file_adds--verbose: a
   file_adds--debug: fourth third
   file_adds--debug: second
   file_adds--debug: 
   file_adds--debug: d
   file_adds--debug: 
   file_adds--debug: 
   file_adds--debug: c
   file_adds--debug: b
   file_adds--debug: a
   file_dels: second
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels--verbose: second
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--debug: second
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: c
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: c
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: c
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_copies: fourth (second)
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies--verbose: fourth (second)
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--debug: fourth (second)
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   files: fourth second third
   files: second
   files: 
   files: d
   files: 
   files: c
   files: c
   files: b
   files: a
   files--verbose: fourth second third
   files--verbose: second
   files--verbose: 
   files--verbose: d
   files--verbose: 
   files--verbose: c
   files--verbose: c
   files--verbose: b
   files--verbose: a
   files--debug: fourth second third
   files--debug: second
   files--debug: 
   files--debug: d
   files--debug: 
   files--debug: c
   files--debug: c
   files--debug: b
   files--debug: a
   manifest: 6:94961b75a2da
   manifest: 5:f2dbc354b94e
   manifest: 4:4dc3def4f9b4
   manifest: 4:4dc3def4f9b4
   manifest: 3:cb5a1327723b
   manifest: 3:cb5a1327723b
   manifest: 2:6e0e82995c35
   manifest: 1:4e8d705b1e53
   manifest: 0:a0c8bcbbb45c
   manifest--verbose: 6:94961b75a2da
   manifest--verbose: 5:f2dbc354b94e
   manifest--verbose: 4:4dc3def4f9b4
   manifest--verbose: 4:4dc3def4f9b4
   manifest--verbose: 3:cb5a1327723b
   manifest--verbose: 3:cb5a1327723b
   manifest--verbose: 2:6e0e82995c35
   manifest--verbose: 1:4e8d705b1e53
   manifest--verbose: 0:a0c8bcbbb45c
   manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
   manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
   manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
   manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
   manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
   manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
   manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
   node: 95c24699272ef57d062b8bccc32c878bf841784a
   node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node: 13207e5a10d9fd28ec424934298e176197f2c67f
   node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node: 97054abb4ab824450e9164180baf491ae0078465
   node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node: 1e4e1b8f71e05681d422154f5421e385fec3454f
   node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
   node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
   node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node--verbose: 97054abb4ab824450e9164180baf491ae0078465
   node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
   node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
   node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
   node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node--debug: 97054abb4ab824450e9164180baf491ae0078465
   node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
   parents: 
   parents: -1:000000000000 
   parents: 5:13207e5a10d9 4:bbe44766e73d 
   parents: 3:10e46f2dcbf4 
   parents: 
   parents: 
   parents: 
   parents: 
   parents: 
   parents--verbose: 
   parents--verbose: -1:000000000000 
   parents--verbose: 5:13207e5a10d9 4:bbe44766e73d 
   parents--verbose: 3:10e46f2dcbf4 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 
   parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
   parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 
   parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
   parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
   parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
   parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
   parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
   parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
   rev: 8
   rev: 7
   rev: 6
   rev: 5
   rev: 4
   rev: 3
   rev: 2
   rev: 1
   rev: 0
   rev--verbose: 8
   rev--verbose: 7
   rev--verbose: 6
   rev--verbose: 5
   rev--verbose: 4
   rev--verbose: 3
   rev--verbose: 2
   rev--verbose: 1
   rev--verbose: 0
   rev--debug: 8
   rev--debug: 7
   rev--debug: 6
   rev--debug: 5
   rev--debug: 4
   rev--debug: 3
   rev--debug: 2
   rev--debug: 1
   rev--debug: 0
   tags: tip
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags--verbose: tip
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--debug: tip
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   diffstat: 3: +2/-1
   diffstat: 1: +1/-0
   diffstat: 0: +0/-0
   diffstat: 1: +1/-0
   diffstat: 0: +0/-0
   diffstat: 1: +1/-0
   diffstat: 1: +4/-0
   diffstat: 1: +2/-0
   diffstat: 1: +1/-0
   diffstat--verbose: 3: +2/-1
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 0: +0/-0
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 0: +0/-0
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 1: +4/-0
   diffstat--verbose: 1: +2/-0
   diffstat--verbose: 1: +1/-0
   diffstat--debug: 3: +2/-1
   diffstat--debug: 1: +1/-0
   diffstat--debug: 0: +0/-0
   diffstat--debug: 1: +1/-0
   diffstat--debug: 0: +0/-0
   diffstat--debug: 1: +1/-0
   diffstat--debug: 1: +4/-0
   diffstat--debug: 1: +2/-0
   diffstat--debug: 1: +1/-0
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=foo
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=foo
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=foo
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   p1rev: 7
   p1rev: -1
   p1rev: 5
   p1rev: 3
   p1rev: 3
   p1rev: 2
   p1rev: 1
   p1rev: 0
   p1rev: -1
   p1rev--verbose: 7
   p1rev--verbose: -1
   p1rev--verbose: 5
   p1rev--verbose: 3
   p1rev--verbose: 3
   p1rev--verbose: 2
   p1rev--verbose: 1
   p1rev--verbose: 0
   p1rev--verbose: -1
   p1rev--debug: 7
   p1rev--debug: -1
   p1rev--debug: 5
   p1rev--debug: 3
   p1rev--debug: 3
   p1rev--debug: 2
   p1rev--debug: 1
   p1rev--debug: 0
   p1rev--debug: -1
   p2rev: -1
   p2rev: -1
   p2rev: 4
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: 4
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: 4
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node: 0000000000000000000000000000000000000000
   p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node: 97054abb4ab824450e9164180baf491ae0078465
   p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node: 0000000000000000000000000000000000000000
   p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node--verbose: 0000000000000000000000000000000000000000
   p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
   p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node--verbose: 0000000000000000000000000000000000000000
   p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node--debug: 0000000000000000000000000000000000000000
   p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
   p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node--debug: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
 
 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|
 
 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"
 
 Check the status template
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > color=
   > EOF
 
   $ hg log -T status -r 10
   changeset:   10:0f9759ec227a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Modify, add, remove, rename
   files:
   M third
   A b
   A fifth
   R a
   R fourth
   
   $ hg log -T status -C -r 10
   changeset:   10:0f9759ec227a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Modify, add, remove, rename
   files:
   M third
   A b
   A fifth
     fourth
   R a
   R fourth
   
   $ hg log -T status -C -r 10 -v
   changeset:   10:0f9759ec227a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   description:
   Modify, add, remove, rename
   
   files:
   M third
   A b
   A fifth
     fourth
   R a
   R fourth
   
   $ hg log -T status -C -r 10 --debug
   changeset:   10:0f9759ec227a4859c2014a345cd8a859022b7c6c
   tag:         tip
   phase:       secret
   parent:      9:bf9dfba36635106d6a73ccc01e28b762da60e066
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    8:89dd546f2de0a9d6d664f58d86097eb97baba567
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   extra:       branch=default
   description:
   Modify, add, remove, rename
   
   files:
   M third
   A b
   A fifth
     fourth
   R a
   R fourth
   
   $ hg log -T status -C -r 10 --quiet
   10:0f9759ec227a
   $ hg --color=debug log -T status -r 10
   [log.changeset changeset.secret|changeset:   10:0f9759ec227a]
   [log.tag|tag:         tip]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
   [log.summary|summary:     Modify, add, remove, rename]
   [ui.note log.files|files:]
   [status.modified|M third]
   [status.added|A b]
   [status.added|A fifth]
   [status.removed|R a]
   [status.removed|R fourth]
   
   $ hg --color=debug log -T status -C -r 10
   [log.changeset changeset.secret|changeset:   10:0f9759ec227a]
   [log.tag|tag:         tip]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
   [log.summary|summary:     Modify, add, remove, rename]
   [ui.note log.files|files:]
   [status.modified|M third]
   [status.added|A b]
   [status.added|A fifth]
   [status.copied|  fourth]
   [status.removed|R a]
   [status.removed|R fourth]
   
   $ hg --color=debug log -T status -C -r 10 -v
   [log.changeset changeset.secret|changeset:   10:0f9759ec227a]
   [log.tag|tag:         tip]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
   [ui.note log.description|description:]
   [ui.note log.description|Modify, add, remove, rename]
   
   [ui.note log.files|files:]
   [status.modified|M third]
   [status.added|A b]
   [status.added|A fifth]
   [status.copied|  fourth]
   [status.removed|R a]
   [status.removed|R fourth]
   
   $ hg --color=debug log -T status -C -r 10 --debug
   [log.changeset changeset.secret|changeset:   10:0f9759ec227a4859c2014a345cd8a859022b7c6c]
   [log.tag|tag:         tip]
   [log.phase|phase:       secret]
   [log.parent changeset.secret|parent:      9:bf9dfba36635106d6a73ccc01e28b762da60e066]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    8:89dd546f2de0a9d6d664f58d86097eb97baba567]
   [log.user|user:        test]
   [log.date|date:        Thu Jan 01 00:00:00 1970 +0000]
   [ui.debug log.extra|extra:       branch=default]
   [ui.note log.description|description:]
   [ui.note log.description|Modify, add, remove, rename]
   
   [ui.note log.files|files:]
   [status.modified|M third]
   [status.added|A b]
   [status.added|A fifth]
   [status.copied|  fourth]
   [status.removed|R a]
   [status.removed|R fourth]
   
   $ hg --color=debug log -T status -C -r 10 --quiet
   [log.node|10:0f9759ec227a]
 
 Check the bisect template
 
   $ hg bisect -g 1
   $ hg bisect -b 3 --noupdate
   Testing changeset 2:97054abb4ab8 (2 changesets remaining, ~1 tests)
   $ hg log -T bisect -r 0:4
   changeset:   0:1e4e1b8f71e0
   bisect:      good (implicit)
   user:        User Name <user@hostname>
   date:        Mon Jan 12 13:46:40 1970 +0000
   summary:     line 1
   
   changeset:   1:b608e9d1a3f0
   bisect:      good
   user:        A. N. Other <other@place>
   date:        Tue Jan 13 17:33:20 1970 +0000
   summary:     other 1
   
   changeset:   2:97054abb4ab8
   bisect:      untested
   user:        other@place
   date:        Wed Jan 14 21:20:00 1970 +0000
   summary:     no person
   
   changeset:   3:10e46f2dcbf4
   bisect:      bad
   user:        person
   date:        Fri Jan 16 01:06:40 1970 +0000
   summary:     no user, no domain
   
   changeset:   4:bbe44766e73d
   bisect:      bad (implicit)
   branch:      foo
   user:        person
   date:        Sat Jan 17 04:53:20 1970 +0000
   summary:     new branch
   
   $ hg log --debug -T bisect -r 0:4
   changeset:   0:1e4e1b8f71e05681d422154f5421e385fec3454f
   bisect:      good (implicit)
   phase:       public
   parent:      -1:0000000000000000000000000000000000000000
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
   user:        User Name <user@hostname>
   date:        Mon Jan 12 13:46:40 1970 +0000
   files+:      a
   extra:       branch=default
   description:
   line 1
   line 2
   
   
   changeset:   1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   bisect:      good
   phase:       public
   parent:      0:1e4e1b8f71e05681d422154f5421e385fec3454f
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
   user:        A. N. Other <other@place>
   date:        Tue Jan 13 17:33:20 1970 +0000
   files+:      b
   extra:       branch=default
   description:
   other 1
   other 2
   
   other 3
   
   
   changeset:   2:97054abb4ab824450e9164180baf491ae0078465
   bisect:      untested
   phase:       public
   parent:      1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
   user:        other@place
   date:        Wed Jan 14 21:20:00 1970 +0000
   files+:      c
   extra:       branch=default
   description:
   no person
   
   
   changeset:   3:10e46f2dcbf4823578cf180f33ecf0b957964c47
   bisect:      bad
   phase:       public
   parent:      2:97054abb4ab824450e9164180baf491ae0078465
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   user:        person
   date:        Fri Jan 16 01:06:40 1970 +0000
   files:       c
   extra:       branch=default
   description:
   no user, no domain
   
   
   changeset:   4:bbe44766e73d5f11ed2177f1838de10c53ef3e74
   bisect:      bad (implicit)
   branch:      foo
   phase:       draft
   parent:      3:10e46f2dcbf4823578cf180f33ecf0b957964c47
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   user:        person
   date:        Sat Jan 17 04:53:20 1970 +0000
   extra:       branch=foo
   description:
   new branch
   
   
   $ hg log -v -T bisect -r 0:4
   changeset:   0:1e4e1b8f71e0
   bisect:      good (implicit)
   user:        User Name <user@hostname>
   date:        Mon Jan 12 13:46:40 1970 +0000
   files:       a
   description:
   line 1
   line 2
   
   
   changeset:   1:b608e9d1a3f0
   bisect:      good
   user:        A. N. Other <other@place>
   date:        Tue Jan 13 17:33:20 1970 +0000
   files:       b
   description:
   other 1
   other 2
   
   other 3
   
   
   changeset:   2:97054abb4ab8
   bisect:      untested
   user:        other@place
   date:        Wed Jan 14 21:20:00 1970 +0000
   files:       c
   description:
   no person
   
   
   changeset:   3:10e46f2dcbf4
   bisect:      bad
   user:        person
   date:        Fri Jan 16 01:06:40 1970 +0000
   files:       c
   description:
   no user, no domain
   
   
   changeset:   4:bbe44766e73d
   bisect:      bad (implicit)
   branch:      foo
   user:        person
   date:        Sat Jan 17 04:53:20 1970 +0000
   description:
   new branch
   
   
   $ hg --color=debug log -T bisect -r 0:4
   [log.changeset changeset.public|changeset:   0:1e4e1b8f71e0]
   [log.bisect bisect.good|bisect:      good (implicit)]
   [log.user|user:        User Name <user@hostname>]
   [log.date|date:        Mon Jan 12 13:46:40 1970 +0000]
   [log.summary|summary:     line 1]
   
   [log.changeset changeset.public|changeset:   1:b608e9d1a3f0]
   [log.bisect bisect.good|bisect:      good]
   [log.user|user:        A. N. Other <other@place>]
   [log.date|date:        Tue Jan 13 17:33:20 1970 +0000]
   [log.summary|summary:     other 1]
   
   [log.changeset changeset.public|changeset:   2:97054abb4ab8]
   [log.bisect bisect.untested|bisect:      untested]
   [log.user|user:        other@place]
   [log.date|date:        Wed Jan 14 21:20:00 1970 +0000]
   [log.summary|summary:     no person]
   
   [log.changeset changeset.public|changeset:   3:10e46f2dcbf4]
   [log.bisect bisect.bad|bisect:      bad]
   [log.user|user:        person]
   [log.date|date:        Fri Jan 16 01:06:40 1970 +0000]
   [log.summary|summary:     no user, no domain]
   
   [log.changeset changeset.draft|changeset:   4:bbe44766e73d]
   [log.bisect bisect.bad|bisect:      bad (implicit)]
   [log.branch|branch:      foo]
   [log.user|user:        person]
   [log.date|date:        Sat Jan 17 04:53:20 1970 +0000]
   [log.summary|summary:     new branch]
   
   $ hg --color=debug log --debug -T bisect -r 0:4
   [log.changeset changeset.public|changeset:   0:1e4e1b8f71e05681d422154f5421e385fec3454f]
   [log.bisect bisect.good|bisect:      good (implicit)]
   [log.phase|phase:       public]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0]
   [log.user|user:        User Name <user@hostname>]
   [log.date|date:        Mon Jan 12 13:46:40 1970 +0000]
   [ui.debug log.files|files+:      a]
   [ui.debug log.extra|extra:       branch=default]
   [ui.note log.description|description:]
   [ui.note log.description|line 1
   line 2]
   
   
   [log.changeset changeset.public|changeset:   1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965]
   [log.bisect bisect.good|bisect:      good]
   [log.phase|phase:       public]
   [log.parent changeset.public|parent:      0:1e4e1b8f71e05681d422154f5421e385fec3454f]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55]
   [log.user|user:        A. N. Other <other@place>]
   [log.date|date:        Tue Jan 13 17:33:20 1970 +0000]
   [ui.debug log.files|files+:      b]
   [ui.debug log.extra|extra:       branch=default]
   [ui.note log.description|description:]
   [ui.note log.description|other 1
   other 2
   
   other 3]
   
   
   [log.changeset changeset.public|changeset:   2:97054abb4ab824450e9164180baf491ae0078465]
   [log.bisect bisect.untested|bisect:      untested]
   [log.phase|phase:       public]
   [log.parent changeset.public|parent:      1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1]
   [log.user|user:        other@place]
   [log.date|date:        Wed Jan 14 21:20:00 1970 +0000]
   [ui.debug log.files|files+:      c]
   [ui.debug log.extra|extra:       branch=default]
   [ui.note log.description|description:]
   [ui.note log.description|no person]
   
   
   [log.changeset changeset.public|changeset:   3:10e46f2dcbf4823578cf180f33ecf0b957964c47]
   [log.bisect bisect.bad|bisect:      bad]
   [log.phase|phase:       public]
   [log.parent changeset.public|parent:      2:97054abb4ab824450e9164180baf491ae0078465]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    3:cb5a1327723bada42f117e4c55a303246eaf9ccc]
   [log.user|user:        person]
   [log.date|date:        Fri Jan 16 01:06:40 1970 +0000]
   [ui.debug log.files|files:       c]
   [ui.debug log.extra|extra:       branch=default]
   [ui.note log.description|description:]
   [ui.note log.description|no user, no domain]
   
   
   [log.changeset changeset.draft|changeset:   4:bbe44766e73d5f11ed2177f1838de10c53ef3e74]
   [log.bisect bisect.bad|bisect:      bad (implicit)]
   [log.branch|branch:      foo]
   [log.phase|phase:       draft]
   [log.parent changeset.public|parent:      3:10e46f2dcbf4823578cf180f33ecf0b957964c47]
   [log.parent changeset.public|parent:      -1:0000000000000000000000000000000000000000]
   [ui.debug log.manifest|manifest:    3:cb5a1327723bada42f117e4c55a303246eaf9ccc]
   [log.user|user:        person]
   [log.date|date:        Sat Jan 17 04:53:20 1970 +0000]
   [ui.debug log.extra|extra:       branch=foo]
   [ui.note log.description|description:]
   [ui.note log.description|new branch]
   
   
   $ hg --color=debug log -v -T bisect -r 0:4
   [log.changeset changeset.public|changeset:   0:1e4e1b8f71e0]
   [log.bisect bisect.good|bisect:      good (implicit)]
   [log.user|user:        User Name <user@hostname>]
   [log.date|date:        Mon Jan 12 13:46:40 1970 +0000]
   [ui.note log.files|files:       a]
   [ui.note log.description|description:]
   [ui.note log.description|line 1
   line 2]
   
   
   [log.changeset changeset.public|changeset:   1:b608e9d1a3f0]
   [log.bisect bisect.good|bisect:      good]
   [log.user|user:        A. N. Other <other@place>]
   [log.date|date:        Tue Jan 13 17:33:20 1970 +0000]
   [ui.note log.files|files:       b]
   [ui.note log.description|description:]
   [ui.note log.description|other 1
   other 2
   
   other 3]
   
   
   [log.changeset changeset.public|changeset:   2:97054abb4ab8]
   [log.bisect bisect.untested|bisect:      untested]
   [log.user|user:        other@place]
   [log.date|date:        Wed Jan 14 21:20:00 1970 +0000]
   [ui.note log.files|files:       c]
   [ui.note log.description|description:]
   [ui.note log.description|no person]
   
   
   [log.changeset changeset.public|changeset:   3:10e46f2dcbf4]
   [log.bisect bisect.bad|bisect:      bad]
   [log.user|user:        person]
   [log.date|date:        Fri Jan 16 01:06:40 1970 +0000]
   [ui.note log.files|files:       c]
   [ui.note log.description|description:]
   [ui.note log.description|no user, no domain]
   
   
   [log.changeset changeset.draft|changeset:   4:bbe44766e73d]
   [log.bisect bisect.bad|bisect:      bad (implicit)]
   [log.branch|branch:      foo]
   [log.user|user:        person]
   [log.date|date:        Sat Jan 17 04:53:20 1970 +0000]
   [ui.note log.description|description:]
   [ui.note log.description|new branch]
   
   
   $ hg bisect --reset
 
 Error on syntax:
 
   $ echo 'x = "f' >> t
   $ hg log
   hg: parse error at t:3: unmatched quotes
   [255]
 
   $ hg log -T '{date'
   hg: parse error at 1: unterminated template expansion
   ({date
     ^ here)
   [255]
   $ hg log -T '{date(}'
   hg: parse error at 6: not a prefix: end
   ({date(}
          ^ here)
   [255]
   $ hg log -T '{date)}'
   hg: parse error at 5: invalid token
   ({date)}
         ^ here)
   [255]
   $ hg log -T '{date date}'
   hg: parse error at 6: invalid token
   ({date date}
          ^ here)
   [255]
 
   $ hg log -T '{}'
   hg: parse error at 1: not a prefix: end
   ({}
     ^ here)
   [255]
   $ hg debugtemplate -v '{()}'
   (template
     (group
       None))
   hg: parse error: missing argument
   [255]
 
 Behind the scenes, this would throw TypeError without intype=bytes
 
   $ hg log -l 3 --template '{date|obfuscate}\n'
   &#48;&#46;&#48;&#48;
   &#48;&#46;&#48;&#48;
   &#49;&#53;&#55;&#55;&#56;&#55;&#50;&#56;&#54;&#48;&#46;&#48;&#48;
 
 Behind the scenes, this will throw a ValueError
 
   $ hg log -l 3 --template 'line: {desc|shortdate}\n'
   hg: parse error: invalid date: 'Modify, add, remove, rename'
   (template filter 'shortdate' is not compatible with keyword 'desc')
   [255]
 
 Behind the scenes, this would throw AttributeError without intype=bytes
 
   $ hg log -l 3 --template 'line: {date|escape}\n'
   line: 0.00
   line: 0.00
   line: 1577872860.00
 
   $ hg log -l 3 --template 'line: {extras|localdate}\n'
   hg: parse error: localdate expects a date information
   [255]
 
 Behind the scenes, this will throw ValueError
 
   $ hg tip --template '{author|email|date}\n'
   hg: parse error: date expects a date information
   [255]
 
   $ hg tip -T '{author|email|shortdate}\n'
   hg: parse error: invalid date: 'test'
   (template filter 'shortdate' is not compatible with keyword 'author')
   [255]
 
   $ hg tip -T '{get(extras, "branch")|shortdate}\n'
   hg: parse error: invalid date: 'default'
   (incompatible use of template filter 'shortdate')
   [255]
 
 Error in nested template:
 
   $ hg log -T '{"date'
   hg: parse error at 2: unterminated string
   ({"date
      ^ here)
   [255]
 
   $ hg log -T '{"foo{date|?}"}'
   hg: parse error at 11: syntax error
   ({"foo{date|?}"}
               ^ here)
   [255]
 
 Thrown an error if a template function doesn't exist
 
   $ hg tip --template '{foo()}\n'
   hg: parse error: unknown function 'foo'
   [255]
 
 Pass generator object created by template function to filter
 
   $ hg log -l 1 --template '{if(author, author)|user}\n'
   test
 
 Test index keyword:
 
   $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n'
   10 0:a 1:b 2:fifth 3:fourth 4:third
   11 0:a
 
   $ hg branches -T '{index} {branch}\n'
   0 default
   1 foo
 
 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
 
 ui verbosity:
 
   $ hg log -l1 -T '{verbosity}\n'
   
   $ hg log -l1 -T '{verbosity}\n' --debug
   debug
   $ hg log -l1 -T '{verbosity}\n' --quiet
   quiet
   $ hg log -l1 -T '{verbosity}\n' --verbose
   verbose
 
   $ cd ..
 
 
 latesttag:
 
   $ 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'
 
 No tag set:
 
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @    5: null+5
   |\
   | o  4: null+4
   | |
   | o  3: null+3
   | |
   o |  2: null+3
   |/
   o  1: null+2
   |
   o  0: null+1
   
 
 One common tag: longest path wins for {latesttagdistance}:
 
   $ hg tag -r 1 -m t1 -d '6 0' t1
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  6: t1+4
   |
   o    5: t1+3
   |\
   | o  4: t1+2
   | |
   | o  3: t1+1
   | |
   o |  2: t1+1
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 One ancestor tag: closest wins:
 
   $ hg tag -r 2 -m t2 -d '7 0' t2
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  7: t2+3
   |
   o  6: t2+2
   |
   o    5: t2+1
   |\
   | o  4: t1+2
   | |
   | o  3: t1+1
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 Two branch tags: more recent wins if same number of changes:
 
   $ hg tag -r 3 -m t3 -d '8 0' t3
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  8: t3+5
   |
   o  7: t3+4
   |
   o  6: t3+3
   |
   o    5: t3+2
   |\
   | o  4: t3+1
   | |
   | o  3: t3+0
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 Two branch tags: fewest changes wins:
 
   $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
   $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   @  9: t4+5,6
   |
   o  8: t4+4,5
   |
   o  7: t4+3,4
   |
   o  6: t4+2,3
   |
   o    5: t4+1,2
   |\
   | o  4: t4+0,0
   | |
   | o  3: t3+0,0
   | |
   o |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
 Merged tag overrides:
 
   $ 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}+{latesttagdistance}\n'
   @  11: t5+6
   |
   o  10: t5+5
   |
   o  9: t5+4
   |
   o  8: t5+3
   |
   o  7: t5+2
   |
   o  6: t5+1
   |
   o    5: t5+0
   |\
   | o  4: t4+0
   | |
   | o  3: at3:t3+0
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
   $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   @  11: t5+6,6
   |
   o  10: t5+5,5
   |
   o  9: t5+4,4
   |
   o  8: t5+3,3
   |
   o  7: t5+2,2
   |
   o  6: t5+1,1
   |
   o    5: t5+0,0
   |\
   | o  4: t4+0,0
   | |
   | o  3: at3+0,0 t3+0,0
   | |
   o |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
   $ 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 ..
 
 
 Style path expansion: issue1948 - ui.style option doesn't work on OSX
 if it is a relative path
 
   $ mkdir -p home/styles
 
   $ cat > home/styles/teststyle <<EOF
   > changeset = 'test {rev}:{node|short}\n'
   > EOF
 
   $ HOME=`pwd`/home; export HOME
 
   $ cat > latesttag/.hg/hgrc <<EOF
   > [ui]
   > style = ~/styles/teststyle
   > EOF
 
   $ hg -R latesttag tip
   test 11:97e5943b523a
 
 Test recursive showlist template (issue1989):
 
   $ cat > style1989 <<EOF
   > changeset = '{file_mods}{manifest}{extras}'
   > file_mod  = 'M|{author|person}\n'
   > manifest = '{rev},{author}\n'
   > extra = '{key}: {author}\n'
   > EOF
 
   $ hg -R latesttag log -r tip --style=style1989
   M|test
   11,test
   branch: test
 
 Test new-style inline templating:
 
   $ hg log -R latesttag -r tip --template 'modified files: {file_mods % " {file}\n"}\n'
   modified files:  .hgtags
   
 
   $ hg log -R latesttag -r tip -T '{rev % "a"}\n'
   hg: parse error: keyword 'rev' is not iterable of mappings
   [255]
   $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "a"}\n'
   hg: parse error: None is not iterable of mappings
   [255]
   $ hg log -R latesttag -r tip -T '{extras % "{key}\n" % "{key}\n"}'
   hg: parse error: list of strings is not mappable
   [255]
 
 Test new-style inline templating of non-list/dict type:
 
   $ hg log -R latesttag -r tip -T '{manifest}\n'
   11:2bc6e9006ce2
   $ hg log -R latesttag -r tip -T 'string length: {manifest|count}\n'
   string length: 15
   $ hg log -R latesttag -r tip -T '{manifest % "{rev}:{node}"}\n'
   11:2bc6e9006ce29882383a22d39fd1f4e66dd3e2fc
 
   $ hg log -R latesttag -r tip -T '{get(extras, "branch") % "{key}: {value}\n"}'
   branch: default
   $ hg log -R latesttag -r tip -T '{get(extras, "unknown") % "{key}\n"}'
   hg: parse error: None is not iterable of mappings
   [255]
   $ hg log -R latesttag -r tip -T '{min(extras) % "{key}: {value}\n"}'
   branch: default
   $ hg log -R latesttag -l1 -T '{min(revset("0:9")) % "{rev}:{node|short}\n"}'
   0:ce3cec86e6c2
   $ hg log -R latesttag -l1 -T '{max(revset("0:9")) % "{rev}:{node|short}\n"}'
   9:fbc7cd862e9c
 
 Test manifest/get() can be join()-ed as before, though it's silly:
 
   $ hg log -R latesttag -r tip -T '{join(manifest, "")}\n'
   11:2bc6e9006ce2
   $ hg log -R latesttag -r tip -T '{join(get(extras, "branch"), "")}\n'
   default
 
 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 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 dot operator precedence:
 
   $ hg debugtemplate -R latesttag -r0 -v '{manifest.node|short}\n'
   (template
     (|
       (.
         (symbol 'manifest')
         (symbol 'node'))
       (symbol 'short'))
     (string '\n'))
   89f4071fec70
 
  (the following examples are invalid, but seem natural in parsing POV)
 
   $ hg debugtemplate -R latesttag -r0 -v '{foo|bar.baz}\n' 2> /dev/null
   (template
     (|
       (symbol 'foo')
       (.
         (symbol 'bar')
         (symbol 'baz')))
     (string '\n'))
   [255]
   $ hg debugtemplate -R latesttag -r0 -v '{foo.bar()}\n' 2> /dev/null
   (template
     (.
       (symbol 'foo')
       (func
         (symbol 'bar')
         None))
     (string '\n'))
   [255]
 
 Test evaluation of dot operator:
 
   $ hg log -R latesttag -l1 -T '{min(revset("0:9")).node}\n'
   ce3cec86e6c26bd9bdfc590a6b92abc9680f1796
   $ hg log -R latesttag -r0 -T '{extras.branch}\n'
   default
 
   $ hg log -R latesttag -l1 -T '{author.invalid}\n'
   hg: parse error: keyword 'author' has no member
   [255]
   $ hg log -R latesttag -l1 -T '{min("abc").invalid}\n'
   hg: parse error: 'a' has no member
   [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]
 
 Test integer literal:
 
   $ hg debugtemplate -v '{(0)}\n'
   (template
     (group
       (integer '0'))
     (string '\n'))
   0
   $ hg debugtemplate -v '{(123)}\n'
   (template
     (group
       (integer '123'))
     (string '\n'))
   123
   $ hg debugtemplate -v '{(-4)}\n'
   (template
     (group
       (negate
         (integer '4')))
     (string '\n'))
   -4
   $ hg debugtemplate '{(-)}\n'
   hg: parse error at 3: not a prefix: )
   ({(-)}\n
       ^ here)
   [255]
   $ hg debugtemplate '{(-a)}\n'
   hg: parse error: negation needs an integer argument
   [255]
 
 top-level integer literal is interpreted as symbol (i.e. variable name):
 
   $ hg debugtemplate -D 1=one -v '{1}\n'
   (template
     (integer '1')
     (string '\n'))
   one
   $ hg debugtemplate -D 1=one -v '{if("t", "{1}")}\n'
   (template
     (func
       (symbol 'if')
       (list
         (string 't')
         (template
           (integer '1'))))
     (string '\n'))
   one
   $ hg debugtemplate -D 1=one -v '{1|stringify}\n'
   (template
     (|
       (integer '1')
       (symbol 'stringify'))
     (string '\n'))
   one
 
 unless explicit symbol is expected:
 
   $ hg log -Ra -r0 -T '{desc|1}\n'
   hg: parse error: expected a symbol, got 'integer'
   [255]
   $ hg log -Ra -r0 -T '{1()}\n'
   hg: parse error: expected a symbol, got 'integer'
   [255]
 
 Test string literal:
 
   $ hg debugtemplate -Ra -r0 -v '{"string with no template fragment"}\n'
   (template
     (string 'string with no template fragment')
     (string '\n'))
   string with no template fragment
   $ hg debugtemplate -Ra -r0 -v '{"template: {rev}"}\n'
   (template
     (template
       (string 'template: ')
       (symbol 'rev'))
     (string '\n'))
   template: 0
   $ hg debugtemplate -Ra -r0 -v '{r"rawstring: {rev}"}\n'
   (template
     (string 'rawstring: {rev}')
     (string '\n'))
   rawstring: {rev}
   $ hg debugtemplate -Ra -r0 -v '{files % r"rawstring: {file}"}\n'
   (template
     (%
       (symbol 'files')
       (string 'rawstring: {file}'))
     (string '\n'))
   rawstring: {file}
 
 Test string escaping:
 
   $ hg log -R latesttag -r 0 --template '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
   >
   <>\n<[>
   <>\n<]>
   <>\n<
 
   $ hg log -R latesttag -r 0 \
   > --config ui.logtemplate='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
   >
   <>\n<[>
   <>\n<]>
   <>\n<
 
   $ hg log -R latesttag -r 0 -T esc \
   > --config templates.esc='>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
   >
   <>\n<[>
   <>\n<]>
   <>\n<
 
   $ cat <<'EOF' > esctmpl
   > changeset = '>\n<>\\n<{if(rev, "[>\n<>\\n<]")}>\n<>\\n<\n'
   > EOF
   $ hg log -R latesttag -r 0 --style ./esctmpl
   >
   <>\n<[>
   <>\n<]>
   <>\n<
 
 Test string escaping of quotes:
 
   $ hg log -Ra -r0 -T '{"\""}\n'
   "
   $ hg log -Ra -r0 -T '{"\\\""}\n'
   \"
   $ hg log -Ra -r0 -T '{r"\""}\n'
   \"
   $ hg log -Ra -r0 -T '{r"\\\""}\n'
   \\\"
 
 
   $ hg log -Ra -r0 -T '{"\""}\n'
   "
   $ hg log -Ra -r0 -T '{"\\\""}\n'
   \"
   $ hg log -Ra -r0 -T '{r"\""}\n'
   \"
   $ hg log -Ra -r0 -T '{r"\\\""}\n'
   \\\"
 
 Test exception in quoted template. single backslash before quotation mark is
 stripped before parsing:
 
   $ cat <<'EOF' > escquotetmpl
   > changeset = "\" \\" \\\" \\\\" {files % \"{file}\"}\n"
   > EOF
   $ cd latesttag
   $ hg log -r 2 --style ../escquotetmpl
   " \" \" \\" head1
 
   $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"'
   valid
   $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'"
   valid
 
 Test compatibility with 2.9.2-3.4 of escaped quoted strings in nested
 _evalifliteral() templates (issue4733):
 
   $ hg log -r 2 -T '{if(rev, "\"{rev}")}\n'
   "2
   $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\"{rev}\")}")}\n'
   "2
   $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\"{rev}\\\")}\")}")}\n'
   "2
 
   $ hg log -r 2 -T '{if(rev, "\\\"")}\n'
   \"
   $ hg log -r 2 -T '{if(rev, "{if(rev, \"\\\\\\\"\")}")}\n'
   \"
   $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, \\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
   \"
 
   $ hg log -r 2 -T '{if(rev, r"\\\"")}\n'
   \\\"
   $ hg log -r 2 -T '{if(rev, "{if(rev, r\"\\\\\\\"\")}")}\n'
   \\\"
   $ hg log -r 2 -T '{if(rev, "{if(rev, \"{if(rev, r\\\"\\\\\\\\\\\\\\\"\\\")}\")}")}\n'
   \\\"
 
 escaped single quotes and errors:
 
   $ hg log -r 2 -T "{if(rev, '{if(rev, \'foo\')}')}"'\n'
   foo
   $ hg log -r 2 -T "{if(rev, '{if(rev, r\'foo\')}')}"'\n'
   foo
   $ hg log -r 2 -T '{if(rev, "{if(rev, \")}")}\n'
   hg: parse error at 21: unterminated string
   ({if(rev, "{if(rev, \")}")}\n
                         ^ here)
   [255]
   $ hg log -r 2 -T '{if(rev, \"\\"")}\n'
   hg: parse error: trailing \ in string
   [255]
   $ hg log -r 2 -T '{if(rev, r\"\\"")}\n'
   hg: parse error: trailing \ in string
   [255]
 
   $ cd ..
 
 Test leading backslashes:
 
   $ cd latesttag
   $ hg log -r 2 -T '\{rev} {files % "\{file}"}\n'
   {rev} {file}
   $ hg log -r 2 -T '\\{rev} {files % "\\{file}"}\n'
   \2 \head1
   $ hg log -r 2 -T '\\\{rev} {files % "\\\{file}"}\n'
   \{rev} \{file}
   $ cd ..
 
 Test leading backslashes in "if" expression (issue4714):
 
   $ cd latesttag
   $ hg log -r 2 -T '{if("1", "\{rev}")} {if("1", r"\{rev}")}\n'
   {rev} \{rev}
   $ hg log -r 2 -T '{if("1", "\\{rev}")} {if("1", r"\\{rev}")}\n'
   \2 \\{rev}
   $ hg log -r 2 -T '{if("1", "\\\{rev}")} {if("1", r"\\\{rev}")}\n'
   \{rev} \\\{rev}
   $ cd ..
 
 "string-escape"-ed "\x5c\x786e" becomes r"\x6e" (once) or r"n" (twice)
 
   $ hg log -R a -r 0 --template '{if("1", "\x5c\x786e", "NG")}\n'
   \x6e
   $ hg log -R a -r 0 --template '{if("1", r"\x5c\x786e", "NG")}\n'
   \x5c\x786e
   $ hg log -R a -r 0 --template '{if("", "NG", "\x5c\x786e")}\n'
   \x6e
   $ hg log -R a -r 0 --template '{if("", "NG", r"\x5c\x786e")}\n'
   \x5c\x786e
 
   $ hg log -R a -r 2 --template '{ifeq("no perso\x6e", desc, "\x5c\x786e", "NG")}\n'
   \x6e
   $ hg log -R a -r 2 --template '{ifeq(r"no perso\x6e", desc, "NG", r"\x5c\x786e")}\n'
   \x5c\x786e
   $ hg log -R a -r 2 --template '{ifeq(desc, "no perso\x6e", "\x5c\x786e", "NG")}\n'
   \x6e
   $ hg log -R a -r 2 --template '{ifeq(desc, r"no perso\x6e", "NG", r"\x5c\x786e")}\n'
   \x5c\x786e
 
   $ hg log -R a -r 8 --template '{join(files, "\n")}\n'
   fourth
   second
   third
   $ hg log -R a -r 8 --template '{join(files, r"\n")}\n'
   fourth\nsecond\nthird
 
   $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", "htm\x6c")}'
   <p>
   1st
   </p>
   <p>
   2nd
   </p>
   $ hg log -R a -r 2 --template '{rstdoc(r"1st\n\n2nd", "html")}'
   <p>
   1st\n\n2nd
   </p>
   $ hg log -R a -r 2 --template '{rstdoc("1st\n\n2nd", r"htm\x6c")}'
   1st
   
   2nd
 
   $ hg log -R a -r 2 --template '{strip(desc, "\x6e")}\n'
   o perso
   $ hg log -R a -r 2 --template '{strip(desc, r"\x6e")}\n'
   no person
   $ hg log -R a -r 2 --template '{strip("no perso\x6e", "\x6e")}\n'
   o perso
   $ hg log -R a -r 2 --template '{strip(r"no perso\x6e", r"\x6e")}\n'
   no perso
 
   $ hg log -R a -r 2 --template '{sub("\\x6e", "\x2d", desc)}\n'
   -o perso-
   $ hg log -R a -r 2 --template '{sub(r"\\x6e", "-", desc)}\n'
   no person
   $ hg log -R a -r 2 --template '{sub("n", r"\x2d", desc)}\n'
   \x2do perso\x2d
   $ hg log -R a -r 2 --template '{sub("n", "\x2d", "no perso\x6e")}\n'
   -o perso-
   $ hg log -R a -r 2 --template '{sub("n", r"\x2d", r"no perso\x6e")}\n'
   \x2do perso\x6e
 
   $ hg log -R a -r 8 --template '{files % "{file}\n"}'
   fourth
   second
   third
 
 Test string escaping in nested expression:
 
   $ hg log -R a -r 8 --template '{ifeq(r"\x6e", if("1", "\x5c\x786e"), join(files, "\x5c\x786e"))}\n'
   fourth\x6esecond\x6ethird
   $ hg log -R a -r 8 --template '{ifeq(if("1", r"\x6e"), "\x5c\x786e", join(files, "\x5c\x786e"))}\n'
   fourth\x6esecond\x6ethird
 
   $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", "\x5c\x786e"))}\n'
   fourth\x6esecond\x6ethird
   $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n'
   fourth\x5c\x786esecond\x5c\x786ethird
 
   $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n'
   3:\x6eo user, \x6eo domai\x6e
   4:\x5c\x786eew bra\x5c\x786ech
 
 Test quotes in nested expression are evaluated just like a $(command)
 substitution in POSIX shells:
 
   $ hg log -R a -r 8 -T '{"{"{rev}:{node|short}"}"}\n'
   8:95c24699272e
   $ hg log -R a -r 8 -T '{"{"\{{rev}} \"{node|short}\""}"}\n'
   {8} "95c24699272e"
 
 Test recursive evaluation:
 
   $ hg init r
   $ cd r
   $ echo a > a
   $ hg ci -Am '{rev}'
   adding a
   $ hg log -r 0 --template '{if(rev, desc)}\n'
   {rev}
   $ hg log -r 0 --template '{if(rev, "{author} {rev}")}\n'
   test 0
 
   $ hg branch -q 'text.{rev}'
   $ echo aa >> aa
   $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
 
   $ hg log -l1 --template '{fill(desc, "20", author, branch)}'
   {node|short}desc to
   text.{rev}be wrapped
   text.{rev}desc to be
   text.{rev}wrapped (no-eol)
   $ hg log -l1 --template '{fill(desc, "20", "{node|short}:", "text.{rev}:")}'
   bcc7ff960b8e:desc to
   text.1:be wrapped
   text.1:desc to be
   text.1:wrapped (no-eol)
   $ hg log -l1 -T '{fill(desc, date, "", "")}\n'
   hg: parse error: fill expects an integer width
   [255]
 
   $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
   bcc7ff960b8e:desc to be
   termwidth.1:wrapped desc
   termwidth.1:to be wrapped (no-eol)
 
   $ hg log -l 1 --template '{sub(r"[0-9]", "-", author)}'
   {node|short} (no-eol)
   $ hg log -l 1 --template '{sub(r"[0-9]", "-", "{node|short}")}'
   bcc-ff---b-e (no-eol)
 
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
   > color=
   > [color]
   > mode=ansi
   > text.{rev} = red
   > text.1 = green
   > EOF
   $ hg log --color=always -l 1 --template '{label(branch, "text\n")}'
   \x1b[0;31mtext\x1b[0m (esc)
   $ hg log --color=always -l 1 --template '{label("text.{rev}", "text\n")}'
   \x1b[0;32mtext\x1b[0m (esc)
 
 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)
 
 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: get() expects a dict as first argument
   [255]
 
 Test json filter applied to hybrid object:
 
   $ hg log -r0 -T '{files|json}\n'
   ["a"]
   $ hg log -r0 -T '{extras|json}\n'
   {"branch": "default"}
 
 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 '{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
 
   $ 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
   obsoleted 1 changesets
   $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
   obsoleted 1 changesets
   $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
   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
 
  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 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
 
 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("", "", "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(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
 
 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
 
 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 'originalnode'
 
   $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n'
   000000000000 bcc7ff960b8e
   $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
   a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
 
 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
   
 
 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
   $ cd r
 
 Test active bookmark templating
 
   $ hg book foo
   $ hg book bar
   $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
   2 bar* foo 
   1 
   0 
   $ hg log --template "{rev} {activebookmark}\n"
   2 bar
   1 
   0 
   $ hg bookmarks --inactive bar
   $ hg log --template "{rev} {activebookmark}\n"
   2 
   1 
   0 
   $ hg book -r1 baz
   $ hg log --template "{rev} {join(bookmarks, ' ')}\n"
   2 bar foo
   1 baz
   0 
   $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
   2 t
   1 f
   0 f
 
 Test namespaces dict
 
   $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n  {join(names, ",")}\n"}\n'
   2
    bookmarks color=bookmark builtin=True
     bar,foo
    tags color=tag builtin=True
     tip
    branches color=branch builtin=True
     text.{rev}
    revnames color=revname builtin=False
     r2
   
   1
    bookmarks color=bookmark builtin=True
     baz
    tags color=tag builtin=True
     
    branches color=branch builtin=True
     text.{rev}
    revnames color=revname builtin=False
     r1
   
   0
    bookmarks color=bookmark builtin=True
     
    tags color=tag builtin=True
     
    branches color=branch builtin=True
     default
    revnames color=revname builtin=False
     r0
   
   $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
   bookmarks: bar foo
   tags: tip
   branches: text.{rev}
   $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
   bookmarks:
    bar
    foo
   tags:
    tip
   branches:
    text.{rev}
   $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
   bar
   foo
   $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
   bar
   foo
 
 Test stringify on sub expressions
 
   $ cd ..
   $ 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 bad template with better error message
 
   $ hg log -Gv -R a --template '{desc|user()}'
   hg: parse error: expected a symbol, got 'func'
   [255]
 
 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 with non-strings like dates
 
   $ hg log -T "{indent(date, '   ')}\n" -r 2:3 -R a
      1200000.00
      1300000.00
 
 Test broken string escapes:
 
   $ hg log -T "bogus\\" -R a
   hg: parse error: trailing \ in string
   [255]
   $ hg log -T "\\xy" -R a
   hg: parse error: invalid \x escape* (glob)
   [255]
 
 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"
 
 Templater supports aliases of symbol and func() styles:
 
   $ hg clone -q a aliases
   $ cd aliases
   $ cat <<EOF >> .hg/hgrc
   > [templatealias]
   > r = rev
   > rn = "{r}:{node|short}"
   > status(c, files) = files % "{c} {file}\n"
   > utcdate(d) = localdate(d, "UTC")
   > EOF
 
   $ hg debugtemplate -vr0 '{rn} {utcdate(date)|isodate}\n'
   (template
     (symbol 'rn')
     (string ' ')
     (|
       (func
         (symbol 'utcdate')
         (symbol 'date'))
       (symbol 'isodate'))
     (string '\n'))
   * expanded:
   (template
     (template
       (symbol 'rev')
       (string ':')
       (|
         (symbol 'node')
         (symbol 'short')))
     (string ' ')
     (|
       (func
         (symbol 'localdate')
         (list
           (symbol 'date')
           (string 'UTC')))
       (symbol 'isodate'))
     (string '\n'))
   0:1e4e1b8f71e0 1970-01-12 13:46 +0000
 
   $ hg debugtemplate -vr0 '{status("A", file_adds)}'
   (template
     (func
       (symbol 'status')
       (list
         (string 'A')
         (symbol 'file_adds'))))
   * expanded:
   (template
     (%
       (symbol 'file_adds')
       (template
         (string 'A')
         (string ' ')
         (symbol 'file')
         (string '\n'))))
   A a
 
 A unary function alias can be called as a filter:
 
   $ hg debugtemplate -vr0 '{date|utcdate|isodate}\n'
   (template
     (|
       (|
         (symbol 'date')
         (symbol 'utcdate'))
       (symbol 'isodate'))
     (string '\n'))
   * expanded:
   (template
     (|
       (func
         (symbol 'localdate')
         (list
           (symbol 'date')
           (string 'UTC')))
       (symbol 'isodate'))
     (string '\n'))
   1970-01-12 13:46 +0000
 
 Aliases should be applied only to command arguments and templates in hgrc.
 Otherwise, our stock styles and web templates could be corrupted:
 
   $ hg log -r0 -T '{rn} {utcdate(date)|isodate}\n'
   0:1e4e1b8f71e0 1970-01-12 13:46 +0000
 
   $ hg log -r0 --config ui.logtemplate='"{rn} {utcdate(date)|isodate}\n"'
   0:1e4e1b8f71e0 1970-01-12 13:46 +0000
 
   $ cat <<EOF > tmpl
   > changeset = 'nothing expanded:{rn}\n'
   > EOF
   $ hg log -r0 --style ./tmpl
   nothing expanded:
 
 Aliases in formatter:
 
   $ hg branches -T '{pad(branch, 7)} {rn}\n'
   default 6:d41e714fe50d
   foo     4:bbe44766e73d
 
 Aliases should honor HGPLAIN:
 
   $ HGPLAIN= hg log -r0 -T 'nothing expanded:{rn}\n'
   nothing expanded:
   $ HGPLAINEXCEPT=templatealias hg log -r0 -T '{rn}\n'
   0:1e4e1b8f71e0
 
 Unparsable alias:
 
   $ hg debugtemplate --config templatealias.bad='x(' -v '{bad}'
   (template
     (symbol 'bad'))
   abort: bad definition of template alias "bad": at 2: not a prefix: end
   [255]
   $ hg log --config templatealias.bad='x(' -T '{bad}'
   abort: bad definition of template alias "bad": at 2: not a prefix: end
   [255]
 
   $ cd ..
 
 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 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"
 
 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)
 
   $ cd ..
 
 Test that template function in extension is registered as expected
 
   $ cd a
 
   $ cat <<EOF > $TESTTMP/customfunc.py
   > from mercurial import registrar
   > 
   > templatefunc = registrar.templatefunc()
   > 
   > @templatefunc(b'custom()')
   > def custom(context, mapping, args):
   >     return b'custom'
   > EOF
   $ cat <<EOF > .hg/hgrc
   > [extensions]
   > customfunc = $TESTTMP/customfunc.py
   > EOF
 
   $ hg log -r . -T "{custom()}\n" --config customfunc.enabled=true
   custom
 
   $ cd ..
 
 Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
 printed graphwidths 3, 5, 7, etc. should all line up in their respective
 columns. We don't care about other aspects of the graph rendering here.
 
   $ hg init graphwidth
   $ cd graphwidth
 
   $ wrappabletext="a a a a a a a a a a a a"
 
   $ printf "first\n" > file
   $ hg add file
   $ hg commit -m "$wrappabletext"
 
   $ printf "first\nsecond\n" > file
   $ hg commit -m "$wrappabletext"
 
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ printf "third\nfirst\n" > file
   $ hg commit -m "$wrappabletext"
   created new head
 
   $ hg merge
   merging file
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   | @  5
   |/
   o  3
   
   $ hg commit -m "$wrappabletext"
 
   $ hg log --graph -T "{graphwidth}"
   @    5
   |\
   | o  5
   | |
   o |  5
   |/
   o  3
   
 
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ printf "third\nfirst\nsecond\n" > file
   $ hg commit -m "$wrappabletext"
   created new head
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   | o    7
   | |\
   +---o  7
   | |
   | o  5
   |/
   o  3
   
 
   $ hg log --graph -T "{graphwidth}" -r 3
   o    5
   |\
   ~ ~
 
   $ hg log --graph -T "{graphwidth}" -r 1
   o  3
   |
   ~
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m "$wrappabletext"
 
   $ printf "seventh\n" >> file
   $ hg commit -m "$wrappabletext"
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   o    5
   |\
   | o  5
   | |
   o |    7
   |\ \
   | o |  7
   | |/
   o /  5
   |/
   o  3
   
 
 The point of graphwidth is to allow wrapping that accounts for the space taken
 by the graph.
 
   $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
   @  a a a a
   |  a a a a
   |  a a a a
   o    a a a
   |\   a a a
   | |  a a a
   | |  a a a
   | o  a a a
   | |  a a a
   | |  a a a
   | |  a a a
   o |    a a
   |\ \   a a
   | | |  a a
   | | |  a a
   | | |  a a
   | | |  a a
   | o |  a a
   | |/   a a
   | |    a a
   | |    a a
   | |    a a
   | |    a a
   o |  a a a
   |/   a a a
   |    a a a
   |    a a a
   o  a a a a
      a a a a
      a a a a
 
 Something tricky happens when there are elided nodes; the next drawn row of
 edges can be more than one column wider, but the graph width only increases by
 one column. The remaining columns are added in between the nodes.
 
   $ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
   o    5
   |\
   | \
   | :\
   o : :  7
   :/ /
   : o  5
   :/
   o  3
   
 
   $ cd ..
 

tests/test-log-linerange.t

@@ -1,922 +1,922 b''
   $ cat >> $HGRCPATH << EOF
   > [diff]
   > git = true
   > EOF
 
   $ hg init
   $ cat > foo << EOF
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -Am init
   adding foo
   $ cat > foo << EOF
   > 0
   > 0
   > 0
   > 0
   > 1
   > 2
   > 3
   > 4
   > EOF
   $ hg ci -m 'more 0'
   $ sed 's/2/2+/' foo > foo.new
   $ mv foo.new foo
   $ cat > bar << EOF
   > a
   > b
   > c
   > d
   > e
   > EOF
   $ hg add bar
   $ hg ci -Am "2 -> 2+; added bar"
   $ cat >> foo << EOF
   > 5
   > 6
   > 7
   > 8
   > 9
   > 10
   > 11
   > EOF
   $ hg ci -m "to 11"
 
 Add some changes with two diff hunks
 
   $ sed 's/^1$/ 1/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11$/11+/' foo > foo.new
   $ mv foo.new foo
   $ hg ci -m '11 -> 11+; leading space before "1"'
 (make sure there are two hunks in "foo")
   $ hg diff -c .
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   $ sed 's/3/3+/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/^11+$/11-/' foo > foo.new
   $ mv foo.new foo
   $ sed 's/a/a+/' bar > bar.new
   $ mv bar.new bar
   $ hg ci -m 'foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+'
 (make sure there are two hunks in "foo")
   $ hg diff -c . foo
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
 
   $ hg log -f -L foo,5:7 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
   $ hg log -f --graph -L foo,5:7 -p
   @  changeset:   5:cfdf972b3971
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   |
   |  diff --git a/foo b/foo
   |  --- a/foo
   |  +++ b/foo
   |  @@ -4,7 +4,7 @@
   |   0
   |    1
   |   2+
   |  -3
   |  +3+
   |   4
   |   5
   |   6
   |
   o  changeset:   4:eaec41c1a0c9
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     11 -> 11+; leading space before "1"
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -2,7 +2,7 @@
   :   0
   :   0
   :   0
   :  -1
   :  + 1
   :   2+
   :   3
   :   4
   :
   o  changeset:   2:63a884426fd0
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     2 -> 2+; added bar
   :
   :  diff --git a/foo b/foo
   :  --- a/foo
   :  +++ b/foo
   :  @@ -3,6 +3,6 @@
   :   0
   :   0
   :   1
   :  -2
   :  +2+
   :   3
   :   4
   :
   o  changeset:   0:5ae1f82b9a00
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     init
   
      diff --git a/foo b/foo
      new file mode 100644
      --- /dev/null
      +++ b/foo
      @@ -0,0 +1,5 @@
      +0
      +1
      +2
      +3
      +4
   
 
 With --template.
 
   $ hg log -f -L foo,5:7 -T '{rev}:{node|short} {desc|firstline}\n'
   5:cfdf972b3971 foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   4:eaec41c1a0c9 11 -> 11+; leading space before "1"
   2:63a884426fd0 2 -> 2+; added bar
   0:5ae1f82b9a00 init
   $ hg log -f -L foo,5:7 -T json
   [
    {
-    "rev": 5,
-    "node": "cfdf972b3971a2a59638bf9583c0debbffee5404",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [0, 0],
     "desc": "foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+",
-    "bookmarks": [],
+    "node": "cfdf972b3971a2a59638bf9583c0debbffee5404",
+    "parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"],
+    "phase": "draft",
+    "rev": 5,
     "tags": ["tip"],
-    "parents": ["eaec41c1a0c9ad0a5e999611d0149d171beffb8c"]
+    "user": "test"
    },
    {
-    "rev": 4,
-    "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [0, 0],
     "desc": "11 -> 11+; leading space before \"1\"",
-    "bookmarks": [],
+    "node": "eaec41c1a0c9ad0a5e999611d0149d171beffb8c",
+    "parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"],
+    "phase": "draft",
+    "rev": 4,
     "tags": [],
-    "parents": ["730a61fbaecf426c17c2c66bc42d195b5d5b0ba8"]
+    "user": "test"
    },
    {
-    "rev": 2,
-    "node": "63a884426fd0b277fcd55895bbb2f230434576eb",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [0, 0],
     "desc": "2 -> 2+; added bar",
-    "bookmarks": [],
+    "node": "63a884426fd0b277fcd55895bbb2f230434576eb",
+    "parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"],
+    "phase": "draft",
+    "rev": 2,
     "tags": [],
-    "parents": ["29a1e7c6b80024f63f310a2d71de979e9d2996d7"]
+    "user": "test"
    },
    {
-    "rev": 0,
-    "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [0, 0],
     "desc": "init",
-    "bookmarks": [],
+    "node": "5ae1f82b9a000ff1e0967d0dac1c58b9d796e1b4",
+    "parents": ["0000000000000000000000000000000000000000"],
+    "phase": "draft",
+    "rev": 0,
     "tags": [],
-    "parents": ["0000000000000000000000000000000000000000"]
+    "user": "test"
    }
   ]
 
 With some white-space diff option, respective revisions are skipped.
 
   $ hg log -f -L foo,5:7 -p --config diff.ignorews=true
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Regular file patterns are not allowed.
 
   $ hg log -f -L foo,5:7 -p bar
   abort: FILE arguments are not compatible with --line-range option
   [255]
 
 Option --rev acts as a restriction.
 
   $ hg log -f -L foo,5:7 -p -r 'desc(2)'
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 With several -L patterns, changes touching any files in their respective line
 range are show.
 
   $ hg log -f -L foo,5:7 -L bar,1:2 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/bar b/bar
   --- a/bar
   +++ b/bar
   @@ -1,4 +1,4 @@
   -a
   +a+
    b
    c
    d
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/bar b/bar
   new file mode 100644
   --- /dev/null
   +++ b/bar
   @@ -0,0 +1,5 @@
   +a
   +b
   +c
   +d
   +e
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Multiple -L options with the same file yields changes touching any of
 specified line ranges.
 
   $ hg log -f -L foo,5:7 -L foo,14:15 -p
   changeset:   5:cfdf972b3971
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11+
   +11-
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   @@ -12,4 +12,4 @@
    8
    9
    10
   -11
   +11+
   
   changeset:   3:730a61fbaecf
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     to 11
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -6,3 +6,10 @@
    2+
    3
    4
   +5
   +6
   +7
   +8
   +9
   +10
   +11
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 A file with a comma in its name.
 
   $ cat > ba,z << EOF
   > q
   > w
   > e
   > r
   > t
   > y
   > EOF
   $ hg ci -Am 'querty'
   adding ba,z
   $ cat >> ba,z << EOF
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'more keys'
   $ cat > ba,z << EOF
   > a
   > z
   > e
   > r
   > t
   > y
   > u
   > i
   > o
   > p
   > EOF
   $ hg ci -m 'azerty'
   $ hg log -f -L ba,z,1:2 -p
   changeset:   8:52373265138b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     azerty
   
   diff --git a/ba,z b/ba,z
   --- a/ba,z
   +++ b/ba,z
   @@ -1,5 +1,5 @@
   -q
   -w
   +a
   +z
    e
    r
    t
   
   changeset:   6:96ba8850f316
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     querty
   
   diff --git a/ba,z b/ba,z
   new file mode 100644
   --- /dev/null
   +++ b/ba,z
   @@ -0,0 +1,6 @@
   +q
   +w
   +e
   +r
   +t
   +y
   
 
 Exact prefix kinds work in -L options.
 
   $ mkdir dir
   $ cd dir
   $ hg log -f -L path:foo,5:7 -p
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Renames are followed.
 
   $ hg mv ../foo baz
   $ sed 's/1/1+/' baz > baz.new
   $ mv baz.new baz
   $ hg ci -m 'foo -> dir/baz; 1-1+'
   $ hg diff -c .
   diff --git a/foo b/dir/baz
   rename from foo
   rename to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   @@ -11,5 +11,5 @@
    7
    8
    9
   -10
   -11-
   +1+0
   +1+1-
   $ hg log -f -L relpath:baz,5:7 -p
   changeset:   9:6af29c3a778f
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo -> dir/baz; 1-1+
   
   diff --git a/foo b/dir/baz
   copy from foo
   copy to dir/baz
   --- a/foo
   +++ b/dir/baz
   @@ -2,7 +2,7 @@
    0
    0
    0
   - 1
   + 1+
    2+
    3+
    4
   
   changeset:   5:cfdf972b3971
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foo: 3 -> 3+ and 11+ -> 11-; bar: a -> a+
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -4,7 +4,7 @@
    0
     1
    2+
   -3
   +3+
    4
    5
    6
   
   changeset:   4:eaec41c1a0c9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     11 -> 11+; leading space before "1"
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -2,7 +2,7 @@
    0
    0
    0
   -1
   + 1
    2+
    3
    4
   
   changeset:   2:63a884426fd0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2 -> 2+; added bar
   
   diff --git a/foo b/foo
   --- a/foo
   +++ b/foo
   @@ -3,6 +3,6 @@
    0
    0
    1
   -2
   +2+
    3
    4
   
   changeset:   0:5ae1f82b9a00
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     init
   
   diff --git a/foo b/foo
   new file mode 100644
   --- /dev/null
   +++ b/foo
   @@ -0,0 +1,5 @@
   +0
   +1
   +2
   +3
   +4
   
 
 Binary files work but without diff hunks filtering.
 (Checking w/ and w/o diff.git option.)
 
   >>> open('binary', 'wb').write(b'this\nis\na\nbinary\0') and None
   $ hg add binary
   $ hg ci -m 'add a binary file' --quiet
   $ hg log -f -L binary,1:2 -p
   changeset:   10:c96381c229df
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff --git a/dir/binary b/dir/binary
   new file mode 100644
   index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c2e1fbed209fe919b3f189a6a31950e9adf61e45
   GIT binary patch
   literal 17
   Wc$_QA$SmdpqC~Ew%)G>+N(KNlNClYy
   
   
   $ hg log -f -L binary,1:2 -p --config diff.git=false
   changeset:   10:c96381c229df
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a binary file
   
   diff -r 6af29c3a778f -r c96381c229df dir/binary
   Binary file dir/binary has changed
   
 
 Option --follow is required.
 
   $ hg log -L foo,5:7
   abort: --line-range requires --follow
   [255]
 
 Non-exact pattern kinds are not allowed.
 
   $ cd ..
   $ hg log -f -L glob:*a*,1:2
   hg: parse error: line range pattern 'glob:*a*' must match exactly one file
   [255]
 
 We get an error for removed files.
 
   $ hg rm dir/baz
   $ hg ci -m 'remove baz' --quiet
   $ hg log -f -L dir/baz,5:7 -p
   abort: cannot follow file not in parent revision: "dir/baz"
   [255]

tests/test-log.t

@@ -1,2634 +1,2634 b''
 Log on empty repository: checking consistency
 
   $ hg init empty
   $ cd empty
   $ hg log
   $ hg log -r 1
   abort: unknown revision '1'!
   [255]
   $ hg log -r -1:0
   abort: unknown revision '-1'!
   [255]
   $ hg log -r 'branch(name)'
   abort: unknown revision 'name'!
   [255]
   $ hg log -r null -q
   -1:000000000000
 
   $ cd ..
 
 The g is crafted to have 2 filelog topological heads in a linear
 changeset graph
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ echo f > f
   $ hg ci -Ama -d '1 0'
   adding a
   adding f
 
   $ hg cp a b
   $ hg cp f g
   $ hg ci -mb -d '2 0'
 
   $ mkdir dir
   $ hg mv b dir
   $ echo g >> g
   $ echo f >> f
   $ hg ci -mc -d '3 0'
 
   $ hg mv a b
   $ hg cp -f f g
   $ echo a > d
   $ hg add d
   $ hg ci -md -d '4 0'
 
   $ hg mv dir/b e
   $ hg ci -me -d '5 0'
 
 Make sure largefiles doesn't interfere with logging a regular file
   $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   updated patterns: .hglf/a, a
   0: a
   $ hg log a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   $ hg log glob:a*
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     d
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   updated patterns: glob:.hglf/a*, glob:a*
   3: d
   0: a
 
 log on directory
 
   $ hg log dir
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   $ hg log somethingthatdoesntexist dir
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
 
 -X, with explicit path
 
   $ hg log a -X a
 
 -f, non-existent directory
 
   $ hg log -f dir
   abort: cannot follow file not in parent revision: "dir"
   [255]
 
 -f, directory
 
   $ hg up -q 3
   $ hg log -f dir
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
 -f, directory with --patch
 
   $ hg log -f dir -p
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null* (glob)
   +++ b/dir/b* (glob)
   @@ -0,0 +1,1 @@
   +a
   
 
 -f, pattern
 
   $ hg log -f -I 'dir**' -p
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null* (glob)
   +++ b/dir/b* (glob)
   @@ -0,0 +1,1 @@
   +a
   
   $ hg up -q 4
 
 -f, a wrong style
 
   $ hg log -f -l1 --style something
   abort: style 'something' not found
   (available styles: bisect, changelog, compact, default, phases, show, status, xml)
   [255]
 
 -f, phases style
 
 
   $ hg log -f -l1 --style phases
   changeset:   4:7e4639b4691b
   tag:         tip
   phase:       draft
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
 
   $ hg log -f -l1 --style phases -q
   4:7e4639b4691b
 
 -f, but no args
 
   $ hg log -f
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   summary:     e
   
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     d
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
 
 one rename
 
   $ hg up -q 2
   $ hg log -vf a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 many renames
 
   $ hg up -q tip
   $ hg log -vf e
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   description:
   e
   
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   files:       b dir/b f g
   description:
   c
   
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   files:       b g
   description:
   b
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 
 log -pf dir/b
 
   $ hg up -q 3
   $ hg log -pf dir/b
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   diff -r 9161b9aeaf16 -r d89b0a12d229 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   diff -r 000000000000 -r 9161b9aeaf16 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 log -pf b inside dir
 
   $ hg --cwd=dir log -pf b
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   diff -r 9161b9aeaf16 -r d89b0a12d229 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   diff -r 000000000000 -r 9161b9aeaf16 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 log -pf, but no args
 
   $ hg log -pf
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   summary:     d
   
   diff -r f8954cd4dc1f -r 2ca5ba701980 a
   --- a/a	Thu Jan 01 00:00:03 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r f8954cd4dc1f -r 2ca5ba701980 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:04 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r f8954cd4dc1f -r 2ca5ba701980 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:04 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r f8954cd4dc1f -r 2ca5ba701980 g
   --- a/g	Thu Jan 01 00:00:03 1970 +0000
   +++ b/g	Thu Jan 01 00:00:04 1970 +0000
   @@ -1,2 +1,2 @@
    f
   -g
   +f
   
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   summary:     c
   
   diff -r d89b0a12d229 -r f8954cd4dc1f b
   --- a/b	Thu Jan 01 00:00:02 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r d89b0a12d229 -r f8954cd4dc1f f
   --- a/f	Thu Jan 01 00:00:02 1970 +0000
   +++ b/f	Thu Jan 01 00:00:03 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +f
   diff -r d89b0a12d229 -r f8954cd4dc1f g
   --- a/g	Thu Jan 01 00:00:02 1970 +0000
   +++ b/g	Thu Jan 01 00:00:03 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +g
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   summary:     b
   
   diff -r 9161b9aeaf16 -r d89b0a12d229 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 9161b9aeaf16 -r d89b0a12d229 g
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     a
   
   diff -r 000000000000 -r 9161b9aeaf16 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 000000000000 -r 9161b9aeaf16 f
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   
 
 log -vf dir/b
 
   $ hg log -vf dir/b
   changeset:   2:f8954cd4dc1f
   user:        test
   date:        Thu Jan 01 00:00:03 1970 +0000
   files:       b dir/b f g
   description:
   c
   
   
   changeset:   1:d89b0a12d229
   user:        test
   date:        Thu Jan 01 00:00:02 1970 +0000
   files:       b g
   description:
   b
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 
 -f and multiple filelog heads
 
   $ hg up -q 2
   $ hg log -f g --template '{rev}\n'
   2
   1
   0
   $ hg up -q tip
   $ hg log -f g --template '{rev}\n'
   3
   2
   0
 
 follow files from the specified revisions (issue4959)
 
   $ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n'
   @  4 dir/b e, dir/b->e
   |
   o  3 a b d g, a->b f->g
   |
   o  2 b dir/b f g, b->dir/b
   |
   o  1 b g, a->b f->g
   |
   o  0 a f,
   
 
   $ hg log -T '{rev}\n' -fr 4 e
   4
   2
   1
   0
   $ hg log -T '{rev}\n' -fr 2 g
   2
   1
   0
   $ hg log -T '{rev}\n' -fr '2+3' g
   3
   2
   1
   0
 
 follow files from the specified revisions with glob patterns (issue5053)
 (BROKEN: should follow copies from e@4)
 
   $ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]'
   4
   2 (false !)
   1 (false !)
   0 (false !)
 
 follow files from the specified revisions with missing patterns
 (BROKEN: should follow copies from e@4)
 
   $ hg log -T '{rev}\n' -fr4 e x
   4
   2 (false !)
   1 (false !)
   0 (false !)
 
 follow files from the specified revisions across copies with -p/--patch
 
   $ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g
   == rev: 4, dir/b->e ==
   diff -r 2ca5ba701980 -r 7e4639b4691b e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:05 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   == rev: 3, a->b f->g ==
   diff -r f8954cd4dc1f -r 2ca5ba701980 g
   --- a/g	Thu Jan 01 00:00:03 1970 +0000
   +++ b/g	Thu Jan 01 00:00:04 1970 +0000
   @@ -1,2 +1,2 @@
    f
   -g
   +f
   
   == rev: 2, b->dir/b ==
   diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r d89b0a12d229 -r f8954cd4dc1f f
   --- a/f	Thu Jan 01 00:00:02 1970 +0000
   +++ b/f	Thu Jan 01 00:00:03 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +f
   
   == rev: 1, a->b f->g ==
   diff -r 9161b9aeaf16 -r d89b0a12d229 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:02 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
   == rev: 0, ==
   diff -r 000000000000 -r 9161b9aeaf16 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 000000000000 -r 9161b9aeaf16 f
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:01 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   
 
 log copies with --copies
 
   $ hg log -vC --template '{rev} {file_copies}\n'
   4 e (dir/b)
   3 b (a)g (f)
   2 dir/b (b)
   1 b (a)g (f)
   0 
 
 log copies switch without --copies, with old filecopy template
 
   $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
   4 
   3 
   2 
   1 
   0 
 
 log copies switch with --copies
 
   $ hg log -vC --template '{rev} {file_copies_switch}\n'
   4 e (dir/b)
   3 b (a)g (f)
   2 dir/b (b)
   1 b (a)g (f)
   0 
 
 
 log copies with hardcoded style and with --style=default
 
   $ hg log -vC -r4
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   copies:      e (dir/b)
   description:
   e
   
   
   $ hg log -vC -r4 --style=default
   changeset:   4:7e4639b4691b
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:05 1970 +0000
   files:       dir/b e
   copies:      e (dir/b)
   description:
   e
   
   
   $ hg log -vC -r4 -Tjson
   [
    {
-    "rev": 4,
-    "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
+    "copies": {"e": "dir/b"},
     "date": [5, 0],
     "desc": "e",
-    "bookmarks": [],
-    "tags": ["tip"],
+    "files": ["dir/b", "e"],
+    "node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
     "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
-    "files": ["dir/b", "e"],
-    "copies": {"e": "dir/b"}
+    "phase": "draft",
+    "rev": 4,
+    "tags": ["tip"],
+    "user": "test"
    }
   ]
 
 log copies, non-linear manifest
 
   $ hg up -C 3
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg mv dir/b e
   $ echo foo > foo
   $ hg ci -Ame2 -d '6 0'
   adding foo
   created new head
   $ hg log -v --template '{rev} {file_copies}\n' -r 5
   5 e (dir/b)
 
 
 log copies, execute bit set
 
 #if execbit
   $ chmod +x e
   $ hg ci -me3 -d '7 0'
   $ hg log -v --template '{rev} {file_copies}\n' -r 6
   6 
 #endif
 
 
 log -p d
 
   $ hg log -pv d
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   files:       a b d g
   description:
   d
   
   
   diff -r f8954cd4dc1f -r 2ca5ba701980 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:04 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 
 log --removed file
 
   $ hg log --removed -v a
   changeset:   3:2ca5ba701980
   user:        test
   date:        Thu Jan 01 00:00:04 1970 +0000
   files:       a b d g
   description:
   d
   
   
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
 
 log --removed revrange file
 
   $ hg log --removed -v -r0:2 a
   changeset:   0:9161b9aeaf16
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   files:       a f
   description:
   a
   
   
   $ cd ..
 
 log --follow tests
 
   $ hg init follow
   $ cd follow
 
   $ echo base > base
   $ hg ci -Ambase -d '1 0'
   adding base
 
   $ echo r1 >> base
   $ hg ci -Amr1 -d '1 0'
   $ echo r2 >> base
   $ hg ci -Amr2 -d '1 0'
 
   $ hg up -C 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo b1 > b1
 
 log -r "follow('set:clean()')"
 
   $ hg log -r "follow('set:clean()')"
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
 
   $ hg ci -Amb1 -d '1 0'
   adding b1
   created new head
 
 
 log -f
 
   $ hg log -f
   changeset:   3:e62f78d544b4
   tag:         tip
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
 
 log -r follow('glob:b*')
 
   $ hg log -r "follow('glob:b*')"
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   3:e62f78d544b4
   tag:         tip
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 log -f -r '1 + 4'
 
   $ hg up -C 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b2 > b2
   $ hg ci -Amb2 -d '1 0'
   adding b2
   created new head
   $ hg log -f -r '1 + 4'
   changeset:   4:ddb82e70d1a1
   tag:         tip
   parent:      0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
 
 log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no
 effect
 
   $ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA
   4:ddb82e70d1a1
   1:3d5bf5654eda
   0:67e992f2c4f3
 
 log -r "follow('set:grep(b2)')"
 
   $ hg log -r "follow('set:grep(b2)')"
   changeset:   4:ddb82e70d1a1
   tag:         tip
   parent:      0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
 log -r "follow('set:grep(b2)', 4)"
 
   $ hg up -qC 0
   $ hg log -r "follow('set:grep(b2)', 4)"
   changeset:   4:ddb82e70d1a1
   tag:         tip
   parent:      0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
 
 follow files starting from multiple revisions:
 
   $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
   3: b1
   4: b2
 
 follow files starting from empty revision:
 
   $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
 
 follow starting from revisions:
 
   $ hg log -Gq -r "follow(startrev=2+4)"
   o  4:ddb82e70d1a1
   |
   | o  2:60c670bf5b30
   | |
   | o  1:3d5bf5654eda
   |/
   @  0:67e992f2c4f3
   
 
 follow the current revision:
 
   $ hg log -Gq -r "follow()"
   @  0:67e992f2c4f3
   
 
   $ hg up -qC 4
 
 log -f -r null
 
   $ hg log -f -r null
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -f -r null -G
   o  changeset:   -1:000000000000
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 
 log -f with null parent
 
   $ hg up -C null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg log -f
 
 
 log -r .  with two parents
 
   $ hg up -C 3
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg merge tip
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg log -r .
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 
 
 log -r .  with one parent
 
   $ hg ci -mm12 -d '1 0'
   $ hg log -r .
   changeset:   5:302e9dd6890d
   tag:         tip
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
 
   $ echo postm >> b1
   $ hg ci -Amb1.1 -d'1 0'
 
 
 log --follow-first
 
   $ hg log --follow-first
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   changeset:   5:302e9dd6890d
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
   changeset:   0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     base
   
 
 
 log -P 2
 
   $ hg log -P 2
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   changeset:   5:302e9dd6890d
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   changeset:   4:ddb82e70d1a1
   parent:      0:67e992f2c4f3
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b2
   
   changeset:   3:e62f78d544b4
   parent:      1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1
   
 
 
 log -r tip -p --git
 
   $ hg log -r tip -p --git
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   diff --git a/b1 b/b1
   --- a/b1
   +++ b/b1
   @@ -1,1 +1,2 @@
    b1
   +postm
   
 
 
 log -r ""
 
   $ hg log -r ''
   hg: parse error: empty query
   [255]
 
 log -r <some unknown node id>
 
   $ hg log -r 1000000000000000000000000000000000000000
   abort: unknown revision '1000000000000000000000000000000000000000'!
   [255]
 
 log -k r1
 
   $ hg log -k r1
   changeset:   1:3d5bf5654eda
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     r1
   
 log -p -l2 --color=always
 
   $ hg --config extensions.color= --config color.mode=ansi \
   >  log -p -l2 --color=always
   \x1b[0;33mchangeset:   6:2404bbcab562\x1b[0m (esc)
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
   \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
   \x1b[0;31;1m--- a/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;32;1m+++ b/b1	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
    b1
   \x1b[0;32m+postm\x1b[0m (esc)
   
   \x1b[0;33mchangeset:   5:302e9dd6890d\x1b[0m (esc)
   parent:      3:e62f78d544b4
   parent:      4:ddb82e70d1a1
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     m12
   
   \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
   \x1b[0;31;1m--- /dev/null	Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
   \x1b[0;32;1m+++ b/b2	Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
   \x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
   \x1b[0;32m+b2\x1b[0m (esc)
   
 
 
 log -r tip --stat
 
   $ hg log -r tip --stat
   changeset:   6:2404bbcab562
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:01 1970 +0000
   summary:     b1.1
   
    b1 |  1 +
    1 files changed, 1 insertions(+), 0 deletions(-)
   
 
   $ cd ..
 
 log --follow --patch FILE in repository where linkrev isn't trustworthy
 (issue5376)
 
   $ hg init follow-dup
   $ cd follow-dup
   $ cat <<EOF >> .hg/hgrc
   > [ui]
   > logtemplate = '=== {rev}: {desc}\n'
   > [diff]
   > nodates = True
   > EOF
   $ echo 0 >> a
   $ hg ci -qAm 'a0'
   $ echo 1 >> a
   $ hg ci -m 'a1'
   $ hg up -q 0
   $ echo 1 >> a
   $ touch b
   $ hg ci -qAm 'a1 with b'
   $ echo 3 >> a
   $ hg ci -m 'a3'
 
  fctx.rev() == 2, but fctx.linkrev() == 1
 
   $ hg log -pf a
   === 3: a3
   diff -r 4ea02ba94d66 -r e7a6331a34f0 a
   --- a/a
   +++ b/a
   @@ -1,2 +1,3 @@
    0
    1
   +3
   
   === 2: a1 with b
   diff -r 49b5e81287e2 -r 4ea02ba94d66 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    0
   +1
   
   === 0: a0
   diff -r 000000000000 -r 49b5e81287e2 a
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,1 @@
   +0
   
 
  fctx.introrev() == 2, but fctx.linkrev() == 1
 
   $ hg up -q 2
   $ hg log -pf a
   === 2: a1 with b
   diff -r 49b5e81287e2 -r 4ea02ba94d66 a
   --- a/a
   +++ b/a
   @@ -1,1 +1,2 @@
    0
   +1
   
   === 0: a0
   diff -r 000000000000 -r 49b5e81287e2 a
   --- /dev/null
   +++ b/a
   @@ -0,0 +1,1 @@
   +0
   
 
   $ cd ..
 
 Multiple copy sources of a file:
 
   $ hg init follow-multi
   $ cd follow-multi
   $ echo 0 >> a
   $ hg ci -qAm 'a'
   $ hg cp a b
   $ hg ci -m 'a->b'
   $ echo 2 >> a
   $ hg ci -m 'a'
   $ echo 3 >> b
   $ hg ci -m 'b'
   $ echo 4 >> a
   $ echo 4 >> b
   $ hg ci -m 'a,b'
   $ echo 5 >> a
   $ hg ci -m 'a0'
   $ echo 6 >> b
   $ hg ci -m 'b0'
   $ hg up -q 4
   $ echo 7 >> b
   $ hg ci -m 'b1'
   created new head
   $ echo 8 >> a
   $ hg ci -m 'a1'
   $ hg rm a
   $ hg mv b a
   $ hg ci -m 'b1->a1'
   $ hg merge -qt :local
   $ hg ci -m '(a0,b1->a1)->a'
 
   $ hg log -GT '{rev}: {desc}\n'
   @    10: (a0,b1->a1)->a
   |\
   | o  9: b1->a1
   | |
   | o  8: a1
   | |
   | o  7: b1
   | |
   o |  6: b0
   | |
   o |  5: a0
   |/
   o  4: a,b
   |
   o  3: b
   |
   o  2: a
   |
   o  1: a->b
   |
   o  0: a
   
 
  since file 'a' has multiple copy sources at the revision 4, ancestors can't
  be indexed solely by fctx.linkrev().
 
   $ hg log -T '{rev}: {desc}\n' -f a
   10: (a0,b1->a1)->a
   9: b1->a1
   7: b1
   5: a0
   4: a,b
   3: b
   2: a
   1: a->b
   0: a
 
   $ cd ..
 
 Test that log should respect the order of -rREV even if multiple OR conditions
 are specified (issue5100):
 
   $ hg init revorder
   $ cd revorder
 
   $ hg branch -q b0
   $ echo 0 >> f0
   $ hg ci -qAm k0 -u u0
   $ hg branch -q b1
   $ echo 1 >> f1
   $ hg ci -qAm k1 -u u1
   $ hg branch -q b2
   $ echo 2 >> f2
   $ hg ci -qAm k2 -u u2
 
   $ hg update -q b2
   $ echo 3 >> f2
   $ hg ci -qAm k2 -u u2
   $ hg update -q b1
   $ echo 4 >> f1
   $ hg ci -qAm k1 -u u1
   $ hg update -q b0
   $ echo 5 >> f0
   $ hg ci -qAm k0 -u u0
 
  summary of revisions:
 
   $ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
   @  5 b0 u0 k0 f0
   |
   | o  4 b1 u1 k1 f1
   | |
   | | o  3 b2 u2 k2 f2
   | | |
   | | o  2 b2 u2 k2 f2
   | |/
   | o  1 b1 u1 k1 f1
   |/
   o  0 b0 u0 k0 f0
   
 
  log -b BRANCH in ascending order:
 
   $ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
   0 b0
   1 b1
   4 b1
   5 b0
   $ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
   0 b0
   1 b1
   4 b1
   5 b0
 
  log --only-branch BRANCH in descending order:
 
   $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
   4 b1
   3 b2
   2 b2
   1 b1
   $ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
   4 b1
   3 b2
   2 b2
   1 b1
 
  log -u USER in ascending order, against compound set:
 
   $ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
   0 u0
   2 u2
   3 u2
   5 u0
   $ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
   0 u0
   2 u2
   3 u2
   5 u0
 
  log -k TEXT in descending order, against compound set:
 
   $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
   5 k0
   3 k2
   2 k2
   1 k1
   0 k0
   $ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
   5 k0
   3 k2
   2 k2
   1 k1
   0 k0
 
  log FILE in ascending order, against dagrange:
 
   $ hg log -r1:: -T '{rev} {files}\n' f1 f2
   1 f1
   2 f2
   3 f2
   4 f1
   $ hg log -r1:: -T '{rev} {files}\n' f2 f1
   1 f1
   2 f2
   3 f2
   4 f1
 
   $ cd ..
 
 User
 
   $ hg init usertest
   $ cd usertest
 
   $ echo a > a
   $ hg ci -A -m "a" -u "User One <[e-mail]>"
   adding a
   $ echo b > b
   $ hg ci -A -m "b" -u "User Two <[e-mail]>"
   adding b
 
   $ hg log -u "User One <[e-mail]>"
   changeset:   0:29a4c94f1924
   user:        User One <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg log -u "user1" -u "user2"
   changeset:   1:e834b5e69c0e
   tag:         tip
   user:        User Two <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     b
   
   changeset:   0:29a4c94f1924
   user:        User One <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
   $ hg log -u "user3"
 
 "-u USER" shouldn't be overridden by "user(USER)" alias
 
   $ hg log --config 'revsetalias.user(x)=branch(x)' -u default
   $ hg log --config 'revsetalias.user(x)=branch(x)' -u user1
   changeset:   0:29a4c94f1924
   user:        User One <[e-mail]>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 
   $ cd ..
 
   $ hg init branches
   $ cd branches
 
   $ echo a > a
   $ hg ci -A -m "commit on default"
   adding a
   $ hg branch test
   marked working directory as branch test
   (branches are permanent and global, did you want a bookmark?)
   $ echo b > b
   $ hg ci -A -m "commit on test"
   adding b
 
   $ hg up default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -A -m "commit on default"
   adding c
   $ hg up test
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -A -m "commit on test"
   adding c
 
 
 log -b default
 
   $ hg log -b default
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b test
 
   $ hg log -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b dummy
 
   $ hg log -b dummy
   abort: unknown revision 'dummy'!
   [255]
 
 
 log -b .
 
   $ hg log -b .
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b default -b test
 
   $ hg log -b default -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b default -b .
 
   $ hg log -b default -b .
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 
 
 log -b . -b test
 
   $ hg log -b . -b test
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
 
 
 log -b 2
 
   $ hg log -b 2
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
 #if gettext
 
 Test that all log names are translated (e.g. branches, bookmarks, tags):
 
   $ hg bookmark babar -r tip
 
   $ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
   \xc3\x84nderung:        3:f5d8de11c2e2 (esc)
   Zweig:           test
   Lesezeichen:     babar
   Marke:           tip
   Vorg\xc3\xa4nger:       1:d32277701ccb (esc)
   Nutzer:          test
   Datum:           Thu Jan 01 00:00:00 1970 +0000
   Zusammenfassung: commit on test
   
   $ hg bookmark -d babar
 
 #endif
 
 log -p --cwd dir (in subdir)
 
   $ mkdir dir
   $ hg log -p --cwd dir
   changeset:   3:f5d8de11c2e2
   branch:      test
   tag:         tip
   parent:      1:d32277701ccb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   diff -r d32277701ccb -r f5d8de11c2e2 c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +c
   
   changeset:   2:c3a4f03cc9a7
   parent:      0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 24427303d56f -r c3a4f03cc9a7 c
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/c	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +c
   
   changeset:   1:d32277701ccb
   branch:      test
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on test
   
   diff -r 24427303d56f -r d32277701ccb b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
   
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 000000000000 -r 24427303d56f a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
 
 log -p -R repo
 
   $ cd dir
   $ hg log -p -R .. ../a
   changeset:   0:24427303d56f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     commit on default
   
   diff -r 000000000000 -r 24427303d56f a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   
 
   $ cd ../..
 
   $ hg init follow2
   $ cd follow2
 
 # Build the following history:
 # tip - o - x - o - x - x
 #    \                 /
 #     o - o - o - x
 #      \     /
 #         o
 #
 # Where "o" is a revision containing "foo" and
 # "x" is a revision without "foo"
 
   $ touch init
   $ hg ci -A -m "init, unrelated"
   adding init
   $ echo 'foo' > init
   $ hg ci -m "change, unrelated"
   $ echo 'foo' > foo
   $ hg ci -A -m "add unrelated old foo"
   adding foo
   $ hg rm foo
   $ hg ci -m "delete foo, unrelated"
   $ echo 'related' > foo
   $ hg ci -A -m "add foo, related"
   adding foo
 
   $ hg up 0
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch branch
   $ hg ci -A -m "first branch, unrelated"
   adding branch
   created new head
   $ touch foo
   $ hg ci -A -m "create foo, related"
   adding foo
   $ echo 'change' > foo
   $ hg ci -m "change foo, related"
 
   $ hg up 6
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'change foo in branch' > foo
   $ hg ci -m "change foo in branch, related"
   created new head
   $ hg merge 7
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ echo 'merge 1' > foo
   $ hg resolve -m foo
   (no more unresolved files)
   $ hg ci -m "First merge, related"
 
   $ hg merge 4
   merging foo
   warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
   [1]
   $ echo 'merge 2' > foo
   $ hg resolve -m foo
   (no more unresolved files)
   $ hg ci -m "Last merge, related"
 
   $ hg log --graph
   @    changeset:   10:4dae8563d2c5
   |\   tag:         tip
   | |  parent:      9:7b35701b003e
   | |  parent:      4:88176d361b69
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Last merge, related
   | |
   | o    changeset:   9:7b35701b003e
   | |\   parent:      8:e5416ad8a855
   | | |  parent:      7:87fe3144dcfa
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | | |  summary:     First merge, related
   | | |
   | | o  changeset:   8:e5416ad8a855
   | | |  parent:      6:dc6c325fe5ee
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | | |  summary:     change foo in branch, related
   | | |
   | o |  changeset:   7:87fe3144dcfa
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   | |    summary:     change foo, related
   | |
   | o  changeset:   6:dc6c325fe5ee
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     create foo, related
   | |
   | o  changeset:   5:73db34516eb9
   | |  parent:      0:e87515fd044a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     first branch, unrelated
   | |
   o |  changeset:   4:88176d361b69
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     add foo, related
   | |
   o |  changeset:   3:dd78ae4afb56
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     delete foo, unrelated
   | |
   o |  changeset:   2:c4c64aedf0f7
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     add unrelated old foo
   | |
   o |  changeset:   1:e5faa7440653
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     change, unrelated
   |
   o  changeset:   0:e87515fd044a
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     init, unrelated
   
 
   $ hg --traceback log -f foo
   changeset:   10:4dae8563d2c5
   tag:         tip
   parent:      9:7b35701b003e
   parent:      4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Last merge, related
   
   changeset:   9:7b35701b003e
   parent:      8:e5416ad8a855
   parent:      7:87fe3144dcfa
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     First merge, related
   
   changeset:   8:e5416ad8a855
   parent:      6:dc6c325fe5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo in branch, related
   
   changeset:   7:87fe3144dcfa
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     change foo, related
   
   changeset:   6:dc6c325fe5ee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     create foo, related
   
   changeset:   4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo, related
   
 
 Also check when maxrev < lastrevfilelog
 
   $ hg --traceback log -f -r4 foo
   changeset:   4:88176d361b69
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add foo, related
   
   $ cd ..
 
 Issue2383: hg log showing _less_ differences than hg diff
 
   $ hg init issue2383
   $ cd issue2383
 
 Create a test repo:
 
   $ echo a > a
   $ hg ci -Am0
   adding a
   $ echo b > b
   $ hg ci -Am1
   adding b
   $ hg co 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b > a
   $ hg ci -m2
   created new head
 
 Merge:
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Make sure there's a file listed in the merge to trigger the bug:
 
   $ echo c > a
   $ hg ci -m3
 
 Two files shown here in diff:
 
   $ hg diff --rev 2:3
   diff -r b09be438c43a -r 8e07aafe1edc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -b
   +c
   diff -r b09be438c43a -r 8e07aafe1edc b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
 
 Diff here should be the same:
 
   $ hg log -vpr 3
   changeset:   3:8e07aafe1edc
   tag:         tip
   parent:      2:b09be438c43a
   parent:      1:925d80f479bb
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   files:       a
   description:
   3
   
   
   diff -r b09be438c43a -r 8e07aafe1edc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -b
   +c
   diff -r b09be438c43a -r 8e07aafe1edc b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +b
   
   $ cd ..
 
 'hg log -r rev fn' when last(filelog(fn)) != rev
 
   $ hg init simplelog
   $ cd simplelog
   $ echo f > a
   $ hg ci -Am'a' -d '0 0'
   adding a
   $ echo f >> a
   $ hg ci -Am'a bis' -d '1 0'
 
   $ hg log -r0 a
   changeset:   0:9f758d63dcde
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a
   
 enable obsolete to test hidden feature
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
   obsoleted 1 changesets
   $ hg up null -q
   $ hg log --template='{rev}:{node}\n'
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg log --template='{rev}:{node}\n' --hidden
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg log -r a
   abort: hidden revision 'a' is pruned!
   (use --hidden to access hidden revisions)
   [255]
 
 test that parent prevent a changeset to be hidden
 
   $ hg up 1 -q --hidden
   updating to a hidden changeset a765632148dc
   (hidden revision 'a765632148dc' is pruned)
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
 
 test that second parent prevent a changeset to be hidden too
 
   $ hg debugsetparents 0 1 # nothing suitable to merge here
   $ hg log --template='{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg debugsetparents 1
   $ hg up -q null
 
 bookmarks prevent a changeset being hidden
 
   $ hg bookmark --hidden -r 1 X
   bookmarking hidden changeset a765632148dc
   (hidden revision 'a765632148dc' is pruned)
   $ hg log --template '{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg bookmark -d X
 
 divergent bookmarks are not hidden
 
   $ hg bookmark --hidden -r 1 X@foo
   bookmarking hidden changeset a765632148dc
   (hidden revision 'a765632148dc' is pruned)
   $ hg log --template '{rev}:{node}\n'
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
 
 test hidden revision 0 (issue5385)
 
   $ hg bookmark -d X@foo
   $ hg up null -q
   $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   obsoleted 1 changesets
   $ echo f > b
   $ hg ci -Am'b' -d '2 0'
   adding b
   $ echo f >> b
   $ hg ci -m'b bis' -d '3 0'
   $ hg log -T'{rev}:{node}\n'
   3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
   2:94375ec45bddd2a824535fc04855bd058c926ec0
 
   $ hg log -T'{rev}:{node}\n' -r:
   2:94375ec45bddd2a824535fc04855bd058c926ec0
   3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
   $ hg log -T'{rev}:{node}\n' -r:tip
   2:94375ec45bddd2a824535fc04855bd058c926ec0
   3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
   $ hg log -T'{rev}:{node}\n' -r:0
   abort: hidden revision '0' is pruned!
   (use --hidden to access hidden revisions)
   [255]
   $ hg log -T'{rev}:{node}\n' -f
   3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
   2:94375ec45bddd2a824535fc04855bd058c926ec0
 
 clear extensions configuration
   $ echo '[extensions]' >> $HGRCPATH
   $ echo "obs=!" >> $HGRCPATH
   $ cd ..
 
 test -u/-k for problematic encoding
 # unicode: cp932:
 # u30A2    0x83 0x41(= 'A')
 # u30C2    0x83 0x61(= 'a')
 
   $ hg init problematicencoding
   $ cd problematicencoding
 
   >>> with open('setup.sh', 'wb') as f:
   ...     f.write(u'''
   ... echo a > text
   ... hg add text
   ... hg --encoding utf-8 commit -u '\u30A2' -m none
   ... echo b > text
   ... hg --encoding utf-8 commit -u '\u30C2' -m none
   ... echo c > text
   ... hg --encoding utf-8 commit -u none -m '\u30A2'
   ... echo d > text
   ... hg --encoding utf-8 commit -u none -m '\u30C2'
   ... '''.encode('utf-8')) and None
   $ sh < setup.sh
 
 test in problematic encoding
   >>> with open('test.sh', 'wb') as f:
   ...     f.write(u'''
   ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
   ... echo ====
   ... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
   ... echo ====
   ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
   ... echo ====
   ... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
   ... '''.encode('cp932')) and None
   $ sh < test.sh
   0
   ====
   1
   ====
   2
   0
   ====
   3
   1
 
   $ cd ..
 
 test hg log on non-existent files and on directories
   $ hg init issue1340
   $ cd issue1340
   $ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
   $ echo 1 > d1/f1
   $ echo 1 > D2/f1
   $ echo 1 > D3.i/f1
   $ echo 1 > d4.hg/f1
   $ echo 1 > d5.d/f1
   $ echo 1 > .d6/f1
   $ hg -q add .
   $ hg commit -m "a bunch of weird directories"
   $ hg log -l1 d1/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 f1
   $ hg log -l1 . | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 ./ | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D2 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D2/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D3.i | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 D3.i/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d4.hg | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d4.hg/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d5.d | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 d5.d/f1 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 .d6 | grep changeset
   changeset:   0:65624cd9070a
   $ hg log -l1 .d6/f1 | grep changeset
   changeset:   0:65624cd9070a
 
 issue3772: hg log -r :null showing revision 0 as well
 
   $ hg log -r :null
   changeset:   0:65624cd9070a
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a bunch of weird directories
   
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -r null:null
   changeset:   -1:000000000000
   user:        
   date:        Thu Jan 01 00:00:00 1970 +0000
   
 working-directory revision requires special treatment
 
 clean:
 
   $ hg log -r 'wdir()' --debug
   changeset:   2147483647:ffffffffffffffffffffffffffffffffffffffff
   phase:       draft
   parent:      0:65624cd9070a035fa7191a54f2b8af39f16b0c08
   parent:      -1:0000000000000000000000000000000000000000
   user:        test
   date:        [A-Za-z0-9:+ ]+ (re)
   extra:       branch=default
   
   $ hg log -r 'wdir()' -p --stat
   changeset:   2147483647:ffffffffffff
   parent:      0:65624cd9070a
   user:        test
   date:        [A-Za-z0-9:+ ]+ (re)
   
   
   
 
 dirty:
 
   $ echo 2 >> d1/f1
   $ echo 2 > d1/f2
   $ hg add d1/f2
   $ hg remove .d6/f1
   $ hg status
   M d1/f1
   A d1/f2
   R .d6/f1
 
   $ hg log -r 'wdir()'
   changeset:   2147483647:ffffffffffff
   parent:      0:65624cd9070a
   user:        test
   date:        [A-Za-z0-9:+ ]+ (re)
   
   $ hg log -r 'wdir()' -q
   2147483647:ffffffffffff
 
   $ hg log -r 'wdir()' --debug
   changeset:   2147483647:ffffffffffffffffffffffffffffffffffffffff
   phase:       draft
   parent:      0:65624cd9070a035fa7191a54f2b8af39f16b0c08
   parent:      -1:0000000000000000000000000000000000000000
   user:        test
   date:        [A-Za-z0-9:+ ]+ (re)
   files:       d1/f1
   files+:      d1/f2
   files-:      .d6/f1
   extra:       branch=default
   
   $ hg log -r 'wdir()' -p --stat --git
   changeset:   2147483647:ffffffffffff
   parent:      0:65624cd9070a
   user:        test
   date:        [A-Za-z0-9:+ ]+ (re)
   
    .d6/f1 |  1 -
    d1/f1  |  1 +
    d1/f2  |  1 +
    3 files changed, 2 insertions(+), 1 deletions(-)
   
   diff --git a/.d6/f1 b/.d6/f1
   deleted file mode 100644
   --- a/.d6/f1
   +++ /dev/null
   @@ -1,1 +0,0 @@
   -1
   diff --git a/d1/f1 b/d1/f1
   --- a/d1/f1
   +++ b/d1/f1
   @@ -1,1 +1,2 @@
    1
   +2
   diff --git a/d1/f2 b/d1/f2
   new file mode 100644
   --- /dev/null
   +++ b/d1/f2
   @@ -0,0 +1,1 @@
   +2
   
   $ hg log -r 'wdir()' -Tjson
   [
    {
-    "rev": null,
-    "node": null,
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [*, 0], (glob)
     "desc": "",
-    "bookmarks": [],
+    "node": null,
+    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
+    "phase": "draft",
+    "rev": null,
     "tags": [],
-    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"]
+    "user": "test"
    }
   ]
 
   $ hg log -r 'wdir()' -Tjson -q
   [
    {
-    "rev": null,
-    "node": null
+    "node": null,
+    "rev": null
    }
   ]
 
   $ hg log -r 'wdir()' -Tjson --debug
   [
    {
-    "rev": null,
-    "node": null,
+    "added": ["d1/f2"],
+    "bookmarks": [],
     "branch": "default",
-    "phase": "draft",
-    "user": "test",
     "date": [*, 0], (glob)
     "desc": "",
-    "bookmarks": [],
-    "tags": [],
-    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
+    "extra": {"branch": "default"},
     "manifest": null,
-    "extra": {"branch": "default"},
     "modified": ["d1/f1"],
-    "added": ["d1/f2"],
-    "removed": [".d6/f1"]
+    "node": null,
+    "parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
+    "phase": "draft",
+    "removed": [".d6/f1"],
+    "rev": null,
+    "tags": [],
+    "user": "test"
    }
   ]
 
   $ hg revert -aqC
 
 Check that adding an arbitrary name shows up in log automatically
 
   $ cat > ../names.py <<EOF
   > """A small extension to test adding arbitrary names to a repo"""
   > from __future__ import absolute_import
   > from mercurial import namespaces
   > 
   > def reposetup(ui, repo):
   >     foo = {b'foo': repo[0].node()}
   >     names = lambda r: foo.keys()
   >     namemap = lambda r, name: foo.get(name)
   >     nodemap = lambda r, node: [name for name, n in foo.items()
   >                                if n == node]
   >     ns = namespaces.namespace(
   >         b"bars", templatename=b"bar", logname=b"barlog",
   >         colorname=b"barcolor", listnames=names, namemap=namemap,
   >         nodemap=nodemap)
   > 
   >     repo.names.addnamespace(ns)
   > EOF
 
   $ hg --config extensions.names=../names.py log -r 0
   changeset:   0:65624cd9070a
   tag:         tip
   barlog:      foo
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a bunch of weird directories
   
   $ hg --config extensions.names=../names.py \
   >  --config extensions.color= --config color.log.barcolor=red \
   >  --color=always log -r 0
   \x1b[0;33mchangeset:   0:65624cd9070a\x1b[0m (esc)
   tag:         tip
   \x1b[0;31mbarlog:      foo\x1b[0m (esc)
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     a bunch of weird directories
   
   $ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
   foo
 
 Templater parse errors:
 
 simple error
   $ hg log -r . -T '{shortest(node}'
   hg: parse error at 14: unexpected token: end
   ({shortest(node}
                  ^ here)
   [255]
 
 multi-line template with error
   $ hg log -r . -T 'line 1
   > line2
   > {shortest(node}
   > line4\nline5'
   hg: parse error at 27: unexpected token: end
   (line 1\nline2\n{shortest(node}\nline4\nline5
                                 ^ here)
   [255]
 
   $ cd ..
 
 hg log -f dir across branches
 
   $ hg init acrossbranches
   $ cd acrossbranches
   $ mkdir d
   $ echo a > d/a && hg ci -Aqm a
   $ echo b > d/a && hg ci -Aqm b
   $ hg up -q 0
   $ echo b > d/a && hg ci -Aqm c
   $ hg log -f d -T '{desc}' -G
   @  c
   |
   o  a
   
 Ensure that largefiles doesn't interfere with following a normal file
   $ hg  --config extensions.largefiles= log -f d -T '{desc}' -G
   The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   @  c
   |
   o  a
   
   $ hg log -f d/a -T '{desc}' -G
   @  c
   |
   o  a
   
   $ cd ..
 
 hg log -f with linkrev pointing to another branch
 -------------------------------------------------
 
 create history with a filerev whose linkrev points to another branch
 
   $ hg init branchedlinkrev
   $ cd branchedlinkrev
   $ echo 1 > a
   $ hg commit -Am 'content1'
   adding a
   $ echo 2 > a
   $ hg commit -m 'content2'
   $ hg up --rev 'desc(content1)'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo unrelated > unrelated
   $ hg commit -Am 'unrelated'
   adding unrelated
   created new head
   $ hg graft -r 'desc(content2)'
   grafting 1:2294ae80ad84 "content2"
   $ echo 3 > a
   $ hg commit -m 'content3'
   $ hg log -G
   @  changeset:   4:50b9b36e9c5d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content3
   |
   o  changeset:   3:15b2327059e5
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content2
   |
   o  changeset:   2:2029acd1168c
   |  parent:      0:ae0a3c9f9e95
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     unrelated
   |
   | o  changeset:   1:2294ae80ad84
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     content2
   |
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 log -f on the file should list the graft result.
 
   $ hg log -Gf a
   @  changeset:   4:50b9b36e9c5d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content3
   |
   o  changeset:   3:15b2327059e5
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     content2
   :
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 plain log lists the original version
 (XXX we should probably list both)
 
   $ hg log -G a
   @  changeset:   4:50b9b36e9c5d
   :  tag:         tip
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     content3
   :
   : o  changeset:   1:2294ae80ad84
   :/   user:        test
   :    date:        Thu Jan 01 00:00:00 1970 +0000
   :    summary:     content2
   :
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 hg log -f from the grafted changeset
 (The bootstrap should properly take the topology in account)
 
   $ hg up 'desc(content3)^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -Gf a
   @  changeset:   3:15b2327059e5
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     content2
   :
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 Test that we use the first non-hidden changeset in that case.
 
 (hide the changeset)
 
   $ hg log -T '{node}\n' -r 1
   2294ae80ad8447bc78383182eeac50cb049df623
   $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
   obsoleted 1 changesets
   $ hg log -G
   o  changeset:   4:50b9b36e9c5d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content3
   |
   @  changeset:   3:15b2327059e5
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content2
   |
   o  changeset:   2:2029acd1168c
   |  parent:      0:ae0a3c9f9e95
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     unrelated
   |
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 Check that log on the file does not drop the file revision.
 
   $ hg log -G a
   o  changeset:   4:50b9b36e9c5d
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     content3
   |
   @  changeset:   3:15b2327059e5
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     content2
   :
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
 Even when a head revision is linkrev-shadowed.
 
   $ hg log -T '{node}\n' -r 4
   50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
   $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
   obsoleted 1 changesets
   $ hg log -G a
   @  changeset:   3:15b2327059e5
   :  tag:         tip
   :  user:        test
   :  date:        Thu Jan 01 00:00:00 1970 +0000
   :  summary:     content2
   :
   o  changeset:   0:ae0a3c9f9e95
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     content1
   
 
   $ cd ..
 
 Even when the file revision is missing from some head:
 
   $ hg init issue4490
   $ cd issue4490
   $ echo '[experimental]' >> .hg/hgrc
   $ echo 'evolution.createmarkers=True' >> .hg/hgrc
   $ echo a > a
   $ hg ci -Am0
   adding a
   $ echo b > b
   $ hg ci -Am1
   adding b
   $ echo B > b
   $ hg ci --amend -m 1
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo c > c
   $ hg ci -Am2
   adding c
   created new head
   $ hg up 'head() and not .'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -G
   o  changeset:   3:db815d6d32e6
   |  tag:         tip
   |  parent:      0:f7b1eb17ad24
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     2
   |
   | @  changeset:   2:9bc8ce7f9356
   |/   parent:      0:f7b1eb17ad24
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     1
   |
   o  changeset:   0:f7b1eb17ad24
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     0
   
   $ hg log -f -G b
   @  changeset:   2:9bc8ce7f9356
   |  parent:      0:f7b1eb17ad24
   ~  user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     1
   
   $ hg log -G b
   @  changeset:   2:9bc8ce7f9356
   |  parent:      0:f7b1eb17ad24
   ~  user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     1
   
   $ cd ..
 
 Check proper report when the manifest changes but not the file issue4499
 ------------------------------------------------------------------------
 
   $ hg init issue4499
   $ cd issue4499
   $ for f in A B C D F E G H I J K L M N O P Q R S T U; do
   >     echo 1 > $f;
   >     hg add $f;
   > done
   $ hg commit -m 'A1B1C1'
   $ echo 2 > A
   $ echo 2 > B
   $ echo 2 > C
   $ hg commit -m 'A2B2C2'
   $ hg up 0
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 3 > A
   $ echo 2 > B
   $ echo 2 > C
   $ hg commit -m 'A3B2C2'
   created new head
 
   $ hg log -G
   @  changeset:   2:fe5fc3d0eb17
   |  tag:         tip
   |  parent:      0:abf4f0e38563
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A3B2C2
   |
   | o  changeset:   1:07dcc6b312c0
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     A2B2C2
   |
   o  changeset:   0:abf4f0e38563
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A1B1C1
   
 
 Log -f on B should reports current changesets
 
   $ hg log -fG B
   @  changeset:   2:fe5fc3d0eb17
   |  tag:         tip
   |  parent:      0:abf4f0e38563
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     A3B2C2
   |
   o  changeset:   0:abf4f0e38563
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A1B1C1
   
   $ cd ..