log: populate keywords if specified in custom -Tjson(...) or -Tcbor(...)

To make things simple, early return for ui.quiet is disabled if the formatter
is templated and provides some datahint().

mercurial/logcmdutil.py

@@ -1,1064 +1,1071 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
 import posixpath
 
 from .i18n import _
 from .node import (
     nullid,
     wdirid,
     wdirrev,
 )
 
 from . import (
     dagop,
     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(b'limit')
     if limit:
         try:
             limit = int(limit)
         except ValueError:
             raise error.Abort(_(b'limit must be a positive integer'))
         if limit <= 0:
             raise error.Abort(_(b'limit must be positive'))
     else:
         limit = None
     return limit
 
 
 def diffordiffstat(
     ui,
     repo,
     diffopts,
     node1,
     node2,
     match,
     changes=None,
     stat=False,
     fp=None,
     graphwidth=0,
     prefix=b'',
     root=b'',
     listsubrepos=False,
     hunksfilterfn=None,
 ):
     '''show diff or diffstat.'''
     ctx1 = repo[node1]
     ctx2 = repo[node2]
     if root:
         relroot = pathutil.canonpath(repo.root, repo.getcwd(), root)
     else:
         relroot = b''
     copysourcematch = None
 
     def compose(f, g):
         return lambda x: f(g(x))
 
     def pathfn(f):
         return posixpath.join(prefix, f)
 
     if relroot != b'':
         # XXX relative roots currently don't work if the root is within a
         # subrepo
         uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
         uirelroot = uipathfn(pathfn(relroot))
         relroot += b'/'
         for matchroot in match.files():
             if not matchroot.startswith(relroot):
                 ui.warn(
                     _(b'warning: %s not inside relative root %s\n')
                     % (uipathfn(pathfn(matchroot)), uirelroot)
                 )
 
         relrootmatch = scmutil.match(ctx2, pats=[relroot], default=b'path')
         match = matchmod.intersectmatchers(match, relrootmatch)
         copysourcematch = relrootmatch
 
         checkroot = repo.ui.configbool(
             b'devel', b'all-warnings'
         ) or repo.ui.configbool(b'devel', b'check-relroot')
 
         def relrootpathfn(f):
             if checkroot and not f.startswith(relroot):
                 raise AssertionError(
                     b"file %s doesn't start with relroot %s" % (f, relroot)
                 )
             return f[len(relroot) :]
 
         pathfn = compose(relrootpathfn, pathfn)
 
     if stat:
         diffopts = diffopts.copy(context=0, noprefix=False)
         width = 80
         if not ui.plain():
             width = ui.termwidth() - graphwidth
         # If an explicit --root was given, don't respect ui.relative-paths
         if not relroot:
             pathfn = compose(scmutil.getuipathfn(repo), pathfn)
 
     chunks = ctx2.diff(
         ctx1,
         match,
         changes,
         opts=diffopts,
         pathfn=pathfn,
         copysourcematch=copysourcematch,
         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)
 
     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)
         subprefix = repo.wvfs.reljoin(prefix, subpath)
         if listsubrepos or match.exact(subpath) or any(submatch.files()):
             sub.diff(
                 ui,
                 diffopts,
                 tempnode2,
                 submatch,
                 changes=changes,
                 stat=stat,
                 fp=fp,
                 prefix=subprefix,
             )
 
 
 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, graphwidth=0, stat=False):
         repo = ctx.repo()
         node = ctx.node()
         prev = ctx.p1().node()
         diffordiffstat(
             ui,
             repo,
             diffopts,
             prev,
             node,
             match=self._makefilematcher(ctx),
             stat=stat,
             graphwidth=graphwidth,
             hunksfilterfn=self._makehunksfilter(ctx),
         )
 
 
 def changesetlabels(ctx):
     labels = [b'log.changeset', b'changeset.%s' % ctx.phasestr()]
     if ctx.obsolete():
         labels.append(b'changeset.obsolete')
     if ctx.isunstable():
         labels.append(b'changeset.unstable')
         for instability in ctx.instabilities():
             labels.append(b'instability.%s' % instability)
     return b' '.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 = patch.diffallopts(ui, diffopts)
         self._includestat = diffopts and diffopts.get(b'stat')
         self._includediff = diffopts and diffopts.get(b'patch')
         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()
         graphwidth = props.get(b'graphwidth', 0)
 
         if self.ui.quiet:
             self.ui.write(
                 b"%s\n" % scmutil.formatchangeid(ctx), label=b'log.node'
             )
             return
 
         columns = self._columns
         self.ui.write(
             columns[b'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 != b'default':
             self.ui.write(columns[b'branch'] % branch, label=b'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 == b'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=b'log.%s' % ns.colorname)
         if self.ui.debugflag:
             self.ui.write(
                 columns[b'phase'] % ctx.phasestr(), label=b'log.phase'
             )
         for pctx in scmutil.meaningfulparents(self.repo, ctx):
             label = b'log.parent changeset.%s' % pctx.phasestr()
             self.ui.write(
                 columns[b'parent'] % scmutil.formatchangeid(pctx), label=label
             )
 
         if self.ui.debugflag:
             mnode = ctx.manifestnode()
             if mnode is None:
                 mnode = wdirid
                 mrev = wdirrev
             else:
                 mrev = self.repo.manifestlog.rev(mnode)
             self.ui.write(
                 columns[b'manifest']
                 % scmutil.formatrevnode(self.ui, mrev, mnode),
                 label=b'ui.debug log.manifest',
             )
         self.ui.write(columns[b'user'] % ctx.user(), label=b'log.user')
         self.ui.write(
             columns[b'date'] % dateutil.datestr(ctx.date()), label=b'log.date'
         )
 
         if ctx.isunstable():
             instabilities = ctx.instabilities()
             self.ui.write(
                 columns[b'instability'] % b', '.join(instabilities),
                 label=b'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([b'files', b'files+', b'files-'], files):
                 if value:
                     self.ui.write(
                         columns[key] % b" ".join(value),
                         label=b'ui.debug log.files',
                     )
         elif ctx.files() and self.ui.verbose:
             self.ui.write(
                 columns[b'files'] % b" ".join(ctx.files()),
                 label=b'ui.note log.files',
             )
         if copies and self.ui.verbose:
             copies = [b'%s (%s)' % c for c in copies]
             self.ui.write(
                 columns[b'copies'] % b' '.join(copies),
                 label=b'ui.note log.copies',
             )
 
         extra = ctx.extra()
         if extra and self.ui.debugflag:
             for key, value in sorted(extra.items()):
                 self.ui.write(
                     columns[b'extra'] % (key, stringutil.escapestr(value)),
                     label=b'ui.debug log.extra',
                 )
 
         description = ctx.description().strip()
         if description:
             if self.ui.verbose:
                 self.ui.write(
                     _(b"description:\n"), label=b'ui.note log.description'
                 )
                 self.ui.write(description, label=b'ui.note log.description')
                 self.ui.write(b"\n\n")
             else:
                 self.ui.write(
                     columns[b'summary'] % description.splitlines()[0],
                     label=b'log.summary',
                 )
         self.ui.write(b"\n")
 
         self._showpatch(ctx, graphwidth)
 
     def _showobsfate(self, ctx):
         # TODO: do not depend on templater
         tres = formatter.templateresources(self.repo.ui, self.repo)
         t = formatter.maketemplater(
             self.repo.ui,
             b'{join(obsfate, "\n")}',
             defaults=templatekw.keywords,
             resources=tres,
         )
         obsfate = t.renderdefault({b'ctx': ctx}).splitlines()
 
         if obsfate:
             for obsfateline in obsfate:
                 self.ui.write(
                     self._columns[b'obsolete'] % obsfateline,
                     label=b'log.obsfate',
                 )
 
     def _exthook(self, ctx):
         '''empty method used by extension as a hook point
         '''
 
     def _showpatch(self, ctx, graphwidth=0):
         if self._includestat:
             self._differ.showdiff(
                 self.ui, ctx, self._diffopts, graphwidth, stat=True
             )
         if self._includestat and self._includediff:
             self.ui.write(b"\n")
         if self._includediff:
             self._differ.showdiff(
                 self.ui, ctx, self._diffopts, graphwidth, stat=False
             )
         if self._includestat or self._includediff:
             self.ui.write(b"\n")
 
 
 class changesetformatter(changesetprinter):
     """Format changeset information by generic formatter"""
 
     def __init__(
         self, ui, repo, fm, differ=None, diffopts=None, buffered=False
     ):
         changesetprinter.__init__(self, ui, repo, differ, diffopts, buffered)
         self._diffopts = patch.difffeatureopts(ui, diffopts, git=True)
         self._fm = fm
 
     def close(self):
         self._fm.end()
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
         fm = self._fm
         fm.startitem()
         fm.context(ctx=ctx)
         fm.data(rev=scmutil.intrev(ctx), node=fm.hexfunc(scmutil.binnode(ctx)))
 
-        if self.ui.quiet:
+        datahint = fm.datahint()
+        if self.ui.quiet and not datahint:
             return
 
         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=b'bookmark'),
             tags=fm.formatlist(ctx.tags(), name=b'tag'),
             parents=fm.formatlist(
                 [fm.hexfunc(c.node()) for c in ctx.parents()], name=b'node'
             ),
         )
 
-        if self.ui.debugflag:
-            fm.data(
-                manifest=fm.hexfunc(ctx.manifestnode() or wdirid),
-                extra=fm.formatdict(ctx.extra()),
-            )
+        if self.ui.debugflag or b'manifest' in datahint:
+            fm.data(manifest=fm.hexfunc(ctx.manifestnode() or wdirid))
+        if self.ui.debugflag or b'extra' in datahint:
+            fm.data(extra=fm.formatdict(ctx.extra()))
 
+        if (
+            self.ui.debugflag
+            or b'modified' in datahint
+            or b'added' in datahint
+            or b'removed' in datahint
+        ):
             files = ctx.p1().status(ctx)
             fm.data(
                 modified=fm.formatlist(files[0], name=b'file'),
                 added=fm.formatlist(files[1], name=b'file'),
                 removed=fm.formatlist(files[2], name=b'file'),
             )
 
-        elif self.ui.verbose:
+        verbose = not self.ui.debugflag and self.ui.verbose
+        if verbose or b'files' in datahint:
             fm.data(files=fm.formatlist(ctx.files(), name=b'file'))
-            if copies:
+        if verbose and copies or b'copies' in datahint:
                 fm.data(
-                    copies=fm.formatdict(copies, key=b'name', value=b'source')
+                copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
                 )
 
-        if self._includestat:
+        if self._includestat or b'diffstat' in datahint:
             self.ui.pushbuffer()
             self._differ.showdiff(self.ui, ctx, self._diffopts, stat=True)
             fm.data(diffstat=self.ui.popbuffer())
-        if self._includediff:
+        if self._includediff or b'diff' in datahint:
             self.ui.pushbuffer()
             self._differ.showdiff(self.ui, ctx, self._diffopts, stat=False)
             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 = {
             b'header': b'',
             b'footer': b'',
             tmplspec.ref: tmplspec.ref,
             b'docheader': b'',
             b'docfooter': b'',
             b'separator': b'',
         }
         if tmplspec.mapfile:
             # find correct templates for current mode, for backward
             # compatibility with 'log -v/-q/--debug' using a mapfile
             tmplmodes = [
                 (True, b''),
                 (self.ui.verbose, b'_verbose'),
                 (self.ui.quiet, b'_quiet'),
                 (self.ui.debugflag, b'_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[b'docheader']:
             self.ui.write(self.t.render(self._parts[b'docheader'], {}))
 
     def close(self):
         if self._parts[b'docfooter']:
             if not self.footer:
                 self.footer = b""
             self.footer += self.t.render(self._parts[b'docfooter'], {})
         return super(changesettemplater, self).close()
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
         props = props.copy()
         props[b'ctx'] = ctx
         props[b'index'] = index = next(self._counter)
         props[b'revcache'] = {b'copies': copies}
         graphwidth = props.get(b'graphwidth', 0)
 
         # 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[b'separator'] and index > 0:
             self.ui.write(self.t.render(self._parts[b'separator'], {}))
 
         # write header
         if self._parts[b'header']:
             h = self.t.render(self._parts[b'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, graphwidth)
 
         if self._parts[b'footer']:
             if not self.footer:
                 self.footer = self.t.render(self._parts[b'footer'], props)
 
 
 def templatespec(tmpl, mapfile):
     if pycompat.ispy3:
         assert not isinstance(tmpl, str), b'tmpl must not be a str'
     if mapfile:
         return formatter.templatespec(b'changeset', tmpl, mapfile)
     else:
         return formatter.templatespec(b'', 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(b'ui', b'logtemplate')
         if tmpl:
             return templatespec(templater.unquotestring(tmpl), None)
         else:
             style = util.expandpath(ui.config(b'ui', b'style'))
 
     if not tmpl and style:
         mapfile = style
         if not os.path.split(mapfile)[0]:
             mapname = templater.templatepath(
                 b'map-cmdline.' + mapfile
             ) or templater.templatepath(mapfile)
             if mapname:
                 mapfile = mapname
         return templatespec(None, mapfile)
 
     return formatter.lookuptemplate(ui, b'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)
     spec = _lookuptemplate(ui, opts.get(b'template'), opts.get(b'style'))
 
     # machine-readable formats have slightly different keyword set than
     # plain templates, which are handled by changesetformatter.
     # note that {b'pickle', b'debug'} can also be added to the list if needed.
     if spec.ref in {b'cbor', b'json'}:
         fm = ui.formatter(b'log', opts)
         return changesetformatter(ui, repo, fm, *postargs)
 
     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(b'removed'))
     if not slowpath:
         follow = opts.get(b'follow') or opts.get(b'follow_first')
         startctxs = []
         if follow and opts.get(b'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(
                         _(
                             b'cannot follow file not in parent '
                             b'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(
                         _(b'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 == b'.' 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 = {
     b'no_merges': (b'not merge()', None),
     b'only_merges': (b'merge()', None),
     b'_matchfiles': (None, b'_matchfiles(%ps)'),
     b'date': (b'date(%s)', None),
     b'branch': (b'branch(%s)', b'%lr'),
     b'_patslog': (b'filelog(%s)', b'%lr'),
     b'keyword': (b'keyword(%s)', b'%lr'),
     b'prune': (b'ancestors(%s)', b'not %lr'),
     b'user': (b'user(%s)', b'%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(b'follow') or opts.get(b'follow_first')
 
     # branch and only_branch are really aliases and must be handled at
     # the same time
     opts[b'branch'] = opts.get(b'branch', []) + opts.get(b'only_branch', [])
     opts[b'branch'] = [repo.lookupbranch(b) for b in opts[b'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 = [b'r:', b'd:relpath']
         for p in pats:
             matchargs.append(b'p:' + p)
         for p in opts.get(b'include', []):
             matchargs.append(b'i:' + p)
         for p in opts.get(b'exclude', []):
             matchargs.append(b'x:' + p)
         opts[b'_matchfiles'] = matchargs
     elif not follow:
         opts[b'_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 b'%' 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 = b'(' + b' and '.join(expr) + b')'
     else:
         expr = None
     return expr
 
 
 def _initialrevs(repo, opts):
     """Return the initial set of revisions to be filtered or followed"""
     follow = opts.get(b'follow') or opts.get(b'follow_first')
     if opts.get(b'rev'):
         revs = scmutil.revrange(repo, opts[b'rev'])
     elif follow and repo.dirstate.p1() == nullid:
         revs = smartset.baseset()
     elif follow:
         revs = repo.revs(b'.')
     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(b'follow') or opts.get(b'follow_first')
     followfirst = opts.get(b'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(b'graph'):
         # User-specified revs might be unsorted, but don't sort before
         # _makerevset because it might depend on the order of revs
         if repo.ui.configbool(b'experimental', b'log.topo'):
             if not revs.istopo():
                 revs = dagop.toposort(revs, repo.changelog.parentrevs)
                 # TODO: try to iterate the set lazily
                 revs = revset.baseset(list(revs), istopo=True)
         elif 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(b'line_range', []):
         try:
             pat, linerange = pat.rsplit(b',', 1)
         except ValueError:
             raise error.Abort(_(b'malformatted line-range pattern %s') % pat)
         try:
             fromline, toline = map(int, linerange.split(b':'))
         except ValueError:
             raise error.Abort(_(b"invalid line range for %s") % pat)
         msg = _(b"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(
                 _(b'cannot follow file not in parent ' b'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(b'ui', b'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 = {b'ctx': ctx, b'repo': repo}
         return templ.renderdefault(props)
 
     return formatnode
 
 
 def displaygraph(ui, repo, dag, displayer, edgefn, getcopies=None, props=None):
     props = props or {}
     formatnode = _graphnodeformatter(ui, displayer)
     state = graphmod.asciistate()
     styles = state[b'styles']
 
     # only set graph styling if HGPLAIN is not set.
     if ui.plain(b'graph'):
         # set all edge styles to |, the default pre-3.8 behaviour
         styles.update(dict.fromkeys(styles, b'|'))
     else:
         edgetypes = {
             b'parent': graphmod.PARENT,
             b'grandparent': graphmod.GRANDPARENT,
             b'missing': graphmod.MISSINGPARENT,
         }
         for name, key in edgetypes.items():
             # experimental config: experimental.graphstyle.*
             styles[key] = ui.config(
                 b'experimental', b'graphstyle.%s' % name, styles[key]
             )
             if not styles[key]:
                 styles[key] = None
 
         # experimental config: experimental.graphshorten
         state[b'graphshorten'] = ui.configbool(b'experimental', b'graphshorten')
 
     for rev, type, ctx, parents in dag:
         char = formatnode(repo, ctx)
         copies = getcopies(ctx) if getcopies else None
         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(b'\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, getcopies):
     for rev in revs:
         ctx = repo[rev]
         copies = getcopies(ctx) if getcopies else None
         displayer.show(ctx, copies=copies)
         displayer.flush(ctx)
     displayer.close()
 
 
 def checkunsupportedgraphflags(pats, opts):
     for op in [b"newest_first"]:
         if op in opts and opts[op]:
             raise error.Abort(
                 _(b"-G/--graph option is incompatible with --%s")
                 % op.replace(b"_", b"-")
             )
 
 
 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-template-map.t

@@ -1,1878 +1,1932 b''
 Test template map files and styles
 ==================================
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg add a
   $ echo line 1 > b
   $ echo line 2 >> b
   $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
 
   $ hg add b
   $ echo other 1 > c
   $ echo other 2 >> c
   $ echo >> c
   $ echo other 3 >> c
   $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
 
   $ hg add c
   $ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
   $ echo c >> c
   $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
 
   $ echo foo > .hg/branch
   $ hg commit -m 'new branch' -d '1400000 0' -u 'person'
 
   $ hg co -q 3
   $ echo other 4 >> d
   $ hg add d
   $ hg commit -m 'new head' -d '1500000 0' -u 'person'
 
   $ hg merge -q foo
   $ hg commit -m 'merge' -d '1500001 0' -u 'person'
 
 Second branch starting at nullrev:
 
   $ hg update null
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo second > second
   $ hg add second
   $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
   created new head
 
   $ echo third > third
   $ hg add third
   $ hg mv second fourth
   $ hg commit -m third -d "2020-01-01 10:01"
 
 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 CBOR style:
 
   $ cat <<'EOF' > "$TESTTMP/decodecborarray.py"
   > from __future__ import absolute_import
   > from mercurial import (
   >     dispatch,
   >     pycompat,
   > )
   > from mercurial.utils import (
   >     cborutil,
   >     stringutil,
   > )
   > dispatch.initstdio()
   > data = pycompat.stdin.read()
   > # our CBOR decoder doesn't support parsing indefinite-length arrays,
   > # but the log output is indefinite stream by nature.
   > assert data[:1] == cborutil.BEGIN_INDEFINITE_ARRAY
   > assert data[-1:] == cborutil.BREAK
   > items = cborutil.decodeall(data[1:-1])
   > pycompat.stdout.write(stringutil.pprint(items, indent=1) + b'\n')
   > EOF
 
   $ hg log -k nosuch -Tcbor | "$PYTHON" "$TESTTMP/decodecborarray.py"
   []
 
   $ hg log -qr0:1 -Tcbor | "$PYTHON" "$TESTTMP/decodecborarray.py"
   [
    {
     'node': '1e4e1b8f71e05681d422154f5421e385fec3454f',
     'rev': 0
    },
    {
     'node': 'b608e9d1a3f0273ccf70fb85fd6866b3482bf965',
     'rev': 1
    }
   ]
 
   $ hg log -vpr . -Tcbor --stat | "$PYTHON" "$TESTTMP/decodecborarray.py"
   [
    {
     'bookmarks': [],
     'branch': 'default',
     'date': [
      1577872860,
      0
     ],
     'desc': 'third',
     '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'
     ],
     'phase': 'draft',
     'rev': 8,
     'tags': [
      'tip'
     ],
     'user': 'test'
    }
   ]
 
   $ hg log -r . -T'cbor(rev, node|short)' | "$PYTHON" "$TESTTMP/decodecborarray.py"
   [
    {
     'node': '95c24699272e',
     'rev': 8
    }
   ]
 
   $ hg log -r . -T'cbor()' | "$PYTHON" "$TESTTMP/decodecborarray.py"
   [
    {}
   ]
 
 Test JSON style:
 
   $ hg log -k nosuch -Tjson
   [
   ]
 
   $ hg log -qr . -Tjson
   [
    {
     "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "rev": 8
    }
   ]
 
   $ hg log -vpr . -Tjson --stat
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1577872860, 0],
     "desc": "third",
     "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"],
     "phase": "draft",
     "rev": 8,
     "tags": ["tip"],
     "user": "test"
    }
   ]
 
 honor --git but not format-breaking diffopts
   $ hg --config diff.noprefix=True log --git -vpr . -Tjson
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1577872860, 0],
     "desc": "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",
     "files": ["fourth", "second", "third"],
     "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
     "phase": "draft",
     "rev": 8,
     "tags": ["tip"],
     "user": "test"
    }
   ]
 
   $ hg log -T json
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1577872860, 0],
     "desc": "third",
     "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
     "phase": "draft",
     "rev": 8,
     "tags": ["tip"],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1000000, 0],
     "desc": "second",
     "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "rev": 7,
     "tags": [],
     "user": "User Name <user@hostname>"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1500001, 0],
     "desc": "merge",
     "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
     "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
     "phase": "draft",
     "rev": 6,
     "tags": [],
     "user": "person"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1500000, 0],
     "desc": "new head",
     "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
     "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
     "phase": "draft",
     "rev": 5,
     "tags": [],
     "user": "person"
    },
    {
     "bookmarks": [],
     "branch": "foo",
     "date": [1400000, 0],
     "desc": "new branch",
     "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
     "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
     "phase": "draft",
     "rev": 4,
     "tags": [],
     "user": "person"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1300000, 0],
     "desc": "no user, no domain",
     "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
     "parents": ["97054abb4ab824450e9164180baf491ae0078465"],
     "phase": "draft",
     "rev": 3,
     "tags": [],
     "user": "person"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1200000, 0],
     "desc": "no person",
     "node": "97054abb4ab824450e9164180baf491ae0078465",
     "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
     "phase": "draft",
     "rev": 2,
     "tags": [],
     "user": "other@place"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1100000, 0],
     "desc": "other 1\nother 2\n\nother 3",
     "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
     "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
     "phase": "draft",
     "rev": 1,
     "tags": [],
     "user": "A. N. Other <other@place>"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1000000, 0],
     "desc": "line 1\nline 2",
     "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "rev": 0,
     "tags": [],
     "user": "User Name <user@hostname>"
    }
   ]
 
   $ hg heads -v -Tjson
   [
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1577872860, 0],
     "desc": "third",
     "files": ["fourth", "second", "third"],
     "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
     "phase": "draft",
     "rev": 8,
     "tags": ["tip"],
     "user": "test"
    },
    {
     "bookmarks": [],
     "branch": "default",
     "date": [1500001, 0],
     "desc": "merge",
     "files": [],
     "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
     "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
     "phase": "draft",
     "rev": 6,
     "tags": [],
     "user": "person"
    },
    {
     "bookmarks": [],
     "branch": "foo",
     "date": [1400000, 0],
     "desc": "new branch",
     "files": [],
     "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
     "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
     "phase": "draft",
     "rev": 4,
     "tags": [],
     "user": "person"
    }
   ]
 
   $ hg log --debug -Tjson
   [
    {
     "added": ["fourth", "third"],
     "bookmarks": [],
     "branch": "default",
     "date": [1577872860, 0],
     "desc": "third",
     "extra": {"branch": "default"},
     "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64",
     "modified": [],
     "node": "95c24699272ef57d062b8bccc32c878bf841784a",
     "parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"],
     "phase": "draft",
     "removed": ["second"],
     "rev": 8,
     "tags": ["tip"],
     "user": "test"
    },
    {
     "added": ["second"],
     "bookmarks": [],
     "branch": "default",
     "date": [1000000, 0],
     "desc": "second",
     "extra": {"branch": "default"},
     "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf",
     "modified": [],
     "node": "29114dbae42b9f078cf2714dbe3a86bba8ec7453",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "removed": [],
     "rev": 7,
     "tags": [],
     "user": "User Name <user@hostname>"
    },
    {
     "added": [],
     "bookmarks": [],
     "branch": "default",
     "date": [1500001, 0],
     "desc": "merge",
     "extra": {"branch": "default"},
     "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
     "modified": [],
     "node": "d41e714fe50d9e4a5f11b4d595d543481b5f980b",
     "parents": ["13207e5a10d9fd28ec424934298e176197f2c67f", "bbe44766e73d5f11ed2177f1838de10c53ef3e74"],
     "phase": "draft",
     "removed": [],
     "rev": 6,
     "tags": [],
     "user": "person"
    },
    {
     "added": ["d"],
     "bookmarks": [],
     "branch": "default",
     "date": [1500000, 0],
     "desc": "new head",
     "extra": {"branch": "default"},
     "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
     "modified": [],
     "node": "13207e5a10d9fd28ec424934298e176197f2c67f",
     "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
     "phase": "draft",
     "removed": [],
     "rev": 5,
     "tags": [],
     "user": "person"
    },
    {
     "added": [],
     "bookmarks": [],
     "branch": "foo",
     "date": [1400000, 0],
     "desc": "new branch",
     "extra": {"branch": "foo"},
     "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
     "modified": [],
     "node": "bbe44766e73d5f11ed2177f1838de10c53ef3e74",
     "parents": ["10e46f2dcbf4823578cf180f33ecf0b957964c47"],
     "phase": "draft",
     "removed": [],
     "rev": 4,
     "tags": [],
     "user": "person"
    },
    {
     "added": [],
     "bookmarks": [],
     "branch": "default",
     "date": [1300000, 0],
     "desc": "no user, no domain",
     "extra": {"branch": "default"},
     "manifest": "cb5a1327723bada42f117e4c55a303246eaf9ccc",
     "modified": ["c"],
     "node": "10e46f2dcbf4823578cf180f33ecf0b957964c47",
     "parents": ["97054abb4ab824450e9164180baf491ae0078465"],
     "phase": "draft",
     "removed": [],
     "rev": 3,
     "tags": [],
     "user": "person"
    },
    {
     "added": ["c"],
     "bookmarks": [],
     "branch": "default",
     "date": [1200000, 0],
     "desc": "no person",
     "extra": {"branch": "default"},
     "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1",
     "modified": [],
     "node": "97054abb4ab824450e9164180baf491ae0078465",
     "parents": ["b608e9d1a3f0273ccf70fb85fd6866b3482bf965"],
     "phase": "draft",
     "removed": [],
     "rev": 2,
     "tags": [],
     "user": "other@place"
    },
    {
     "added": ["b"],
     "bookmarks": [],
     "branch": "default",
     "date": [1100000, 0],
     "desc": "other 1\nother 2\n\nother 3",
     "extra": {"branch": "default"},
     "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55",
     "modified": [],
     "node": "b608e9d1a3f0273ccf70fb85fd6866b3482bf965",
     "parents": ["1e4e1b8f71e05681d422154f5421e385fec3454f"],
     "phase": "draft",
     "removed": [],
     "rev": 1,
     "tags": [],
     "user": "A. N. Other <other@place>"
    },
    {
     "added": ["a"],
     "bookmarks": [],
     "branch": "default",
     "date": [1000000, 0],
     "desc": "line 1\nline 2",
     "extra": {"branch": "default"},
     "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0",
     "modified": [],
     "node": "1e4e1b8f71e05681d422154f5421e385fec3454f",
     "parents": ["0000000000000000000000000000000000000000"],
     "phase": "draft",
     "removed": [],
     "rev": 0,
     "tags": [],
     "user": "User Name <user@hostname>"
    }
   ]
 
   $ hg log -l2 -T'json(rev, parents)'
   [
    {"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], "rev": 8},
    {"parents": ["0000000000000000000000000000000000000000"], "rev": 7}
   ]
 
+  $ hg log -qr. -T'json(rev, parents)'
+  [
+   {"parents": ["29114dbae42b9f078cf2714dbe3a86bba8ec7453"], "rev": 8}
+  ]
+
+  $ hg log -r. -T'json(diff)'
+  [
+   {"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"}
+  ]
+
+  $ hg log -r. -T'json(diffstat)'
+  [
+   {"diffstat": " fourth |  1 +\n second |  1 -\n third  |  1 +\n 3 files changed, 2 insertions(+), 1 deletions(-)\n"}
+  ]
+
+  $ hg log -r. -T'json(manifest)'
+  [
+   {"manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64"}
+  ]
+
+  $ hg log -r. -T'json(extra)'
+  [
+   {"extra": {"branch": "default"}}
+  ]
+
+  $ hg log -r3 -T'json(modified)'
+  [
+   {"modified": ["c"]}
+  ]
+
+  $ hg log -r. -T'json(added)'
+  [
+   {"added": ["fourth", "third"]}
+  ]
+
+  $ hg log -r. -T'json(removed)'
+  [
+   {"removed": ["second"]}
+  ]
+
+  $ hg log -r. -T'json(files)'
+  [
+   {"files": ["fourth", "second", "third"]}
+  ]
+
+ --copies is the exception. copies dict is built only when --copies switch
+ is on:
+
+  $ hg log -r'.^:' -T'json(copies)' --copies
+  [
+   {"copies": {}},
+   {"copies": {"fourth": "second"}}
+  ]
+
   $ hg log -r. -T'json()'
   [
    {}
   ]
 
 Other unsupported formatter styles:
 
   $ hg log -qr . -Tpickle
   abort: "pickle" not in template map
   [255]
   $ hg log -qr . -Tdebug
   abort: "debug" not in template map
   [255]
 
 Unparsable function-style references:
 
   $ hg log -qr . -T'json(-)'
   hg: parse error at 6: not a prefix: )
   (json(-)
          ^ here)
   [255]
 
 For backward compatibility, the following examples are not parsed as
 function-style references:
 
   $ hg log -qr . -T'cbor(rev'
   cbor(rev (no-eol)
   $ hg log -qr . -T'json (rev)'
   json (rev) (no-eol)
   $ hg log -qr . -T'json(x="{rev}")'
   json(x="8") (no-eol)
 
 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
 
   $ hg phase -r 5 --public
   $ hg phase -r 7 --secret --force
 
 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>
   
 
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a
   $ hg add a
   $ hg ci -m future
 
 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
 
   $ cd ..
 
 Set up latesttag repository:
 
   $ hg init latesttag
   $ cd latesttag
 
   $ echo a > file
   $ hg ci -Am a -d '0 0'
   adding file
 
   $ echo b >> file
   $ hg ci -m b -d '1 0'
 
   $ echo c >> head1
   $ hg ci -Am h1c -d '2 0'
   adding head1
 
   $ hg update -q 1
   $ echo d >> head2
   $ hg ci -Am h2d -d '3 0'
   adding head2
   created new head
 
   $ echo e >> head2
   $ hg ci -m h2e -d '4 0'
 
   $ hg merge -q
   $ hg ci -m merge -d '5 -3600'
 
   $ hg tag -r 1 -m t1 -d '6 0' t1
   $ hg tag -r 2 -m t2 -d '7 0' t2
   $ hg tag -r 3 -m t3 -d '8 0' t3
   $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
   $ hg tag -r 5 -m t5 -d '9 0' t5
   $ hg tag -r 3 -m at3 -d '10 0' at3
 
   $ 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,
   branch: test