log: do not accept string-matcher pattern as -u/-b/-B parameter

I'm pretty sure this is a bug introduced after we've switched the filtering
backend to revset matcher.

mercurial/logcmdutil.py

@@ -1,1219 +1,1219 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 .thirdparty import attr
 
 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,
 )
 
 
 if pycompat.TYPE_CHECKING:
     from typing import (
         Any,
         Callable,
         Dict,
         List,
         Optional,
         Tuple,
     )
 
     for t in (Any, Callable, Dict, List, Optional, Tuple):
         assert t
 
 
 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,
     ctx1,
     ctx2,
     match,
     changes=None,
     stat=False,
     fp=None,
     graphwidth=0,
     prefix=b'',
     root=b'',
     listsubrepos=False,
     hunksfilterfn=None,
 ):
     '''show diff or diffstat.'''
     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)
 
     node2 = ctx2.node()
     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):
         diffordiffstat(
             ui,
             ctx.repo(),
             diffopts,
             ctx.p1(),
             ctx,
             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 pycompat.iteritems(self.repo.names):
             # 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)
             for key, value in zip(
                 [b'files', b'files+', b'files-'],
                 [files.modified, files.added, files.removed],
             ):
                 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)))
 
         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 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.modified, name=b'file'),
                 added=fm.formatlist(files.added, name=b'file'),
                 removed=fm.formatlist(files.removed, name=b'file'),
             )
 
         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 verbose and copies or b'copies' in datahint:
             fm.data(
                 copies=fm.formatdict(copies or {}, key=b'name', value=b'source')
             )
 
         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 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._exthook(ctx)
         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):
     assert not (tmpl and mapfile)
     if mapfile:
         return formatter.mapfile_templatespec(b'changeset', mapfile)
     else:
         return formatter.literal_templatespec(tmpl)
 
 
 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'command-templates', b'log')
         if tmpl:
             return formatter.literal_templatespec(templater.unquotestring(tmpl))
         else:
             style = util.expandpath(ui.config(b'ui', b'style'))
 
     if not tmpl and style:
         mapfile = style
         fp = None
         if not os.path.split(mapfile)[0]:
             (mapname, fp) = templater.try_open_template(
                 b'map-cmdline.' + mapfile
             ) or templater.try_open_template(mapfile)
             if mapname:
                 mapfile = mapname
         return formatter.mapfile_templatespec(b'changeset', mapfile, fp)
 
     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 = formatter.literal_templatespec(tmpl)
     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. [command-templates] setting 'log'
     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)
 
 
 @attr.s
 class walkopts(object):
     """Options to configure a set of revisions and file matcher factory
     to scan revision/file history
     """
 
     # raw command-line parameters, which a matcher will be built from
     pats = attr.ib()  # type: List[bytes]
     opts = attr.ib()  # type: Dict[bytes, Any]
 
     # a list of revset expressions to be traversed; if follow, it specifies
     # the start revisions
     revspec = attr.ib()  # type: List[bytes]
 
     # miscellaneous queries to filter revisions (see "hg help log" for details)
     bookmarks = attr.ib(default=attr.Factory(list))  # type: List[bytes]
     branches = attr.ib(default=attr.Factory(list))  # type: List[bytes]
     date = attr.ib(default=None)  # type: Optional[bytes]
     keywords = attr.ib(default=attr.Factory(list))  # type: List[bytes]
     no_merges = attr.ib(default=False)  # type: bool
     only_merges = attr.ib(default=False)  # type: bool
     prune_ancestors = attr.ib(default=attr.Factory(list))  # type: List[bytes]
     users = attr.ib(default=attr.Factory(list))  # type: List[bytes]
 
     # miscellaneous matcher arguments
     include_pats = attr.ib(default=attr.Factory(list))  # type: List[bytes]
     exclude_pats = attr.ib(default=attr.Factory(list))  # type: List[bytes]
 
     # 0: no follow, 1: follow first, 2: follow both parents
     follow = attr.ib(default=0)  # type: int
 
     # do not attempt filelog-based traversal, which may be fast but cannot
     # include revisions where files were removed
     force_changelog_traversal = attr.ib(default=False)  # type: bool
 
     # filter revisions by file patterns, which should be disabled only if
     # you want to include revisions where files were unmodified
     filter_revisions_by_pats = attr.ib(default=True)  # type: bool
 
     # sort revisions prior to traversal: 'desc', 'topo', or None
     sort_revisions = attr.ib(default=None)  # type: Optional[bytes]
 
     # limit number of changes displayed; None means unlimited
     limit = attr.ib(default=None)  # type: Optional[int]
 
 
 def parseopts(ui, pats, opts):
     # type: (Any, List[bytes], Dict[bytes, Any]) -> walkopts
     """Parse log command options into walkopts
 
     The returned walkopts will be passed in to getrevs() or makewalker().
     """
     if opts.get(b'follow_first'):
         follow = 1
     elif opts.get(b'follow'):
         follow = 2
     else:
         follow = 0
 
     if opts.get(b'graph'):
         if ui.configbool(b'experimental', b'log.topo'):
             sort_revisions = b'topo'
         else:
             sort_revisions = b'desc'
     else:
         sort_revisions = None
 
     return walkopts(
         pats=pats,
         opts=opts,
         revspec=opts.get(b'rev', []),
         bookmarks=opts.get(b'bookmark', []),
         # branch and only_branch are really aliases and must be handled at
         # the same time
         branches=opts.get(b'branch', []) + opts.get(b'only_branch', []),
         date=opts.get(b'date'),
         keywords=opts.get(b'keyword', []),
         no_merges=bool(opts.get(b'no_merges')),
         only_merges=bool(opts.get(b'only_merges')),
         prune_ancestors=opts.get(b'prune', []),
         users=opts.get(b'user', []),
         include_pats=opts.get(b'include', []),
         exclude_pats=opts.get(b'exclude', []),
         follow=follow,
         force_changelog_traversal=bool(opts.get(b'removed')),
         sort_revisions=sort_revisions,
         limit=getlimit(opts),
     )
 
 
 def _makematcher(repo, revs, wopts):
     """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 a log-like command should build 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, wopts.pats, wopts.opts)
     slowpath = match.anypats() or (
         not match.always() and wopts.force_changelog_traversal
     )
     if not slowpath:
         if wopts.follow and wopts.revspec:
             # There may be the case that a path doesn't exist in some (but
             # not all) of the specified start revisions, but let's consider
             # the path is valid. Missing files will be warned by the matcher.
             startctxs = [repo[r] for r in revs]
             for f in match.files():
                 found = False
                 for c in startctxs:
                     if f in c:
                         found = True
                     elif c.hasdir(f):
                         # If a directory exists in any of the start revisions,
                         # take the slow path.
                         found = slowpath = True
                 if not found:
                     raise error.Abort(
                         _(
                             b'cannot follow file not in any of the specified '
                             b'revisions: "%s"'
                         )
                         % f
                     )
         elif wopts.follow:
             for f in match.files():
                 if 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 file exists in wdir but not in history, which means
                     # the file isn't committed yet.
                     raise error.Abort(
                         _(b'cannot follow nonexistent file: "%s"') % f
                     )
         else:
             for f in match.files():
                 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.
                     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(scmutil.intrev(ctx), []))
 
     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, wopts, slowpath):
     """Return a revset string built from log options and file patterns"""
     opts = {
-        b'branch': [repo.lookupbranch(b) for b in wopts.branches],
+        b'branch': [b'literal:' + repo.lookupbranch(b) for b in wopts.branches],
         b'date': wopts.date,
         b'keyword': wopts.keywords,
         b'no_merges': wopts.no_merges,
         b'only_merges': wopts.only_merges,
         b'prune': wopts.prune_ancestors,
-        b'user': wopts.users,
+        b'user': [b'literal:' + v for v in wopts.users],
     }
 
     if wopts.filter_revisions_by_pats and slowpath:
         # 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 wopts.pats:
             matchargs.append(b'p:' + p)
         for p in wopts.include_pats:
             matchargs.append(b'i:' + p)
         for p in wopts.exclude_pats:
             matchargs.append(b'x:' + p)
         opts[b'_matchfiles'] = matchargs
     elif wopts.filter_revisions_by_pats and not wopts.follow:
         opts[b'_patslog'] = list(wopts.pats)
 
     expr = []
     for op, val in sorted(pycompat.iteritems(opts)):
         if not val:
             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 wopts.bookmarks:
         expr.append(
             revsetlang.formatspec(
                 b'%lr',
                 [scmutil.format_bookmark_revspec(v) for v in wopts.bookmarks],
             )
         )
 
     if expr:
         expr = b'(' + b' and '.join(expr) + b')'
     else:
         expr = None
     return expr
 
 
 def _initialrevs(repo, wopts):
     """Return the initial set of revisions to be filtered or followed"""
     if wopts.revspec:
         revs = scmutil.revrange(repo, wopts.revspec)
     elif wopts.follow and repo.dirstate.p1() == nullid:
         revs = smartset.baseset()
     elif wopts.follow:
         revs = repo.revs(b'.')
     else:
         revs = smartset.spanset(repo)
         revs.reverse()
     return revs
 
 
 def makewalker(repo, wopts):
     # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[Callable[[Any], matchmod.basematcher]]]
     """Build (revs, makefilematcher) to scan revision/file history
 
     - revs is the smartset to be traversed.
     - makefilematcher is a function to map ctx to a matcher for that revision
     """
     revs = _initialrevs(repo, wopts)
     if not revs:
         return smartset.baseset(), None
     # TODO: might want to merge slowpath with wopts.force_changelog_traversal
     match, pats, slowpath = _makematcher(repo, revs, wopts)
     wopts = attr.evolve(wopts, pats=pats)
 
     filematcher = None
     if wopts.follow:
         if slowpath or match.always():
             revs = dagop.revancestors(repo, revs, followfirst=wopts.follow == 1)
         else:
             assert not wopts.force_changelog_traversal
             revs, filematcher = _fileancestors(
                 repo, revs, match, followfirst=wopts.follow == 1
             )
         revs.reverse()
     if filematcher is None:
         filematcher = _makenofollowfilematcher(repo, wopts.pats, wopts.opts)
     if filematcher is None:
 
         def filematcher(ctx):
             return match
 
     expr = _makerevset(repo, wopts, slowpath)
     if wopts.sort_revisions:
         assert wopts.sort_revisions in {b'topo', b'desc'}
         if wopts.sort_revisions == b'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()):
             # User-specified revs might be unsorted
             revs.sort(reverse=True)
     if expr:
         matcher = revset.match(None, expr)
         revs = matcher(repo, revs)
     if wopts.limit is not None:
         revs = revs.slice(0, wopts.limit)
 
     return revs, filematcher
 
 
 def getrevs(repo, wopts):
     # type: (Any, walkopts) -> Tuple[smartset.abstractsmartset, Optional[changesetdiffer]]
     """Return (revs, differ) where revs is a smartset
 
     differ is a changesetdiffer with pre-configured file matcher.
     """
     revs, filematcher = makewalker(repo, wopts)
     if not revs:
         return revs, None
     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 revision: "%s"') % fname
             )
         fctx = wctx.filectx(fname)
         for fctx, linerange in dagop.blockancestors(fctx, fromline, toline):
             rev = fctx.introrev()
             if rev is None:
                 rev = wdirrev
             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(scmutil.intrev(ctx))
         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(scmutil.intrev(ctx), []))
         return scmutil.matchfiles(repo, files)
 
     revs = sorted(linerangesbyrev, reverse=True)
 
     differ = changesetdiffer()
     differ._makefilematcher = filematcher
     differ._makehunksfilter = hunksfilter
     return smartset.baseset(revs), differ
 
 
 def _graphnodeformatter(ui, displayer):
     spec = ui.config(b'command-templates', b'graphnode')
     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, cache):
         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.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.graphshorten = ui.configbool(b'experimental', b'graphshorten')
 
     formatnode_cache = {}
     for rev, type, ctx, parents in dag:
         char = formatnode(repo, ctx, formatnode_cache)
         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)

mercurial/scmutil.py

@@ -1,2320 +1,2321 b''
 # scmutil.py - Mercurial core utility functions
 #
 #  Copyright 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 errno
 import glob
 import os
 import posixpath
 import re
 import subprocess
 import weakref
 
 from .i18n import _
 from .node import (
     bin,
     hex,
     nullid,
     nullrev,
     short,
     wdirid,
     wdirrev,
 )
 from .pycompat import getattr
 from .thirdparty import attr
 from . import (
     copies as copiesmod,
     encoding,
     error,
     match as matchmod,
     obsolete,
     obsutil,
     pathutil,
     phases,
     policy,
     pycompat,
     requirements as requirementsmod,
     revsetlang,
     similar,
     smartset,
     url,
     util,
     vfs,
 )
 
 from .utils import (
     hashutil,
     procutil,
     stringutil,
 )
 
 if pycompat.iswindows:
     from . import scmwindows as scmplatform
 else:
     from . import scmposix as scmplatform
 
 parsers = policy.importmod('parsers')
 rustrevlog = policy.importrust('revlog')
 
 termsize = scmplatform.termsize
 
 
 @attr.s(slots=True, repr=False)
 class status(object):
     """Struct with a list of files per status.
 
     The 'deleted', 'unknown' and 'ignored' properties are only
     relevant to the working copy.
     """
 
     modified = attr.ib(default=attr.Factory(list))
     added = attr.ib(default=attr.Factory(list))
     removed = attr.ib(default=attr.Factory(list))
     deleted = attr.ib(default=attr.Factory(list))
     unknown = attr.ib(default=attr.Factory(list))
     ignored = attr.ib(default=attr.Factory(list))
     clean = attr.ib(default=attr.Factory(list))
 
     def __iter__(self):
         yield self.modified
         yield self.added
         yield self.removed
         yield self.deleted
         yield self.unknown
         yield self.ignored
         yield self.clean
 
     def __repr__(self):
         return (
             r'<status modified=%s, added=%s, removed=%s, deleted=%s, '
             r'unknown=%s, ignored=%s, clean=%s>'
         ) % tuple(pycompat.sysstr(stringutil.pprint(v)) for v in self)
 
 
 def itersubrepos(ctx1, ctx2):
     """find subrepos in ctx1 or ctx2"""
     # Create a (subpath, ctx) mapping where we prefer subpaths from
     # ctx1. The subpaths from ctx2 are important when the .hgsub file
     # has been modified (in ctx2) but not yet committed (in ctx1).
     subpaths = dict.fromkeys(ctx2.substate, ctx2)
     subpaths.update(dict.fromkeys(ctx1.substate, ctx1))
 
     missing = set()
 
     for subpath in ctx2.substate:
         if subpath not in ctx1.substate:
             del subpaths[subpath]
             missing.add(subpath)
 
     for subpath, ctx in sorted(pycompat.iteritems(subpaths)):
         yield subpath, ctx.sub(subpath)
 
     # Yield an empty subrepo based on ctx1 for anything only in ctx2.  That way,
     # status and diff will have an accurate result when it does
     # 'sub.{status|diff}(rev2)'.  Otherwise, the ctx2 subrepo is compared
     # against itself.
     for subpath in missing:
         yield subpath, ctx2.nullsub(subpath, ctx1)
 
 
 def nochangesfound(ui, repo, excluded=None):
     """Report no changes for push/pull, excluded is None or a list of
     nodes excluded from the push/pull.
     """
     secretlist = []
     if excluded:
         for n in excluded:
             ctx = repo[n]
             if ctx.phase() >= phases.secret and not ctx.extinct():
                 secretlist.append(n)
 
     if secretlist:
         ui.status(
             _(b"no changes found (ignored %d secret changesets)\n")
             % len(secretlist)
         )
     else:
         ui.status(_(b"no changes found\n"))
 
 
 def callcatch(ui, func):
     """call func() with global exception handling
 
     return func() if no exception happens. otherwise do some error handling
     and return an exit code accordingly. does not handle all exceptions.
     """
     coarse_exit_code = -1
     detailed_exit_code = -1
     try:
         try:
             return func()
         except:  # re-raises
             ui.traceback()
             raise
     # Global exception handling, alphabetically
     # Mercurial-specific first, followed by built-in and library exceptions
     except error.LockHeld as inst:
         detailed_exit_code = 20
         if inst.errno == errno.ETIMEDOUT:
             reason = _(b'timed out waiting for lock held by %r') % (
                 pycompat.bytestr(inst.locker)
             )
         else:
             reason = _(b'lock held by %r') % inst.locker
         ui.error(
             _(b"abort: %s: %s\n")
             % (inst.desc or stringutil.forcebytestr(inst.filename), reason)
         )
         if not inst.locker:
             ui.error(_(b"(lock might be very busy)\n"))
     except error.LockUnavailable as inst:
         detailed_exit_code = 20
         ui.error(
             _(b"abort: could not lock %s: %s\n")
             % (
                 inst.desc or stringutil.forcebytestr(inst.filename),
                 encoding.strtolocal(inst.strerror),
             )
         )
     except error.OutOfBandError as inst:
         detailed_exit_code = 100
         if inst.args:
             msg = _(b"abort: remote error:\n")
         else:
             msg = _(b"abort: remote error\n")
         ui.error(msg)
         if inst.args:
             ui.error(b''.join(inst.args))
         if inst.hint:
             ui.error(b'(%s)\n' % inst.hint)
     except error.RepoError as inst:
         ui.error(_(b"abort: %s\n") % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
     except error.ResponseError as inst:
         ui.error(_(b"abort: %s") % inst.args[0])
         msg = inst.args[1]
         if isinstance(msg, type(u'')):
             msg = pycompat.sysbytes(msg)
         if not isinstance(msg, bytes):
             ui.error(b" %r\n" % (msg,))
         elif not msg:
             ui.error(_(b" empty string\n"))
         else:
             ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
     except error.CensoredNodeError as inst:
         ui.error(_(b"abort: file censored %s\n") % inst)
     except error.StorageError as inst:
         ui.error(_(b"abort: %s\n") % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
     except error.InterventionRequired as inst:
         ui.error(b"%s\n" % inst)
         if inst.hint:
             ui.error(_(b"(%s)\n") % inst.hint)
         detailed_exit_code = 240
         coarse_exit_code = 1
     except error.WdirUnsupported:
         ui.error(_(b"abort: working directory revision cannot be specified\n"))
     except error.Abort as inst:
         if isinstance(inst, (error.InputError, error.ParseError)):
             detailed_exit_code = 10
         elif isinstance(inst, error.StateError):
             detailed_exit_code = 20
         elif isinstance(inst, error.ConfigError):
             detailed_exit_code = 30
         elif isinstance(inst, error.SecurityError):
             detailed_exit_code = 150
         elif isinstance(inst, error.CanceledError):
             detailed_exit_code = 250
         ui.error(inst.format())
     except error.WorkerError as inst:
         # Don't print a message -- the worker already should have
         return inst.status_code
     except ImportError as inst:
         ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
         m = stringutil.forcebytestr(inst).split()[-1]
         if m in b"mpatch bdiff".split():
             ui.error(_(b"(did you forget to compile extensions?)\n"))
         elif m in b"zlib".split():
             ui.error(_(b"(is your Python install correct?)\n"))
     except util.urlerr.httperror as inst:
         detailed_exit_code = 100
         ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
     except util.urlerr.urlerror as inst:
         detailed_exit_code = 100
         try:  # usually it is in the form (errno, strerror)
             reason = inst.reason.args[1]
         except (AttributeError, IndexError):
             # it might be anything, for example a string
             reason = inst.reason
         if isinstance(reason, pycompat.unicode):
             # SSLError of Python 2.7.9 contains a unicode
             reason = encoding.unitolocal(reason)
         ui.error(_(b"abort: error: %s\n") % stringutil.forcebytestr(reason))
     except (IOError, OSError) as inst:
         if (
             util.safehasattr(inst, b"args")
             and inst.args
             and inst.args[0] == errno.EPIPE
         ):
             pass
         elif getattr(inst, "strerror", None):  # common IOError or OSError
             if getattr(inst, "filename", None) is not None:
                 ui.error(
                     _(b"abort: %s: '%s'\n")
                     % (
                         encoding.strtolocal(inst.strerror),
                         stringutil.forcebytestr(inst.filename),
                     )
                 )
             else:
                 ui.error(_(b"abort: %s\n") % encoding.strtolocal(inst.strerror))
         else:  # suspicious IOError
             raise
     except MemoryError:
         ui.error(_(b"abort: out of memory\n"))
     except SystemExit as inst:
         # Commands shouldn't sys.exit directly, but give a return code.
         # Just in case catch this and and pass exit code to caller.
         detailed_exit_code = 254
         coarse_exit_code = inst.code
 
     if ui.configbool(b'ui', b'detailed-exit-code'):
         return detailed_exit_code
     else:
         return coarse_exit_code
 
 
 def checknewlabel(repo, lbl, kind):
     # Do not use the "kind" parameter in ui output.
     # It makes strings difficult to translate.
     if lbl in [b'tip', b'.', b'null']:
         raise error.InputError(_(b"the name '%s' is reserved") % lbl)
     for c in (b':', b'\0', b'\n', b'\r'):
         if c in lbl:
             raise error.InputError(
                 _(b"%r cannot be used in a name") % pycompat.bytestr(c)
             )
     try:
         int(lbl)
         raise error.InputError(_(b"cannot use an integer as a name"))
     except ValueError:
         pass
     if lbl.strip() != lbl:
         raise error.InputError(
             _(b"leading or trailing whitespace in name %r") % lbl
         )
 
 
 def checkfilename(f):
     '''Check that the filename f is an acceptable filename for a tracked file'''
     if b'\r' in f or b'\n' in f:
         raise error.InputError(
             _(b"'\\n' and '\\r' disallowed in filenames: %r")
             % pycompat.bytestr(f)
         )
 
 
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''
     checkfilename(f)
     abort, warn = checkportabilityalert(ui)
     if abort or warn:
         msg = util.checkwinfilename(f)
         if msg:
             msg = b"%s: %s" % (msg, procutil.shellquote(f))
             if abort:
                 raise error.InputError(msg)
             ui.warn(_(b"warning: %s\n") % msg)
 
 
 def checkportabilityalert(ui):
     """check if the user's config requests nothing, a warning, or abort for
     non-portable filenames"""
     val = ui.config(b'ui', b'portablefilenames')
     lval = val.lower()
     bval = stringutil.parsebool(val)
     abort = pycompat.iswindows or lval == b'abort'
     warn = bval or lval == b'warn'
     if bval is None and not (warn or abort or lval == b'ignore'):
         raise error.ConfigError(
             _(b"ui.portablefilenames value is invalid ('%s')") % val
         )
     return abort, warn
 
 
 class casecollisionauditor(object):
     def __init__(self, ui, abort, dirstate):
         self._ui = ui
         self._abort = abort
         allfiles = b'\0'.join(dirstate)
         self._loweredfiles = set(encoding.lower(allfiles).split(b'\0'))
         self._dirstate = dirstate
         # The purpose of _newfiles is so that we don't complain about
         # case collisions if someone were to call this object with the
         # same filename twice.
         self._newfiles = set()
 
     def __call__(self, f):
         if f in self._newfiles:
             return
         fl = encoding.lower(f)
         if fl in self._loweredfiles and f not in self._dirstate:
             msg = _(b'possible case-folding collision for %s') % f
             if self._abort:
                 raise error.Abort(msg)
             self._ui.warn(_(b"warning: %s\n") % msg)
         self._loweredfiles.add(fl)
         self._newfiles.add(f)
 
 
 def filteredhash(repo, maxrev):
     """build hash of filtered revisions in the current repoview.
 
     Multiple caches perform up-to-date validation by checking that the
     tiprev and tipnode stored in the cache file match the current repository.
     However, this is not sufficient for validating repoviews because the set
     of revisions in the view may change without the repository tiprev and
     tipnode changing.
 
     This function hashes all the revs filtered from the view and returns
     that SHA-1 digest.
     """
     cl = repo.changelog
     if not cl.filteredrevs:
         return None
     key = cl._filteredrevs_hashcache.get(maxrev)
     if not key:
         revs = sorted(r for r in cl.filteredrevs if r <= maxrev)
         if revs:
             s = hashutil.sha1()
             for rev in revs:
                 s.update(b'%d;' % rev)
             key = s.digest()
             cl._filteredrevs_hashcache[maxrev] = key
     return key
 
 
 def walkrepos(path, followsym=False, seen_dirs=None, recurse=False):
     """yield every hg repository under path, always recursively.
     The recurse flag will only control recursion into repo working dirs"""
 
     def errhandler(err):
         if err.filename == path:
             raise err
 
     samestat = getattr(os.path, 'samestat', None)
     if followsym and samestat is not None:
 
         def adddir(dirlst, dirname):
             dirstat = os.stat(dirname)
             match = any(samestat(dirstat, lstdirstat) for lstdirstat in dirlst)
             if not match:
                 dirlst.append(dirstat)
             return not match
 
     else:
         followsym = False
 
     if (seen_dirs is None) and followsym:
         seen_dirs = []
         adddir(seen_dirs, path)
     for root, dirs, files in os.walk(path, topdown=True, onerror=errhandler):
         dirs.sort()
         if b'.hg' in dirs:
             yield root  # found a repository
             qroot = os.path.join(root, b'.hg', b'patches')
             if os.path.isdir(os.path.join(qroot, b'.hg')):
                 yield qroot  # we have a patch queue repo here
             if recurse:
                 # avoid recursing inside the .hg directory
                 dirs.remove(b'.hg')
             else:
                 dirs[:] = []  # don't descend further
         elif followsym:
             newdirs = []
             for d in dirs:
                 fname = os.path.join(root, d)
                 if adddir(seen_dirs, fname):
                     if os.path.islink(fname):
                         for hgname in walkrepos(fname, True, seen_dirs):
                             yield hgname
                     else:
                         newdirs.append(d)
             dirs[:] = newdirs
 
 
 def binnode(ctx):
     """Return binary node id for a given basectx"""
     node = ctx.node()
     if node is None:
         return wdirid
     return node
 
 
 def intrev(ctx):
     """Return integer for a given basectx that can be used in comparison or
     arithmetic operation"""
     rev = ctx.rev()
     if rev is None:
         return wdirrev
     return rev
 
 
 def formatchangeid(ctx):
     """Format changectx as '{rev}:{node|formatnode}', which is the default
     template provided by logcmdutil.changesettemplater"""
     repo = ctx.repo()
     return formatrevnode(repo.ui, intrev(ctx), binnode(ctx))
 
 
 def formatrevnode(ui, rev, node):
     """Format given revision and node depending on the current verbosity"""
     if ui.debugflag:
         hexfunc = hex
     else:
         hexfunc = short
     return b'%d:%s' % (rev, hexfunc(node))
 
 
 def resolvehexnodeidprefix(repo, prefix):
     if prefix.startswith(b'x'):
         prefix = prefix[1:]
     try:
         # Uses unfiltered repo because it's faster when prefix is ambiguous/
         # This matches the shortesthexnodeidprefix() function below.
         node = repo.unfiltered().changelog._partialmatch(prefix)
     except error.AmbiguousPrefixLookupError:
         revset = repo.ui.config(
             b'experimental', b'revisions.disambiguatewithin'
         )
         if revset:
             # Clear config to avoid infinite recursion
             configoverrides = {
                 (b'experimental', b'revisions.disambiguatewithin'): None
             }
             with repo.ui.configoverride(configoverrides):
                 revs = repo.anyrevs([revset], user=True)
                 matches = []
                 for rev in revs:
                     node = repo.changelog.node(rev)
                     if hex(node).startswith(prefix):
                         matches.append(node)
                 if len(matches) == 1:
                     return matches[0]
         raise
     if node is None:
         return
     repo.changelog.rev(node)  # make sure node isn't filtered
     return node
 
 
 def mayberevnum(repo, prefix):
     """Checks if the given prefix may be mistaken for a revision number"""
     try:
         i = int(prefix)
         # if we are a pure int, then starting with zero will not be
         # confused as a rev; or, obviously, if the int is larger
         # than the value of the tip rev. We still need to disambiguate if
         # prefix == '0', since that *is* a valid revnum.
         if (prefix != b'0' and prefix[0:1] == b'0') or i >= len(repo):
             return False
         return True
     except ValueError:
         return False
 
 
 def shortesthexnodeidprefix(repo, node, minlength=1, cache=None):
     """Find the shortest unambiguous prefix that matches hexnode.
 
     If "cache" is not None, it must be a dictionary that can be used for
     caching between calls to this method.
     """
     # _partialmatch() of filtered changelog could take O(len(repo)) time,
     # which would be unacceptably slow. so we look for hash collision in
     # unfiltered space, which means some hashes may be slightly longer.
 
     minlength = max(minlength, 1)
 
     def disambiguate(prefix):
         """Disambiguate against revnums."""
         if repo.ui.configbool(b'experimental', b'revisions.prefixhexnode'):
             if mayberevnum(repo, prefix):
                 return b'x' + prefix
             else:
                 return prefix
 
         hexnode = hex(node)
         for length in range(len(prefix), len(hexnode) + 1):
             prefix = hexnode[:length]
             if not mayberevnum(repo, prefix):
                 return prefix
 
     cl = repo.unfiltered().changelog
     revset = repo.ui.config(b'experimental', b'revisions.disambiguatewithin')
     if revset:
         revs = None
         if cache is not None:
             revs = cache.get(b'disambiguationrevset')
         if revs is None:
             revs = repo.anyrevs([revset], user=True)
             if cache is not None:
                 cache[b'disambiguationrevset'] = revs
         if cl.rev(node) in revs:
             hexnode = hex(node)
             nodetree = None
             if cache is not None:
                 nodetree = cache.get(b'disambiguationnodetree')
             if not nodetree:
                 if util.safehasattr(parsers, 'nodetree'):
                     # The CExt is the only implementation to provide a nodetree
                     # class so far.
                     index = cl.index
                     if util.safehasattr(index, 'get_cindex'):
                         # the rust wrapped need to give access to its internal index
                         index = index.get_cindex()
                     nodetree = parsers.nodetree(index, len(revs))
                     for r in revs:
                         nodetree.insert(r)
                     if cache is not None:
                         cache[b'disambiguationnodetree'] = nodetree
             if nodetree is not None:
                 length = max(nodetree.shortest(node), minlength)
                 prefix = hexnode[:length]
                 return disambiguate(prefix)
             for length in range(minlength, len(hexnode) + 1):
                 matches = []
                 prefix = hexnode[:length]
                 for rev in revs:
                     otherhexnode = repo[rev].hex()
                     if prefix == otherhexnode[:length]:
                         matches.append(otherhexnode)
                 if len(matches) == 1:
                     return disambiguate(prefix)
 
     try:
         return disambiguate(cl.shortest(node, minlength))
     except error.LookupError:
         raise error.RepoLookupError()
 
 
 def isrevsymbol(repo, symbol):
     """Checks if a symbol exists in the repo.
 
     See revsymbol() for details. Raises error.AmbiguousPrefixLookupError if the
     symbol is an ambiguous nodeid prefix.
     """
     try:
         revsymbol(repo, symbol)
         return True
     except error.RepoLookupError:
         return False
 
 
 def revsymbol(repo, symbol):
     """Returns a context given a single revision symbol (as string).
 
     This is similar to revsingle(), but accepts only a single revision symbol,
     i.e. things like ".", "tip", "1234", "deadbeef", "my-bookmark" work, but
     not "max(public())".
     """
     if not isinstance(symbol, bytes):
         msg = (
             b"symbol (%s of type %s) was not a string, did you mean "
             b"repo[symbol]?" % (symbol, type(symbol))
         )
         raise error.ProgrammingError(msg)
     try:
         if symbol in (b'.', b'tip', b'null'):
             return repo[symbol]
 
         try:
             r = int(symbol)
             if b'%d' % r != symbol:
                 raise ValueError
             l = len(repo.changelog)
             if r < 0:
                 r += l
             if r < 0 or r >= l and r != wdirrev:
                 raise ValueError
             return repo[r]
         except error.FilteredIndexError:
             raise
         except (ValueError, OverflowError, IndexError):
             pass
 
         if len(symbol) == 40:
             try:
                 node = bin(symbol)
                 rev = repo.changelog.rev(node)
                 return repo[rev]
             except error.FilteredLookupError:
                 raise
             except (TypeError, LookupError):
                 pass
 
         # look up bookmarks through the name interface
         try:
             node = repo.names.singlenode(repo, symbol)
             rev = repo.changelog.rev(node)
             return repo[rev]
         except KeyError:
             pass
 
         node = resolvehexnodeidprefix(repo, symbol)
         if node is not None:
             rev = repo.changelog.rev(node)
             return repo[rev]
 
         raise error.RepoLookupError(_(b"unknown revision '%s'") % symbol)
 
     except error.WdirUnsupported:
         return repo[None]
     except (
         error.FilteredIndexError,
         error.FilteredLookupError,
         error.FilteredRepoLookupError,
     ):
         raise _filterederror(repo, symbol)
 
 
 def _filterederror(repo, changeid):
     """build an exception to be raised about a filtered changeid
 
     This is extracted in a function to help extensions (eg: evolve) to
     experiment with various message variants."""
     if repo.filtername.startswith(b'visible'):
 
         # Check if the changeset is obsolete
         unfilteredrepo = repo.unfiltered()
         ctx = revsymbol(unfilteredrepo, changeid)
 
         # If the changeset is obsolete, enrich the message with the reason
         # that made this changeset not visible
         if ctx.obsolete():
             msg = obsutil._getfilteredreason(repo, changeid, ctx)
         else:
             msg = _(b"hidden revision '%s'") % changeid
 
         hint = _(b'use --hidden to access hidden revisions')
 
         return error.FilteredRepoLookupError(msg, hint=hint)
     msg = _(b"filtered revision '%s' (not in '%s' subset)")
     msg %= (changeid, repo.filtername)
     return error.FilteredRepoLookupError(msg)
 
 
 def revsingle(repo, revspec, default=b'.', localalias=None):
     if not revspec and revspec != 0:
         return repo[default]
 
     l = revrange(repo, [revspec], localalias=localalias)
     if not l:
         raise error.Abort(_(b'empty revision set'))
     return repo[l.last()]
 
 
 def _pairspec(revspec):
     tree = revsetlang.parse(revspec)
     return tree and tree[0] in (
         b'range',
         b'rangepre',
         b'rangepost',
         b'rangeall',
     )
 
 
 def revpair(repo, revs):
     if not revs:
         return repo[b'.'], repo[None]
 
     l = revrange(repo, revs)
 
     if not l:
         raise error.Abort(_(b'empty revision range'))
 
     first = l.first()
     second = l.last()
 
     if (
         first == second
         and len(revs) >= 2
         and not all(revrange(repo, [r]) for r in revs)
     ):
         raise error.Abort(_(b'empty revision on one side of range'))
 
     # if top-level is range expression, the result must always be a pair
     if first == second and len(revs) == 1 and not _pairspec(revs[0]):
         return repo[first], repo[None]
 
     return repo[first], repo[second]
 
 
 def revrange(repo, specs, localalias=None):
     """Execute 1 to many revsets and return the union.
 
     This is the preferred mechanism for executing revsets using user-specified
     config options, such as revset aliases.
 
     The revsets specified by ``specs`` will be executed via a chained ``OR``
     expression. If ``specs`` is empty, an empty result is returned.
 
     ``specs`` can contain integers, in which case they are assumed to be
     revision numbers.
 
     It is assumed the revsets are already formatted. If you have arguments
     that need to be expanded in the revset, call ``revsetlang.formatspec()``
     and pass the result as an element of ``specs``.
 
     Specifying a single revset is allowed.
 
     Returns a ``smartset.abstractsmartset`` which is a list-like interface over
     integer revisions.
     """
     allspecs = []
     for spec in specs:
         if isinstance(spec, int):
             spec = revsetlang.formatspec(b'%d', spec)
         allspecs.append(spec)
     return repo.anyrevs(allspecs, user=True, localalias=localalias)
 
 
 def increasingwindows(windowsize=8, sizelimit=512):
     while True:
         yield windowsize
         if windowsize < sizelimit:
             windowsize *= 2
 
 
 def walkchangerevs(repo, revs, makefilematcher, prepare):
     """Iterate over files and the revs in a "windowed" way.
 
     Callers most commonly need to iterate backwards over the history
     in which they are interested. Doing so has awful (quadratic-looking)
     performance, so we use iterators in a "windowed" way.
 
     We walk a window of revisions in the desired order.  Within the
     window, we first walk forwards to gather data, then in the desired
     order (usually backwards) to display it.
 
     This function returns an iterator yielding contexts. Before
     yielding each context, the iterator will first call the prepare
     function on each context in the window in forward order."""
 
     if not revs:
         return []
     change = repo.__getitem__
 
     def iterate():
         it = iter(revs)
         stopiteration = False
         for windowsize in increasingwindows():
             nrevs = []
             for i in pycompat.xrange(windowsize):
                 rev = next(it, None)
                 if rev is None:
                     stopiteration = True
                     break
                 nrevs.append(rev)
             for rev in sorted(nrevs):
                 ctx = change(rev)
                 prepare(ctx, makefilematcher(ctx))
             for rev in nrevs:
                 yield change(rev)
 
             if stopiteration:
                 break
 
     return iterate()
 
 
 def meaningfulparents(repo, ctx):
     """Return list of meaningful (or all if debug) parentrevs for rev.
 
     For merges (two non-nullrev revisions) both parents are meaningful.
     Otherwise the first parent revision is considered meaningful if it
     is not the preceding revision.
     """
     parents = ctx.parents()
     if len(parents) > 1:
         return parents
     if repo.ui.debugflag:
         return [parents[0], repo[nullrev]]
     if parents[0].rev() >= intrev(ctx) - 1:
         return []
     return parents
 
 
 def getuipathfn(repo, legacyrelativevalue=False, forcerelativevalue=None):
     """Return a function that produced paths for presenting to the user.
 
     The returned function takes a repo-relative path and produces a path
     that can be presented in the UI.
 
     Depending on the value of ui.relative-paths, either a repo-relative or
     cwd-relative path will be produced.
 
     legacyrelativevalue is the value to use if ui.relative-paths=legacy
 
     If forcerelativevalue is not None, then that value will be used regardless
     of what ui.relative-paths is set to.
     """
     if forcerelativevalue is not None:
         relative = forcerelativevalue
     else:
         config = repo.ui.config(b'ui', b'relative-paths')
         if config == b'legacy':
             relative = legacyrelativevalue
         else:
             relative = stringutil.parsebool(config)
             if relative is None:
                 raise error.ConfigError(
                     _(b"ui.relative-paths is not a boolean ('%s')") % config
                 )
 
     if relative:
         cwd = repo.getcwd()
         if cwd != b'':
             # this branch would work even if cwd == b'' (ie cwd = repo
             # root), but its generality makes the returned function slower
             pathto = repo.pathto
             return lambda f: pathto(f, cwd)
     if repo.ui.configbool(b'ui', b'slash'):
         return lambda f: f
     else:
         return util.localpath
 
 
 def subdiruipathfn(subpath, uipathfn):
     '''Create a new uipathfn that treats the file as relative to subpath.'''
     return lambda f: uipathfn(posixpath.join(subpath, f))
 
 
 def anypats(pats, opts):
     """Checks if any patterns, including --include and --exclude were given.
 
     Some commands (e.g. addremove) use this condition for deciding whether to
     print absolute or relative paths.
     """
     return bool(pats or opts.get(b'include') or opts.get(b'exclude'))
 
 
 def expandpats(pats):
     """Expand bare globs when running on windows.
     On posix we assume it already has already been done by sh."""
     if not util.expandglobs:
         return list(pats)
     ret = []
     for kindpat in pats:
         kind, pat = matchmod._patsplit(kindpat, None)
         if kind is None:
             try:
                 globbed = glob.glob(pat)
             except re.error:
                 globbed = [pat]
             if globbed:
                 ret.extend(globbed)
                 continue
         ret.append(kindpat)
     return ret
 
 
 def matchandpats(
     ctx, pats=(), opts=None, globbed=False, default=b'relpath', badfn=None
 ):
     """Return a matcher and the patterns that were used.
     The matcher will warn about bad matches, unless an alternate badfn callback
     is provided."""
     if opts is None:
         opts = {}
     if not globbed and default == b'relpath':
         pats = expandpats(pats or [])
 
     uipathfn = getuipathfn(ctx.repo(), legacyrelativevalue=True)
 
     def bad(f, msg):
         ctx.repo().ui.warn(b"%s: %s\n" % (uipathfn(f), msg))
 
     if badfn is None:
         badfn = bad
 
     m = ctx.match(
         pats,
         opts.get(b'include'),
         opts.get(b'exclude'),
         default,
         listsubrepos=opts.get(b'subrepos'),
         badfn=badfn,
     )
 
     if m.always():
         pats = []
     return m, pats
 
 
 def match(
     ctx, pats=(), opts=None, globbed=False, default=b'relpath', badfn=None
 ):
     '''Return a matcher that will warn about bad matches.'''
     return matchandpats(ctx, pats, opts, globbed, default, badfn=badfn)[0]
 
 
 def matchall(repo):
     '''Return a matcher that will efficiently match everything.'''
     return matchmod.always()
 
 
 def matchfiles(repo, files, badfn=None):
     '''Return a matcher that will efficiently match exactly these files.'''
     return matchmod.exact(files, badfn=badfn)
 
 
 def parsefollowlinespattern(repo, rev, pat, msg):
     """Return a file name from `pat` pattern suitable for usage in followlines
     logic.
     """
     if not matchmod.patkind(pat):
         return pathutil.canonpath(repo.root, repo.getcwd(), pat)
     else:
         ctx = repo[rev]
         m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=ctx)
         files = [f for f in ctx if m(f)]
         if len(files) != 1:
             raise error.ParseError(msg)
         return files[0]
 
 
 def getorigvfs(ui, repo):
     """return a vfs suitable to save 'orig' file
 
     return None if no special directory is configured"""
     origbackuppath = ui.config(b'ui', b'origbackuppath')
     if not origbackuppath:
         return None
     return vfs.vfs(repo.wvfs.join(origbackuppath))
 
 
 def backuppath(ui, repo, filepath):
     """customize where working copy backup files (.orig files) are created
 
     Fetch user defined path from config file: [ui] origbackuppath = <path>
     Fall back to default (filepath with .orig suffix) if not specified
 
     filepath is repo-relative
 
     Returns an absolute path
     """
     origvfs = getorigvfs(ui, repo)
     if origvfs is None:
         return repo.wjoin(filepath + b".orig")
 
     origbackupdir = origvfs.dirname(filepath)
     if not origvfs.isdir(origbackupdir) or origvfs.islink(origbackupdir):
         ui.note(_(b'creating directory: %s\n') % origvfs.join(origbackupdir))
 
         # Remove any files that conflict with the backup file's path
         for f in reversed(list(pathutil.finddirs(filepath))):
             if origvfs.isfileorlink(f):
                 ui.note(_(b'removing conflicting file: %s\n') % origvfs.join(f))
                 origvfs.unlink(f)
                 break
 
         origvfs.makedirs(origbackupdir)
 
     if origvfs.isdir(filepath) and not origvfs.islink(filepath):
         ui.note(
             _(b'removing conflicting directory: %s\n') % origvfs.join(filepath)
         )
         origvfs.rmtree(filepath, forcibly=True)
 
     return origvfs.join(filepath)
 
 
 class _containsnode(object):
     """proxy __contains__(node) to container.__contains__ which accepts revs"""
 
     def __init__(self, repo, revcontainer):
         self._torev = repo.changelog.rev
         self._revcontains = revcontainer.__contains__
 
     def __contains__(self, node):
         return self._revcontains(self._torev(node))
 
 
 def cleanupnodes(
     repo,
     replacements,
     operation,
     moves=None,
     metadata=None,
     fixphase=False,
     targetphase=None,
     backup=True,
 ):
     """do common cleanups when old nodes are replaced by new nodes
 
     That includes writing obsmarkers or stripping nodes, and moving bookmarks.
     (we might also want to move working directory parent in the future)
 
     By default, bookmark moves are calculated automatically from 'replacements',
     but 'moves' can be used to override that. Also, 'moves' may include
     additional bookmark moves that should not have associated obsmarkers.
 
     replacements is {oldnode: [newnode]} or a iterable of nodes if they do not
     have replacements. operation is a string, like "rebase".
 
     metadata is dictionary containing metadata to be stored in obsmarker if
     obsolescence is enabled.
     """
     assert fixphase or targetphase is None
     if not replacements and not moves:
         return
 
     # translate mapping's other forms
     if not util.safehasattr(replacements, b'items'):
         replacements = {(n,): () for n in replacements}
     else:
         # upgrading non tuple "source" to tuple ones for BC
         repls = {}
         for key, value in replacements.items():
             if not isinstance(key, tuple):
                 key = (key,)
             repls[key] = value
         replacements = repls
 
     # Unfiltered repo is needed since nodes in replacements might be hidden.
     unfi = repo.unfiltered()
 
     # Calculate bookmark movements
     if moves is None:
         moves = {}
         for oldnodes, newnodes in replacements.items():
             for oldnode in oldnodes:
                 if oldnode in moves:
                     continue
                 if len(newnodes) > 1:
                     # usually a split, take the one with biggest rev number
                     newnode = next(unfi.set(b'max(%ln)', newnodes)).node()
                 elif len(newnodes) == 0:
                     # move bookmark backwards
                     allreplaced = []
                     for rep in replacements:
                         allreplaced.extend(rep)
                     roots = list(
                         unfi.set(b'max((::%n) - %ln)', oldnode, allreplaced)
                     )
                     if roots:
                         newnode = roots[0].node()
                     else:
                         newnode = nullid
                 else:
                     newnode = newnodes[0]
                 moves[oldnode] = newnode
 
     allnewnodes = [n for ns in replacements.values() for n in ns]
     toretract = {}
     toadvance = {}
     if fixphase:
         precursors = {}
         for oldnodes, newnodes in replacements.items():
             for oldnode in oldnodes:
                 for newnode in newnodes:
                     precursors.setdefault(newnode, []).append(oldnode)
 
         allnewnodes.sort(key=lambda n: unfi[n].rev())
         newphases = {}
 
         def phase(ctx):
             return newphases.get(ctx.node(), ctx.phase())
 
         for newnode in allnewnodes:
             ctx = unfi[newnode]
             parentphase = max(phase(p) for p in ctx.parents())
             if targetphase is None:
                 oldphase = max(
                     unfi[oldnode].phase() for oldnode in precursors[newnode]
                 )
                 newphase = max(oldphase, parentphase)
             else:
                 newphase = max(targetphase, parentphase)
             newphases[newnode] = newphase
             if newphase > ctx.phase():
                 toretract.setdefault(newphase, []).append(newnode)
             elif newphase < ctx.phase():
                 toadvance.setdefault(newphase, []).append(newnode)
 
     with repo.transaction(b'cleanup') as tr:
         # Move bookmarks
         bmarks = repo._bookmarks
         bmarkchanges = []
         for oldnode, newnode in moves.items():
             oldbmarks = repo.nodebookmarks(oldnode)
             if not oldbmarks:
                 continue
             from . import bookmarks  # avoid import cycle
 
             repo.ui.debug(
                 b'moving bookmarks %r from %s to %s\n'
                 % (
                     pycompat.rapply(pycompat.maybebytestr, oldbmarks),
                     hex(oldnode),
                     hex(newnode),
                 )
             )
             # Delete divergent bookmarks being parents of related newnodes
             deleterevs = repo.revs(
                 b'parents(roots(%ln & (::%n))) - parents(%n)',
                 allnewnodes,
                 newnode,
                 oldnode,
             )
             deletenodes = _containsnode(repo, deleterevs)
             for name in oldbmarks:
                 bmarkchanges.append((name, newnode))
                 for b in bookmarks.divergent2delete(repo, deletenodes, name):
                     bmarkchanges.append((b, None))
 
         if bmarkchanges:
             bmarks.applychanges(repo, tr, bmarkchanges)
 
         for phase, nodes in toretract.items():
             phases.retractboundary(repo, tr, phase, nodes)
         for phase, nodes in toadvance.items():
             phases.advanceboundary(repo, tr, phase, nodes)
 
         mayusearchived = repo.ui.config(b'experimental', b'cleanup-as-archived')
         # Obsolete or strip nodes
         if obsolete.isenabled(repo, obsolete.createmarkersopt):
             # If a node is already obsoleted, and we want to obsolete it
             # without a successor, skip that obssolete request since it's
             # unnecessary. That's the "if s or not isobs(n)" check below.
             # Also sort the node in topology order, that might be useful for
             # some obsstore logic.
             # NOTE: the sorting might belong to createmarkers.
             torev = unfi.changelog.rev
             sortfunc = lambda ns: torev(ns[0][0])
             rels = []
             for ns, s in sorted(replacements.items(), key=sortfunc):
                 rel = (tuple(unfi[n] for n in ns), tuple(unfi[m] for m in s))
                 rels.append(rel)
             if rels:
                 obsolete.createmarkers(
                     repo, rels, operation=operation, metadata=metadata
                 )
         elif phases.supportinternal(repo) and mayusearchived:
             # this assume we do not have "unstable" nodes above the cleaned ones
             allreplaced = set()
             for ns in replacements.keys():
                 allreplaced.update(ns)
             if backup:
                 from . import repair  # avoid import cycle
 
                 node = min(allreplaced, key=repo.changelog.rev)
                 repair.backupbundle(
                     repo, allreplaced, allreplaced, node, operation
                 )
             phases.retractboundary(repo, tr, phases.archived, allreplaced)
         else:
             from . import repair  # avoid import cycle
 
             tostrip = list(n for ns in replacements for n in ns)
             if tostrip:
                 repair.delayedstrip(
                     repo.ui, repo, tostrip, operation, backup=backup
                 )
 
 
 def addremove(repo, matcher, prefix, uipathfn, opts=None):
     if opts is None:
         opts = {}
     m = matcher
     dry_run = opts.get(b'dry_run')
     try:
         similarity = float(opts.get(b'similarity') or 0)
     except ValueError:
         raise error.Abort(_(b'similarity must be a number'))
     if similarity < 0 or similarity > 100:
         raise error.Abort(_(b'similarity must be between 0 and 100'))
     similarity /= 100.0
 
     ret = 0
 
     wctx = repo[None]
     for subpath in sorted(wctx.substate):
         submatch = matchmod.subdirmatcher(subpath, m)
         if opts.get(b'subrepos') or m.exact(subpath) or any(submatch.files()):
             sub = wctx.sub(subpath)
             subprefix = repo.wvfs.reljoin(prefix, subpath)
             subuipathfn = subdiruipathfn(subpath, uipathfn)
             try:
                 if sub.addremove(submatch, subprefix, subuipathfn, opts):
                     ret = 1
             except error.LookupError:
                 repo.ui.status(
                     _(b"skipping missing subrepository: %s\n")
                     % uipathfn(subpath)
                 )
 
     rejected = []
 
     def badfn(f, msg):
         if f in m.files():
             m.bad(f, msg)
         rejected.append(f)
 
     badmatch = matchmod.badmatch(m, badfn)
     added, unknown, deleted, removed, forgotten = _interestingfiles(
         repo, badmatch
     )
 
     unknownset = set(unknown + forgotten)
     toprint = unknownset.copy()
     toprint.update(deleted)
     for abs in sorted(toprint):
         if repo.ui.verbose or not m.exact(abs):
             if abs in unknownset:
                 status = _(b'adding %s\n') % uipathfn(abs)
                 label = b'ui.addremove.added'
             else:
                 status = _(b'removing %s\n') % uipathfn(abs)
                 label = b'ui.addremove.removed'
             repo.ui.status(status, label=label)
 
     renames = _findrenames(
         repo, m, added + unknown, removed + deleted, similarity, uipathfn
     )
 
     if not dry_run:
         _markchanges(repo, unknown + forgotten, deleted, renames)
 
     for f in rejected:
         if f in m.files():
             return 1
     return ret
 
 
 def marktouched(repo, files, similarity=0.0):
     """Assert that files have somehow been operated upon. files are relative to
     the repo root."""
     m = matchfiles(repo, files, badfn=lambda x, y: rejected.append(x))
     rejected = []
 
     added, unknown, deleted, removed, forgotten = _interestingfiles(repo, m)
 
     if repo.ui.verbose:
         unknownset = set(unknown + forgotten)
         toprint = unknownset.copy()
         toprint.update(deleted)
         for abs in sorted(toprint):
             if abs in unknownset:
                 status = _(b'adding %s\n') % abs
             else:
                 status = _(b'removing %s\n') % abs
             repo.ui.status(status)
 
     # TODO: We should probably have the caller pass in uipathfn and apply it to
     # the messages above too. legacyrelativevalue=True is consistent with how
     # it used to work.
     uipathfn = getuipathfn(repo, legacyrelativevalue=True)
     renames = _findrenames(
         repo, m, added + unknown, removed + deleted, similarity, uipathfn
     )
 
     _markchanges(repo, unknown + forgotten, deleted, renames)
 
     for f in rejected:
         if f in m.files():
             return 1
     return 0
 
 
 def _interestingfiles(repo, matcher):
     """Walk dirstate with matcher, looking for files that addremove would care
     about.
 
     This is different from dirstate.status because it doesn't care about
     whether files are modified or clean."""
     added, unknown, deleted, removed, forgotten = [], [], [], [], []
     audit_path = pathutil.pathauditor(repo.root, cached=True)
 
     ctx = repo[None]
     dirstate = repo.dirstate
     matcher = repo.narrowmatch(matcher, includeexact=True)
     walkresults = dirstate.walk(
         matcher,
         subrepos=sorted(ctx.substate),
         unknown=True,
         ignored=False,
         full=False,
     )
     for abs, st in pycompat.iteritems(walkresults):
         dstate = dirstate[abs]
         if dstate == b'?' and audit_path.check(abs):
             unknown.append(abs)
         elif dstate != b'r' and not st:
             deleted.append(abs)
         elif dstate == b'r' and st:
             forgotten.append(abs)
         # for finding renames
         elif dstate == b'r' and not st:
             removed.append(abs)
         elif dstate == b'a':
             added.append(abs)
 
     return added, unknown, deleted, removed, forgotten
 
 
 def _findrenames(repo, matcher, added, removed, similarity, uipathfn):
     '''Find renames from removed files to added ones.'''
     renames = {}
     if similarity > 0:
         for old, new, score in similar.findrenames(
             repo, added, removed, similarity
         ):
             if (
                 repo.ui.verbose
                 or not matcher.exact(old)
                 or not matcher.exact(new)
             ):
                 repo.ui.status(
                     _(
                         b'recording removal of %s as rename to %s '
                         b'(%d%% similar)\n'
                     )
                     % (uipathfn(old), uipathfn(new), score * 100)
                 )
             renames[new] = old
     return renames
 
 
 def _markchanges(repo, unknown, deleted, renames):
     """Marks the files in unknown as added, the files in deleted as removed,
     and the files in renames as copied."""
     wctx = repo[None]
     with repo.wlock():
         wctx.forget(deleted)
         wctx.add(unknown)
         for new, old in pycompat.iteritems(renames):
             wctx.copy(old, new)
 
 
 def getrenamedfn(repo, endrev=None):
     if copiesmod.usechangesetcentricalgo(repo):
 
         def getrenamed(fn, rev):
             ctx = repo[rev]
             p1copies = ctx.p1copies()
             if fn in p1copies:
                 return p1copies[fn]
             p2copies = ctx.p2copies()
             if fn in p2copies:
                 return p2copies[fn]
             return None
 
         return getrenamed
 
     rcache = {}
     if endrev is None:
         endrev = len(repo)
 
     def getrenamed(fn, rev):
         """looks up all renames for a file (up to endrev) the first
         time the file is given. It indexes on the changerev and only
         parses the manifest if linkrev != changerev.
         Returns rename info for fn at changerev rev."""
         if fn not in rcache:
             rcache[fn] = {}
             fl = repo.file(fn)
             for i in fl:
                 lr = fl.linkrev(i)
                 renamed = fl.renamed(fl.node(i))
                 rcache[fn][lr] = renamed and renamed[0]
                 if lr >= endrev:
                     break
         if rev in rcache[fn]:
             return rcache[fn][rev]
 
         # If linkrev != rev (i.e. rev not found in rcache) fallback to
         # filectx logic.
         try:
             return repo[rev][fn].copysource()
         except error.LookupError:
             return None
 
     return getrenamed
 
 
 def getcopiesfn(repo, endrev=None):
     if copiesmod.usechangesetcentricalgo(repo):
 
         def copiesfn(ctx):
             if ctx.p2copies():
                 allcopies = ctx.p1copies().copy()
                 # There should be no overlap
                 allcopies.update(ctx.p2copies())
                 return sorted(allcopies.items())
             else:
                 return sorted(ctx.p1copies().items())
 
     else:
         getrenamed = getrenamedfn(repo, endrev)
 
         def copiesfn(ctx):
             copies = []
             for fn in ctx.files():
                 rename = getrenamed(fn, ctx.rev())
                 if rename:
                     copies.append((fn, rename))
             return copies
 
     return copiesfn
 
 
 def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
     """Update the dirstate to reflect the intent of copying src to dst. For
     different reasons it might not end with dst being marked as copied from src.
     """
     origsrc = repo.dirstate.copied(src) or src
     if dst == origsrc:  # copying back a copy?
         if repo.dirstate[dst] not in b'mn' and not dryrun:
             repo.dirstate.normallookup(dst)
     else:
         if repo.dirstate[origsrc] == b'a' and origsrc == src:
             if not ui.quiet:
                 ui.warn(
                     _(
                         b"%s has not been committed yet, so no copy "
                         b"data will be stored for %s.\n"
                     )
                     % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))
                 )
             if repo.dirstate[dst] in b'?r' and not dryrun:
                 wctx.add([dst])
         elif not dryrun:
             wctx.copy(origsrc, dst)
 
 
 def movedirstate(repo, newctx, match=None):
     """Move the dirstate to newctx and adjust it as necessary.
 
     A matcher can be provided as an optimization. It is probably a bug to pass
     a matcher that doesn't match all the differences between the parent of the
     working copy and newctx.
     """
     oldctx = repo[b'.']
     ds = repo.dirstate
     copies = dict(ds.copies())
     ds.setparents(newctx.node(), nullid)
     s = newctx.status(oldctx, match=match)
     for f in s.modified:
         if ds[f] == b'r':
             # modified + removed -> removed
             continue
         ds.normallookup(f)
 
     for f in s.added:
         if ds[f] == b'r':
             # added + removed -> unknown
             ds.drop(f)
         elif ds[f] != b'a':
             ds.add(f)
 
     for f in s.removed:
         if ds[f] == b'a':
             # removed + added -> normal
             ds.normallookup(f)
         elif ds[f] != b'r':
             ds.remove(f)
 
     # Merge old parent and old working dir copies
     oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
     oldcopies.update(copies)
     copies = {
         dst: oldcopies.get(src, src)
         for dst, src in pycompat.iteritems(oldcopies)
     }
     # Adjust the dirstate copies
     for dst, src in pycompat.iteritems(copies):
         if src not in newctx or dst in newctx or ds[dst] != b'a':
             src = None
         ds.copy(src, dst)
     repo._quick_access_changeid_invalidate()
 
 
 def filterrequirements(requirements):
     """filters the requirements into two sets:
 
     wcreq: requirements which should be written in .hg/requires
     storereq: which should be written in .hg/store/requires
 
     Returns (wcreq, storereq)
     """
     if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
         wc, store = set(), set()
         for r in requirements:
             if r in requirementsmod.WORKING_DIR_REQUIREMENTS:
                 wc.add(r)
             else:
                 store.add(r)
         return wc, store
     return requirements, None
 
 
 def istreemanifest(repo):
     """ returns whether the repository is using treemanifest or not """
     return requirementsmod.TREEMANIFEST_REQUIREMENT in repo.requirements
 
 
 def writereporequirements(repo, requirements=None):
     """ writes requirements for the repo to .hg/requires """
     if requirements:
         repo.requirements = requirements
     wcreq, storereq = filterrequirements(repo.requirements)
     if wcreq is not None:
         writerequires(repo.vfs, wcreq)
     if storereq is not None:
         writerequires(repo.svfs, storereq)
     elif repo.ui.configbool(b'format', b'usestore'):
         # only remove store requires if we are using store
         repo.svfs.tryunlink(b'requires')
 
 
 def writerequires(opener, requirements):
     with opener(b'requires', b'w', atomictemp=True) as fp:
         for r in sorted(requirements):
             fp.write(b"%s\n" % r)
 
 
 class filecachesubentry(object):
     def __init__(self, path, stat):
         self.path = path
         self.cachestat = None
         self._cacheable = None
 
         if stat:
             self.cachestat = filecachesubentry.stat(self.path)
 
             if self.cachestat:
                 self._cacheable = self.cachestat.cacheable()
             else:
                 # None means we don't know yet
                 self._cacheable = None
 
     def refresh(self):
         if self.cacheable():
             self.cachestat = filecachesubentry.stat(self.path)
 
     def cacheable(self):
         if self._cacheable is not None:
             return self._cacheable
 
         # we don't know yet, assume it is for now
         return True
 
     def changed(self):
         # no point in going further if we can't cache it
         if not self.cacheable():
             return True
 
         newstat = filecachesubentry.stat(self.path)
 
         # we may not know if it's cacheable yet, check again now
         if newstat and self._cacheable is None:
             self._cacheable = newstat.cacheable()
 
             # check again
             if not self._cacheable:
                 return True
 
         if self.cachestat != newstat:
             self.cachestat = newstat
             return True
         else:
             return False
 
     @staticmethod
     def stat(path):
         try:
             return util.cachestat(path)
         except OSError as e:
             if e.errno != errno.ENOENT:
                 raise
 
 
 class filecacheentry(object):
     def __init__(self, paths, stat=True):
         self._entries = []
         for path in paths:
             self._entries.append(filecachesubentry(path, stat))
 
     def changed(self):
         '''true if any entry has changed'''
         for entry in self._entries:
             if entry.changed():
                 return True
         return False
 
     def refresh(self):
         for entry in self._entries:
             entry.refresh()
 
 
 class filecache(object):
     """A property like decorator that tracks files under .hg/ for updates.
 
     On first access, the files defined as arguments are stat()ed and the
     results cached. The decorated function is called. The results are stashed
     away in a ``_filecache`` dict on the object whose method is decorated.
 
     On subsequent access, the cached result is used as it is set to the
     instance dictionary.
 
     On external property set/delete operations, the caller must update the
     corresponding _filecache entry appropriately. Use __class__.<attr>.set()
     instead of directly setting <attr>.
 
     When using the property API, the cached data is always used if available.
     No stat() is performed to check if the file has changed.
 
     Others can muck about with the state of the ``_filecache`` dict. e.g. they
     can populate an entry before the property's getter is called. In this case,
     entries in ``_filecache`` will be used during property operations,
     if available. If the underlying file changes, it is up to external callers
     to reflect this by e.g. calling ``delattr(obj, attr)`` to remove the cached
     method result as well as possibly calling ``del obj._filecache[attr]`` to
     remove the ``filecacheentry``.
     """
 
     def __init__(self, *paths):
         self.paths = paths
 
     def join(self, obj, fname):
         """Used to compute the runtime path of a cached file.
 
         Users should subclass filecache and provide their own version of this
         function to call the appropriate join function on 'obj' (an instance
         of the class that its member function was decorated).
         """
         raise NotImplementedError
 
     def __call__(self, func):
         self.func = func
         self.sname = func.__name__
         self.name = pycompat.sysbytes(self.sname)
         return self
 
     def __get__(self, obj, type=None):
         # if accessed on the class, return the descriptor itself.
         if obj is None:
             return self
 
         assert self.sname not in obj.__dict__
 
         entry = obj._filecache.get(self.name)
 
         if entry:
             if entry.changed():
                 entry.obj = self.func(obj)
         else:
             paths = [self.join(obj, path) for path in self.paths]
 
             # We stat -before- creating the object so our cache doesn't lie if
             # a writer modified between the time we read and stat
             entry = filecacheentry(paths, True)
             entry.obj = self.func(obj)
 
             obj._filecache[self.name] = entry
 
         obj.__dict__[self.sname] = entry.obj
         return entry.obj
 
     # don't implement __set__(), which would make __dict__ lookup as slow as
     # function call.
 
     def set(self, obj, value):
         if self.name not in obj._filecache:
             # we add an entry for the missing value because X in __dict__
             # implies X in _filecache
             paths = [self.join(obj, path) for path in self.paths]
             ce = filecacheentry(paths, False)
             obj._filecache[self.name] = ce
         else:
             ce = obj._filecache[self.name]
 
         ce.obj = value  # update cached copy
         obj.__dict__[self.sname] = value  # update copy returned by obj.x
 
 
 def extdatasource(repo, source):
     """Gather a map of rev -> value dict from the specified source
 
     A source spec is treated as a URL, with a special case shell: type
     for parsing the output from a shell command.
 
     The data is parsed as a series of newline-separated records where
     each record is a revision specifier optionally followed by a space
     and a freeform string value. If the revision is known locally, it
     is converted to a rev, otherwise the record is skipped.
 
     Note that both key and value are treated as UTF-8 and converted to
     the local encoding. This allows uniformity between local and
     remote data sources.
     """
 
     spec = repo.ui.config(b"extdata", source)
     if not spec:
         raise error.Abort(_(b"unknown extdata source '%s'") % source)
 
     data = {}
     src = proc = None
     try:
         if spec.startswith(b"shell:"):
             # external commands should be run relative to the repo root
             cmd = spec[6:]
             proc = subprocess.Popen(
                 procutil.tonativestr(cmd),
                 shell=True,
                 bufsize=-1,
                 close_fds=procutil.closefds,
                 stdout=subprocess.PIPE,
                 cwd=procutil.tonativestr(repo.root),
             )
             src = proc.stdout
         else:
             # treat as a URL or file
             src = url.open(repo.ui, spec)
         for l in src:
             if b" " in l:
                 k, v = l.strip().split(b" ", 1)
             else:
                 k, v = l.strip(), b""
 
             k = encoding.tolocal(k)
             try:
                 data[revsingle(repo, k).rev()] = encoding.tolocal(v)
             except (error.LookupError, error.RepoLookupError):
                 pass  # we ignore data for nodes that don't exist locally
     finally:
         if proc:
             try:
                 proc.communicate()
             except ValueError:
                 # This happens if we started iterating src and then
                 # get a parse error on a line. It should be safe to ignore.
                 pass
         if src:
             src.close()
     if proc and proc.returncode != 0:
         raise error.Abort(
             _(b"extdata command '%s' failed: %s")
             % (cmd, procutil.explainexit(proc.returncode))
         )
 
     return data
 
 
 class progress(object):
     def __init__(self, ui, updatebar, topic, unit=b"", total=None):
         self.ui = ui
         self.pos = 0
         self.topic = topic
         self.unit = unit
         self.total = total
         self.debug = ui.configbool(b'progress', b'debug')
         self._updatebar = updatebar
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, exc_tb):
         self.complete()
 
     def update(self, pos, item=b"", total=None):
         assert pos is not None
         if total:
             self.total = total
         self.pos = pos
         self._updatebar(self.topic, self.pos, item, self.unit, self.total)
         if self.debug:
             self._printdebug(item)
 
     def increment(self, step=1, item=b"", total=None):
         self.update(self.pos + step, item, total)
 
     def complete(self):
         self.pos = None
         self.unit = b""
         self.total = None
         self._updatebar(self.topic, self.pos, b"", self.unit, self.total)
 
     def _printdebug(self, item):
         unit = b''
         if self.unit:
             unit = b' ' + self.unit
         if item:
             item = b' ' + item
 
         if self.total:
             pct = 100.0 * self.pos / self.total
             self.ui.debug(
                 b'%s:%s %d/%d%s (%4.2f%%)\n'
                 % (self.topic, item, self.pos, self.total, unit, pct)
             )
         else:
             self.ui.debug(b'%s:%s %d%s\n' % (self.topic, item, self.pos, unit))
 
 
 def gdinitconfig(ui):
     """helper function to know if a repo should be created as general delta"""
     # experimental config: format.generaldelta
     return ui.configbool(b'format', b'generaldelta') or ui.configbool(
         b'format', b'usegeneraldelta'
     )
 
 
 def gddeltaconfig(ui):
     """helper function to know if incoming delta should be optimised"""
     # experimental config: format.generaldelta
     return ui.configbool(b'format', b'generaldelta')
 
 
 class simplekeyvaluefile(object):
     """A simple file with key=value lines
 
     Keys must be alphanumerics and start with a letter, values must not
     contain '\n' characters"""
 
     firstlinekey = b'__firstline'
 
     def __init__(self, vfs, path, keys=None):
         self.vfs = vfs
         self.path = path
 
     def read(self, firstlinenonkeyval=False):
         """Read the contents of a simple key-value file
 
         'firstlinenonkeyval' indicates whether the first line of file should
         be treated as a key-value pair or reuturned fully under the
         __firstline key."""
         lines = self.vfs.readlines(self.path)
         d = {}
         if firstlinenonkeyval:
             if not lines:
                 e = _(b"empty simplekeyvalue file")
                 raise error.CorruptedState(e)
             # we don't want to include '\n' in the __firstline
             d[self.firstlinekey] = lines[0][:-1]
             del lines[0]
 
         try:
             # the 'if line.strip()' part prevents us from failing on empty
             # lines which only contain '\n' therefore are not skipped
             # by 'if line'
             updatedict = dict(
                 line[:-1].split(b'=', 1) for line in lines if line.strip()
             )
             if self.firstlinekey in updatedict:
                 e = _(b"%r can't be used as a key")
                 raise error.CorruptedState(e % self.firstlinekey)
             d.update(updatedict)
         except ValueError as e:
             raise error.CorruptedState(stringutil.forcebytestr(e))
         return d
 
     def write(self, data, firstline=None):
         """Write key=>value mapping to a file
         data is a dict. Keys must be alphanumerical and start with a letter.
         Values must not contain newline characters.
 
         If 'firstline' is not None, it is written to file before
         everything else, as it is, not in a key=value form"""
         lines = []
         if firstline is not None:
             lines.append(b'%s\n' % firstline)
 
         for k, v in data.items():
             if k == self.firstlinekey:
                 e = b"key name '%s' is reserved" % self.firstlinekey
                 raise error.ProgrammingError(e)
             if not k[0:1].isalpha():
                 e = b"keys must start with a letter in a key-value file"
                 raise error.ProgrammingError(e)
             if not k.isalnum():
                 e = b"invalid key name in a simple key-value file"
                 raise error.ProgrammingError(e)
             if b'\n' in v:
                 e = b"invalid value in a simple key-value file"
                 raise error.ProgrammingError(e)
             lines.append(b"%s=%s\n" % (k, v))
         with self.vfs(self.path, mode=b'wb', atomictemp=True) as fp:
             fp.write(b''.join(lines))
 
 
 _reportobsoletedsource = [
     b'debugobsolete',
     b'pull',
     b'push',
     b'serve',
     b'unbundle',
 ]
 
 _reportnewcssource = [
     b'pull',
     b'unbundle',
 ]
 
 
 def prefetchfiles(repo, revmatches):
     """Invokes the registered file prefetch functions, allowing extensions to
     ensure the corresponding files are available locally, before the command
     uses them.
 
     Args:
       revmatches: a list of (revision, match) tuples to indicate the files to
       fetch at each revision. If any of the match elements is None, it matches
       all files.
     """
 
     def _matcher(m):
         if m:
             assert isinstance(m, matchmod.basematcher)
             # The command itself will complain about files that don't exist, so
             # don't duplicate the message.
             return matchmod.badmatch(m, lambda fn, msg: None)
         else:
             return matchall(repo)
 
     revbadmatches = [(rev, _matcher(match)) for (rev, match) in revmatches]
 
     fileprefetchhooks(repo, revbadmatches)
 
 
 # a list of (repo, revs, match) prefetch functions
 fileprefetchhooks = util.hooks()
 
 # A marker that tells the evolve extension to suppress its own reporting
 _reportstroubledchangesets = True
 
 
 def registersummarycallback(repo, otr, txnname=b'', as_validator=False):
     """register a callback to issue a summary after the transaction is closed
 
     If as_validator is true, then the callbacks are registered as transaction
     validators instead
     """
 
     def txmatch(sources):
         return any(txnname.startswith(source) for source in sources)
 
     categories = []
 
     def reportsummary(func):
         """decorator for report callbacks."""
         # The repoview life cycle is shorter than the one of the actual
         # underlying repository. So the filtered object can die before the
         # weakref is used leading to troubles. We keep a reference to the
         # unfiltered object and restore the filtering when retrieving the
         # repository through the weakref.
         filtername = repo.filtername
         reporef = weakref.ref(repo.unfiltered())
 
         def wrapped(tr):
             repo = reporef()
             if filtername:
                 assert repo is not None  # help pytype
                 repo = repo.filtered(filtername)
             func(repo, tr)
 
         newcat = b'%02i-txnreport' % len(categories)
         if as_validator:
             otr.addvalidator(newcat, wrapped)
         else:
             otr.addpostclose(newcat, wrapped)
         categories.append(newcat)
         return wrapped
 
     @reportsummary
     def reportchangegroup(repo, tr):
         cgchangesets = tr.changes.get(b'changegroup-count-changesets', 0)
         cgrevisions = tr.changes.get(b'changegroup-count-revisions', 0)
         cgfiles = tr.changes.get(b'changegroup-count-files', 0)
         cgheads = tr.changes.get(b'changegroup-count-heads', 0)
         if cgchangesets or cgrevisions or cgfiles:
             htext = b""
             if cgheads:
                 htext = _(b" (%+d heads)") % cgheads
             msg = _(b"added %d changesets with %d changes to %d files%s\n")
             if as_validator:
                 msg = _(b"adding %d changesets with %d changes to %d files%s\n")
             assert repo is not None  # help pytype
             repo.ui.status(msg % (cgchangesets, cgrevisions, cgfiles, htext))
 
     if txmatch(_reportobsoletedsource):
 
         @reportsummary
         def reportobsoleted(repo, tr):
             obsoleted = obsutil.getobsoleted(repo, tr)
             newmarkers = len(tr.changes.get(b'obsmarkers', ()))
             if newmarkers:
                 repo.ui.status(_(b'%i new obsolescence markers\n') % newmarkers)
             if obsoleted:
                 msg = _(b'obsoleted %i changesets\n')
                 if as_validator:
                     msg = _(b'obsoleting %i changesets\n')
                 repo.ui.status(msg % len(obsoleted))
 
     if obsolete.isenabled(
         repo, obsolete.createmarkersopt
     ) and repo.ui.configbool(
         b'experimental', b'evolution.report-instabilities'
     ):
         instabilitytypes = [
             (b'orphan', b'orphan'),
             (b'phase-divergent', b'phasedivergent'),
             (b'content-divergent', b'contentdivergent'),
         ]
 
         def getinstabilitycounts(repo):
             filtered = repo.changelog.filteredrevs
             counts = {}
             for instability, revset in instabilitytypes:
                 counts[instability] = len(
                     set(obsolete.getrevs(repo, revset)) - filtered
                 )
             return counts
 
         oldinstabilitycounts = getinstabilitycounts(repo)
 
         @reportsummary
         def reportnewinstabilities(repo, tr):
             newinstabilitycounts = getinstabilitycounts(repo)
             for instability, revset in instabilitytypes:
                 delta = (
                     newinstabilitycounts[instability]
                     - oldinstabilitycounts[instability]
                 )
                 msg = getinstabilitymessage(delta, instability)
                 if msg:
                     repo.ui.warn(msg)
 
     if txmatch(_reportnewcssource):
 
         @reportsummary
         def reportnewcs(repo, tr):
             """Report the range of new revisions pulled/unbundled."""
             origrepolen = tr.changes.get(b'origrepolen', len(repo))
             unfi = repo.unfiltered()
             if origrepolen >= len(unfi):
                 return
 
             # Compute the bounds of new visible revisions' range.
             revs = smartset.spanset(repo, start=origrepolen)
             if revs:
                 minrev, maxrev = repo[revs.min()], repo[revs.max()]
 
                 if minrev == maxrev:
                     revrange = minrev
                 else:
                     revrange = b'%s:%s' % (minrev, maxrev)
                 draft = len(repo.revs(b'%ld and draft()', revs))
                 secret = len(repo.revs(b'%ld and secret()', revs))
                 if not (draft or secret):
                     msg = _(b'new changesets %s\n') % revrange
                 elif draft and secret:
                     msg = _(b'new changesets %s (%d drafts, %d secrets)\n')
                     msg %= (revrange, draft, secret)
                 elif draft:
                     msg = _(b'new changesets %s (%d drafts)\n')
                     msg %= (revrange, draft)
                 elif secret:
                     msg = _(b'new changesets %s (%d secrets)\n')
                     msg %= (revrange, secret)
                 else:
                     errormsg = b'entered unreachable condition'
                     raise error.ProgrammingError(errormsg)
                 repo.ui.status(msg)
 
             # search new changesets directly pulled as obsolete
             duplicates = tr.changes.get(b'revduplicates', ())
             obsadded = unfi.revs(
                 b'(%d: + %ld) and obsolete()', origrepolen, duplicates
             )
             cl = repo.changelog
             extinctadded = [r for r in obsadded if r not in cl]
             if extinctadded:
                 # They are not just obsolete, but obsolete and invisible
                 # we call them "extinct" internally but the terms have not been
                 # exposed to users.
                 msg = b'(%d other changesets obsolete on arrival)\n'
                 repo.ui.status(msg % len(extinctadded))
 
         @reportsummary
         def reportphasechanges(repo, tr):
             """Report statistics of phase changes for changesets pre-existing
             pull/unbundle.
             """
             origrepolen = tr.changes.get(b'origrepolen', len(repo))
             published = []
             for revs, (old, new) in tr.changes.get(b'phases', []):
                 if new != phases.public:
                     continue
                 published.extend(rev for rev in revs if rev < origrepolen)
             if not published:
                 return
             msg = _(b'%d local changesets published\n')
             if as_validator:
                 msg = _(b'%d local changesets will be published\n')
             repo.ui.status(msg % len(published))
 
 
 def getinstabilitymessage(delta, instability):
     """function to return the message to show warning about new instabilities
 
     exists as a separate function so that extension can wrap to show more
     information like how to fix instabilities"""
     if delta > 0:
         return _(b'%i new %s changesets\n') % (delta, instability)
 
 
 def nodesummaries(repo, nodes, maxnumnodes=4):
     if len(nodes) <= maxnumnodes or repo.ui.verbose:
         return b' '.join(short(h) for h in nodes)
     first = b' '.join(short(h) for h in nodes[:maxnumnodes])
     return _(b"%s and %d others") % (first, len(nodes) - maxnumnodes)
 
 
 def enforcesinglehead(repo, tr, desc, accountclosed=False):
     """check that no named branch has multiple heads"""
     if desc in (b'strip', b'repair'):
         # skip the logic during strip
         return
     visible = repo.filtered(b'visible')
     # possible improvement: we could restrict the check to affected branch
     bm = visible.branchmap()
     for name in bm:
         heads = bm.branchheads(name, closed=accountclosed)
         if len(heads) > 1:
             msg = _(b'rejecting multiple heads on branch "%s"')
             msg %= name
             hint = _(b'%d heads: %s')
             hint %= (len(heads), nodesummaries(repo, heads))
             raise error.Abort(msg, hint=hint)
 
 
 def wrapconvertsink(sink):
     """Allow extensions to wrap the sink returned by convcmd.convertsink()
     before it is used, whether or not the convert extension was formally loaded.
     """
     return sink
 
 
 def unhidehashlikerevs(repo, specs, hiddentype):
     """parse the user specs and unhide changesets whose hash or revision number
     is passed.
 
     hiddentype can be: 1) 'warn': warn while unhiding changesets
                        2) 'nowarn': don't warn while unhiding changesets
 
     returns a repo object with the required changesets unhidden
     """
     if not repo.filtername or not repo.ui.configbool(
         b'experimental', b'directaccess'
     ):
         return repo
 
     if repo.filtername not in (b'visible', b'visible-hidden'):
         return repo
 
     symbols = set()
     for spec in specs:
         try:
             tree = revsetlang.parse(spec)
         except error.ParseError:  # will be reported by scmutil.revrange()
             continue
 
         symbols.update(revsetlang.gethashlikesymbols(tree))
 
     if not symbols:
         return repo
 
     revs = _getrevsfromsymbols(repo, symbols)
 
     if not revs:
         return repo
 
     if hiddentype == b'warn':
         unfi = repo.unfiltered()
         revstr = b", ".join([pycompat.bytestr(unfi[l]) for l in revs])
         repo.ui.warn(
             _(
                 b"warning: accessing hidden changesets for write "
                 b"operation: %s\n"
             )
             % revstr
         )
 
     # we have to use new filtername to separate branch/tags cache until we can
     # disbale these cache when revisions are dynamically pinned.
     return repo.filtered(b'visible-hidden', revs)
 
 
 def _getrevsfromsymbols(repo, symbols):
     """parse the list of symbols and returns a set of revision numbers of hidden
     changesets present in symbols"""
     revs = set()
     unfi = repo.unfiltered()
     unficl = unfi.changelog
     cl = repo.changelog
     tiprev = len(unficl)
     allowrevnums = repo.ui.configbool(b'experimental', b'directaccess.revnums')
     for s in symbols:
         try:
             n = int(s)
             if n <= tiprev:
                 if not allowrevnums:
                     continue
                 else:
                     if n not in cl:
                         revs.add(n)
                     continue
         except ValueError:
             pass
 
         try:
             s = resolvehexnodeidprefix(unfi, s)
         except (error.LookupError, error.WdirUnsupported):
             s = None
 
         if s is not None:
             rev = unficl.rev(s)
             if rev not in cl:
                 revs.add(rev)
 
     return revs
 
 
 def bookmarkrevs(repo, mark):
     """Select revisions reachable by a given bookmark
 
     If the bookmarked revision isn't a head, an empty set will be returned.
     """
     return repo.revs(format_bookmark_revspec(mark))
 
 
 def format_bookmark_revspec(mark):
     """Build a revset expression to select revisions reachable by a given
     bookmark"""
+    mark = b'literal:' + mark
     return revsetlang.formatspec(
         b"ancestors(bookmark(%s)) - "
         b"ancestors(head() and not bookmark(%s)) - "
         b"ancestors(bookmark() and not bookmark(%s))",
         mark,
         mark,
         mark,
     )

tests/test-glog-beautifygraph.t

@@ -1,3115 +1,3115 b''
 @  (34) head
 |
 | o  (33) head
 | |
 o |    (32) expand
 |\ \
 | o \    (31) expand
 | |\ \
 | | o \    (30) expand
 | | |\ \
 | | | o |  (29) regular commit
 | | | | |
 | | o | |    (28) merge zero known
 | | |\ \ \
 o | | | | |  (27) collapse
 |/ / / / /
 | | o---+  (26) merge one known; far right
 | | | | |
 +---o | |  (25) merge one known; far left
 | | | | |
 | | o | |  (24) merge one known; immediate right
 | | |\| |
 | | o | |  (23) merge one known; immediate left
 | |/| | |
 +---o---+  (22) merge two known; one far left, one far right
 | |  / /
 o | | |    (21) expand
 |\ \ \ \
 | o---+-+  (20) merge two known; two far right
 |  / / /
 o | | |    (19) expand
 |\ \ \ \
 +---+---o  (18) merge two known; two far left
 | | | |
 | o | |    (17) expand
 | |\ \ \
 | | o---+  (16) merge two known; one immediate right, one near right
 | | |/ /
 o | | |    (15) expand
 |\ \ \ \
 | o-----+  (14) merge two known; one immediate right, one far right
 | |/ / /
 o | | |    (13) expand
 |\ \ \ \
 +---o | |  (12) merge two known; one immediate right, one far left
 | | |/ /
 | o | |    (11) expand
 | |\ \ \
 | | o---+  (10) merge two known; one immediate left, one near right
 | |/ / /
 o | | |    (9) expand
 |\ \ \ \
 | o-----+  (8) merge two known; one immediate left, one far right
 |/ / / /
 o | | |    (7) expand
 |\ \ \ \
 +---o | |  (6) merge two known; one immediate left, one far left
 | |/ / /
 | o | |    (5) expand
 | |\ \ \
 | | o | |  (4) merge two known; one immediate left, one immediate right
 | |/|/ /
 | o / /  (3) collapse
 |/ / /
 o / /  (2) collapse
 |/ /
 o /  (1) collapse
 |/
 o  (0) root
 
   $ commit()
   > {
   >   rev=$1
   >   msg=$2
   >   shift 2
   >   if [ "$#" -gt 0 ]; then
   >       hg debugsetparents "$@"
   >   fi
   >   echo $rev > a
   >   hg commit -Aqd "$rev 0" -m "($rev) $msg"
   > }
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "printrevset=$TESTDIR/printrevset.py" >> $HGRCPATH
   $ echo "beautifygraph=" >> $HGRCPATH
 
 Set a default of narrow-text UTF-8.
 
   $ HGENCODING=UTF-8; export HGENCODING
   $ HGENCODINGAMBIGUOUS=narrow; export HGENCODINGAMBIGUOUS
 
 Empty repo:
 
   $ hg init repo
   $ cd repo
   $ hg log -G
 
 Building DAG:
 
   $ commit 0 "root"
   $ commit 1 "collapse" 0
   $ commit 2 "collapse" 1
   $ commit 3 "collapse" 2
   $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
   $ commit 5 "expand" 3 4
   $ commit 6 "merge two known; one immediate left, one far left" 2 5
   $ commit 7 "expand" 2 5
   $ commit 8 "merge two known; one immediate left, one far right" 0 7
   $ commit 9 "expand" 7 8
   $ commit 10 "merge two known; one immediate left, one near right" 0 6
   $ commit 11 "expand" 6 10
   $ commit 12 "merge two known; one immediate right, one far left" 1 9
   $ commit 13 "expand" 9 11
   $ commit 14 "merge two known; one immediate right, one far right" 0 12
   $ commit 15 "expand" 13 14
   $ commit 16 "merge two known; one immediate right, one near right" 0 1
   $ commit 17 "expand" 12 16
   $ commit 18 "merge two known; two far left" 1 15
   $ commit 19 "expand" 15 17
   $ commit 20 "merge two known; two far right" 0 18
   $ commit 21 "expand" 19 20
   $ commit 22 "merge two known; one far left, one far right" 18 21
   $ commit 23 "merge one known; immediate left" 1 22
   $ commit 24 "merge one known; immediate right" 0 23
   $ commit 25 "merge one known; far left" 21 24
   $ commit 26 "merge one known; far right" 18 25
   $ commit 27 "collapse" 21
   $ commit 28 "merge zero known" 1 26
   $ commit 29 "regular commit" 0
   $ commit 30 "expand" 28 29
   $ commit 31 "expand" 21 30
   $ commit 32 "expand" 27 31
   $ commit 33 "head" 18
   $ commit 34 "head" 32
 
 The extension should not turn on unless we're in UTF-8.
 
   $ HGENCODING=latin1 hg log -G -q
   beautifygraph: unsupported encoding, UTF-8 required
   @  34:fea3ac5810e0
   |
   | o  33:68608f5145f9
   | |
   o |    32:d06dffa21a31
   |\ \
   | o \    31:621d83e11f67
   | |\ \
   | | o \    30:6e11cd4b648f
   | | |\ \
   | | | o |  29:cd9bb2be7593
   | | | | |
   | | o | |    28:44ecd0b9ae99
   | | |\ \ \
   o | | | | |  27:886ed638191b
   |/ / / / /
   | | o---+  26:7f25b6c2f0b9
   | | | | |
   +---o | |  25:91da8ed57247
   | | | | |
   | | o | |  24:a9c19a3d96b7
   | | |\| |
   | | o | |  23:a01cddf0766d
   | |/| | |
   +---o---+  22:e0d9cccacb5d
   | |  / /
   o | | |    21:d42a756af44d
   |\ \ \ \
   | o---+-+  20:d30ed6450e32
   |  / / /
   o | | |    19:31ddc2c1573b
   |\ \ \ \
   +---+---o  18:1aa84d96232a
   | | | |
   | o | |    17:44765d7c06e0
   | |\ \ \
   | | o---+  16:3677d192927d
   | | |/ /
   o | | |    15:1dda3f72782d
   |\ \ \ \
   | o-----+  14:8eac370358ef
   | |/ / /
   o | | |    13:22d8966a97e3
   |\ \ \ \
   +---o | |  12:86b91144a6e9
   | | |/ /
   | o | |    11:832d76e6bdf2
   | |\ \ \
   | | o---+  10:74c64d036d72
   | |/ / /
   o | | |    9:7010c0af0a35
   |\ \ \ \
   | o-----+  8:7a0b11f71937
   |/ / / /
   o | | |    7:b632bb1b1224
   |\ \ \ \
   +---o | |  6:b105a072e251
   | |/ / /
   | o | |    5:4409d547b708
   | |\ \ \
   | | o | |  4:26a8bac39d9f
   | |/|/ /
   | o / /  3:27eef8ed80b4
   |/ / /
   o / /  2:3d9a33b8d1e1
   |/ /
   o /  1:6db2ef61d156
   |/
   o  0:e6eb3150255d
   
 
 The extension should not turn on if we're using wide text.
 
   $ HGENCODINGAMBIGUOUS=wide hg log -G -q
   beautifygraph: unsupported terminal settings, monospace narrow text required
   @  34:fea3ac5810e0
   |
   | o  33:68608f5145f9
   | |
   o |    32:d06dffa21a31
   |\ \
   | o \    31:621d83e11f67
   | |\ \
   | | o \    30:6e11cd4b648f
   | | |\ \
   | | | o |  29:cd9bb2be7593
   | | | | |
   | | o | |    28:44ecd0b9ae99
   | | |\ \ \
   o | | | | |  27:886ed638191b
   |/ / / / /
   | | o---+  26:7f25b6c2f0b9
   | | | | |
   +---o | |  25:91da8ed57247
   | | | | |
   | | o | |  24:a9c19a3d96b7
   | | |\| |
   | | o | |  23:a01cddf0766d
   | |/| | |
   +---o---+  22:e0d9cccacb5d
   | |  / /
   o | | |    21:d42a756af44d
   |\ \ \ \
   | o---+-+  20:d30ed6450e32
   |  / / /
   o | | |    19:31ddc2c1573b
   |\ \ \ \
   +---+---o  18:1aa84d96232a
   | | | |
   | o | |    17:44765d7c06e0
   | |\ \ \
   | | o---+  16:3677d192927d
   | | |/ /
   o | | |    15:1dda3f72782d
   |\ \ \ \
   | o-----+  14:8eac370358ef
   | |/ / /
   o | | |    13:22d8966a97e3
   |\ \ \ \
   +---o | |  12:86b91144a6e9
   | | |/ /
   | o | |    11:832d76e6bdf2
   | |\ \ \
   | | o---+  10:74c64d036d72
   | |/ / /
   o | | |    9:7010c0af0a35
   |\ \ \ \
   | o-----+  8:7a0b11f71937
   |/ / / /
   o | | |    7:b632bb1b1224
   |\ \ \ \
   +---o | |  6:b105a072e251
   | |/ / /
   | o | |    5:4409d547b708
   | |\ \ \
   | | o | |  4:26a8bac39d9f
   | |/|/ /
   | o / /  3:27eef8ed80b4
   |/ / /
   o / /  2:3d9a33b8d1e1
   |/ /
   o /  1:6db2ef61d156
   |/
   o  0:e6eb3150255d
   
 
 The rest of our tests will use the default narrow text UTF-8.
 
   $ hg log -G -q
   \xe2\x97\x8d  34:fea3ac5810e0 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x95\xb2  31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x95\xb2  30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  27:886ed638191b (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  21:d42a756af44d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\xa4  20:d30ed6450e32 (esc)
   \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  19:31ddc2c1573b (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  8:7a0b11f71937 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x95\xb1 \xe2\x95\xb1  3:27eef8ed80b4 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x95\xb1 \xe2\x95\xb1  2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x95\xb1  1:6db2ef61d156 (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8b  0:e6eb3150255d (esc)
   
 
   $ hg log -G
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82  summary:     (33) head (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (32) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:31 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (31) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:30 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (30) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:29 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (29) regular commit (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:28 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (28) merge zero known (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   27:886ed638191b (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:27 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (27) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:26 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (26) merge one known; far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:25 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (25) merge one known; far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:24 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (24) merge one known; immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:23 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (23) merge one known; immediate left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:22 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (22) merge two known; one far left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   21:d42a756af44d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:21 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (21) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\xa4  changeset:   20:d30ed6450e32 (esc)
   \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:20 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (20) merge two known; two far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   19:31ddc2c1573b (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:19 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (19) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:18 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (18) merge two known; two far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:17 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (17) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:16 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (16) merge two known; one immediate right, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      13:22d8966a97e3 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:15 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (15) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:14 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (14) merge two known; one immediate right, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:13 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (13) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:12 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (12) merge two known; one immediate right, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:11 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (11) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:10 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (10) merge two known; one immediate left, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (9) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:08 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (8) merge two known; one immediate left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:07 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (7) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:06 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (6) merge two known; one immediate left, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:05 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (5) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:04 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (4) merge two known; one immediate left, one immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   3:27eef8ed80b4 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:03 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (3) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:02 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (2) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   1:6db2ef61d156 (esc)
   \xe2\x94\x82\xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:01 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:e6eb3150255d (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 File glog:
   $ hg log -G a
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82  summary:     (33) head (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (32) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:31 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (31) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:30 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (30) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:29 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (29) regular commit (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:28 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (28) merge zero known (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   27:886ed638191b (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:27 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (27) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:26 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (26) merge one known; far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:25 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (25) merge one known; far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:24 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (24) merge one known; immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:23 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (23) merge one known; immediate left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:22 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (22) merge two known; one far left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   21:d42a756af44d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:21 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (21) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\xa4  changeset:   20:d30ed6450e32 (esc)
   \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:20 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (20) merge two known; two far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   19:31ddc2c1573b (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:19 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (19) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:18 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (18) merge two known; two far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:17 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (17) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:16 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (16) merge two known; one immediate right, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      13:22d8966a97e3 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:15 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (15) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:14 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (14) merge two known; one immediate right, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:13 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (13) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:12 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (12) merge two known; one immediate right, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:11 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (11) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:10 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (10) merge two known; one immediate left, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (9) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:08 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (8) merge two known; one immediate left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:07 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (7) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:06 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (6) merge two known; one immediate left, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:05 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (5) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:04 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (4) merge two known; one immediate left, one immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   3:27eef8ed80b4 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:03 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (3) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:02 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (2) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   1:6db2ef61d156 (esc)
   \xe2\x94\x82\xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:01 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:e6eb3150255d (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 File glog per revset:
 
   $ hg log -G -r 'file("a")'
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82  summary:     (33) head (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (32) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:31 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (31) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:30 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (30) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   29:cd9bb2be7593 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:29 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (29) regular commit (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:28 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (28) merge zero known (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   27:886ed638191b (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:27 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (27) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:26 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (26) merge one known; far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:25 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (25) merge one known; far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:24 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (24) merge one known; immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:23 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (23) merge one known; immediate left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1   parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:22 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (22) merge two known; one far left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   21:d42a756af44d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:21 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (21) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\xa4  changeset:   20:d30ed6450e32 (esc)
   \xe2\x94\x82   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82  \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:20 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (20) merge two known; two far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   19:31ddc2c1573b (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:19 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (19) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xbc\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:18 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (18) merge two known; two far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:17 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (17) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:16 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (16) merge two known; one immediate right, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      13:22d8966a97e3 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:15 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (15) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:14 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (14) merge two known; one immediate right, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:13 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (13) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:12 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (12) merge two known; one immediate right, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:11 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (11) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:10 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (10) merge two known; one immediate left, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (9) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x94\xa4  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:08 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (8) merge two known; one immediate left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  changeset:   7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:07 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (7) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:06 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (6) merge two known; one immediate left, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   5:4409d547b708 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2 \xe2\x95\xb2   parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:05 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (5) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   4:26a8bac39d9f (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:04 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (4) merge two known; one immediate left, one immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   3:27eef8ed80b4 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:03 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82    summary:     (3) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82\xe2\x95\xb1 \xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:02 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (2) collapse (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   1:6db2ef61d156 (esc)
   \xe2\x94\x82\xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:01 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:e6eb3150255d (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 File glog per revset (only merges):
 
   $ hg log -G -r 'file("a")' -m
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x94\x82 \xe2\x94\x86  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86  summary:     (32) expand (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   31:621d83e11f67 (esc)
   \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x86  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x86  parent:      30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:31 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86  summary:     (31) expand (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   30:6e11cd4b648f (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      29:cd9bb2be7593 (esc)
   \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:30 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x86  summary:     (30) expand (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   28:44ecd0b9ae99 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:28 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x86  summary:     (28) merge zero known (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  parent:      25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:26 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  summary:     (26) merge one known; far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x86  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  parent:      24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:25 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  summary:     (25) merge one known; far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:24 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  summary:     (24) merge one known; immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:23 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  summary:     (23) merge one known; immediate left (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   22:e0d9cccacb5d (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x86\xe2\x95\xb1   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x86    parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x86    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86    date:        Thu Jan 01 00:00:22 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86    summary:     (22) merge two known; one far left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:21 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (21) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:20 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (20) merge two known; two far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:19 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (19) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   18:1aa84d96232a (esc)
   \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x95\xa7 \xe2\x94\x82 \xe2\x94\x82  parent:      15:1dda3f72782d (esc)
     \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
     \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:18 1970 +0000 (esc)
     \xe2\x94\x82 \xe2\x94\x82  summary:     (18) merge two known; two far left (esc)
    \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:17 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (17) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b  changeset:   16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x95\xa7  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82      user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82      date:        Thu Jan 01 00:00:16 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82      summary:     (16) merge two known; one immediate right, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      13:22d8966a97e3 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:15 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (15) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:14 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (14) merge two known; one immediate right, one far right (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:13 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (13) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:12 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (12) merge two known; one immediate right, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:11 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (11) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b  changeset:   10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:10 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (10) merge two known; one immediate left, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (9) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:08 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (8) merge two known; one immediate left, one far right (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:07 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (7) expand (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   6:b105a072e251 (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82  parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:06 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (6) merge two known; one immediate left, one far left (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   5:4409d547b708 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      4:26a8bac39d9f (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:05 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (5) expand (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   4:26a8bac39d9f (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      3:27eef8ed80b4 (esc)
        user:        test
        date:        Thu Jan 01 00:00:04 1970 +0000
        summary:     (4) merge two known; one immediate left, one immediate right
   
 
 Empty revision range - display nothing:
   $ hg log -G -r 1..0
 
   $ cd ..
 
 #if no-outer-repo
 
 From outer space:
   $ hg log -G -l1 repo
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x95\xa7  parent:      32:d06dffa21a31 (esc)
      user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   $ hg log -G -l1 repo/a
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x95\xa7  parent:      32:d06dffa21a31 (esc)
      user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   $ hg log -G -l1 repo/missing
 
 #endif
 
 File log with revs != cset revs:
   $ hg init flog
   $ cd flog
   $ echo one >one
   $ hg add one
   $ hg commit -mone
   $ echo two >two
   $ hg add two
   $ hg commit -mtwo
   $ echo more >two
   $ hg commit -mmore
   $ hg log -G two
   \xe2\x97\x8d  changeset:   2:12c28321755b (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82  summary:     more (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   1:5ac72c0599bf (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x95\xa7  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
      summary:     two
   
 
 Issue1896: File log with explicit style
   $ hg log -G --style=default one
   \xe2\x97\x8b  changeset:   0:3d578b4a1f53 (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     one
   
 Issue2395: glog --style header and footer
   $ hg log -G --style=xml one
   <?xml version="1.0"?>
   <log>
   \xe2\x97\x8b  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> (esc)
      <author email="test">test</author>
      <date>1970-01-01T00:00:00+00:00</date>
      <msg xml:space="preserve">one</msg>
      </logentry>
   </log>
 
   $ cd ..
 
 Incoming and outgoing:
 
   $ hg clone -U -r31 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 31 changesets with 31 changes to 1 files
   new changesets e6eb3150255d:621d83e11f67
   $ cd repo2
 
   $ hg incoming --graph ../repo
   comparing with ../repo
   searching for changes
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82    parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (33) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82  parent:      27:886ed638191b (esc)
   \xe2\x94\x82  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (32) expand (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   27:886ed638191b (esc)
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
   $ cd ..
 
   $ hg -R repo outgoing --graph repo2
   comparing with repo2
   searching for changes
   \xe2\x97\x8d  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82    parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (33) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82  parent:      27:886ed638191b (esc)
   \xe2\x94\x82  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (32) expand (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   27:886ed638191b (esc)
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
 
 File + limit with revs != cset revs:
   $ cd repo
   $ touch b
   $ hg ci -Aqm0
   $ hg log -G -l2 a
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:33 1970 +0000
      summary:     (33) head
   
 
 File + limit + -ra:b, (b - a) < limit:
   $ hg log -G -l3000 -r32:tip a
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x95\xa7  user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (33) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      31:621d83e11f67 (esc)
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 Point out a common and an uncommon unshown parent
 
   $ hg log -G -r 'rev(8) or rev(9)'
   \xe2\x97\x8b  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (9) expand (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      0:e6eb3150255d (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      7:b632bb1b1224 (esc)
        user:        test
        date:        Thu Jan 01 00:00:08 1970 +0000
        summary:     (8) merge two known; one immediate left, one far right
   
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 a
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
 
 file(File) + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 -r 'file("a")'
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
 
 limit(file(File) and a::b), b < tip:
 
   $ hg log -G -r 'limit(file("a") and 32::34, 1)'
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      31:621d83e11f67 (esc)
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -r 'limit(file("a") and 34::32, 1)'
 
 File + limit + -ra:b, b < tip, (b - a) < limit:
 
   $ hg log -G -l10 -r33:34 a
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:33 1970 +0000
      summary:     (33) head
   
 
 Do not crash or produce strange graphs if history is buggy
 
   $ hg branch branch
   marked working directory as branch branch
   (branches are permanent and global, did you want a bookmark?)
   $ commit 36 "buggy merge: identical parents" 35 35
   $ hg log -G -l5
   \xe2\x97\x8d  changeset:   36:08a19a744424 (esc)
   \xe2\x94\x82  branch:      branch (esc)
   \xe2\x94\x82  tag:         tip (esc)
   \xe2\x94\x82  parent:      35:9159c3644c5e (esc)
   \xe2\x94\x82  parent:      35:9159c3644c5e (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:36 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (36) buggy merge: identical parents (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   35:9159c3644c5e (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82  summary:     0 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   34:fea3ac5810e0 (esc)
   \xe2\x94\x82  parent:      32:d06dffa21a31 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:34 1970 +0000 (esc)
   \xe2\x94\x82  summary:     (34) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   33:68608f5145f9 (esc)
   \xe2\x94\x82 \xe2\x94\x82  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x95\xa7  user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:33 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (33) head (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      31:621d83e11f67 (esc)
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 Test log -G options
 
   $ testlog() {
   >   hg log -G --print-revset "$@"
   >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > log.nodes
   >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > glog.nodes
   >   (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \
   >     | grep '^[-+@ ]' || :
   > }
 
 glog always reorders nodes which explains the difference with log
 
   $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
   ['27', '25', '21', '34', '32', '31']
   []
   <baseset- [21, 25, 27, 31, 32, 34]>
   --- log.nodes	* (glob)
   +++ glog.nodes	* (glob)
   @@ -1,6 +1,6 @@
   -nodetag 27
   -nodetag 25
   -nodetag 21
    nodetag 34
    nodetag 32
    nodetag 31
   +nodetag 27
   +nodetag 25
   +nodetag 21
   $ testlog -u test -u not-a-user
   []
   (or
     (list
       (func
         (symbol 'user')
-        (string 'test'))
+        (string 'literal:test'))
       (func
         (symbol 'user')
-        (string 'not-a-user'))))
+        (string 'literal:not-a-user'))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
-        <user 'test'>>,
+        <user 'literal:test'>>,
       <filteredset
         <fullreposet+ 0:37>,
-        <user 'not-a-user'>>>>
+        <user 'literal:not-a-user'>>>>
   $ testlog -b not-a-branch
   abort: unknown revision 'not-a-branch'
   abort: unknown revision 'not-a-branch'
   abort: unknown revision 'not-a-branch'
   $ testlog -b 35 -b 36 --only-branch branch
   []
   (or
     (list
       (func
         (symbol 'branch')
-        (string 'default'))
+        (string 'literal:default'))
       (or
         (list
           (func
             (symbol 'branch')
-            (string 'branch'))
+            (string 'literal:branch'))
           (func
             (symbol 'branch')
-            (string 'branch'))))))
+            (string 'literal:branch'))))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
-        <branch 'default'>>,
+        <branch 'literal:default'>>,
       <addset
         <filteredset
           <fullreposet+ 0:37>,
-          <branch 'branch'>>,
+          <branch 'literal:branch'>>,
         <filteredset
           <fullreposet+ 0:37>,
-          <branch 'branch'>>>>>
+          <branch 'literal:branch'>>>>>
   $ testlog -k expand -k merge
   []
   (or
     (list
       (func
         (symbol 'keyword')
         (string 'expand'))
       (func
         (symbol 'keyword')
         (string 'merge'))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
         <keyword 'expand'>>,
       <filteredset
         <fullreposet+ 0:37>,
         <keyword 'merge'>>>>
   $ testlog --only-merges
   []
   (func
     (symbol 'merge')
     None)
   <filteredset
     <spanset- 0:37>,
     <merge>>
   $ testlog --no-merges
   []
   (not
     (func
       (symbol 'merge')
       None))
   <filteredset
     <spanset- 0:37>,
     <not
       <filteredset
         <spanset- 0:37>,
         <merge>>>>
   $ testlog --date '2 0 to 4 0'
   []
   (func
     (symbol 'date')
     (string '2 0 to 4 0'))
   <filteredset
     <spanset- 0:37>,
     <date '2 0 to 4 0'>>
   $ hg log -G -d 'brace ) in a date'
   hg: parse error: invalid date: 'brace ) in a date'
   [10]
   $ testlog --prune 31 --prune 32
   []
   (not
     (or
       (list
         (func
           (symbol 'ancestors')
           (string '31'))
         (func
           (symbol 'ancestors')
           (string '32')))))
   <filteredset
     <spanset- 0:37>,
     <not
       <addset
         <filteredset
           <spanset- 0:37>,
           <generatorsetdesc+>>,
         <filteredset
           <spanset- 0:37>,
           <generatorsetdesc+>>>>>
 
 Dedicated repo for --follow and paths filtering. The g is crafted to
 have 2 filelog topological heads in a linear changeset graph.
 
   $ cd ..
   $ hg init follow
   $ cd follow
   $ testlog --follow
   []
   []
   <baseset []>
   $ testlog -rnull
   ['null']
   []
   <baseset [-1]>
   $ echo a > a
   $ echo aa > aa
   $ echo f > f
   $ hg ci -Am "add a" a aa f
   $ hg cp a b
   $ hg cp f g
   $ hg ci -m "copy a b"
   $ mkdir dir
   $ hg mv b dir
   $ echo g >> g
   $ echo f >> f
   $ hg ci -m "mv b dir/b"
   $ hg mv a b
   $ hg cp -f f g
   $ echo a > d
   $ hg add d
   $ hg ci -m "mv a b; add d"
   $ hg mv dir/b e
   $ hg ci -m "mv dir/b e"
   $ hg log -G --template '({rev}) {desc|firstline}\n'
   \xe2\x97\x8d  (4) mv dir/b e (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  (3) mv a b; add d (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  (2) mv b dir/b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  (1) copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  (0) add a (esc)
   
 
   $ testlog a
   []
   (func
     (symbol 'filelog')
     (string 'a'))
   <filteredset
     <spanset- 0:5>, set([0])>
   $ testlog a b
   []
   (or
     (list
       (func
         (symbol 'filelog')
         (string 'a'))
       (func
         (symbol 'filelog')
         (string 'b'))))
   <filteredset
     <spanset- 0:5>,
     <addset
       <baseset+ [0]>,
       <baseset+ [1]>>>
 
 Test falling back to slow path for non-existing files
 
   $ testlog a c
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')
       (string 'p:c')))
   <filteredset
     <spanset- 0:5>,
     <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test multiple --include/--exclude/paths
 
   $ testlog --include a --include e --exclude b --exclude e a e
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')
       (string 'p:e')
       (string 'i:a')
       (string 'i:e')
       (string 'x:b')
       (string 'x:e')))
   <filteredset
     <spanset- 0:5>,
     <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=2147483647>>
 
 Test glob expansion of pats
 
   $ expandglobs=`"$PYTHON" -c "import mercurial.util; \
   >   print(mercurial.util.expandglobs and 'true' or 'false')"`
   $ if [ $expandglobs = "true" ]; then
   >    testlog 'a*';
   > else
   >    testlog a*;
   > fi;
   []
   (func
     (symbol 'filelog')
     (string 'aa'))
   <filteredset
     <spanset- 0:5>, set([0])>
 
 Test --follow on a non-existent directory
 
   $ testlog -f dir
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
 
 Test --follow on a directory
 
   $ hg up -q '.^'
   $ testlog -f dir
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:dir')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ hg up -q tip
 
 Test --follow on file not in parent revision
 
   $ testlog -f a
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
 
 Test --follow and patterns
 
   $ testlog -f 'glob:*'
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:glob:*')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test --follow on a single rename
 
   $ hg up -q 2
   $ testlog -f a
   []
   []
   <generatorsetdesc->
 
 Test --follow and multiple renames
 
   $ hg up -q tip
   $ testlog -f e
   []
   []
   <generatorsetdesc->
 
 Test --follow and multiple filelog heads
 
   $ hg up -q 2
   $ testlog -f g
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 2
   nodetag 1
   nodetag 0
   $ hg up -q tip
   $ testlog -f g
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 3
   nodetag 2
   nodetag 0
 
 Test --follow and multiple files
 
   $ testlog -f g e
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 4
   nodetag 3
   nodetag 2
   nodetag 1
   nodetag 0
 
 Test --follow null parent
 
   $ hg up -q null
   $ testlog -f
   []
   []
   <baseset []>
 
 Test --follow-first
 
   $ hg up -q 3
   $ echo ee > e
   $ hg ci -Am "add another e" e
   created new head
   $ hg merge --tool internal:other 4
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo merge > e
   $ hg ci -m "merge 5 and 4"
   $ testlog --follow-first
   []
   []
   <generatorsetdesc->
 
 Cannot compare with log --follow-first FILE as it never worked
 
   $ hg log -G --print-revset --follow-first e
   []
   []
   <generatorsetdesc->
   $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
   \xe2\x97\x8d  6 merge 5 and 4 (esc)
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 (esc)
   \xe2\x97\x8b  5 add another e (esc)
   \xe2\x94\x82 (esc)
   \xe2\x95\xa7 (esc)
 
 Test --copies
 
   $ hg log -G --copies --template "{rev} {desc|firstline} \
   >   copies: {file_copies_switch}\n"
   \xe2\x97\x8d  6 merge 5 and 4   copies: (esc)
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  5 add another e   copies: (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  4 mv dir/b e   copies: e (dir/b) (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8b  3 mv a b; add d   copies: b (a)g (f) (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  2 mv b dir/b   copies: dir/b (b) (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 copy a b   copies: b (a)g (f) (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 add a   copies: (esc)
   
 Test "set:..." and parent revision
 
   $ hg up -q 4
   $ testlog "set:copied()"
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:set:copied()')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog --include "set:copied()"
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'i:set:copied()')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=2147483647>>
   $ testlog -r "sort(file('set:copied()'), -rev)"
   ['sort(file(\'set:copied()\'), -rev)']
   []
   <filteredset
     <fullreposet- 0:7>,
     <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='glob', rev=None>>
 
 Test --removed
 
   $ testlog --removed
   []
   []
   <spanset- 0:7>
   $ testlog --removed a
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog --removed --follow a
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test --patch and --stat with --follow and --follow-first
 
   $ hg up -q 3
   $ hg log -G --git --patch b
   \xe2\x97\x8b  changeset:   1:216d4c92cf98 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x95\xa7  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
      summary:     copy a b
   
      diff --git a/a b/b
      copy from a
      copy to b
   
 
   $ hg log -G --git --stat b
   \xe2\x97\x8b  changeset:   1:216d4c92cf98 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x95\xa7  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
      summary:     copy a b
   
       b |  0
       1 files changed, 0 insertions(+), 0 deletions(-)
   
 
   $ hg log -G --git --patch --follow b
   \xe2\x97\x8b  changeset:   1:216d4c92cf98 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82  summary:     copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82  diff --git a/a b/b (esc)
   \xe2\x94\x82  copy from a (esc)
   \xe2\x94\x82  copy to b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:f8035bb17114 (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
      diff --git a/a b/a
      new file mode 100644
      --- /dev/null
      +++ b/a
      @@ -0,0 +1,1 @@
      +a
   
 
   $ hg log -G --git --stat --follow b
   \xe2\x97\x8b  changeset:   1:216d4c92cf98 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82  summary:     copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82   b |  0 (esc)
   \xe2\x94\x82   1 files changed, 0 insertions(+), 0 deletions(-) (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:f8035bb17114 (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
       a |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
   
 
   $ hg up -q 6
   $ hg log -G --git --patch --follow-first e
   \xe2\x97\x8d  changeset:   6:9feeac35a70a (esc)
   \xe2\x94\x82\xe2\x95\xb2   tag:         tip (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      5:99b31f1c2782 (esc)
   \xe2\x94\x82    parent:      4:17d952250a9d (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82    summary:     merge 5 and 4 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82    diff --git a/e b/e (esc)
   \xe2\x94\x82    --- a/e (esc)
   \xe2\x94\x82    +++ b/e (esc)
   \xe2\x94\x82    @@ -1,1 +1,1 @@ (esc)
   \xe2\x94\x82    -ee (esc)
   \xe2\x94\x82    +merge (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   5:99b31f1c2782 (esc)
   \xe2\x94\x82  parent:      3:5918b8d165d1 (esc)
   \xe2\x95\xa7  user:        test (esc)
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add another e
   
      diff --git a/e b/e
      new file mode 100644
      --- /dev/null
      +++ b/e
      @@ -0,0 +1,1 @@
      +ee
   
 
 Test old-style --rev
 
   $ hg tag 'foo-bar'
   $ testlog -r 'foo-bar'
   ['foo-bar']
   []
   <baseset [6]>
 
 Test --follow and forward --rev
 
   $ hg up -q 6
   $ echo g > g
   $ hg ci -Am 'add g' g
   created new head
   $ hg up -q 2
   $ hg log -G --template "{rev} {desc|firstline}\n"
   \xe2\x97\x8b  8 add g (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  7 Added tag foo-bar for changeset 9feeac35a70a (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8b  6 merge 5 and 4 (esc)
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  5 add another e (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  4 mv dir/b e (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8b  3 mv a b; add d (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8d  2 mv b dir/b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 add a (esc)
   
   $ hg archive -r 7 archive
   $ grep changessincelatesttag archive/.hg_archival.txt
   changessincelatesttag: 1
   $ rm -r archive
 
 changessincelatesttag with no prior tag
   $ hg archive -r 4 archive
   $ grep changessincelatesttag archive/.hg_archival.txt
   changessincelatesttag: 5
 
   $ hg export 'all()'
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID f8035bb17114da16215af3436ec5222428ace8ee
   # Parent  0000000000000000000000000000000000000000
   add a
   
   diff -r 000000000000 -r f8035bb17114 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 000000000000 -r f8035bb17114 aa
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/aa	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +aa
   diff -r 000000000000 -r f8035bb17114 f
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92
   # Parent  f8035bb17114da16215af3436ec5222428ace8ee
   copy a b
   
   diff -r f8035bb17114 -r 216d4c92cf98 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r f8035bb17114 -r 216d4c92cf98 g
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3
   # Parent  216d4c92cf98ff2b4641d508b76b529f3d424c92
   mv b dir/b
   
   diff -r 216d4c92cf98 -r bb573313a9e8 b
   --- a/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 216d4c92cf98 -r bb573313a9e8 dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 216d4c92cf98 -r bb573313a9e8 f
   --- a/f	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +f
   diff -r 216d4c92cf98 -r bb573313a9e8 g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +g
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed
   # Parent  bb573313a9e8349099b6ea2b2fb1fc7f424446f3
   mv a b; add d
   
   diff -r bb573313a9e8 -r 5918b8d165d1 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r bb573313a9e8 -r 5918b8d165d1 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r bb573313a9e8 -r 5918b8d165d1 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r bb573313a9e8 -r 5918b8d165d1 g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,2 @@
    f
   -g
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260
   # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
   mv dir/b e
   
   diff -r 5918b8d165d1 -r 17d952250a9d dir/b
   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 5918b8d165d1 -r 17d952250a9d e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b
   # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
   add another e
   
   diff -r 5918b8d165d1 -r 99b31f1c2782 e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ee
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f
   # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
   # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
   merge 5 and 4
   
   diff -r 99b31f1c2782 -r 9feeac35a70a dir/b
   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 99b31f1c2782 -r 9feeac35a70a e
   --- a/e	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -ee
   +merge
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd
   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
   Added tag foo-bar for changeset 9feeac35a70a
   
   diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7
   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
   add g
   
   diff -r 9feeac35a70a -r 3bd4551ec3fe g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,1 @@
   -f
   -f
   +g
   $ testlog --follow -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   []
   <generatorsetdesc->
 
 Test --follow-first and forward --rev
 
   $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   []
   <generatorsetdesc->
 
 Test --follow and backward --rev
 
   $ testlog --follow -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   []
   <generatorsetdesc->
 
 Test --follow-first and backward --rev
 
   $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   []
   <generatorsetdesc->
 
 Test --follow with --rev of graphlog extension
 
   $ hg --config extensions.graphlog= glog -qfr1
   \xe2\x97\x8b  1:216d4c92cf98 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0:f8035bb17114 (esc)
   
 
 Test subdir
 
   $ hg up -q 3
   $ cd dir
   $ testlog .
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:.')))
   <filteredset
     <spanset- 0:9>,
     <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog ../b
   []
   (func
     (symbol 'filelog')
     (string '../b'))
   <filteredset
     <spanset- 0:9>, set([1])>
   $ testlog -f ../b
   []
   []
   <generatorsetdesc->
   $ cd ..
 
 Test --hidden
  (enable obsolete)
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
   $ hg debugobsolete `hg id --debug -i -r 8`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ testlog
   []
   []
   <spanset- 0:9>
   $ testlog --hidden
   []
   []
   <spanset- 0:9>
   $ hg log -G --template '{rev} {desc}\n'
   \xe2\x97\x8b  7 Added tag foo-bar for changeset 9feeac35a70a (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  6 merge 5 and 4 (esc)
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  5 add another e (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  4 mv dir/b e (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8d  3 mv a b; add d (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  2 mv b dir/b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 add a (esc)
   
 
 A template without trailing newline should do something sane
 
   $ hg log -G -r ::2 --template '{rev} {desc}'
   \xe2\x97\x8b  2 mv b dir/b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 add a (esc)
   
 
 Extra newlines must be preserved
 
   $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
   \xe2\x97\x8b (esc)
   \xe2\x94\x82  2 mv b dir/b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b (esc)
   \xe2\x94\x82  1 copy a b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b (esc)
      0 add a
   
 
 The almost-empty template should do something sane too ...
 
   $ hg log -G -r ::2 --template '\n'
   \xe2\x97\x8b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b (esc)
   
 
 issue3772
 
   $ hg log -G -r :null
   \xe2\x97\x8b  changeset:   0:f8035bb17114 (esc)
   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x82  summary:     add a (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   -1:000000000000 (esc)
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -G -r null:null
   \xe2\x97\x8b  changeset:   -1:000000000000 (esc)
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 should not draw line down to null due to the magic of fullreposet
 
   $ hg log -G -r 'all()' | tail -6
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:f8035bb17114 (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
 
   $ hg log -G -r 'branch(default)' | tail -6
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   0:f8035bb17114 (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
 
 working-directory revision
 
   $ hg log -G -qr '. + wdir()'
   \xe2\x97\x8b  2147483647:ffffffffffff (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8d  3:5918b8d165d1 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x95\xa7 (esc)
 
 node template with changesetprinter:
 
   $ hg log -Gqr 5:7 --config command-templates.graphnode='"{rev}"'
   7  7:9febbb9c8b2e
   \xe2\x94\x82 (esc)
   6    6:9feeac35a70a
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 (esc)
   5  5:99b31f1c2782
   \xe2\x94\x82 (esc)
   \xe2\x95\xa7 (esc)
 
 node template with changesettemplater (shared cache variable):
 
   $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
   > --config command-templates.graphnode='{ifeq(latesttagdistance, 0, "#", graphnode)}'
   \xe2\x97\x8b  7 foo-bar+1 (esc)
   \xe2\x94\x82 (esc)
   #    6 foo-bar+0
   \xe2\x94\x82\xe2\x95\xb2 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 (esc)
   \xe2\x97\x8b  5 null+5 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x95\xa7 (esc)
 
 label() should just work in node template:
 
   $ hg log -Gqr 7 --config extensions.color= --color=debug \
   > --config command-templates.graphnode='{label("branch.{branch}", rev)}'
   [branch.default\xe2\x94\x827]  [log.node|7:9febbb9c8b2e] (esc)
   \xe2\x94\x82 (esc)
   \xe2\x95\xa7 (esc)
 
   $ cd ..
 
 change graph edge styling
 
   $ cd repo
 
 Setting HGPLAIN ignores graphmod styling:
 
   $ HGPLAIN=1 hg log -G -r 'file("a")' -m
   @  changeset:   36:08a19a744424
   |  branch:      branch
   |  tag:         tip
   |  parent:      35:9159c3644c5e
   |  parent:      35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:36 1970 +0000
   |  summary:     (36) buggy merge: identical parents
   |
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | |  parent:      31:621d83e11f67
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | |  summary:     (32) expand
   | |
   o |  changeset:   31:621d83e11f67
   |\|  parent:      21:d42a756af44d
   | |  parent:      30:6e11cd4b648f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | |  summary:     (31) expand
   | |
   o |    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | | |  parent:      29:cd9bb2be7593
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | |  summary:     (30) expand
   | | |
   o | |    changeset:   28:44ecd0b9ae99
   |\ \ \   parent:      1:6db2ef61d156
   | | | |  parent:      26:7f25b6c2f0b9
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | |  summary:     (28) merge zero known
   | | | |
   o | | |    changeset:   26:7f25b6c2f0b9
   |\ \ \ \   parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   | o-----+  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | o | | |    changeset:   24:a9c19a3d96b7
   | |\ \ \ \   parent:      0:e6eb3150255d
   | | | | | |  parent:      23:a01cddf0766d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | | |  summary:     (24) merge one known; immediate right
   | | | | | |
   | o---+ | |  changeset:   23:a01cddf0766d
   | | | | | |  parent:      1:6db2ef61d156
   | | | | | |  parent:      22:e0d9cccacb5d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | | |  summary:     (23) merge one known; immediate left
   | | | | | |
   | o-------+  changeset:   22:e0d9cccacb5d
   | | | | | |  parent:      18:1aa84d96232a
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | | |    summary:     (22) merge two known; one far left, one far right
   | | | | |
   | | | | o    changeset:   21:d42a756af44d
   | | | | |\   parent:      19:31ddc2c1573b
   | | | | | |  parent:      20:d30ed6450e32
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | | |  summary:     (21) expand
   | | | | | |
   +-+-------o  changeset:   20:d30ed6450e32
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      18:1aa84d96232a
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | | |    summary:     (20) merge two known; two far right
   | | | | |
   | | | | o    changeset:   19:31ddc2c1573b
   | | | | |\   parent:      15:1dda3f72782d
   | | | | | |  parent:      17:44765d7c06e0
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | | |  summary:     (19) expand
   | | | | | |
   o---+---+ |  changeset:   18:1aa84d96232a
     | | | | |  parent:      1:6db2ef61d156
    / / / / /   parent:      15:1dda3f72782d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | | |    summary:     (18) merge two known; two far left
   | | | | |
   | | | | o    changeset:   17:44765d7c06e0
   | | | | |\   parent:      12:86b91144a6e9
   | | | | | |  parent:      16:3677d192927d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | | |  summary:     (17) expand
   | | | | | |
   +-+-------o  changeset:   16:3677d192927d
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | | |
   | | | o |    changeset:   15:1dda3f72782d
   | | | |\ \   parent:      13:22d8966a97e3
   | | | | | |  parent:      14:8eac370358ef
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | | |  summary:     (15) expand
   | | | | | |
   +-------o |  changeset:   14:8eac370358ef
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      12:86b91144a6e9
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | | |
   | | | o |    changeset:   13:22d8966a97e3
   | | | |\ \   parent:      9:7010c0af0a35
   | | | | | |  parent:      11:832d76e6bdf2
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | | |  summary:     (13) expand
   | | | | | |
   | +---+---o  changeset:   12:86b91144a6e9
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    parent:      9:7010c0af0a35
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | | |
   | | | | o    changeset:   11:832d76e6bdf2
   | | | | |\   parent:      6:b105a072e251
   | | | | | |  parent:      10:74c64d036d72
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | | |  summary:     (11) expand
   | | | | | |
   +---------o  changeset:   10:74c64d036d72
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      6:b105a072e251
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | | |
   | | | o |    changeset:   9:7010c0af0a35
   | | | |\ \   parent:      7:b632bb1b1224
   | | | | | |  parent:      8:7a0b11f71937
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | | |  summary:     (9) expand
   | | | | | |
   +-------o |  changeset:   8:7a0b11f71937
   | | | |/ /   parent:      0:e6eb3150255d
   | | | | |    parent:      7:b632bb1b1224
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | | |
   | | | o |    changeset:   7:b632bb1b1224
   | | | |\ \   parent:      2:3d9a33b8d1e1
   | | | | | |  parent:      5:4409d547b708
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | | |  summary:     (7) expand
   | | | | | |
   | | | +---o  changeset:   6:b105a072e251
   | | | | |/   parent:      2:3d9a33b8d1e1
   | | | | |    parent:      5:4409d547b708
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | | |
   | | | o |    changeset:   5:4409d547b708
   | | | |\ \   parent:      3:27eef8ed80b4
   | | | | | |  parent:      4:26a8bac39d9f
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | | |  summary:     (5) expand
   | | | | | |
   | +---o | |  changeset:   4:26a8bac39d9f
   | | | |/ /   parent:      1:6db2ef61d156
   | | | | |    parent:      3:27eef8ed80b4
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | | |
 
 .. unless HGPLAINEXCEPT=graph is set:
 
   $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
   \xe2\x97\x8d  changeset:   36:08a19a744424 (esc)
   \xe2\x94\x86  branch:      branch (esc)
   \xe2\x94\x86  tag:         tip (esc)
   \xe2\x94\x86  parent:      35:9159c3644c5e (esc)
   \xe2\x94\x86  parent:      35:9159c3644c5e (esc)
   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x86  date:        Thu Jan 01 00:00:36 1970 +0000 (esc)
   \xe2\x94\x86  summary:     (36) buggy merge: identical parents (esc)
   \xe2\x94\x86 (esc)
   \xe2\x97\x8b  changeset:   32:d06dffa21a31 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      27:886ed638191b (esc)
   \xe2\x94\x82 \xe2\x94\x86  parent:      31:621d83e11f67 (esc)
   \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:32 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86  summary:     (32) expand (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   31:621d83e11f67 (esc)
   \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x86  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x86  parent:      30:6e11cd4b648f (esc)
   \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:31 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86  summary:     (31) expand (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   30:6e11cd4b648f (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      28:44ecd0b9ae99 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      29:cd9bb2be7593 (esc)
   \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:30 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x86  summary:     (30) expand (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   28:44ecd0b9ae99 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:28 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x86  summary:     (28) merge zero known (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x86  changeset:   26:7f25b6c2f0b9 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  parent:      25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:26 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  summary:     (26) merge one known; far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   25:91da8ed57247 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x86  parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  parent:      24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  date:        Thu Jan 01 00:00:25 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86  summary:     (25) merge one known; far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   24:a9c19a3d96b7 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:24 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  summary:     (24) merge one known; immediate right (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   23:a01cddf0766d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x86  parent:      22:e0d9cccacb5d (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  date:        Thu Jan 01 00:00:23 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82   \xe2\x94\x86  summary:     (23) merge one known; immediate left (esc)
   \xe2\x94\x82 \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x86  changeset:   22:e0d9cccacb5d (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x86\xe2\x95\xb1   parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x86    parent:      21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x86    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x86    date:        Thu Jan 01 00:00:22 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x86    summary:     (22) merge two known; one far left, one far right (esc)
   \xe2\x94\x82 \xe2\x94\x86 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   21:d42a756af44d (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:21 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (21) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   20:d30ed6450e32 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      18:1aa84d96232a (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:20 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (20) merge two known; two far right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   19:31ddc2c1573b (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      15:1dda3f72782d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:19 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (19) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82 \xe2\x94\x82  changeset:   18:1aa84d96232a (esc)
   \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x95\xa7 \xe2\x94\x82 \xe2\x94\x82  parent:      15:1dda3f72782d (esc)
     \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
     \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:18 1970 +0000 (esc)
     \xe2\x94\x82 \xe2\x94\x82  summary:     (18) merge two known; two far left (esc)
    \xe2\x95\xb1 \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   17:44765d7c06e0 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:17 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (17) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b  changeset:   16:3677d192927d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7 \xe2\x95\xa7  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82      user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82      date:        Thu Jan 01 00:00:16 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82      summary:     (16) merge two known; one immediate right, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   15:1dda3f72782d (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      13:22d8966a97e3 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:15 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (15) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   14:8eac370358ef (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2\xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      12:86b91144a6e9 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:14 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (14) merge two known; one immediate right, one far right (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   13:22d8966a97e3 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:13 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (13) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x9c\xe2\x94\x80\xe2\x94\x80\xe2\x94\x80\xe2\x97\x8b  changeset:   12:86b91144a6e9 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      1:6db2ef61d156 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      9:7010c0af0a35 (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:12 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (12) merge two known; one immediate right, one far left (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   11:832d76e6bdf2 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb2   parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:11 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (11) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x97\x8b  changeset:   10:74c64d036d72 (esc)
   \xe2\x94\x82 \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x95\xa7  parent:      6:b105a072e251 (esc)
   \xe2\x94\x82 \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82    date:        Thu Jan 01 00:00:10 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82    summary:     (10) merge two known; one immediate left, one near right (esc)
   \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   9:7010c0af0a35 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  parent:      8:7a0b11f71937 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  date:        Thu Jan 01 00:00:09 1970 +0000 (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82  summary:     (9) expand (esc)
   \xe2\x94\x82 \xe2\x94\x82 \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b \xe2\x94\x82  changeset:   8:7a0b11f71937 (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82 \xe2\x94\x82  parent:      0:e6eb3150255d (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      7:b632bb1b1224 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:08 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (8) merge two known; one immediate left, one far right (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x97\x8b \xe2\x94\x82  changeset:   7:b632bb1b1224 (esc)
   \xe2\x94\x82\xe2\x95\xb2 \xe2\x95\xb2   parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x95\xa7 \xe2\x94\x82  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82   \xe2\x94\x82  user:        test (esc)
   \xe2\x94\x82   \xe2\x94\x82  date:        Thu Jan 01 00:00:07 1970 +0000 (esc)
   \xe2\x94\x82   \xe2\x94\x82  summary:     (7) expand (esc)
   \xe2\x94\x82  \xe2\x95\xb1 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  changeset:   6:b105a072e251 (esc)
   \xe2\x94\x82\xe2\x95\xb1\xe2\x94\x82  parent:      2:3d9a33b8d1e1 (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      5:4409d547b708 (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:06 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (6) merge two known; one immediate left, one far left (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   5:4409d547b708 (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      3:27eef8ed80b4 (esc)
   \xe2\x94\x82 \xe2\x95\xa7  parent:      4:26a8bac39d9f (esc)
   \xe2\x94\x82    user:        test (esc)
   \xe2\x94\x82    date:        Thu Jan 01 00:00:05 1970 +0000 (esc)
   \xe2\x94\x82    summary:     (5) expand (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  changeset:   4:26a8bac39d9f (esc)
   \xe2\x94\x82\xe2\x95\xb2   parent:      1:6db2ef61d156 (esc)
   \xe2\x95\xa7 \xe2\x95\xa7  parent:      3:27eef8ed80b4 (esc)
        user:        test
        date:        Thu Jan 01 00:00:04 1970 +0000
        summary:     (4) merge two known; one immediate left, one immediate right
   
   $ cd ..
   $ cd repo
 
 behavior with newlines
 
   $ hg log -G -r ::2 -T '{rev} {desc}'
   \xe2\x97\x8b  2 (2) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 (0) root (esc)
   
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n'
   \xe2\x97\x8b  2 (2) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 (0) root (esc)
   
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
   \xe2\x97\x8b  2 (2) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 (0) root (esc)
   
 
   $ hg log -G -r ::2 -T '\n{rev} {desc}'
   \xe2\x97\x8b (esc)
   \xe2\x94\x82  2 (2) collapse (esc)
   \xe2\x97\x8b (esc)
   \xe2\x94\x82  1 (1) collapse (esc)
   \xe2\x97\x8b (esc)
      0 (0) root
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
   \xe2\x97\x8b  2 (2) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  1 (1) collapse (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  0 (0) root (esc)
   
   
   $ cd ..
 
 When inserting extra line nodes to handle more than 2 parents, ensure that
 the right node styles are used (issue5174):
 
   $ hg init repo-issue5174
   $ cd repo-issue5174
   $ echo a > f0
   $ hg ci -Aqm 0
   $ echo a > f1
   $ hg ci -Aqm 1
   $ echo a > f2
   $ hg ci -Aqm 2
   $ hg co ".^"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a > f3
   $ hg ci -Aqm 3
   $ hg co ".^^"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a > f4
   $ hg ci -Aqm 4
   $ hg merge -r 2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -qm 5
   $ hg merge -r 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -qm 6
   $ hg log -G -r '0 | 1 | 2 | 6'
   \xe2\x97\x8d  changeset:   6:851fe89689ad (esc)
   \xe2\x94\x86\xe2\x95\xb2   tag:         tip (esc)
   \xe2\x94\x86 \xe2\x94\x86  parent:      5:4f1e3cf15f5d (esc)
   \xe2\x94\x86 \xe2\x94\x86  parent:      3:b74ba7084d2d (esc)
   \xe2\x94\x86 \xe2\x94\x86  user:        test (esc)
   \xe2\x94\x86 \xe2\x94\x86  date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x86 \xe2\x94\x86  summary:     6 (esc)
   \xe2\x94\x86 \xe2\x94\x86 (esc)
   \xe2\x94\x86 \xe2\x95\xb2 (esc)
   \xe2\x94\x86 \xe2\x94\x86\xe2\x95\xb2 (esc)
   \xe2\x94\x86 \xe2\x97\x8b \xe2\x94\x86  changeset:   2:3e6599df4cce (esc)
   \xe2\x94\x86 \xe2\x94\x86\xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x86 \xe2\x94\x86    date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x86 \xe2\x94\x86    summary:     2 (esc)
   \xe2\x94\x86 \xe2\x94\x86 (esc)
   \xe2\x94\x86 \xe2\x97\x8b  changeset:   1:bd9a55143933 (esc)
   \xe2\x94\x86\xe2\x95\xb1   user:        test (esc)
   \xe2\x94\x86    date:        Thu Jan 01 00:00:00 1970 +0000 (esc)
   \xe2\x94\x86    summary:     1 (esc)
   \xe2\x94\x86 (esc)
   \xe2\x97\x8b  changeset:   0:870a5edc339c (esc)
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     0
   
 
   $ cd ..
 
 Multiple roots (issue5440):
 
   $ hg init multiroots
   $ cd multiroots
   $ cat <<EOF > .hg/hgrc
   > [command-templates]
   > log = '{rev} {desc}\n\n'
   > EOF
 
   $ touch foo
   $ hg ci -Aqm foo
   $ hg co -q null
   $ touch bar
   $ hg ci -Aqm bar
 
   $ hg log -Gr null:
   \xe2\x97\x8d  1 bar (esc)
   \xe2\x94\x82 (esc)
   \xe2\x94\x82 \xe2\x97\x8b  0 foo (esc)
   \xe2\x94\x82\xe2\x95\xb1 (esc)
   \xe2\x97\x8b  -1 (esc)
   
   $ hg log -Gr null+0
   \xe2\x97\x8b  0 foo (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  -1 (esc)
   
   $ hg log -Gr null+1
   \xe2\x97\x8d  1 bar (esc)
   \xe2\x94\x82 (esc)
   \xe2\x97\x8b  -1 (esc)
   
 
   $ cd ..

tests/test-glog.t

@@ -1,3463 +1,3463 b''
 @  (34) head
 |
 | o  (33) head
 | |
 o |    (32) expand
 |\ \
 | o \    (31) expand
 | |\ \
 | | o \    (30) expand
 | | |\ \
 | | | o |  (29) regular commit
 | | | | |
 | | o | |    (28) merge zero known
 | | |\ \ \
 o | | | | |  (27) collapse
 |/ / / / /
 | | o---+  (26) merge one known; far right
 | | | | |
 +---o | |  (25) merge one known; far left
 | | | | |
 | | o | |  (24) merge one known; immediate right
 | | |\| |
 | | o | |  (23) merge one known; immediate left
 | |/| | |
 +---o---+  (22) merge two known; one far left, one far right
 | |  / /
 o | | |    (21) expand
 |\ \ \ \
 | o---+-+  (20) merge two known; two far right
 |  / / /
 o | | |    (19) expand
 |\ \ \ \
 +---+---o  (18) merge two known; two far left
 | | | |
 | o | |    (17) expand
 | |\ \ \
 | | o---+  (16) merge two known; one immediate right, one near right
 | | |/ /
 o | | |    (15) expand
 |\ \ \ \
 | o-----+  (14) merge two known; one immediate right, one far right
 | |/ / /
 o | | |    (13) expand
 |\ \ \ \
 +---o | |  (12) merge two known; one immediate right, one far left
 | | |/ /
 | o | |    (11) expand
 | |\ \ \
 | | o---+  (10) merge two known; one immediate left, one near right
 | |/ / /
 o | | |    (9) expand
 |\ \ \ \
 | o-----+  (8) merge two known; one immediate left, one far right
 |/ / / /
 o | | |    (7) expand
 |\ \ \ \
 +---o | |  (6) merge two known; one immediate left, one far left
 | |/ / /
 | o | |    (5) expand
 | |\ \ \
 | | o | |  (4) merge two known; one immediate left, one immediate right
 | |/|/ /
 | o / /  (3) collapse
 |/ / /
 o / /  (2) collapse
 |/ /
 o /  (1) collapse
 |/
 o  (0) root
 
 
   $ commit()
   > {
   >   rev=$1
   >   msg=$2
   >   shift 2
   >   if [ "$#" -gt 0 ]; then
   >       hg debugsetparents "$@"
   >   fi
   >   echo $rev > a
   >   hg commit -Aqd "$rev 0" -m "($rev) $msg"
   > }
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "printrevset=$TESTDIR/printrevset.py" >> $HGRCPATH
 
   $ hg init repo
   $ cd repo
 
 Empty repo:
 
   $ hg log -G
 
 
 Building DAG:
 
   $ commit 0 "root"
   $ commit 1 "collapse" 0
   $ commit 2 "collapse" 1
   $ commit 3 "collapse" 2
   $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
   $ commit 5 "expand" 3 4
   $ commit 6 "merge two known; one immediate left, one far left" 2 5
   $ commit 7 "expand" 2 5
   $ commit 8 "merge two known; one immediate left, one far right" 0 7
   $ commit 9 "expand" 7 8
   $ commit 10 "merge two known; one immediate left, one near right" 0 6
   $ commit 11 "expand" 6 10
   $ commit 12 "merge two known; one immediate right, one far left" 1 9
   $ commit 13 "expand" 9 11
   $ commit 14 "merge two known; one immediate right, one far right" 0 12
   $ commit 15 "expand" 13 14
   $ commit 16 "merge two known; one immediate right, one near right" 0 1
   $ commit 17 "expand" 12 16
   $ commit 18 "merge two known; two far left" 1 15
   $ commit 19 "expand" 15 17
   $ commit 20 "merge two known; two far right" 0 18
   $ commit 21 "expand" 19 20
   $ commit 22 "merge two known; one far left, one far right" 18 21
   $ commit 23 "merge one known; immediate left" 1 22
   $ commit 24 "merge one known; immediate right" 0 23
   $ commit 25 "merge one known; far left" 21 24
   $ commit 26 "merge one known; far right" 18 25
   $ commit 27 "collapse" 21
   $ commit 28 "merge zero known" 1 26
   $ commit 29 "regular commit" 0
   $ commit 30 "expand" 28 29
   $ commit 31 "expand" 21 30
   $ commit 32 "expand" 27 31
   $ commit 33 "head" 18
   $ commit 34 "head" 32
 
 
   $ hg log -G -q
   @  34:fea3ac5810e0
   |
   | o  33:68608f5145f9
   | |
   o |    32:d06dffa21a31
   |\ \
   | o \    31:621d83e11f67
   | |\ \
   | | o \    30:6e11cd4b648f
   | | |\ \
   | | | o |  29:cd9bb2be7593
   | | | | |
   | | o | |    28:44ecd0b9ae99
   | | |\ \ \
   o | | | | |  27:886ed638191b
   |/ / / / /
   | | o---+  26:7f25b6c2f0b9
   | | | | |
   +---o | |  25:91da8ed57247
   | | | | |
   | | o | |  24:a9c19a3d96b7
   | | |\| |
   | | o | |  23:a01cddf0766d
   | |/| | |
   +---o---+  22:e0d9cccacb5d
   | |  / /
   o | | |    21:d42a756af44d
   |\ \ \ \
   | o---+-+  20:d30ed6450e32
   |  / / /
   o | | |    19:31ddc2c1573b
   |\ \ \ \
   +---+---o  18:1aa84d96232a
   | | | |
   | o | |    17:44765d7c06e0
   | |\ \ \
   | | o---+  16:3677d192927d
   | | |/ /
   o | | |    15:1dda3f72782d
   |\ \ \ \
   | o-----+  14:8eac370358ef
   | |/ / /
   o | | |    13:22d8966a97e3
   |\ \ \ \
   +---o | |  12:86b91144a6e9
   | | |/ /
   | o | |    11:832d76e6bdf2
   | |\ \ \
   | | o---+  10:74c64d036d72
   | |/ / /
   o | | |    9:7010c0af0a35
   |\ \ \ \
   | o-----+  8:7a0b11f71937
   |/ / / /
   o | | |    7:b632bb1b1224
   |\ \ \ \
   +---o | |  6:b105a072e251
   | |/ / /
   | o | |    5:4409d547b708
   | |\ \ \
   | | o | |  4:26a8bac39d9f
   | |/|/ /
   | o / /  3:27eef8ed80b4
   |/ / /
   o / /  2:3d9a33b8d1e1
   |/ /
   o /  1:6db2ef61d156
   |/
   o  0:e6eb3150255d
   
 
   $ hg log -G
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 File glog:
   $ hg log -G a
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 File glog per revset:
 
   $ hg log -G -r 'file("a")'
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:33 1970 +0000
   | |  summary:     (33) head
   | |
   o |    changeset:   32:d06dffa21a31
   |\ \   parent:      27:886ed638191b
   | | |  parent:      31:621d83e11f67
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | | |  summary:     (32) expand
   | | |
   | o |    changeset:   31:621d83e11f67
   | |\ \   parent:      21:d42a756af44d
   | | | |  parent:      30:6e11cd4b648f
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | | | |  summary:     (31) expand
   | | | |
   | | o |    changeset:   30:6e11cd4b648f
   | | |\ \   parent:      28:44ecd0b9ae99
   | | | | |  parent:      29:cd9bb2be7593
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | | | |  summary:     (30) expand
   | | | | |
   | | | o |  changeset:   29:cd9bb2be7593
   | | | | |  parent:      0:e6eb3150255d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
   | | | | |  summary:     (29) regular commit
   | | | | |
   | | o | |    changeset:   28:44ecd0b9ae99
   | | |\ \ \   parent:      1:6db2ef61d156
   | | | | | |  parent:      26:7f25b6c2f0b9
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | | | |  summary:     (28) merge zero known
   | | | | | |
   o | | | | |  changeset:   27:886ed638191b
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
   | | | | |    summary:     (27) collapse
   | | | | |
   | | o---+  changeset:   26:7f25b6c2f0b9
   | | | | |  parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   +---o | |  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | | o | |  changeset:   24:a9c19a3d96b7
   | | |\| |  parent:      0:e6eb3150255d
   | | | | |  parent:      23:a01cddf0766d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | |  summary:     (24) merge one known; immediate right
   | | | | |
   | | o | |  changeset:   23:a01cddf0766d
   | |/| | |  parent:      1:6db2ef61d156
   | | | | |  parent:      22:e0d9cccacb5d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | |  summary:     (23) merge one known; immediate left
   | | | | |
   +---o---+  changeset:   22:e0d9cccacb5d
   | |   | |  parent:      18:1aa84d96232a
   | |  / /   parent:      21:d42a756af44d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | |    summary:     (22) merge two known; one far left, one far right
   | | | |
   o | | |    changeset:   21:d42a756af44d
   |\ \ \ \   parent:      19:31ddc2c1573b
   | | | | |  parent:      20:d30ed6450e32
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | |  summary:     (21) expand
   | | | | |
   | o---+-+  changeset:   20:d30ed6450e32
   |   | | |  parent:      0:e6eb3150255d
   |  / / /   parent:      18:1aa84d96232a
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | |    summary:     (20) merge two known; two far right
   | | | |
   o | | |    changeset:   19:31ddc2c1573b
   |\ \ \ \   parent:      15:1dda3f72782d
   | | | | |  parent:      17:44765d7c06e0
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | |  summary:     (19) expand
   | | | | |
   +---+---o  changeset:   18:1aa84d96232a
   | | | |    parent:      1:6db2ef61d156
   | | | |    parent:      15:1dda3f72782d
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | |    summary:     (18) merge two known; two far left
   | | | |
   | o | |    changeset:   17:44765d7c06e0
   | |\ \ \   parent:      12:86b91144a6e9
   | | | | |  parent:      16:3677d192927d
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | |  summary:     (17) expand
   | | | | |
   | | o---+  changeset:   16:3677d192927d
   | | | | |  parent:      0:e6eb3150255d
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | |
   o | | |    changeset:   15:1dda3f72782d
   |\ \ \ \   parent:      13:22d8966a97e3
   | | | | |  parent:      14:8eac370358ef
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | |  summary:     (15) expand
   | | | | |
   | o-----+  changeset:   14:8eac370358ef
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      12:86b91144a6e9
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | |
   o | | |    changeset:   13:22d8966a97e3
   |\ \ \ \   parent:      9:7010c0af0a35
   | | | | |  parent:      11:832d76e6bdf2
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | |  summary:     (13) expand
   | | | | |
   +---o | |  changeset:   12:86b91144a6e9
   | | |/ /   parent:      1:6db2ef61d156
   | | | |    parent:      9:7010c0af0a35
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | |
   | o | |    changeset:   11:832d76e6bdf2
   | |\ \ \   parent:      6:b105a072e251
   | | | | |  parent:      10:74c64d036d72
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | |  summary:     (11) expand
   | | | | |
   | | o---+  changeset:   10:74c64d036d72
   | | | | |  parent:      0:e6eb3150255d
   | |/ / /   parent:      6:b105a072e251
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | |
   o | | |    changeset:   9:7010c0af0a35
   |\ \ \ \   parent:      7:b632bb1b1224
   | | | | |  parent:      8:7a0b11f71937
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | |  summary:     (9) expand
   | | | | |
   | o-----+  changeset:   8:7a0b11f71937
   | | | | |  parent:      0:e6eb3150255d
   |/ / / /   parent:      7:b632bb1b1224
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | |
   o | | |    changeset:   7:b632bb1b1224
   |\ \ \ \   parent:      2:3d9a33b8d1e1
   | | | | |  parent:      5:4409d547b708
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | |  summary:     (7) expand
   | | | | |
   +---o | |  changeset:   6:b105a072e251
   | |/ / /   parent:      2:3d9a33b8d1e1
   | | | |    parent:      5:4409d547b708
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | |
   | o | |    changeset:   5:4409d547b708
   | |\ \ \   parent:      3:27eef8ed80b4
   | | | | |  parent:      4:26a8bac39d9f
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | |  summary:     (5) expand
   | | | | |
   | | o | |  changeset:   4:26a8bac39d9f
   | |/|/ /   parent:      1:6db2ef61d156
   | | | |    parent:      3:27eef8ed80b4
   | | | |    user:        test
   | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | |
   | o | |  changeset:   3:27eef8ed80b4
   |/ / /   user:        test
   | | |    date:        Thu Jan 01 00:00:03 1970 +0000
   | | |    summary:     (3) collapse
   | | |
   o | |  changeset:   2:3d9a33b8d1e1
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:02 1970 +0000
   | |    summary:     (2) collapse
   | |
   o |  changeset:   1:6db2ef61d156
   |/   user:        test
   |    date:        Thu Jan 01 00:00:01 1970 +0000
   |    summary:     (1) collapse
   |
   o  changeset:   0:e6eb3150255d
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     (0) root
   
 
 
 File glog per revset (only merges):
 
   $ hg log -G -r 'file("a")' -m
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | :  parent:      31:621d83e11f67
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:32 1970 +0000
   | :  summary:     (32) expand
   | :
   o :  changeset:   31:621d83e11f67
   |\:  parent:      21:d42a756af44d
   | :  parent:      30:6e11cd4b648f
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:31 1970 +0000
   | :  summary:     (31) expand
   | :
   o :    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | ~ :  parent:      29:cd9bb2be7593
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:30 1970 +0000
   |   :  summary:     (30) expand
   |  /
   o :    changeset:   28:44ecd0b9ae99
   |\ \   parent:      1:6db2ef61d156
   | ~ :  parent:      26:7f25b6c2f0b9
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:28 1970 +0000
   |   :  summary:     (28) merge zero known
   |  /
   o :    changeset:   26:7f25b6c2f0b9
   |\ \   parent:      18:1aa84d96232a
   | | :  parent:      25:91da8ed57247
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:26 1970 +0000
   | | :  summary:     (26) merge one known; far right
   | | :
   | o :  changeset:   25:91da8ed57247
   | |\:  parent:      21:d42a756af44d
   | | :  parent:      24:a9c19a3d96b7
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:25 1970 +0000
   | | :  summary:     (25) merge one known; far left
   | | :
   | o :    changeset:   24:a9c19a3d96b7
   | |\ \   parent:      0:e6eb3150255d
   | | ~ :  parent:      23:a01cddf0766d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
   | |   :  summary:     (24) merge one known; immediate right
   | |  /
   | o :    changeset:   23:a01cddf0766d
   | |\ \   parent:      1:6db2ef61d156
   | | ~ :  parent:      22:e0d9cccacb5d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
   | |   :  summary:     (23) merge one known; immediate left
   | |  /
   | o :  changeset:   22:e0d9cccacb5d
   |/:/   parent:      18:1aa84d96232a
   | :    parent:      21:d42a756af44d
   | :    user:        test
   | :    date:        Thu Jan 01 00:00:22 1970 +0000
   | :    summary:     (22) merge two known; one far left, one far right
   | :
   | o    changeset:   21:d42a756af44d
   | |\   parent:      19:31ddc2c1573b
   | | |  parent:      20:d30ed6450e32
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | |  summary:     (21) expand
   | | |
   +---o  changeset:   20:d30ed6450e32
   | | |  parent:      0:e6eb3150255d
   | | ~  parent:      18:1aa84d96232a
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | |    summary:     (20) merge two known; two far right
   | |
   | o    changeset:   19:31ddc2c1573b
   | |\   parent:      15:1dda3f72782d
   | | |  parent:      17:44765d7c06e0
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | |  summary:     (19) expand
   | | |
   o | |  changeset:   18:1aa84d96232a
   |\| |  parent:      1:6db2ef61d156
   ~ | |  parent:      15:1dda3f72782d
     | |  user:        test
     | |  date:        Thu Jan 01 00:00:18 1970 +0000
     | |  summary:     (18) merge two known; two far left
    / /
   | o    changeset:   17:44765d7c06e0
   | |\   parent:      12:86b91144a6e9
   | | |  parent:      16:3677d192927d
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | |  summary:     (17) expand
   | | |
   | | o    changeset:   16:3677d192927d
   | | |\   parent:      0:e6eb3150255d
   | | ~ ~  parent:      1:6db2ef61d156
   | |      user:        test
   | |      date:        Thu Jan 01 00:00:16 1970 +0000
   | |      summary:     (16) merge two known; one immediate right, one near right
   | |
   o |    changeset:   15:1dda3f72782d
   |\ \   parent:      13:22d8966a97e3
   | | |  parent:      14:8eac370358ef
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | |  summary:     (15) expand
   | | |
   | o |  changeset:   14:8eac370358ef
   | |\|  parent:      0:e6eb3150255d
   | ~ |  parent:      12:86b91144a6e9
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:14 1970 +0000
   |   |  summary:     (14) merge two known; one immediate right, one far right
   |  /
   o |    changeset:   13:22d8966a97e3
   |\ \   parent:      9:7010c0af0a35
   | | |  parent:      11:832d76e6bdf2
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | |  summary:     (13) expand
   | | |
   +---o  changeset:   12:86b91144a6e9
   | | |  parent:      1:6db2ef61d156
   | | ~  parent:      9:7010c0af0a35
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | |    summary:     (12) merge two known; one immediate right, one far left
   | |
   | o    changeset:   11:832d76e6bdf2
   | |\   parent:      6:b105a072e251
   | | |  parent:      10:74c64d036d72
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | |  summary:     (11) expand
   | | |
   | | o  changeset:   10:74c64d036d72
   | |/|  parent:      0:e6eb3150255d
   | | ~  parent:      6:b105a072e251
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | |    summary:     (10) merge two known; one immediate left, one near right
   | |
   o |    changeset:   9:7010c0af0a35
   |\ \   parent:      7:b632bb1b1224
   | | |  parent:      8:7a0b11f71937
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | |  summary:     (9) expand
   | | |
   | o |  changeset:   8:7a0b11f71937
   |/| |  parent:      0:e6eb3150255d
   | ~ |  parent:      7:b632bb1b1224
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:08 1970 +0000
   |   |  summary:     (8) merge two known; one immediate left, one far right
   |  /
   o |    changeset:   7:b632bb1b1224
   |\ \   parent:      2:3d9a33b8d1e1
   | ~ |  parent:      5:4409d547b708
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:07 1970 +0000
   |   |  summary:     (7) expand
   |  /
   | o  changeset:   6:b105a072e251
   |/|  parent:      2:3d9a33b8d1e1
   | ~  parent:      5:4409d547b708
   |    user:        test
   |    date:        Thu Jan 01 00:00:06 1970 +0000
   |    summary:     (6) merge two known; one immediate left, one far left
   |
   o    changeset:   5:4409d547b708
   |\   parent:      3:27eef8ed80b4
   | ~  parent:      4:26a8bac39d9f
   |    user:        test
   |    date:        Thu Jan 01 00:00:05 1970 +0000
   |    summary:     (5) expand
   |
   o    changeset:   4:26a8bac39d9f
   |\   parent:      1:6db2ef61d156
   ~ ~  parent:      3:27eef8ed80b4
        user:        test
        date:        Thu Jan 01 00:00:04 1970 +0000
        summary:     (4) merge two known; one immediate left, one immediate right
   
 
 
 Empty revision range - display nothing:
   $ hg log -G -r 1..0
 
   $ cd ..
 
 #if no-outer-repo
 
 From outer space:
   $ hg log -G -l1 repo
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   ~  parent:      32:d06dffa21a31
      user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   $ hg log -G -l1 repo/a
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   ~  parent:      32:d06dffa21a31
      user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   $ hg log -G -l1 repo/missing
 
 #endif
 
 File log with revs != cset revs:
   $ hg init flog
   $ cd flog
   $ echo one >one
   $ hg add one
   $ hg commit -mone
   $ echo two >two
   $ hg add two
   $ hg commit -mtwo
   $ echo more >two
   $ hg commit -mmore
   $ hg log -G two
   @  changeset:   2:12c28321755b
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     more
   |
   o  changeset:   1:5ac72c0599bf
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     two
   
 
 Issue1896: File log with explicit style
   $ hg log -G --style=default one
   o  changeset:   0:3d578b4a1f53
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     one
   
 Issue2395: glog --style header and footer
   $ hg log -G --style=xml one
   <?xml version="1.0"?>
   <log>
   o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
      <author email="test">test</author>
      <date>1970-01-01T00:00:00+00:00</date>
      <msg xml:space="preserve">one</msg>
      </logentry>
   </log>
 
   $ cd ..
 
 Incoming and outgoing:
 
   $ hg clone -U -r31 repo repo2
   adding changesets
   adding manifests
   adding file changes
   added 31 changesets with 31 changes to 1 files
   new changesets e6eb3150255d:621d83e11f67
   $ cd repo2
 
   $ hg incoming --graph ../repo
   comparing with ../repo
   searching for changes
   o  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   |    parent:      18:1aa84d96232a
   |    user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o  changeset:   32:d06dffa21a31
   |  parent:      27:886ed638191b
   |  parent:      31:621d83e11f67
   |  user:        test
   |  date:        Thu Jan 01 00:00:32 1970 +0000
   |  summary:     (32) expand
   |
   o  changeset:   27:886ed638191b
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
   $ cd ..
 
   $ hg -R repo outgoing --graph repo2
   comparing with repo2
   searching for changes
   @  changeset:   34:fea3ac5810e0
   |  tag:         tip
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   |    parent:      18:1aa84d96232a
   |    user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o  changeset:   32:d06dffa21a31
   |  parent:      27:886ed638191b
   |  parent:      31:621d83e11f67
   |  user:        test
   |  date:        Thu Jan 01 00:00:32 1970 +0000
   |  summary:     (32) expand
   |
   o  changeset:   27:886ed638191b
      parent:      21:d42a756af44d
      user:        test
      date:        Thu Jan 01 00:00:27 1970 +0000
      summary:     (27) collapse
   
 
 File + limit with revs != cset revs:
   $ cd repo
   $ touch b
   $ hg ci -Aqm0
   $ hg log -G -l2 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   ~  user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   o  changeset:   33:68608f5145f9
   |  parent:      18:1aa84d96232a
   ~  user:        test
      date:        Thu Jan 01 00:00:33 1970 +0000
      summary:     (33) head
   
 
 File + limit + -ra:b, (b - a) < limit:
   $ hg log -G -l3000 -r32:tip a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | ~  user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   ~ ~  parent:      31:621d83e11f67
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 Point out a common and an uncommon unshown parent
 
   $ hg log -G -r 'rev(8) or rev(9)'
   o    changeset:   9:7010c0af0a35
   |\   parent:      7:b632bb1b1224
   | ~  parent:      8:7a0b11f71937
   |    user:        test
   |    date:        Thu Jan 01 00:00:09 1970 +0000
   |    summary:     (9) expand
   |
   o    changeset:   8:7a0b11f71937
   |\   parent:      0:e6eb3150255d
   ~ ~  parent:      7:b632bb1b1224
        user:        test
        date:        Thu Jan 01 00:00:08 1970 +0000
        summary:     (8) merge two known; one immediate left, one far right
   
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   ~  user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
 
 file(File) + limit + -ra:b, b < tip:
 
   $ hg log -G -l1 -r32:34 -r 'file("a")'
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   ~  user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
 
 limit(file(File) and a::b), b < tip:
 
   $ hg log -G -r 'limit(file("a") and 32::34, 1)'
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   ~ ~  parent:      31:621d83e11f67
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 File + limit + -ra:b, b < tip:
 
   $ hg log -G -r 'limit(file("a") and 34::32, 1)'
 
 File + limit + -ra:b, b < tip, (b - a) < limit:
 
   $ hg log -G -l10 -r33:34 a
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   ~  user:        test
      date:        Thu Jan 01 00:00:34 1970 +0000
      summary:     (34) head
   
   o  changeset:   33:68608f5145f9
   |  parent:      18:1aa84d96232a
   ~  user:        test
      date:        Thu Jan 01 00:00:33 1970 +0000
      summary:     (33) head
   
 
 Do not crash or produce strange graphs if history is buggy
 
   $ hg branch branch
   marked working directory as branch branch
   (branches are permanent and global, did you want a bookmark?)
   $ commit 36 "buggy merge: identical parents" 35 35
   $ hg log -G -l5
   @  changeset:   36:08a19a744424
   |  branch:      branch
   |  tag:         tip
   |  parent:      35:9159c3644c5e
   |  parent:      35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:36 1970 +0000
   |  summary:     (36) buggy merge: identical parents
   |
   o  changeset:   35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     0
   |
   o  changeset:   34:fea3ac5810e0
   |  parent:      32:d06dffa21a31
   |  user:        test
   |  date:        Thu Jan 01 00:00:34 1970 +0000
   |  summary:     (34) head
   |
   | o  changeset:   33:68608f5145f9
   | |  parent:      18:1aa84d96232a
   | ~  user:        test
   |    date:        Thu Jan 01 00:00:33 1970 +0000
   |    summary:     (33) head
   |
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   ~ ~  parent:      31:621d83e11f67
        user:        test
        date:        Thu Jan 01 00:00:32 1970 +0000
        summary:     (32) expand
   
 
 Test log -G options
 
   $ testlog() {
   >   hg log -G --print-revset "$@"
   >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > log.nodes
   >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
   >     | sed 's/.*nodetag/nodetag/' > glog.nodes
   >   (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \
   >     | grep '^[-+@ ]' || :
   > }
 
 glog always reorders nodes which explains the difference with log
 
   $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
   ['27', '25', '21', '34', '32', '31']
   []
   <baseset- [21, 25, 27, 31, 32, 34]>
   --- log.nodes	* (glob)
   +++ glog.nodes	* (glob)
   @@ -1,6 +1,6 @@
   -nodetag 27
   -nodetag 25
   -nodetag 21
    nodetag 34
    nodetag 32
    nodetag 31
   +nodetag 27
   +nodetag 25
   +nodetag 21
   $ testlog -u test -u not-a-user
   []
   (or
     (list
       (func
         (symbol 'user')
-        (string 'test'))
+        (string 'literal:test'))
       (func
         (symbol 'user')
-        (string 'not-a-user'))))
+        (string 'literal:not-a-user'))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
-        <user 'test'>>,
+        <user 'literal:test'>>,
       <filteredset
         <fullreposet+ 0:37>,
-        <user 'not-a-user'>>>>
+        <user 'literal:not-a-user'>>>>
   $ testlog -b not-a-branch
   abort: unknown revision 'not-a-branch'
   abort: unknown revision 'not-a-branch'
   abort: unknown revision 'not-a-branch'
   $ testlog -b 35 -b 36 --only-branch branch
   []
   (or
     (list
       (func
         (symbol 'branch')
-        (string 'default'))
+        (string 'literal:default'))
       (or
         (list
           (func
             (symbol 'branch')
-            (string 'branch'))
+            (string 'literal:branch'))
           (func
             (symbol 'branch')
-            (string 'branch'))))))
+            (string 'literal:branch'))))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
-        <branch 'default'>>,
+        <branch 'literal:default'>>,
       <addset
         <filteredset
           <fullreposet+ 0:37>,
-          <branch 'branch'>>,
+          <branch 'literal:branch'>>,
         <filteredset
           <fullreposet+ 0:37>,
-          <branch 'branch'>>>>>
+          <branch 'literal:branch'>>>>>
   $ testlog -k expand -k merge
   []
   (or
     (list
       (func
         (symbol 'keyword')
         (string 'expand'))
       (func
         (symbol 'keyword')
         (string 'merge'))))
   <filteredset
     <spanset- 0:37>,
     <addset
       <filteredset
         <fullreposet+ 0:37>,
         <keyword 'expand'>>,
       <filteredset
         <fullreposet+ 0:37>,
         <keyword 'merge'>>>>
   $ testlog --only-merges
   []
   (func
     (symbol 'merge')
     None)
   <filteredset
     <spanset- 0:37>,
     <merge>>
   $ testlog --no-merges
   []
   (not
     (func
       (symbol 'merge')
       None))
   <filteredset
     <spanset- 0:37>,
     <not
       <filteredset
         <spanset- 0:37>,
         <merge>>>>
   $ testlog --date '2 0 to 4 0'
   []
   (func
     (symbol 'date')
     (string '2 0 to 4 0'))
   <filteredset
     <spanset- 0:37>,
     <date '2 0 to 4 0'>>
   $ hg log -G -d 'brace ) in a date'
   hg: parse error: invalid date: 'brace ) in a date'
   [10]
   $ testlog --prune 31 --prune 32
   []
   (not
     (or
       (list
         (func
           (symbol 'ancestors')
           (string '31'))
         (func
           (symbol 'ancestors')
           (string '32')))))
   <filteredset
     <spanset- 0:37>,
     <not
       <addset
         <filteredset
           <spanset- 0:37>,
           <generatorsetdesc+>>,
         <filteredset
           <spanset- 0:37>,
           <generatorsetdesc+>>>>>
 
 Dedicated repo for --follow and paths filtering. The g is crafted to
 have 2 filelog topological heads in a linear changeset graph.
 
   $ cd ..
   $ hg init follow
   $ cd follow
   $ testlog --follow
   []
   []
   <baseset []>
   $ testlog -rnull
   ['null']
   []
   <baseset [-1]>
   $ echo a > a
   $ echo aa > aa
   $ echo f > f
   $ hg ci -Am "add a" a aa f
   $ hg cp a b
   $ hg cp f g
   $ hg ci -m "copy a b"
   $ mkdir dir
   $ hg mv b dir
   $ echo g >> g
   $ echo f >> f
   $ hg ci -m "mv b dir/b"
   $ hg mv a b
   $ hg cp -f f g
   $ echo a > d
   $ hg add d
   $ hg ci -m "mv a b; add d"
   $ hg mv dir/b e
   $ hg ci -m "mv dir/b e"
   $ hg log -G --template '({rev}) {desc|firstline}\n'
   @  (4) mv dir/b e
   |
   o  (3) mv a b; add d
   |
   o  (2) mv b dir/b
   |
   o  (1) copy a b
   |
   o  (0) add a
   
 
   $ testlog a
   []
   (func
     (symbol 'filelog')
     (string 'a'))
   <filteredset
     <spanset- 0:5>, set([0])>
   $ testlog a b
   []
   (or
     (list
       (func
         (symbol 'filelog')
         (string 'a'))
       (func
         (symbol 'filelog')
         (string 'b'))))
   <filteredset
     <spanset- 0:5>,
     <addset
       <baseset+ [0]>,
       <baseset+ [1]>>>
 
 Test falling back to slow path for non-existing files
 
   $ testlog a c
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')
       (string 'p:c')))
   <filteredset
     <spanset- 0:5>,
     <matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test multiple --include/--exclude/paths
 
   $ testlog --include a --include e --exclude b --exclude e a e
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')
       (string 'p:e')
       (string 'i:a')
       (string 'i:e')
       (string 'x:b')
       (string 'x:e')))
   <filteredset
     <spanset- 0:5>,
     <matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=2147483647>>
 
 Test glob expansion of pats
 
   $ expandglobs=`"$PYTHON" -c "import mercurial.util; \
   >   print(mercurial.util.expandglobs and 'true' or 'false')"`
   $ if [ $expandglobs = "true" ]; then
   >    testlog 'a*';
   > else
   >    testlog a*;
   > fi;
   []
   (func
     (symbol 'filelog')
     (string 'aa'))
   <filteredset
     <spanset- 0:5>, set([0])>
 
 Test --follow on a non-existent directory
 
   $ testlog -f dir
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
   abort: cannot follow file not in parent revision: "dir"
 
 Test --follow on a directory
 
   $ hg up -q '.^'
   $ testlog -f dir
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:dir')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ hg up -q tip
 
 Test --follow on file not in parent revision
 
   $ testlog -f a
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
   abort: cannot follow file not in parent revision: "a"
 
 Test --follow and patterns
 
   $ testlog -f 'glob:*'
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:glob:*')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test --follow on a single rename
 
   $ hg up -q 2
   $ testlog -f a
   []
   []
   <generatorsetdesc->
 
 Test --follow and multiple renames
 
   $ hg up -q tip
   $ testlog -f e
   []
   []
   <generatorsetdesc->
 
 Test --follow and multiple filelog heads
 
   $ hg up -q 2
   $ testlog -f g
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 2
   nodetag 1
   nodetag 0
   $ hg up -q tip
   $ testlog -f g
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 3
   nodetag 2
   nodetag 0
 
 Test --follow and multiple files
 
   $ testlog -f g e
   []
   []
   <generatorsetdesc->
   $ cat log.nodes
   nodetag 4
   nodetag 3
   nodetag 2
   nodetag 1
   nodetag 0
 
 Test --follow null parent
 
   $ hg up -q null
   $ testlog -f
   []
   []
   <baseset []>
 
 Test --follow-first
 
   $ hg up -q 3
   $ echo ee > e
   $ hg ci -Am "add another e" e
   created new head
   $ hg merge --tool internal:other 4
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ echo merge > e
   $ hg ci -m "merge 5 and 4"
   $ testlog --follow-first
   []
   []
   <generatorsetdesc->
 
 Cannot compare with log --follow-first FILE as it never worked
 
   $ hg log -G --print-revset --follow-first e
   []
   []
   <generatorsetdesc->
   $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
   @    6 merge 5 and 4
   |\
   | ~
   o  5 add another e
   |
   ~
 
 Test --copies
 
   $ hg log -G --copies --template "{rev} {desc|firstline} \
   >   copies: {file_copies_switch}\n"
   @    6 merge 5 and 4   copies:
   |\
   | o  5 add another e   copies:
   | |
   o |  4 mv dir/b e   copies: e (dir/b)
   |/
   o  3 mv a b; add d   copies: b (a)g (f)
   |
   o  2 mv b dir/b   copies: dir/b (b)
   |
   o  1 copy a b   copies: b (a)g (f)
   |
   o  0 add a   copies:
   
 Test "set:..." and parent revision
 
   $ hg up -q 4
   $ testlog "set:copied()"
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:set:copied()')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog --include "set:copied()"
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'i:set:copied()')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=2147483647>>
   $ testlog -r "sort(file('set:copied()'), -rev)"
   ['sort(file(\'set:copied()\'), -rev)']
   []
   <filteredset
     <fullreposet- 0:7>,
     <matchfiles patterns=['set:copied()'], include=[] exclude=[], default='glob', rev=None>>
 
 Test --removed
 
   $ testlog --removed
   []
   []
   <spanset- 0:7>
   $ testlog --removed a
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')))
   <filteredset
     <spanset- 0:7>,
     <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog --removed --follow a
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:a')))
   <filteredset
     <generatorsetdesc->,
     <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=2147483647>>
 
 Test --patch and --stat with --follow and --follow-first
 
   $ hg up -q 3
   $ hg log -G --git --patch b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     copy a b
   
      diff --git a/a b/b
      copy from a
      copy to b
   
 
   $ hg log -G --git --stat b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     copy a b
   
       b |  0
       1 files changed, 0 insertions(+), 0 deletions(-)
   
 
   $ hg log -G --git --patch --follow b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |  diff --git a/a b/b
   |  copy from a
   |  copy to b
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
      diff --git a/a b/a
      new file mode 100644
      --- /dev/null
      +++ b/a
      @@ -0,0 +1,1 @@
      +a
   
 
   $ hg log -G --git --stat --follow b
   o  changeset:   1:216d4c92cf98
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     copy a b
   |
   |   b |  0
   |   1 files changed, 0 insertions(+), 0 deletions(-)
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
       a |  1 +
       1 files changed, 1 insertions(+), 0 deletions(-)
   
 
   $ hg up -q 6
   $ hg log -G --git --patch --follow-first e
   @    changeset:   6:9feeac35a70a
   |\   tag:         tip
   | ~  parent:      5:99b31f1c2782
   |    parent:      4:17d952250a9d
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     merge 5 and 4
   |
   |    diff --git a/e b/e
   |    --- a/e
   |    +++ b/e
   |    @@ -1,1 +1,1 @@
   |    -ee
   |    +merge
   |
   o  changeset:   5:99b31f1c2782
   |  parent:      3:5918b8d165d1
   ~  user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add another e
   
      diff --git a/e b/e
      new file mode 100644
      --- /dev/null
      +++ b/e
      @@ -0,0 +1,1 @@
      +ee
   
 
 Test old-style --rev
 
   $ hg tag 'foo-bar'
   $ testlog -r 'foo-bar'
   ['foo-bar']
   []
   <baseset [6]>
 
 Test --follow and forward --rev
 
   $ hg up -q 6
   $ echo g > g
   $ hg ci -Am 'add g' g
   created new head
   $ hg up -q 2
   $ hg log -G --template "{rev} {desc|firstline}\n"
   o  8 add g
   |
   | o  7 Added tag foo-bar for changeset 9feeac35a70a
   |/
   o    6 merge 5 and 4
   |\
   | o  5 add another e
   | |
   o |  4 mv dir/b e
   |/
   o  3 mv a b; add d
   |
   @  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
   $ hg archive -r 7 archive
   $ grep changessincelatesttag archive/.hg_archival.txt
   changessincelatesttag: 1
   $ rm -r archive
 
 changessincelatesttag with no prior tag
   $ hg archive -r 4 archive
   $ grep changessincelatesttag archive/.hg_archival.txt
   changessincelatesttag: 5
 
   $ hg export 'all()'
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID f8035bb17114da16215af3436ec5222428ace8ee
   # Parent  0000000000000000000000000000000000000000
   add a
   
   diff -r 000000000000 -r f8035bb17114 a
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 000000000000 -r f8035bb17114 aa
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/aa	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +aa
   diff -r 000000000000 -r f8035bb17114 f
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92
   # Parent  f8035bb17114da16215af3436ec5222428ace8ee
   copy a b
   
   diff -r f8035bb17114 -r 216d4c92cf98 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r f8035bb17114 -r 216d4c92cf98 g
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3
   # Parent  216d4c92cf98ff2b4641d508b76b529f3d424c92
   mv b dir/b
   
   diff -r 216d4c92cf98 -r bb573313a9e8 b
   --- a/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 216d4c92cf98 -r bb573313a9e8 dir/b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/dir/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r 216d4c92cf98 -r bb573313a9e8 f
   --- a/f	Thu Jan 01 00:00:00 1970 +0000
   +++ b/f	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +f
   diff -r 216d4c92cf98 -r bb573313a9e8 g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    f
   +g
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed
   # Parent  bb573313a9e8349099b6ea2b2fb1fc7f424446f3
   mv a b; add d
   
   diff -r bb573313a9e8 -r 5918b8d165d1 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r bb573313a9e8 -r 5918b8d165d1 b
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r bb573313a9e8 -r 5918b8d165d1 d
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/d	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   diff -r bb573313a9e8 -r 5918b8d165d1 g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,2 @@
    f
   -g
   +f
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260
   # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
   mv dir/b e
   
   diff -r 5918b8d165d1 -r 17d952250a9d dir/b
   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 5918b8d165d1 -r 17d952250a9d e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +a
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b
   # Parent  5918b8d165d1364e78a66d02e66caa0133c5d1ed
   add another e
   
   diff -r 5918b8d165d1 -r 99b31f1c2782 e
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ee
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f
   # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
   # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
   merge 5 and 4
   
   diff -r 99b31f1c2782 -r 9feeac35a70a dir/b
   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +0,0 @@
   -a
   diff -r 99b31f1c2782 -r 9feeac35a70a e
   --- a/e	Thu Jan 01 00:00:00 1970 +0000
   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -ee
   +merge
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd
   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
   Added tag foo-bar for changeset 9feeac35a70a
   
   diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7
   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
   add g
   
   diff -r 9feeac35a70a -r 3bd4551ec3fe g
   --- a/g	Thu Jan 01 00:00:00 1970 +0000
   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,1 @@
   -f
   -f
   +g
   $ testlog --follow -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   []
   <generatorsetdesc->
 
 Test --follow-first and forward --rev
 
   $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
   ['6', '8', '5', '7', '4']
   []
   <generatorsetdesc->
 
 Test --follow and backward --rev
 
   $ testlog --follow -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   []
   <generatorsetdesc->
 
 Test --follow-first and backward --rev
 
   $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
   ['6', '5', '7', '8', '4']
   []
   <generatorsetdesc->
 
 Test --follow with --rev of graphlog extension
 
   $ hg --config extensions.graphlog= glog -qfr1
   o  1:216d4c92cf98
   |
   o  0:f8035bb17114
   
 
 Test subdir
 
   $ hg up -q 3
   $ cd dir
   $ testlog .
   []
   (func
     (symbol '_matchfiles')
     (list
       (string 'r:')
       (string 'd:relpath')
       (string 'p:.')))
   <filteredset
     <spanset- 0:9>,
     <matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=2147483647>>
   $ testlog ../b
   []
   (func
     (symbol 'filelog')
     (string '../b'))
   <filteredset
     <spanset- 0:9>, set([1])>
   $ testlog -f ../b
   []
   []
   <generatorsetdesc->
   $ cd ..
 
 Test --hidden
  (enable obsolete)
 
   $ cat >> $HGRCPATH << EOF
   > [experimental]
   > evolution.createmarkers=True
   > EOF
 
   $ hg debugobsolete `hg id --debug -i -r 8`
   1 new obsolescence markers
   obsoleted 1 changesets
   $ testlog
   []
   []
   <spanset- 0:9>
   $ testlog --hidden
   []
   []
   <spanset- 0:9>
   $ hg log -G --template '{rev} {desc}\n'
   o  7 Added tag foo-bar for changeset 9feeac35a70a
   |
   o    6 merge 5 and 4
   |\
   | o  5 add another e
   | |
   o |  4 mv dir/b e
   |/
   @  3 mv a b; add d
   |
   o  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
 
 A template without trailing newline should do something sane
 
   $ hg log -G -r ::2 --template '{rev} {desc}'
   o  2 mv b dir/b
   |
   o  1 copy a b
   |
   o  0 add a
   
 
 Extra newlines must be preserved
 
   $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n'
   o
   |  2 mv b dir/b
   |
   o
   |  1 copy a b
   |
   o
      0 add a
   
 
 The almost-empty template should do something sane too ...
 
   $ hg log -G -r ::2 --template '\n'
   o
   |
   o
   |
   o
   
 
 issue3772
 
   $ hg log -G -r :null
   o  changeset:   0:f8035bb17114
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add a
   |
   o  changeset:   -1:000000000000
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
   $ hg log -G -r null:null
   o  changeset:   -1:000000000000
      user:
      date:        Thu Jan 01 00:00:00 1970 +0000
   
 
 should not draw line down to null due to the magic of fullreposet
 
   $ hg log -G -r 'all()' | tail -6
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
 
   $ hg log -G -r 'branch(default)' | tail -6
   |
   o  changeset:   0:f8035bb17114
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add a
   
 
 working-directory revision
 
   $ hg log -G -qr '. + wdir()'
   o  2147483647:ffffffffffff
   |
   @  3:5918b8d165d1
   |
   ~
 
 node template with changesetprinter:
 
   $ hg log -Gqr 5:7 --config command-templates.graphnode='"{rev}"'
   7  7:9febbb9c8b2e
   |
   6    6:9feeac35a70a
   |\
   | ~
   5  5:99b31f1c2782
   |
   ~
 
 node template with changesetprinter (legacy config):
 
   $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
   7  7:9febbb9c8b2e
   |
   6    6:9feeac35a70a
   |\
   | ~
   5  5:99b31f1c2782
   |
   ~
 
 node template with changesettemplater (shared cache variable):
 
   $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
   > --config command-templates.graphnode='{ifeq(latesttagdistance, 0, "#", graphnode)}'
   o  7 foo-bar+1
   |
   #    6 foo-bar+0
   |\
   | ~
   o  5 null+5
   |
   ~
 
 label() should just work in node template:
 
   $ hg log -Gqr 7 --config extensions.color= --color=debug \
   > --config command-templates.graphnode='{label("branch.{branch}", rev)}'
   [branch.default|7]  [log.node|7:9febbb9c8b2e]
   |
   ~
 
   $ cd ..
 
 change graph edge styling
 
   $ cd repo
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > graphstyle.parent = |
   > graphstyle.grandparent = :
   > graphstyle.missing =
   > EOF
   $ hg log -G -r 'file("a")' -m
   @  changeset:   36:08a19a744424
   :  branch:      branch
   :  tag:         tip
   :  parent:      35:9159c3644c5e
   :  parent:      35:9159c3644c5e
   :  user:        test
   :  date:        Thu Jan 01 00:00:36 1970 +0000
   :  summary:     (36) buggy merge: identical parents
   :
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | :  parent:      31:621d83e11f67
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:32 1970 +0000
   | :  summary:     (32) expand
   | :
   o :  changeset:   31:621d83e11f67
   |\:  parent:      21:d42a756af44d
   | :  parent:      30:6e11cd4b648f
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:31 1970 +0000
   | :  summary:     (31) expand
   | :
   o :    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | ~ :  parent:      29:cd9bb2be7593
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:30 1970 +0000
   |   :  summary:     (30) expand
   |  /
   o :    changeset:   28:44ecd0b9ae99
   |\ \   parent:      1:6db2ef61d156
   | ~ :  parent:      26:7f25b6c2f0b9
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:28 1970 +0000
   |   :  summary:     (28) merge zero known
   |  /
   o :    changeset:   26:7f25b6c2f0b9
   |\ \   parent:      18:1aa84d96232a
   | | :  parent:      25:91da8ed57247
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:26 1970 +0000
   | | :  summary:     (26) merge one known; far right
   | | :
   | o :  changeset:   25:91da8ed57247
   | |\:  parent:      21:d42a756af44d
   | | :  parent:      24:a9c19a3d96b7
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:25 1970 +0000
   | | :  summary:     (25) merge one known; far left
   | | :
   | o :    changeset:   24:a9c19a3d96b7
   | |\ \   parent:      0:e6eb3150255d
   | | ~ :  parent:      23:a01cddf0766d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
   | |   :  summary:     (24) merge one known; immediate right
   | |  /
   | o :    changeset:   23:a01cddf0766d
   | |\ \   parent:      1:6db2ef61d156
   | | ~ :  parent:      22:e0d9cccacb5d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
   | |   :  summary:     (23) merge one known; immediate left
   | |  /
   | o :  changeset:   22:e0d9cccacb5d
   |/:/   parent:      18:1aa84d96232a
   | :    parent:      21:d42a756af44d
   | :    user:        test
   | :    date:        Thu Jan 01 00:00:22 1970 +0000
   | :    summary:     (22) merge two known; one far left, one far right
   | :
   | o    changeset:   21:d42a756af44d
   | |\   parent:      19:31ddc2c1573b
   | | |  parent:      20:d30ed6450e32
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | |  summary:     (21) expand
   | | |
   +---o  changeset:   20:d30ed6450e32
   | | |  parent:      0:e6eb3150255d
   | | ~  parent:      18:1aa84d96232a
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | |    summary:     (20) merge two known; two far right
   | |
   | o    changeset:   19:31ddc2c1573b
   | |\   parent:      15:1dda3f72782d
   | | |  parent:      17:44765d7c06e0
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | |  summary:     (19) expand
   | | |
   o | |  changeset:   18:1aa84d96232a
   |\| |  parent:      1:6db2ef61d156
   ~ | |  parent:      15:1dda3f72782d
     | |  user:        test
     | |  date:        Thu Jan 01 00:00:18 1970 +0000
     | |  summary:     (18) merge two known; two far left
    / /
   | o    changeset:   17:44765d7c06e0
   | |\   parent:      12:86b91144a6e9
   | | |  parent:      16:3677d192927d
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | |  summary:     (17) expand
   | | |
   | | o    changeset:   16:3677d192927d
   | | |\   parent:      0:e6eb3150255d
   | | ~ ~  parent:      1:6db2ef61d156
   | |      user:        test
   | |      date:        Thu Jan 01 00:00:16 1970 +0000
   | |      summary:     (16) merge two known; one immediate right, one near right
   | |
   o |    changeset:   15:1dda3f72782d
   |\ \   parent:      13:22d8966a97e3
   | | |  parent:      14:8eac370358ef
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | |  summary:     (15) expand
   | | |
   | o |  changeset:   14:8eac370358ef
   | |\|  parent:      0:e6eb3150255d
   | ~ |  parent:      12:86b91144a6e9
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:14 1970 +0000
   |   |  summary:     (14) merge two known; one immediate right, one far right
   |  /
   o |    changeset:   13:22d8966a97e3
   |\ \   parent:      9:7010c0af0a35
   | | |  parent:      11:832d76e6bdf2
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | |  summary:     (13) expand
   | | |
   +---o  changeset:   12:86b91144a6e9
   | | |  parent:      1:6db2ef61d156
   | | ~  parent:      9:7010c0af0a35
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | |    summary:     (12) merge two known; one immediate right, one far left
   | |
   | o    changeset:   11:832d76e6bdf2
   | |\   parent:      6:b105a072e251
   | | |  parent:      10:74c64d036d72
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | |  summary:     (11) expand
   | | |
   | | o  changeset:   10:74c64d036d72
   | |/|  parent:      0:e6eb3150255d
   | | ~  parent:      6:b105a072e251
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | |    summary:     (10) merge two known; one immediate left, one near right
   | |
   o |    changeset:   9:7010c0af0a35
   |\ \   parent:      7:b632bb1b1224
   | | |  parent:      8:7a0b11f71937
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | |  summary:     (9) expand
   | | |
   | o |  changeset:   8:7a0b11f71937
   |/| |  parent:      0:e6eb3150255d
   | ~ |  parent:      7:b632bb1b1224
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:08 1970 +0000
   |   |  summary:     (8) merge two known; one immediate left, one far right
   |  /
   o |    changeset:   7:b632bb1b1224
   |\ \   parent:      2:3d9a33b8d1e1
   | ~ |  parent:      5:4409d547b708
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:07 1970 +0000
   |   |  summary:     (7) expand
   |  /
   | o  changeset:   6:b105a072e251
   |/|  parent:      2:3d9a33b8d1e1
   | ~  parent:      5:4409d547b708
   |    user:        test
   |    date:        Thu Jan 01 00:00:06 1970 +0000
   |    summary:     (6) merge two known; one immediate left, one far left
   |
   o    changeset:   5:4409d547b708
   |\   parent:      3:27eef8ed80b4
   | ~  parent:      4:26a8bac39d9f
   |    user:        test
   |    date:        Thu Jan 01 00:00:05 1970 +0000
   |    summary:     (5) expand
   |
   o    changeset:   4:26a8bac39d9f
   |\   parent:      1:6db2ef61d156
   ~ ~  parent:      3:27eef8ed80b4
        user:        test
        date:        Thu Jan 01 00:00:04 1970 +0000
        summary:     (4) merge two known; one immediate left, one immediate right
   
 
 Setting HGPLAIN ignores graphmod styling:
 
   $ HGPLAIN=1 hg log -G -r 'file("a")' -m
   @  changeset:   36:08a19a744424
   |  branch:      branch
   |  tag:         tip
   |  parent:      35:9159c3644c5e
   |  parent:      35:9159c3644c5e
   |  user:        test
   |  date:        Thu Jan 01 00:00:36 1970 +0000
   |  summary:     (36) buggy merge: identical parents
   |
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | |  parent:      31:621d83e11f67
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:32 1970 +0000
   | |  summary:     (32) expand
   | |
   o |  changeset:   31:621d83e11f67
   |\|  parent:      21:d42a756af44d
   | |  parent:      30:6e11cd4b648f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:31 1970 +0000
   | |  summary:     (31) expand
   | |
   o |    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | | |  parent:      29:cd9bb2be7593
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:30 1970 +0000
   | | |  summary:     (30) expand
   | | |
   o | |    changeset:   28:44ecd0b9ae99
   |\ \ \   parent:      1:6db2ef61d156
   | | | |  parent:      26:7f25b6c2f0b9
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
   | | | |  summary:     (28) merge zero known
   | | | |
   o | | |    changeset:   26:7f25b6c2f0b9
   |\ \ \ \   parent:      18:1aa84d96232a
   | | | | |  parent:      25:91da8ed57247
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
   | | | | |  summary:     (26) merge one known; far right
   | | | | |
   | o-----+  changeset:   25:91da8ed57247
   | | | | |  parent:      21:d42a756af44d
   | | | | |  parent:      24:a9c19a3d96b7
   | | | | |  user:        test
   | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
   | | | | |  summary:     (25) merge one known; far left
   | | | | |
   | o | | |    changeset:   24:a9c19a3d96b7
   | |\ \ \ \   parent:      0:e6eb3150255d
   | | | | | |  parent:      23:a01cddf0766d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
   | | | | | |  summary:     (24) merge one known; immediate right
   | | | | | |
   | o---+ | |  changeset:   23:a01cddf0766d
   | | | | | |  parent:      1:6db2ef61d156
   | | | | | |  parent:      22:e0d9cccacb5d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
   | | | | | |  summary:     (23) merge one known; immediate left
   | | | | | |
   | o-------+  changeset:   22:e0d9cccacb5d
   | | | | | |  parent:      18:1aa84d96232a
   |/ / / / /   parent:      21:d42a756af44d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
   | | | | |    summary:     (22) merge two known; one far left, one far right
   | | | | |
   | | | | o    changeset:   21:d42a756af44d
   | | | | |\   parent:      19:31ddc2c1573b
   | | | | | |  parent:      20:d30ed6450e32
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | | | | |  summary:     (21) expand
   | | | | | |
   +-+-------o  changeset:   20:d30ed6450e32
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      18:1aa84d96232a
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | | | | |    summary:     (20) merge two known; two far right
   | | | | |
   | | | | o    changeset:   19:31ddc2c1573b
   | | | | |\   parent:      15:1dda3f72782d
   | | | | | |  parent:      17:44765d7c06e0
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | | | | |  summary:     (19) expand
   | | | | | |
   o---+---+ |  changeset:   18:1aa84d96232a
     | | | | |  parent:      1:6db2ef61d156
    / / / / /   parent:      15:1dda3f72782d
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
   | | | | |    summary:     (18) merge two known; two far left
   | | | | |
   | | | | o    changeset:   17:44765d7c06e0
   | | | | |\   parent:      12:86b91144a6e9
   | | | | | |  parent:      16:3677d192927d
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | | | | |  summary:     (17) expand
   | | | | | |
   +-+-------o  changeset:   16:3677d192927d
   | | | | |    parent:      0:e6eb3150255d
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
   | | | | |    summary:     (16) merge two known; one immediate right, one near right
   | | | | |
   | | | o |    changeset:   15:1dda3f72782d
   | | | |\ \   parent:      13:22d8966a97e3
   | | | | | |  parent:      14:8eac370358ef
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | | | | |  summary:     (15) expand
   | | | | | |
   +-------o |  changeset:   14:8eac370358ef
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      12:86b91144a6e9
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
   | | | | |    summary:     (14) merge two known; one immediate right, one far right
   | | | | |
   | | | o |    changeset:   13:22d8966a97e3
   | | | |\ \   parent:      9:7010c0af0a35
   | | | | | |  parent:      11:832d76e6bdf2
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | | | | |  summary:     (13) expand
   | | | | | |
   | +---+---o  changeset:   12:86b91144a6e9
   | | | | |    parent:      1:6db2ef61d156
   | | | | |    parent:      9:7010c0af0a35
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | | | | |    summary:     (12) merge two known; one immediate right, one far left
   | | | | |
   | | | | o    changeset:   11:832d76e6bdf2
   | | | | |\   parent:      6:b105a072e251
   | | | | | |  parent:      10:74c64d036d72
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | | | | |  summary:     (11) expand
   | | | | | |
   +---------o  changeset:   10:74c64d036d72
   | | | | |/   parent:      0:e6eb3150255d
   | | | | |    parent:      6:b105a072e251
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | | | | |    summary:     (10) merge two known; one immediate left, one near right
   | | | | |
   | | | o |    changeset:   9:7010c0af0a35
   | | | |\ \   parent:      7:b632bb1b1224
   | | | | | |  parent:      8:7a0b11f71937
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | | | | |  summary:     (9) expand
   | | | | | |
   +-------o |  changeset:   8:7a0b11f71937
   | | | |/ /   parent:      0:e6eb3150255d
   | | | | |    parent:      7:b632bb1b1224
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
   | | | | |    summary:     (8) merge two known; one immediate left, one far right
   | | | | |
   | | | o |    changeset:   7:b632bb1b1224
   | | | |\ \   parent:      2:3d9a33b8d1e1
   | | | | | |  parent:      5:4409d547b708
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
   | | | | | |  summary:     (7) expand
   | | | | | |
   | | | +---o  changeset:   6:b105a072e251
   | | | | |/   parent:      2:3d9a33b8d1e1
   | | | | |    parent:      5:4409d547b708
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
   | | | | |    summary:     (6) merge two known; one immediate left, one far left
   | | | | |
   | | | o |    changeset:   5:4409d547b708
   | | | |\ \   parent:      3:27eef8ed80b4
   | | | | | |  parent:      4:26a8bac39d9f
   | | | | | |  user:        test
   | | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
   | | | | | |  summary:     (5) expand
   | | | | | |
   | +---o | |  changeset:   4:26a8bac39d9f
   | | | |/ /   parent:      1:6db2ef61d156
   | | | | |    parent:      3:27eef8ed80b4
   | | | | |    user:        test
   | | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
   | | | | |    summary:     (4) merge two known; one immediate left, one immediate right
   | | | | |
 
 .. unless HGPLAINEXCEPT=graph is set:
 
   $ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m
   @  changeset:   36:08a19a744424
   :  branch:      branch
   :  tag:         tip
   :  parent:      35:9159c3644c5e
   :  parent:      35:9159c3644c5e
   :  user:        test
   :  date:        Thu Jan 01 00:00:36 1970 +0000
   :  summary:     (36) buggy merge: identical parents
   :
   o    changeset:   32:d06dffa21a31
   |\   parent:      27:886ed638191b
   | :  parent:      31:621d83e11f67
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:32 1970 +0000
   | :  summary:     (32) expand
   | :
   o :  changeset:   31:621d83e11f67
   |\:  parent:      21:d42a756af44d
   | :  parent:      30:6e11cd4b648f
   | :  user:        test
   | :  date:        Thu Jan 01 00:00:31 1970 +0000
   | :  summary:     (31) expand
   | :
   o :    changeset:   30:6e11cd4b648f
   |\ \   parent:      28:44ecd0b9ae99
   | ~ :  parent:      29:cd9bb2be7593
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:30 1970 +0000
   |   :  summary:     (30) expand
   |  /
   o :    changeset:   28:44ecd0b9ae99
   |\ \   parent:      1:6db2ef61d156
   | ~ :  parent:      26:7f25b6c2f0b9
   |   :  user:        test
   |   :  date:        Thu Jan 01 00:00:28 1970 +0000
   |   :  summary:     (28) merge zero known
   |  /
   o :    changeset:   26:7f25b6c2f0b9
   |\ \   parent:      18:1aa84d96232a
   | | :  parent:      25:91da8ed57247
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:26 1970 +0000
   | | :  summary:     (26) merge one known; far right
   | | :
   | o :  changeset:   25:91da8ed57247
   | |\:  parent:      21:d42a756af44d
   | | :  parent:      24:a9c19a3d96b7
   | | :  user:        test
   | | :  date:        Thu Jan 01 00:00:25 1970 +0000
   | | :  summary:     (25) merge one known; far left
   | | :
   | o :    changeset:   24:a9c19a3d96b7
   | |\ \   parent:      0:e6eb3150255d
   | | ~ :  parent:      23:a01cddf0766d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:24 1970 +0000
   | |   :  summary:     (24) merge one known; immediate right
   | |  /
   | o :    changeset:   23:a01cddf0766d
   | |\ \   parent:      1:6db2ef61d156
   | | ~ :  parent:      22:e0d9cccacb5d
   | |   :  user:        test
   | |   :  date:        Thu Jan 01 00:00:23 1970 +0000
   | |   :  summary:     (23) merge one known; immediate left
   | |  /
   | o :  changeset:   22:e0d9cccacb5d
   |/:/   parent:      18:1aa84d96232a
   | :    parent:      21:d42a756af44d
   | :    user:        test
   | :    date:        Thu Jan 01 00:00:22 1970 +0000
   | :    summary:     (22) merge two known; one far left, one far right
   | :
   | o    changeset:   21:d42a756af44d
   | |\   parent:      19:31ddc2c1573b
   | | |  parent:      20:d30ed6450e32
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:21 1970 +0000
   | | |  summary:     (21) expand
   | | |
   +---o  changeset:   20:d30ed6450e32
   | | |  parent:      0:e6eb3150255d
   | | ~  parent:      18:1aa84d96232a
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:20 1970 +0000
   | |    summary:     (20) merge two known; two far right
   | |
   | o    changeset:   19:31ddc2c1573b
   | |\   parent:      15:1dda3f72782d
   | | |  parent:      17:44765d7c06e0
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:19 1970 +0000
   | | |  summary:     (19) expand
   | | |
   o | |  changeset:   18:1aa84d96232a
   |\| |  parent:      1:6db2ef61d156
   ~ | |  parent:      15:1dda3f72782d
     | |  user:        test
     | |  date:        Thu Jan 01 00:00:18 1970 +0000
     | |  summary:     (18) merge two known; two far left
    / /
   | o    changeset:   17:44765d7c06e0
   | |\   parent:      12:86b91144a6e9
   | | |  parent:      16:3677d192927d
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:17 1970 +0000
   | | |  summary:     (17) expand
   | | |
   | | o    changeset:   16:3677d192927d
   | | |\   parent:      0:e6eb3150255d
   | | ~ ~  parent:      1:6db2ef61d156
   | |      user:        test
   | |      date:        Thu Jan 01 00:00:16 1970 +0000
   | |      summary:     (16) merge two known; one immediate right, one near right
   | |
   o |    changeset:   15:1dda3f72782d
   |\ \   parent:      13:22d8966a97e3
   | | |  parent:      14:8eac370358ef
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:15 1970 +0000
   | | |  summary:     (15) expand
   | | |
   | o |  changeset:   14:8eac370358ef
   | |\|  parent:      0:e6eb3150255d
   | ~ |  parent:      12:86b91144a6e9
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:14 1970 +0000
   |   |  summary:     (14) merge two known; one immediate right, one far right
   |  /
   o |    changeset:   13:22d8966a97e3
   |\ \   parent:      9:7010c0af0a35
   | | |  parent:      11:832d76e6bdf2
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:13 1970 +0000
   | | |  summary:     (13) expand
   | | |
   +---o  changeset:   12:86b91144a6e9
   | | |  parent:      1:6db2ef61d156
   | | ~  parent:      9:7010c0af0a35
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:12 1970 +0000
   | |    summary:     (12) merge two known; one immediate right, one far left
   | |
   | o    changeset:   11:832d76e6bdf2
   | |\   parent:      6:b105a072e251
   | | |  parent:      10:74c64d036d72
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:11 1970 +0000
   | | |  summary:     (11) expand
   | | |
   | | o  changeset:   10:74c64d036d72
   | |/|  parent:      0:e6eb3150255d
   | | ~  parent:      6:b105a072e251
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:10 1970 +0000
   | |    summary:     (10) merge two known; one immediate left, one near right
   | |
   o |    changeset:   9:7010c0af0a35
   |\ \   parent:      7:b632bb1b1224
   | | |  parent:      8:7a0b11f71937
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:09 1970 +0000
   | | |  summary:     (9) expand
   | | |
   | o |  changeset:   8:7a0b11f71937
   |/| |  parent:      0:e6eb3150255d
   | ~ |  parent:      7:b632bb1b1224
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:08 1970 +0000
   |   |  summary:     (8) merge two known; one immediate left, one far right
   |  /
   o |    changeset:   7:b632bb1b1224
   |\ \   parent:      2:3d9a33b8d1e1
   | ~ |  parent:      5:4409d547b708
   |   |  user:        test
   |   |  date:        Thu Jan 01 00:00:07 1970 +0000
   |   |  summary:     (7) expand
   |  /
   | o  changeset:   6:b105a072e251
   |/|  parent:      2:3d9a33b8d1e1
   | ~  parent:      5:4409d547b708
   |    user:        test
   |    date:        Thu Jan 01 00:00:06 1970 +0000
   |    summary:     (6) merge two known; one immediate left, one far left
   |
   o    changeset:   5:4409d547b708
   |\   parent:      3:27eef8ed80b4
   | ~  parent:      4:26a8bac39d9f
   |    user:        test
   |    date:        Thu Jan 01 00:00:05 1970 +0000
   |    summary:     (5) expand
   |
   o    changeset:   4:26a8bac39d9f
   |\   parent:      1:6db2ef61d156
   ~ ~  parent:      3:27eef8ed80b4
        user:        test
        date:        Thu Jan 01 00:00:04 1970 +0000
        summary:     (4) merge two known; one immediate left, one immediate right
   
 Previously, one could specify graphstyle.grandparent = <N><char> to draw <char>
 on only the last N lines (for positive N) or everything but the first N lines
 (for negative N), with the rest of the edge using the parent edge styling.
 
 This was removed, and this test now shows that muliple characters being
 specified in graphstyle.grandparent aren't treated specially (including in width
 calculations; there's no specific reason to *avoid* handling the width
 calculations, but it's difficult to do correctly and efficiently).
 
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > graphstyle.parent = !
   > graphstyle.grandparent = 3.
   > graphstyle.missing =
   > EOF
   $ hg log -G -r '36:18 & file("a")' -m
   @  changeset:   36:08a19a744424
   3.  branch:      branch
   3.  tag:         tip
   3.  parent:      35:9159c3644c5e
   3.  parent:      35:9159c3644c5e
   3.  user:        test
   3.  date:        Thu Jan 01 00:00:36 1970 +0000
   3.  summary:     (36) buggy merge: identical parents
   3.
   o    changeset:   32:d06dffa21a31
   !\   parent:      27:886ed638191b
   ! 3.  parent:      31:621d83e11f67
   ! 3.  user:        test
   ! 3.  date:        Thu Jan 01 00:00:32 1970 +0000
   ! 3.  summary:     (32) expand
   ! 3.
   o 3.  changeset:   31:621d83e11f67
   !\3.  parent:      21:d42a756af44d
   ! 3.  parent:      30:6e11cd4b648f
   ! 3.  user:        test
   ! 3.  date:        Thu Jan 01 00:00:31 1970 +0000
   ! 3.  summary:     (31) expand
   ! 3.
   o 3.   changeset:   30:6e11cd4b648f
   !\ \   parent:      28:44ecd0b9ae99
   ! ~ 3.  parent:      29:cd9bb2be7593
   !   3.  user:        test
   !   3.  date:        Thu Jan 01 00:00:30 1970 +0000
   !   3.  summary:     (30) expand
   !  /
   o 3.   changeset:   28:44ecd0b9ae99
   !\ \   parent:      1:6db2ef61d156
   ! ~ 3.  parent:      26:7f25b6c2f0b9
   !   3.  user:        test
   !   3.  date:        Thu Jan 01 00:00:28 1970 +0000
   !   3.  summary:     (28) merge zero known
   !  /
   o 3.   changeset:   26:7f25b6c2f0b9
   !\ \   parent:      18:1aa84d96232a
   ! ! 3.  parent:      25:91da8ed57247
   ! ! 3.  user:        test
   ! ! 3.  date:        Thu Jan 01 00:00:26 1970 +0000
   ! ! 3.  summary:     (26) merge one known; far right
   ! ! 3.
   ! o 3.  changeset:   25:91da8ed57247
   ! !\3.  parent:      21:d42a756af44d
   ! ! 3.  parent:      24:a9c19a3d96b7
   ! ! 3.  user:        test
   ! ! 3.  date:        Thu Jan 01 00:00:25 1970 +0000
   ! ! 3.  summary:     (25) merge one known; far left
   ! ! 3.
   ! o 3.   changeset:   24:a9c19a3d96b7
   ! !\ \   parent:      0:e6eb3150255d
   ! ! ~ 3.  parent:      23:a01cddf0766d
   ! !   3.  user:        test
   ! !   3.  date:        Thu Jan 01 00:00:24 1970 +0000
   ! !   3.  summary:     (24) merge one known; immediate right
   ! !  /
   ! o 3.   changeset:   23:a01cddf0766d
   ! !\ \   parent:      1:6db2ef61d156
   ! ! ~ 3.  parent:      22:e0d9cccacb5d
   ! !   3.  user:        test
   ! !   3.  date:        Thu Jan 01 00:00:23 1970 +0000
   ! !   3.  summary:     (23) merge one known; immediate left
   ! !  /
   ! o 3.  changeset:   22:e0d9cccacb5d
   !/3./  parent:      18:1aa84d96232a
   ! 3.   parent:      21:d42a756af44d
   ! 3.   user:        test
   ! 3.   date:        Thu Jan 01 00:00:22 1970 +0000
   ! 3.   summary:     (22) merge two known; one far left, one far right
   ! 3.
   ! o    changeset:   21:d42a756af44d
   ! !\   parent:      19:31ddc2c1573b
   ! ! !  parent:      20:d30ed6450e32
   ! ! !  user:        test
   ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
   ! ! !  summary:     (21) expand
   ! ! !
   +---o  changeset:   20:d30ed6450e32
   ! ! |  parent:      0:e6eb3150255d
   ! ! ~  parent:      18:1aa84d96232a
   ! !    user:        test
   ! !    date:        Thu Jan 01 00:00:20 1970 +0000
   ! !    summary:     (20) merge two known; two far right
   ! !
   ! o    changeset:   19:31ddc2c1573b
   ! |\   parent:      15:1dda3f72782d
   ! ~ ~  parent:      17:44765d7c06e0
   !      user:        test
   !      date:        Thu Jan 01 00:00:19 1970 +0000
   !      summary:     (19) expand
   !
   o    changeset:   18:1aa84d96232a
   |\   parent:      1:6db2ef61d156
   ~ ~  parent:      15:1dda3f72782d
        user:        test
        date:        Thu Jan 01 00:00:18 1970 +0000
        summary:     (18) merge two known; two far left
   
 (This formerly tested "All but the first 3 lines", but is now showing that it's
 still not treated any differently):
 
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > graphstyle.parent = !
   > graphstyle.grandparent = -3.
   > graphstyle.missing =
   > EOF
   $ hg log -G -r '36:18 & file("a")' -m
   @  changeset:   36:08a19a744424
   -3.  branch:      branch
   -3.  tag:         tip
   -3.  parent:      35:9159c3644c5e
   -3.  parent:      35:9159c3644c5e
   -3.  user:        test
   -3.  date:        Thu Jan 01 00:00:36 1970 +0000
   -3.  summary:     (36) buggy merge: identical parents
   -3.
   o    changeset:   32:d06dffa21a31
   !\   parent:      27:886ed638191b
   ! -3.  parent:      31:621d83e11f67
   ! -3.  user:        test
   ! -3.  date:        Thu Jan 01 00:00:32 1970 +0000
   ! -3.  summary:     (32) expand
   ! -3.
   o -3.  changeset:   31:621d83e11f67
   !\-3.  parent:      21:d42a756af44d
   ! -3.  parent:      30:6e11cd4b648f
   ! -3.  user:        test
   ! -3.  date:        Thu Jan 01 00:00:31 1970 +0000
   ! -3.  summary:     (31) expand
   ! -3.
   o -3.  changeset:   30:6e11cd4b648f
   !\ \   parent:      28:44ecd0b9ae99
   ! ~ -3.  parent:      29:cd9bb2be7593
   !   -3.  user:        test
   !   -3.  date:        Thu Jan 01 00:00:30 1970 +0000
   !   -3.  summary:     (30) expand
   !  /
   o -3.  changeset:   28:44ecd0b9ae99
   !\ \   parent:      1:6db2ef61d156
   ! ~ -3.  parent:      26:7f25b6c2f0b9
   !   -3.  user:        test
   !   -3.  date:        Thu Jan 01 00:00:28 1970 +0000
   !   -3.  summary:     (28) merge zero known
   !  /
   o -3.  changeset:   26:7f25b6c2f0b9
   !\ \   parent:      18:1aa84d96232a
   ! ! -3.  parent:      25:91da8ed57247
   ! ! -3.  user:        test
   ! ! -3.  date:        Thu Jan 01 00:00:26 1970 +0000
   ! ! -3.  summary:     (26) merge one known; far right
   ! ! -3.
   ! o -3.  changeset:   25:91da8ed57247
   ! !\-3.  parent:      21:d42a756af44d
   ! ! -3.  parent:      24:a9c19a3d96b7
   ! ! -3.  user:        test
   ! ! -3.  date:        Thu Jan 01 00:00:25 1970 +0000
   ! ! -3.  summary:     (25) merge one known; far left
   ! ! -3.
   ! o -3.  changeset:   24:a9c19a3d96b7
   ! !\ \   parent:      0:e6eb3150255d
   ! ! ~ -3.  parent:      23:a01cddf0766d
   ! !   -3.  user:        test
   ! !   -3.  date:        Thu Jan 01 00:00:24 1970 +0000
   ! !   -3.  summary:     (24) merge one known; immediate right
   ! !  /
   ! o -3.  changeset:   23:a01cddf0766d
   ! !\ \   parent:      1:6db2ef61d156
   ! ! ~ -3.  parent:      22:e0d9cccacb5d
   ! !   -3.  user:        test
   ! !   -3.  date:        Thu Jan 01 00:00:23 1970 +0000
   ! !   -3.  summary:     (23) merge one known; immediate left
   ! !  /
   ! o -3.  changeset:   22:e0d9cccacb5d
   !/-3./  parent:      18:1aa84d96232a
   ! -3.  parent:      21:d42a756af44d
   ! -3.  user:        test
   ! -3.  date:        Thu Jan 01 00:00:22 1970 +0000
   ! -3.  summary:     (22) merge two known; one far left, one far right
   ! -3.
   ! o    changeset:   21:d42a756af44d
   ! !\   parent:      19:31ddc2c1573b
   ! ! !  parent:      20:d30ed6450e32
   ! ! !  user:        test
   ! ! !  date:        Thu Jan 01 00:00:21 1970 +0000
   ! ! !  summary:     (21) expand
   ! ! !
   +---o  changeset:   20:d30ed6450e32
   ! ! |  parent:      0:e6eb3150255d
   ! ! ~  parent:      18:1aa84d96232a
   ! !    user:        test
   ! !    date:        Thu Jan 01 00:00:20 1970 +0000
   ! !    summary:     (20) merge two known; two far right
   ! !
   ! o    changeset:   19:31ddc2c1573b
   ! |\   parent:      15:1dda3f72782d
   ! ~ ~  parent:      17:44765d7c06e0
   !      user:        test
   !      date:        Thu Jan 01 00:00:19 1970 +0000
   !      summary:     (19) expand
   !
   o    changeset:   18:1aa84d96232a
   |\   parent:      1:6db2ef61d156
   ~ ~  parent:      15:1dda3f72782d
        user:        test
        date:        Thu Jan 01 00:00:18 1970 +0000
        summary:     (18) merge two known; two far left
   
   $ cd ..
 
 Change graph shorten, test better with graphstyle.missing not none
 
   $ cd repo
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > graphstyle.parent = |
   > graphstyle.grandparent = :
   > graphstyle.missing = '
   > graphshorten = true
   > EOF
   $ hg log -G -r 'file("a")' -m -T '{rev} {desc}'
   @  36 (36) buggy merge: identical parents
   o    32 (32) expand
   |\
   o :  31 (31) expand
   |\:
   o :    30 (30) expand
   |\ \
   o \ \    28 (28) merge zero known
   |\ \ \
   o \ \ \    26 (26) merge one known; far right
   |\ \ \ \
   | o-----+  25 (25) merge one known; far left
   | o ' ' :    24 (24) merge one known; immediate right
   | |\ \ \ \
   | o---+ ' :  23 (23) merge one known; immediate left
   | o-------+  22 (22) merge two known; one far left, one far right
   |/ / / / /
   | ' ' ' o    21 (21) expand
   | ' ' ' |\
   +-+-------o  20 (20) merge two known; two far right
   | ' ' ' o    19 (19) expand
   | ' ' ' |\
   o---+---+ |  18 (18) merge two known; two far left
    / / / / /
   ' ' ' | o    17 (17) expand
   ' ' ' | |\
   +-+-------o  16 (16) merge two known; one immediate right, one near right
   ' ' ' o |    15 (15) expand
   ' ' ' |\ \
   +-------o |  14 (14) merge two known; one immediate right, one far right
   ' ' ' | |/
   ' ' ' o |    13 (13) expand
   ' ' ' |\ \
   ' +---+---o  12 (12) merge two known; one immediate right, one far left
   ' ' ' | o    11 (11) expand
   ' ' ' | |\
   +---------o  10 (10) merge two known; one immediate left, one near right
   ' ' ' | |/
   ' ' ' o |    9 (9) expand
   ' ' ' |\ \
   +-------o |  8 (8) merge two known; one immediate left, one far right
   ' ' ' |/ /
   ' ' ' o |    7 (7) expand
   ' ' ' |\ \
   ' ' ' +---o  6 (6) merge two known; one immediate left, one far left
   ' ' ' | '/
   ' ' ' o '    5 (5) expand
   ' ' ' |\ \
   ' +---o ' '  4 (4) merge two known; one immediate left, one immediate right
   ' ' ' '/ /
 
 behavior with newlines
 
   $ hg log -G -r ::2 -T '{rev} {desc}'
   o  2 (2) collapse
   o  1 (1) collapse
   o  0 (0) root
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n'
   o  2 (2) collapse
   o  1 (1) collapse
   o  0 (0) root
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n\n'
   o  2 (2) collapse
   |
   o  1 (1) collapse
   |
   o  0 (0) root
   
 
   $ hg log -G -r ::2 -T '\n{rev} {desc}'
   o
   |  2 (2) collapse
   o
   |  1 (1) collapse
   o
      0 (0) root
 
   $ hg log -G -r ::2 -T '{rev} {desc}\n\n\n'
   o  2 (2) collapse
   |
   |
   o  1 (1) collapse
   |
   |
   o  0 (0) root
   
   
   $ cd ..
 
 When inserting extra line nodes to handle more than 2 parents, ensure that
 the right node styles are used (issue5174):
 
   $ hg init repo-issue5174
   $ cd repo-issue5174
   $ echo a > f0
   $ hg ci -Aqm 0
   $ echo a > f1
   $ hg ci -Aqm 1
   $ echo a > f2
   $ hg ci -Aqm 2
   $ hg co ".^"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a > f3
   $ hg ci -Aqm 3
   $ hg co ".^^"
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo a > f4
   $ hg ci -Aqm 4
   $ hg merge -r 2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -qm 5
   $ hg merge -r 3
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -qm 6
   $ hg log -G -r '0 | 1 | 2 | 6'
   @    changeset:   6:851fe89689ad
   :\   tag:         tip
   : :  parent:      5:4f1e3cf15f5d
   : :  parent:      3:b74ba7084d2d
   : :  user:        test
   : :  date:        Thu Jan 01 00:00:00 1970 +0000
   : :  summary:     6
   : :
   : \
   : :\
   : o :  changeset:   2:3e6599df4cce
   : :/   user:        test
   : :    date:        Thu Jan 01 00:00:00 1970 +0000
   : :    summary:     2
   : :
   : o  changeset:   1:bd9a55143933
   :/   user:        test
   :    date:        Thu Jan 01 00:00:00 1970 +0000
   :    summary:     1
   :
   o  changeset:   0:870a5edc339c
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     0
   
 
   $ cd ..
 
 Multiple roots (issue5440):
 
   $ hg init multiroots
   $ cd multiroots
   $ cat <<EOF > .hg/hgrc
   > [command-templates]
   > log = '{rev} {desc}\n\n'
   > EOF
 
   $ touch foo
   $ hg ci -Aqm foo
   $ hg co -q null
   $ touch bar
   $ hg ci -Aqm bar
 
   $ hg log -Gr null:
   @  1 bar
   |
   | o  0 foo
   |/
   o  -1
   
   $ hg log -Gr null+0
   o  0 foo
   |
   o  -1
   
   $ hg log -Gr null+1
   @  1 bar
   |
   o  -1
   
 
   $ cd ..

tests/test-log-bookmark.t

@@ -1,192 +1,198 b''
 Test 'hg log' with a bookmark
 
 
 Create the repository
 
   $ hg init Test-D8973
   $ cd Test-D8973
   $ echo "bar" > foo.txt
   $ hg add foo.txt
   $ hg commit -m "Add foo in 'default'"
 
 
 Add a bookmark for topic X
 
   $ hg branch -f sebhtml
   marked working directory as branch sebhtml
   (branches are permanent and global, did you want a bookmark?)
 
   $ hg bookmark sebhtml/99991-topic-X
   $ hg up sebhtml/99991-topic-X
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "X" > x.txt
   $ hg add x.txt
   $ hg commit -m "Add x.txt in 'sebhtml/99991-topic-X'"
 
   $ hg log -B sebhtml/99991-topic-X
   changeset:   1:29f39dea9bf9
   branch:      sebhtml
   bookmark:    sebhtml/99991-topic-X
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Add x.txt in 'sebhtml/99991-topic-X'
   
 
 Add a bookmark for topic Y
 
   $ hg update default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark sebhtml/99991-topic-X)
 
   $ echo "Y" > y.txt
   $ hg add y.txt
   $ hg branch -f sebhtml
   marked working directory as branch sebhtml
   $ hg bookmark sebhtml/99992-topic-Y
   $ hg up sebhtml/99992-topic-Y
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg commit -m "Add y.txt in 'sebhtml/99992-topic-Y'"
   created new head
 
   $ hg log -B sebhtml/99992-topic-Y
   changeset:   2:11df7969cf8d
   branch:      sebhtml
   bookmark:    sebhtml/99992-topic-Y
   tag:         tip
   parent:      0:eaea25376a59
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Add y.txt in 'sebhtml/99992-topic-Y'
   
 
 The log of topic Y does not interfere with the log of topic X
 
   $ hg log -B sebhtml/99991-topic-X
   changeset:   1:29f39dea9bf9
   branch:      sebhtml
   bookmark:    sebhtml/99991-topic-X
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Add x.txt in 'sebhtml/99991-topic-X'
   
 
 Merge topics Y and X in the default branch
 
   $ hg update default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark sebhtml/99992-topic-Y)
 
   $ hg bookmark
      sebhtml/99991-topic-X     1:29f39dea9bf9
      sebhtml/99992-topic-Y     2:11df7969cf8d
 
   $ hg merge sebhtml/99992-topic-Y
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg commit -m "Merge branch 'sebhtml/99992-topic-Y' into 'default'"
 
   $ hg update default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg merge sebhtml/99991-topic-X
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg commit -m "Merge branch 'sebhtml/99991-topic-X' into 'default'"
 
 
 Check the log of topic X, topic Y, and default branch
 
   $ hg log -B sebhtml/99992-topic-Y
 
   $ hg log -B sebhtml/99991-topic-X
 
   $ hg log -b default
   changeset:   4:c26ba8c1e1cb
   tag:         tip
   parent:      3:2189f3fb90d6
   parent:      1:29f39dea9bf9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge branch 'sebhtml/99991-topic-X' into 'default'
   
   changeset:   3:2189f3fb90d6
   parent:      0:eaea25376a59
   parent:      2:11df7969cf8d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Merge branch 'sebhtml/99992-topic-Y' into 'default'
   
   changeset:   0:eaea25376a59
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     Add foo in 'default'
   
 
 Set up multiple bookmarked heads:
 
   $ hg bookmark merged-head
   $ hg up 1
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   (leaving bookmark merged-head)
   $ echo "Z" > z.txt
   $ hg ci -Am 'Add Z'
   adding z.txt
   $ hg bookmark topic-Z
 
   $ hg log -GT '{rev}: {branch}, {bookmarks}\n'
   @  5: sebhtml, topic-Z
   |
   | o  4: default, merged-head
   |/|
   | o    3: default,
   | |\
   | | o  2: sebhtml, sebhtml/99992-topic-Y
   | |/
   o |  1: sebhtml, sebhtml/99991-topic-X
   |/
   o  0: default,
   
 
 Multiple revisions under bookmarked head:
 
   $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head
   o    4: default, merged-head
   |\
   | ~
   o    3: default,
   |\
   ~ ~
 
 Follows multiple bookmarks:
 
   $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head -B topic-Z
   @  5: sebhtml, topic-Z
   |
   ~
   o    4: default, merged-head
   |\
   | ~
   o    3: default,
   |\
   ~ ~
 
 Filter by bookmark and branch:
 
   $ hg log -GT '{rev}: {branch}, {bookmarks}\n' -B merged-head -B topic-Z -b default
   o    4: default, merged-head
   |\
   | ~
   o    3: default,
   |\
   ~ ~
 
 
 Unknown bookmark:
 
   $ hg log -B unknown
   abort: bookmark 'unknown' does not exist
   [255]
+
+Shouldn't accept string-matcher syntax:
+
+  $ hg log -B 're:.*'
+  abort: bookmark 're:.*' does not exist
+  [255]

tests/test-log.t

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