templatekw: make {file_*} compare to both merge parents (issue4292)

This redefines the {file_adds}, {file_dels}, {file_mods} template
keywords by getting the lists from the recently introduced context
methods instead of getting them from status compared to p1. As
mentioned before, these are better defined on merge commits. The total
number of files from the three lists now always add up to the number
of files in {files}.

I timed this command:

  hg log -r 4.0::5.0 -T '{rev}\n {file_mods}\n {file_adds}\n {file_dels}\n'

It went from 7.6s to 5.6s with this patch. So it's actually faster
than before.

Note that the "files:" field in the bazaar test log output was using
"{file_mods}" (not "{files}" as one might think based on the label).

Differential Revision: https://phab.mercurial-scm.org/D6369

mercurial/templatekw.py

@@ -1,863 +1,864 b''
 # templatekw.py - common changeset template keywords
 #
 # Copyright 2005-2009 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
 
 from .i18n import _
 from .node import (
     hex,
     nullid,
     wdirid,
     wdirrev,
 )
 
 from . import (
     diffutil,
     encoding,
     error,
     hbisect,
     i18n,
     obsutil,
     patch,
     pycompat,
     registrar,
     scmutil,
     templateutil,
     util,
 )
 from .utils import (
     stringutil,
 )
 
 _hybrid = templateutil.hybrid
 hybriddict = templateutil.hybriddict
 hybridlist = templateutil.hybridlist
 compatdict = templateutil.compatdict
 compatlist = templateutil.compatlist
 _showcompatlist = templateutil._showcompatlist
 
 def getlatesttags(context, mapping, pattern=None):
     '''return date, distance and name for the latest tag of rev'''
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     cache = context.resource(mapping, 'cache')
 
     cachename = 'latesttags'
     if pattern is not None:
         cachename += '-' + pattern
         match = stringutil.stringmatcher(pattern)[2]
     else:
         match = util.always
 
     if cachename not in cache:
         # Cache mapping from rev to a tuple with tag date, tag
         # distance and tag name
         cache[cachename] = {-1: (0, 0, ['null'])}
     latesttags = cache[cachename]
 
     rev = ctx.rev()
     todo = [rev]
     while todo:
         rev = todo.pop()
         if rev in latesttags:
             continue
         ctx = repo[rev]
         tags = [t for t in ctx.tags()
                 if (repo.tagtype(t) and repo.tagtype(t) != 'local'
                     and match(t))]
         if tags:
             latesttags[rev] = ctx.date()[0], 0, [t for t in sorted(tags)]
             continue
         try:
             ptags = [latesttags[p.rev()] for p in ctx.parents()]
             if len(ptags) > 1:
                 if ptags[0][2] == ptags[1][2]:
                     # The tuples are laid out so the right one can be found by
                     # comparison in this case.
                     pdate, pdist, ptag = max(ptags)
                 else:
                     def key(x):
                         tag = x[2][0]
                         if ctx.rev() is None:
                             # only() doesn't support wdir
                             prevs = [c.rev() for c in ctx.parents()]
                             changes = repo.revs('only(%ld, %s)', prevs, tag)
                             changessincetag = len(changes) + 1
                         else:
                             changes = repo.revs('only(%d, %s)', ctx.rev(), tag)
                             changessincetag = len(changes)
                         # Smallest number of changes since tag wins. Date is
                         # used as tiebreaker.
                         return [-changessincetag, x[0]]
                     pdate, pdist, ptag = max(ptags, key=key)
             else:
                 pdate, pdist, ptag = ptags[0]
         except KeyError:
             # Cache miss - recurse
             todo.append(rev)
             todo.extend(p.rev() for p in ctx.parents())
             continue
         latesttags[rev] = pdate, pdist + 1, ptag
     return latesttags[rev]
 
 def getlogcolumns():
     """Return a dict of log column labels"""
     _ = pycompat.identity  # temporarily disable gettext
     # i18n: column positioning for "hg log"
     columns = _('bookmark:    %s\n'
                 'branch:      %s\n'
                 'changeset:   %s\n'
                 'copies:      %s\n'
                 'date:        %s\n'
                 'extra:       %s=%s\n'
                 'files+:      %s\n'
                 'files-:      %s\n'
                 'files:       %s\n'
                 'instability: %s\n'
                 'manifest:    %s\n'
                 'obsolete:    %s\n'
                 'parent:      %s\n'
                 'phase:       %s\n'
                 'summary:     %s\n'
                 'tag:         %s\n'
                 'user:        %s\n')
     return dict(zip([s.split(':', 1)[0] for s in columns.splitlines()],
                     i18n._(columns).splitlines(True)))
 
 # basic internal templates
 _changeidtmpl = '{rev}:{node|formatnode}'
 
 # default templates internally used for rendering of lists
 defaulttempl = {
     'parent': _changeidtmpl + ' ',
     'manifest': _changeidtmpl,
     'file_copy': '{name} ({source})',
     'envvar': '{key}={value}',
     'extra': '{key}={value|stringescape}'
 }
 # filecopy is preserved for compatibility reasons
 defaulttempl['filecopy'] = defaulttempl['file_copy']
 
 # keywords are callables (see registrar.templatekeyword for details)
 keywords = {}
 templatekeyword = registrar.templatekeyword(keywords)
 
 @templatekeyword('author', requires={'ctx'})
 def showauthor(context, mapping):
     """Alias for ``{user}``"""
     return showuser(context, mapping)
 
 @templatekeyword('bisect', requires={'repo', 'ctx'})
 def showbisect(context, mapping):
     """String. The changeset bisection status."""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     return hbisect.label(repo, ctx.node())
 
 @templatekeyword('branch', requires={'ctx'})
 def showbranch(context, mapping):
     """String. The name of the branch on which the changeset was
     committed.
     """
     ctx = context.resource(mapping, 'ctx')
     return ctx.branch()
 
 @templatekeyword('branches', requires={'ctx'})
 def showbranches(context, mapping):
     """List of strings. The name of the branch on which the
     changeset was committed. Will be empty if the branch name was
     default. (DEPRECATED)
     """
     ctx = context.resource(mapping, 'ctx')
     branch = ctx.branch()
     if branch != 'default':
         return compatlist(context, mapping, 'branch', [branch],
                           plural='branches')
     return compatlist(context, mapping, 'branch', [], plural='branches')
 
 @templatekeyword('bookmarks', requires={'repo', 'ctx'})
 def showbookmarks(context, mapping):
     """List of strings. Any bookmarks associated with the
     changeset. Also sets 'active', the name of the active bookmark.
     """
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     bookmarks = ctx.bookmarks()
     active = repo._activebookmark
     makemap = lambda v: {'bookmark': v, 'active': active, 'current': active}
     f = _showcompatlist(context, mapping, 'bookmark', bookmarks)
     return _hybrid(f, bookmarks, makemap, pycompat.identity)
 
 @templatekeyword('children', requires={'ctx'})
 def showchildren(context, mapping):
     """List of strings. The children of the changeset."""
     ctx = context.resource(mapping, 'ctx')
     childrevs = ['%d:%s' % (cctx.rev(), cctx) for cctx in ctx.children()]
     return compatlist(context, mapping, 'children', childrevs, element='child')
 
 # Deprecated, but kept alive for help generation a purpose.
 @templatekeyword('currentbookmark', requires={'repo', 'ctx'})
 def showcurrentbookmark(context, mapping):
     """String. The active bookmark, if it is associated with the changeset.
     (DEPRECATED)"""
     return showactivebookmark(context, mapping)
 
 @templatekeyword('activebookmark', requires={'repo', 'ctx'})
 def showactivebookmark(context, mapping):
     """String. The active bookmark, if it is associated with the changeset."""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     active = repo._activebookmark
     if active and active in ctx.bookmarks():
         return active
     return ''
 
 @templatekeyword('date', requires={'ctx'})
 def showdate(context, mapping):
     """Date information. The date when the changeset was committed."""
     ctx = context.resource(mapping, 'ctx')
     # the default string format is '<float(unixtime)><tzoffset>' because
     # python-hglib splits date at decimal separator.
     return templateutil.date(ctx.date(), showfmt='%d.0%d')
 
 @templatekeyword('desc', requires={'ctx'})
 def showdescription(context, mapping):
     """String. The text of the changeset description."""
     ctx = context.resource(mapping, 'ctx')
     s = ctx.description()
     if isinstance(s, encoding.localstr):
         # try hard to preserve utf-8 bytes
         return encoding.tolocal(encoding.fromlocal(s).strip())
     elif isinstance(s, encoding.safelocalstr):
         return encoding.safelocalstr(s.strip())
     else:
         return s.strip()
 
 @templatekeyword('diffstat', requires={'ui', 'ctx'})
 def showdiffstat(context, mapping):
     """String. Statistics of changes with the following format:
     "modified files: +added/-removed lines"
     """
     ui = context.resource(mapping, 'ui')
     ctx = context.resource(mapping, 'ctx')
     diffopts = diffutil.diffallopts(ui, {'noprefix': False})
     diff = ctx.diff(opts=diffopts)
     stats = patch.diffstatdata(util.iterlines(diff))
     maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats)
     return '%d: +%d/-%d' % (len(stats), adds, removes)
 
 @templatekeyword('envvars', requires={'ui'})
 def showenvvars(context, mapping):
     """A dictionary of environment variables. (EXPERIMENTAL)"""
     ui = context.resource(mapping, 'ui')
     env = ui.exportableenviron()
     env = util.sortdict((k, env[k]) for k in sorted(env))
     return compatdict(context, mapping, 'envvar', env, plural='envvars')
 
 @templatekeyword('extras', requires={'ctx'})
 def showextras(context, mapping):
     """List of dicts with key, value entries of the 'extras'
     field of this changeset."""
     ctx = context.resource(mapping, 'ctx')
     extras = ctx.extra()
     extras = util.sortdict((k, extras[k]) for k in sorted(extras))
     makemap = lambda k: {'key': k, 'value': extras[k]}
     c = [makemap(k) for k in extras]
     f = _showcompatlist(context, mapping, 'extra', c, plural='extras')
     return _hybrid(f, extras, makemap,
                    lambda k: '%s=%s' % (k, stringutil.escapestr(extras[k])))
 
 def _getfilestatus(context, mapping, listall=False):
     ctx = context.resource(mapping, 'ctx')
     revcache = context.resource(mapping, 'revcache')
     if 'filestatus' not in revcache or revcache['filestatusall'] < listall:
         stat = ctx.p1().status(ctx, listignored=listall, listclean=listall,
                                listunknown=listall)
         revcache['filestatus'] = stat
         revcache['filestatusall'] = listall
     return revcache['filestatus']
 
 def _getfilestatusmap(context, mapping, listall=False):
     revcache = context.resource(mapping, 'revcache')
     if 'filestatusmap' not in revcache or revcache['filestatusall'] < listall:
         stat = _getfilestatus(context, mapping, listall=listall)
         revcache['filestatusmap'] = statmap = {}
         for char, files in zip(pycompat.iterbytestr('MAR!?IC'), stat):
             statmap.update((f, char) for f in files)
     return revcache['filestatusmap']  # {path: statchar}
 
-def _showfilesbystat(context, mapping, name, index):
-    stat = _getfilestatus(context, mapping)
-    files = stat[index]
-    return templateutil.compatfileslist(context, mapping, name, files)
-
 @templatekeyword('file_copies',
                  requires={'repo', 'ctx', 'cache', 'revcache'})
 def showfilecopies(context, mapping):
     """List of strings. Files copied in this changeset with
     their sources.
     """
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     cache = context.resource(mapping, 'cache')
     copies = context.resource(mapping, 'revcache').get('copies')
     if copies is None:
         if 'getrenamed' not in cache:
             cache['getrenamed'] = scmutil.getrenamedfn(repo)
         copies = []
         getrenamed = cache['getrenamed']
         for fn in ctx.files():
             rename = getrenamed(fn, ctx.rev())
             if rename:
                 copies.append((fn, rename))
     return templateutil.compatfilecopiesdict(context, mapping, 'file_copy',
                                              copies)
 
 # showfilecopiesswitch() displays file copies only if copy records are
 # provided before calling the templater, usually with a --copies
 # command line switch.
 @templatekeyword('file_copies_switch', requires={'revcache'})
 def showfilecopiesswitch(context, mapping):
     """List of strings. Like "file_copies" but displayed
     only if the --copied switch is set.
     """
     copies = context.resource(mapping, 'revcache').get('copies') or []
     return templateutil.compatfilecopiesdict(context, mapping, 'file_copy',
                                              copies)
 
 @templatekeyword('file_adds', requires={'ctx', 'revcache'})
 def showfileadds(context, mapping):
     """List of strings. Files added by this changeset."""
-    return _showfilesbystat(context, mapping, 'file_add', 1)
+    ctx = context.resource(mapping, 'ctx')
+    return templateutil.compatfileslist(context, mapping, 'file_add',
+                                        ctx.filesadded())
 
 @templatekeyword('file_dels', requires={'ctx', 'revcache'})
 def showfiledels(context, mapping):
     """List of strings. Files removed by this changeset."""
-    return _showfilesbystat(context, mapping, 'file_del', 2)
+    ctx = context.resource(mapping, 'ctx')
+    return templateutil.compatfileslist(context, mapping, 'file_del',
+                                        ctx.filesremoved())
 
 @templatekeyword('file_mods', requires={'ctx', 'revcache'})
 def showfilemods(context, mapping):
     """List of strings. Files modified by this changeset."""
-    return _showfilesbystat(context, mapping, 'file_mod', 0)
+    ctx = context.resource(mapping, 'ctx')
+    return templateutil.compatfileslist(context, mapping, 'file_mod',
+                                        ctx.filesmodified())
 
 @templatekeyword('files', requires={'ctx'})
 def showfiles(context, mapping):
     """List of strings. All files modified, added, or removed by this
     changeset.
     """
     ctx = context.resource(mapping, 'ctx')
     return templateutil.compatfileslist(context, mapping, 'file', ctx.files())
 
 @templatekeyword('graphnode', requires={'repo', 'ctx'})
 def showgraphnode(context, mapping):
     """String. The character representing the changeset node in an ASCII
     revision graph."""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     return getgraphnode(repo, ctx)
 
 def getgraphnode(repo, ctx):
     return getgraphnodecurrent(repo, ctx) or getgraphnodesymbol(ctx)
 
 def getgraphnodecurrent(repo, ctx):
     wpnodes = repo.dirstate.parents()
     if wpnodes[1] == nullid:
         wpnodes = wpnodes[:1]
     if ctx.node() in wpnodes:
         return '@'
     else:
         return ''
 
 def getgraphnodesymbol(ctx):
     if ctx.obsolete():
         return 'x'
     elif ctx.isunstable():
         return '*'
     elif ctx.closesbranch():
         return '_'
     else:
         return 'o'
 
 @templatekeyword('graphwidth', requires=())
 def showgraphwidth(context, mapping):
     """Integer. The width of the graph drawn by 'log --graph' or zero."""
     # just hosts documentation; should be overridden by template mapping
     return 0
 
 @templatekeyword('index', requires=())
 def showindex(context, mapping):
     """Integer. The current iteration of the loop. (0 indexed)"""
     # just hosts documentation; should be overridden by template mapping
     raise error.Abort(_("can't use index in this context"))
 
 @templatekeyword('latesttag', requires={'repo', 'ctx', 'cache'})
 def showlatesttag(context, mapping):
     """List of strings. The global tags on the most recent globally
     tagged ancestor of this changeset.  If no such tags exist, the list
     consists of the single string "null".
     """
     return showlatesttags(context, mapping, None)
 
 def showlatesttags(context, mapping, pattern):
     """helper method for the latesttag keyword and function"""
     latesttags = getlatesttags(context, mapping, pattern)
 
     # latesttag[0] is an implementation detail for sorting csets on different
     # branches in a stable manner- it is the date the tagged cset was created,
     # not the date the tag was created.  Therefore it isn't made visible here.
     makemap = lambda v: {
         'changes': _showchangessincetag,
         'distance': latesttags[1],
         'latesttag': v,   # BC with {latesttag % '{latesttag}'}
         'tag': v
     }
 
     tags = latesttags[2]
     f = _showcompatlist(context, mapping, 'latesttag', tags, separator=':')
     return _hybrid(f, tags, makemap, pycompat.identity)
 
 @templatekeyword('latesttagdistance', requires={'repo', 'ctx', 'cache'})
 def showlatesttagdistance(context, mapping):
     """Integer. Longest path to the latest tag."""
     return getlatesttags(context, mapping)[1]
 
 @templatekeyword('changessincelatesttag', requires={'repo', 'ctx', 'cache'})
 def showchangessincelatesttag(context, mapping):
     """Integer. All ancestors not in the latest tag."""
     tag = getlatesttags(context, mapping)[2][0]
     mapping = context.overlaymap(mapping, {'tag': tag})
     return _showchangessincetag(context, mapping)
 
 def _showchangessincetag(context, mapping):
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     offset = 0
     revs = [ctx.rev()]
     tag = context.symbol(mapping, 'tag')
 
     # The only() revset doesn't currently support wdir()
     if ctx.rev() is None:
         offset = 1
         revs = [p.rev() for p in ctx.parents()]
 
     return len(repo.revs('only(%ld, %s)', revs, tag)) + offset
 
 # teach templater latesttags.changes is switched to (context, mapping) API
 _showchangessincetag._requires = {'repo', 'ctx'}
 
 @templatekeyword('manifest', requires={'repo', 'ctx'})
 def showmanifest(context, mapping):
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     mnode = ctx.manifestnode()
     if mnode is None:
         mnode = wdirid
         mrev = wdirrev
     else:
         mrev = repo.manifestlog.rev(mnode)
     mhex = hex(mnode)
     mapping = context.overlaymap(mapping, {'rev': mrev, 'node': mhex})
     f = context.process('manifest', mapping)
     return templateutil.hybriditem(f, None, f,
                                    lambda x: {'rev': mrev, 'node': mhex})
 
 @templatekeyword('obsfate', requires={'ui', 'repo', 'ctx'})
 def showobsfate(context, mapping):
     # this function returns a list containing pre-formatted obsfate strings.
     #
     # This function will be replaced by templates fragments when we will have
     # the verbosity templatekw available.
     succsandmarkers = showsuccsandmarkers(context, mapping)
 
     ui = context.resource(mapping, 'ui')
     repo = context.resource(mapping, 'repo')
     values = []
 
     for x in succsandmarkers.tovalue(context, mapping):
         v = obsutil.obsfateprinter(ui, repo, x['successors'], x['markers'],
                                    scmutil.formatchangeid)
         values.append(v)
 
     return compatlist(context, mapping, "fate", values)
 
 def shownames(context, mapping, namespace):
     """helper method to generate a template keyword for a namespace"""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     ns = repo.names[namespace]
     names = ns.names(repo, ctx.node())
     return compatlist(context, mapping, ns.templatename, names,
                       plural=namespace)
 
 @templatekeyword('namespaces', requires={'repo', 'ctx'})
 def shownamespaces(context, mapping):
     """Dict of lists. Names attached to this changeset per
     namespace."""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
 
     namespaces = util.sortdict()
     def makensmapfn(ns):
         # 'name' for iterating over namespaces, templatename for local reference
         return lambda v: {'name': v, ns.templatename: v}
 
     for k, ns in repo.names.iteritems():
         names = ns.names(repo, ctx.node())
         f = _showcompatlist(context, mapping, 'name', names)
         namespaces[k] = _hybrid(f, names, makensmapfn(ns), pycompat.identity)
 
     f = _showcompatlist(context, mapping, 'namespace', list(namespaces))
 
     def makemap(ns):
         return {
             'namespace': ns,
             'names': namespaces[ns],
             'builtin': repo.names[ns].builtin,
             'colorname': repo.names[ns].colorname,
         }
 
     return _hybrid(f, namespaces, makemap, pycompat.identity)
 
 @templatekeyword('negrev', requires={'repo', 'ctx'})
 def shownegrev(context, mapping):
     """Integer. The repository-local changeset negative revision number,
     which counts in the opposite direction."""
     ctx = context.resource(mapping, 'ctx')
     rev = ctx.rev()
     if rev is None or rev < 0:  # wdir() or nullrev?
         return None
     repo = context.resource(mapping, 'repo')
     return rev - len(repo)
 
 @templatekeyword('node', requires={'ctx'})
 def shownode(context, mapping):
     """String. The changeset identification hash, as a 40 hexadecimal
     digit string.
     """
     ctx = context.resource(mapping, 'ctx')
     return ctx.hex()
 
 @templatekeyword('obsolete', requires={'ctx'})
 def showobsolete(context, mapping):
     """String. Whether the changeset is obsolete. (EXPERIMENTAL)"""
     ctx = context.resource(mapping, 'ctx')
     if ctx.obsolete():
         return 'obsolete'
     return ''
 
 @templatekeyword('path', requires={'fctx'})
 def showpath(context, mapping):
     """String. Repository-absolute path of the current file. (EXPERIMENTAL)"""
     fctx = context.resource(mapping, 'fctx')
     return fctx.path()
 
 @templatekeyword('peerurls', requires={'repo'})
 def showpeerurls(context, mapping):
     """A dictionary of repository locations defined in the [paths] section
     of your configuration file."""
     repo = context.resource(mapping, 'repo')
     # see commands.paths() for naming of dictionary keys
     paths = repo.ui.paths
     urls = util.sortdict((k, p.rawloc) for k, p in sorted(paths.iteritems()))
     def makemap(k):
         p = paths[k]
         d = {'name': k, 'url': p.rawloc}
         d.update((o, v) for o, v in sorted(p.suboptions.iteritems()))
         return d
     return _hybrid(None, urls, makemap, lambda k: '%s=%s' % (k, urls[k]))
 
 @templatekeyword("predecessors", requires={'repo', 'ctx'})
 def showpredecessors(context, mapping):
     """Returns the list of the closest visible successors. (EXPERIMENTAL)"""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     predecessors = sorted(obsutil.closestpredecessors(repo, ctx.node()))
     predecessors = pycompat.maplist(hex, predecessors)
 
     return _hybrid(None, predecessors,
                    lambda x: {'ctx': repo[x]},
                    lambda x: scmutil.formatchangeid(repo[x]))
 
 @templatekeyword('reporoot', requires={'repo'})
 def showreporoot(context, mapping):
     """String. The root directory of the current repository."""
     repo = context.resource(mapping, 'repo')
     return repo.root
 
 @templatekeyword('size', requires={'fctx'})
 def showsize(context, mapping):
     """Integer. Size of the current file in bytes. (EXPERIMENTAL)"""
     fctx = context.resource(mapping, 'fctx')
     return fctx.size()
 
 # requires 'fctx' to denote {status} depends on (ctx, path) pair
 @templatekeyword('status', requires={'ctx', 'fctx', 'revcache'})
 def showstatus(context, mapping):
     """String. Status code of the current file. (EXPERIMENTAL)"""
     path = templateutil.runsymbol(context, mapping, 'path')
     path = templateutil.stringify(context, mapping, path)
     if not path:
         return
     statmap = _getfilestatusmap(context, mapping)
     if path not in statmap:
         statmap = _getfilestatusmap(context, mapping, listall=True)
     return statmap.get(path)
 
 @templatekeyword("successorssets", requires={'repo', 'ctx'})
 def showsuccessorssets(context, mapping):
     """Returns a string of sets of successors for a changectx. Format used
     is: [ctx1, ctx2], [ctx3] if ctx has been split into ctx1 and ctx2
     while also diverged into ctx3. (EXPERIMENTAL)"""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     if not ctx.obsolete():
         return ''
 
     ssets = obsutil.successorssets(repo, ctx.node(), closest=True)
     ssets = [[hex(n) for n in ss] for ss in ssets]
 
     data = []
     for ss in ssets:
         h = _hybrid(None, ss, lambda x: {'ctx': repo[x]},
                     lambda x: scmutil.formatchangeid(repo[x]))
         data.append(h)
 
     # Format the successorssets
     def render(d):
         return templateutil.stringify(context, mapping, d)
 
     def gen(data):
         yield "; ".join(render(d) for d in data)
 
     return _hybrid(gen(data), data, lambda x: {'successorset': x},
                    pycompat.identity)
 
 @templatekeyword("succsandmarkers", requires={'repo', 'ctx'})
 def showsuccsandmarkers(context, mapping):
     """Returns a list of dict for each final successor of ctx. The dict
     contains successors node id in "successors" keys and the list of
     obs-markers from ctx to the set of successors in "markers".
     (EXPERIMENTAL)
     """
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
 
     values = obsutil.successorsandmarkers(repo, ctx)
 
     if values is None:
         values = []
 
     # Format successors and markers to avoid exposing binary to templates
     data = []
     for i in values:
         # Format successors
         successors = i['successors']
 
         successors = [hex(n) for n in successors]
         successors = _hybrid(None, successors,
                              lambda x: {'ctx': repo[x]},
                              lambda x: scmutil.formatchangeid(repo[x]))
 
         # Format markers
         finalmarkers = []
         for m in i['markers']:
             hexprec = hex(m[0])
             hexsucs = tuple(hex(n) for n in m[1])
             hexparents = None
             if m[5] is not None:
                 hexparents = tuple(hex(n) for n in m[5])
             newmarker = (hexprec, hexsucs) + m[2:5] + (hexparents,) + m[6:]
             finalmarkers.append(newmarker)
 
         data.append({'successors': successors, 'markers': finalmarkers})
 
     return templateutil.mappinglist(data)
 
 @templatekeyword('p1', requires={'ctx'})
 def showp1(context, mapping):
     """Changeset. The changeset's first parent. ``{p1.rev}`` for the revision
     number, and ``{p1.node}`` for the identification hash."""
     ctx = context.resource(mapping, 'ctx')
     return templateutil.mappingdict({'ctx': ctx.p1()}, tmpl=_changeidtmpl)
 
 @templatekeyword('p2', requires={'ctx'})
 def showp2(context, mapping):
     """Changeset. The changeset's second parent. ``{p2.rev}`` for the revision
     number, and ``{p2.node}`` for the identification hash."""
     ctx = context.resource(mapping, 'ctx')
     return templateutil.mappingdict({'ctx': ctx.p2()}, tmpl=_changeidtmpl)
 
 @templatekeyword('p1rev', requires={'ctx'})
 def showp1rev(context, mapping):
     """Integer. The repository-local revision number of the changeset's
     first parent, or -1 if the changeset has no parents. (DEPRECATED)"""
     ctx = context.resource(mapping, 'ctx')
     return ctx.p1().rev()
 
 @templatekeyword('p2rev', requires={'ctx'})
 def showp2rev(context, mapping):
     """Integer. The repository-local revision number of the changeset's
     second parent, or -1 if the changeset has no second parent. (DEPRECATED)"""
     ctx = context.resource(mapping, 'ctx')
     return ctx.p2().rev()
 
 @templatekeyword('p1node', requires={'ctx'})
 def showp1node(context, mapping):
     """String. The identification hash of the changeset's first parent,
     as a 40 digit hexadecimal string. If the changeset has no parents, all
     digits are 0. (DEPRECATED)"""
     ctx = context.resource(mapping, 'ctx')
     return ctx.p1().hex()
 
 @templatekeyword('p2node', requires={'ctx'})
 def showp2node(context, mapping):
     """String. The identification hash of the changeset's second
     parent, as a 40 digit hexadecimal string. If the changeset has no second
     parent, all digits are 0. (DEPRECATED)"""
     ctx = context.resource(mapping, 'ctx')
     return ctx.p2().hex()
 
 @templatekeyword('parents', requires={'repo', 'ctx'})
 def showparents(context, mapping):
     """List of strings. The parents of the changeset in "rev:node"
     format. If the changeset has only one "natural" parent (the predecessor
     revision) nothing is shown."""
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
     pctxs = scmutil.meaningfulparents(repo, ctx)
     prevs = [p.rev() for p in pctxs]
     parents = [[('rev', p.rev()),
                 ('node', p.hex()),
                 ('phase', p.phasestr())]
                for p in pctxs]
     f = _showcompatlist(context, mapping, 'parent', parents)
     return _hybrid(f, prevs, lambda x: {'ctx': repo[x]},
                    lambda x: scmutil.formatchangeid(repo[x]), keytype=int)
 
 @templatekeyword('phase', requires={'ctx'})
 def showphase(context, mapping):
     """String. The changeset phase name."""
     ctx = context.resource(mapping, 'ctx')
     return ctx.phasestr()
 
 @templatekeyword('phaseidx', requires={'ctx'})
 def showphaseidx(context, mapping):
     """Integer. The changeset phase index. (ADVANCED)"""
     ctx = context.resource(mapping, 'ctx')
     return ctx.phase()
 
 @templatekeyword('rev', requires={'ctx'})
 def showrev(context, mapping):
     """Integer. The repository-local changeset revision number."""
     ctx = context.resource(mapping, 'ctx')
     return scmutil.intrev(ctx)
 
 def showrevslist(context, mapping, name, revs):
     """helper to generate a list of revisions in which a mapped template will
     be evaluated"""
     repo = context.resource(mapping, 'repo')
     # revs may be a smartset; don't compute it until f() has to be evaluated
     def f():
         srevs = ['%d' % r for r in revs]
         return _showcompatlist(context, mapping, name, srevs)
     return _hybrid(f, revs,
                    lambda x: {name: x, 'ctx': repo[x]},
                    pycompat.identity, keytype=int)
 
 @templatekeyword('subrepos', requires={'ctx'})
 def showsubrepos(context, mapping):
     """List of strings. Updated subrepositories in the changeset."""
     ctx = context.resource(mapping, 'ctx')
     substate = ctx.substate
     if not substate:
         return compatlist(context, mapping, 'subrepo', [])
     psubstate = ctx.p1().substate or {}
     subrepos = []
     for sub in substate:
         if sub not in psubstate or substate[sub] != psubstate[sub]:
             subrepos.append(sub) # modified or newly added in ctx
     for sub in psubstate:
         if sub not in substate:
             subrepos.append(sub) # removed in ctx
     return compatlist(context, mapping, 'subrepo', sorted(subrepos))
 
 # don't remove "showtags" definition, even though namespaces will put
 # a helper function for "tags" keyword into "keywords" map automatically,
 # because online help text is built without namespaces initialization
 @templatekeyword('tags', requires={'repo', 'ctx'})
 def showtags(context, mapping):
     """List of strings. Any tags associated with the changeset."""
     return shownames(context, mapping, 'tags')
 
 @templatekeyword('termwidth', requires={'ui'})
 def showtermwidth(context, mapping):
     """Integer. The width of the current terminal."""
     ui = context.resource(mapping, 'ui')
     return ui.termwidth()
 
 @templatekeyword('user', requires={'ctx'})
 def showuser(context, mapping):
     """String. The unmodified author of the changeset."""
     ctx = context.resource(mapping, 'ctx')
     return ctx.user()
 
 @templatekeyword('instabilities', requires={'ctx'})
 def showinstabilities(context, mapping):
     """List of strings. Evolution instabilities affecting the changeset.
     (EXPERIMENTAL)
     """
     ctx = context.resource(mapping, 'ctx')
     return compatlist(context, mapping, 'instability', ctx.instabilities(),
                       plural='instabilities')
 
 @templatekeyword('verbosity', requires={'ui'})
 def showverbosity(context, mapping):
     """String. The current output verbosity in 'debug', 'quiet', 'verbose',
     or ''."""
     ui = context.resource(mapping, 'ui')
     # see logcmdutil.changesettemplater for priority of these flags
     if ui.debugflag:
         return 'debug'
     elif ui.quiet:
         return 'quiet'
     elif ui.verbose:
         return 'verbose'
     return ''
 
 @templatekeyword('whyunstable', requires={'repo', 'ctx'})
 def showwhyunstable(context, mapping):
     """List of dicts explaining all instabilities of a changeset.
     (EXPERIMENTAL)
     """
     repo = context.resource(mapping, 'repo')
     ctx = context.resource(mapping, 'ctx')
 
     def formatnode(ctx):
         return '%s (%s)' % (scmutil.formatchangeid(ctx), ctx.phasestr())
 
     entries = obsutil.whyunstable(repo, ctx)
 
     for entry in entries:
         if entry.get('divergentnodes'):
             dnodes = entry['divergentnodes']
             dnhybrid = _hybrid(None, [dnode.hex() for dnode in dnodes],
                                lambda x: {'ctx': repo[x]},
                                lambda x: formatnode(repo[x]))
             entry['divergentnodes'] = dnhybrid
 
     tmpl = ('{instability}:{if(divergentnodes, " ")}{divergentnodes} '
             '{reason} {node|short}')
     return templateutil.mappinglist(entries, tmpl=tmpl, sep='\n')
 
 def loadkeyword(ui, extname, registrarobj):
     """Load template keyword from specified registrarobj
     """
     for name, func in registrarobj._table.iteritems():
         keywords[name] = func
 
 # tell hggettext to extract docstrings from these functions:
 i18nfunctions = keywords.values()

relnotes/next

@@ -1,42 +1,56 b''
 == New Features ==
 
  * New config `commands.commit.post-status` shows status after successful
  commit.
 
 
 == New Experimental Features ==
 
  * New config `experimental.log.topo` makes `hg log -G` use
    topological sorting. This is especially useful for aliases since it
    lets the alias accept an `-r` option while still using topological
    sorting with or without the `-r` (unlike if you use the `sort(...,
    topo)` revset).
 
 
 == Bug Fixes  ==
 
+ * issue4292: "hg log and {files} {file_adds} {file_mods} {file_dels}
+   in template show wrong files on merged revision". See details in
+   "Backwards Compatibility Changes".
+
 
 == Backwards Compatibility Changes ==
 
  * Removed (experimental) support for log graph lines mixing
    parent/grandparent styles. Setting
    e.g. `experimental.graphstyle.parent = !` and
    `experimental.graphstyle.grandparent = 3.` would use `!` for the
    first three lines of the graph and then `.`. This is no longer
    supported.
 
  * If `ui.origbackuppath` had been (incorrectly) configured to point
    to a file, we will now replace that file by a directory and put
    backups in that directory. This is similar to how we would
    previously replace files *in* the configured directory by
    subdirectories.
 
+* Template keyword `{file_mods}`, `{file_adds}`, and `{file_dels}`
+   have changed behavior on merge commits. They used to be relative to
+   the first parent, but they now consider both parents. `{file_adds}`
+   shows files that exists in the commit but did not exist in either
+   parent. `{file_dels}` shows files that do not exist in the commit
+   but existed in either parent. `{file_mods}` show the remaining
+   files from `{files}` that were not in the other two
+   sets.
+
+
 == Internal API Changes ==
 
  * Matchers are no longer iterable. Use `match.files()` instead.
 
  * `match.visitdir()` and `match.visitchildrenset()` now expect the
    empty string instead of '.' to indicate the root directory.
 
  * `util.dirs()` and `util.finddirs()` now include an entry for the
    root directory (empty string).

tests/test-convert-bzr-merges.t

@@ -1,225 +1,225 b''
 #require bzr
 
 N.B. bzr 1.13 has a bug that breaks this test.  If you see this
 test fail, check your bzr version.  Upgrading to bzr 1.13.1
 should fix it.
 
   $ . "$TESTDIR/bzr-definitions"
 
 test multiple merges at once
 
   $ mkdir test-multimerge
   $ cd test-multimerge
   $ bzr init -q source
   $ cd source
   $ echo content > file
   $ echo text > rename_me
   $ bzr add -q file rename_me
   $ bzr commit -q -m 'Initial add' '--commit-time=2009-10-10 08:00:00 +0100'
   $ cd ..
   $ bzr branch -q source source-branch1
   $ cd source-branch1
   $ echo morecontent >> file
   $ echo evenmorecontent > file-branch1
   $ bzr add -q file-branch1
   $ bzr commit -q -m 'Added branch1 file' '--commit-time=2009-10-10 08:00:01 +0100'
   $ cd ../source
   $ sleep 1
   $ echo content > file-parent
   $ bzr add -q file-parent
   $ bzr commit -q -m 'Added parent file' '--commit-time=2009-10-10 08:00:02 +0100'
   $ cd ..
   $ bzr branch -q source source-branch2
   $ cd source-branch2
   $ echo somecontent > file-branch2
   $ bzr add -q file-branch2
   $ bzr mv -q rename_me renamed
   $ echo change > renamed
   $ bzr commit -q -m 'Added brach2 file' '--commit-time=2009-10-10 08:00:03 +0100'
   $ sleep 1
   $ cd ../source
   $ bzr merge -q ../source-branch1
   $ bzr merge -q --force ../source-branch2
   $ bzr commit -q -m 'Merged branches' '--commit-time=2009-10-10 08:00:04 +0100'
   $ cd ..
 
 BUG: file-branch2 should not be added in rev 4, and the rename_me -> renamed
 move should be recorded in the fixup merge.
   $ hg convert --datesort --config convert.bzr.saverev=False source source-hg
   initializing destination source-hg repository
   scanning source...
   sorting...
   converting...
   4 Initial add
   3 Added branch1 file
   2 Added parent file
   1 Added brach2 file
   0 Merged branches
   warning: can't find ancestor for 'renamed' copied from 'rename_me'!
   $ glog -R source-hg
   o    5@source "(octopus merge fixup)" files+: [], files-: [], files: [renamed]
   |\
-  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
+  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
   | |\
   o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
    / /
   | o  2@source "Added parent file" files+: [file-parent], files-: [], files: []
   | |
   o |  1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
   |/
   o  0@source "Initial add" files+: [file rename_me], files-: [], files: []
   
   $ manifest source-hg tip
   % manifest of tip
   644   file
   644   file-branch1
   644   file-branch2
   644   file-parent
   644   renamed
 
   $ hg convert source-hg hg2hg
   initializing destination hg2hg repository
   scanning source...
   sorting...
   converting...
   5 Initial add
   4 Added branch1 file
   3 Added parent file
   2 Added brach2 file
   1 Merged branches
   0 (octopus merge fixup)
 
 BUG: The manifest entries should be the same for matching revisions, and
 nothing should be outgoing
 
   $ hg -R source-hg manifest --debug -r tip | grep renamed
   67109fdebf6c556eb0a9d5696dd98c8420520405 644   renamed
   $ hg -R hg2hg manifest --debug -r tip | grep renamed
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
   $ hg -R source-hg manifest --debug -r 'tip^' | grep renamed
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
   $ hg -R hg2hg manifest --debug -r 'tip^' | grep renamed
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
 
 BUG: The revisions found should be the same in both repos
 
   $ hg --cwd source-hg log -r 'file("renamed")' -G -Tcompact
   o    5[tip]:4,3   6652429c300a   2009-10-10 08:00 +0100   foo
   |\     (octopus merge fixup)
   | |
   | o    4:2,1   e0ae8af3503a   2009-10-10 08:00 +0100   foo
   | |\     Merged branches
   | ~ ~
   o  3   138bed2e14be   2009-10-10 08:00 +0100   foo
   |    Added brach2 file
   ~
   $ hg --cwd hg2hg log -r 'file("renamed")' -G -Tcompact
   o    4:2,1   e0ae8af3503a   2009-10-10 08:00 +0100   foo
   |\     Merged branches
   ~ ~
   o  3   138bed2e14be   2009-10-10 08:00 +0100   foo
   |    Added brach2 file
   ~
 
 BUG(?): The move seems to be recorded in rev 4, so it should probably show up
 there.  It's not recorded as a move in rev 5, even in source-hg.
 
   $ hg -R source-hg up -q tip
   $ hg -R hg2hg up -q tip
   $ hg --cwd source-hg log -r 'follow("renamed")' -G -Tcompact
   @    5[tip]:4,3   6652429c300a   2009-10-10 08:00 +0100   foo
   |\     (octopus merge fixup)
   | :
   o :  3   138bed2e14be   2009-10-10 08:00 +0100   foo
   :/     Added brach2 file
   :
   o  0   18b86f5df51b   2009-10-10 08:00 +0100   foo
        Initial add
   
   $ hg --cwd hg2hg log -r 'follow("renamed")' -G -Tcompact
   o  3   138bed2e14be   2009-10-10 08:00 +0100   foo
   :    Added brach2 file
   :
   o  0   18b86f5df51b   2009-10-10 08:00 +0100   foo
        Initial add
   
 
   $ hg -R hg2hg out source-hg -T compact
   comparing with source-hg
   searching for changes
   5[tip]:4,3   3be2299ccd31   2009-10-10 08:00 +0100   foo
     (octopus merge fixup)
   
 
   $ glog -R hg2hg
   @    5@source "(octopus merge fixup)" files+: [], files-: [], files: []
   |\
-  | o    4@source "Merged branches" files+: [file-branch1 file-branch2 renamed], files-: [rename_me], files: [file]
+  | o    4@source "Merged branches" files+: [file-branch2 renamed], files-: [rename_me], files: []
   | |\
   o---+  3@source-branch2 "Added brach2 file" files+: [file-branch2 renamed], files-: [rename_me], files: []
    / /
   | o  2@source "Added parent file" files+: [file-parent], files-: [], files: []
   | |
   o |  1@source-branch1 "Added branch1 file" files+: [file-branch1], files-: [], files: [file]
   |/
   o  0@source "Initial add" files+: [file rename_me], files-: [], files: []
   
 
   $ hg -R source-hg log --debug -r tip
   changeset:   5:6652429c300ab66fdeaf2e730945676a00b53231
   branch:      source
   tag:         tip
   phase:       draft
   parent:      4:e0ae8af3503af9bbffb0b29268a02744cc61a561
   parent:      3:138bed2e14be415a2692b02e41405b2864f758b4
   manifest:    5:1eabd5f5d4b985784cf2c45c717ff053eca14b0d
   user:        Foo Bar <[e-mail]>
   date:        Sat Oct 10 08:00:04 2009 +0100
   files:       renamed
   extra:       branch=source
   description:
   (octopus merge fixup)
   
   
   $ hg -R hg2hg log --debug -r tip
   changeset:   5:3be2299ccd315ff9aab2b49bdb0d14e3244435e8
   branch:      source
   tag:         tip
   phase:       draft
   parent:      4:e0ae8af3503af9bbffb0b29268a02744cc61a561
   parent:      3:138bed2e14be415a2692b02e41405b2864f758b4
   manifest:    4:3ece3c7f2cc6df15b3cbbf3273c69869fc7c3ab0
   user:        Foo Bar <[e-mail]>
   date:        Sat Oct 10 08:00:04 2009 +0100
   extra:       branch=source
   description:
   (octopus merge fixup)
   
   
   $ hg -R source-hg manifest --debug -r tip
   cdf31ed9242b209cd94697112160e2c5b37a667d 644   file
   5108144f585149b29779d7c7e51d61dd22303ffe 644   file-branch1
   80753c4a9ac3806858405b96b24a907b309e3616 644   file-branch2
   7108421418404a937c684d2479a34a24d2ce4757 644   file-parent
   67109fdebf6c556eb0a9d5696dd98c8420520405 644   renamed
   $ hg -R source-hg manifest --debug -r 'tip^'
   cdf31ed9242b209cd94697112160e2c5b37a667d 644   file
   5108144f585149b29779d7c7e51d61dd22303ffe 644   file-branch1
   80753c4a9ac3806858405b96b24a907b309e3616 644   file-branch2
   7108421418404a937c684d2479a34a24d2ce4757 644   file-parent
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
 
   $ hg -R hg2hg manifest --debug -r tip
   cdf31ed9242b209cd94697112160e2c5b37a667d 644   file
   5108144f585149b29779d7c7e51d61dd22303ffe 644   file-branch1
   80753c4a9ac3806858405b96b24a907b309e3616 644   file-branch2
   7108421418404a937c684d2479a34a24d2ce4757 644   file-parent
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
   $ hg -R hg2hg manifest --debug -r 'tip^'
   cdf31ed9242b209cd94697112160e2c5b37a667d 644   file
   5108144f585149b29779d7c7e51d61dd22303ffe 644   file-branch1
   80753c4a9ac3806858405b96b24a907b309e3616 644   file-branch2
   7108421418404a937c684d2479a34a24d2ce4757 644   file-parent
   27c968376d7c3afd095ecb9c7697919b933448c8 644   renamed
 
   $ cd ..

tests/test-convert-bzr.t

@@ -1,288 +1,288 b''
 #require bzr
 
   $ . "$TESTDIR/bzr-definitions"
 
 create and rename on the same file in the same step
 
   $ mkdir test-createandrename
   $ cd test-createandrename
   $ bzr init -q source
 
 test empty repo conversion (issue3233)
 
   $ hg convert source source-hg
   initializing destination source-hg repository
   scanning source...
   sorting...
   converting...
 
 back to the rename stuff
 
   $ cd source
   $ echo a > a
   $ echo c > c
   $ echo e > e
   $ bzr add -q a c e
   $ bzr commit -q -m 'Initial add: a, c, e'
   $ bzr mv a b
   a => b
   $ bzr mv c d
   c => d
   $ bzr mv e f
   e => f
   $ echo a2 >> a
   $ mkdir e
   $ bzr add -q a e
   $ bzr commit -q -m 'rename a into b, create a, rename c into d'
   $ cd ..
   $ hg convert source source-hg
   scanning source...
   sorting...
   converting...
   1 Initial add: a, c, e
   0 rename a into b, create a, rename c into d
   $ glog -R source-hg
   o  1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a]
   |
   o  0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: []
   
 
 manifest
 
   $ hg manifest -R source-hg -r tip
   a
   b
   d
   f
 
 test --rev option
 
   $ hg convert -r 1 source source-1-hg
   initializing destination source-1-hg repository
   scanning source...
   sorting...
   converting...
   0 Initial add: a, c, e
   $ glog -R source-1-hg
   o  0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: []
   
 
 test with filemap
 
   $ cat > filemap <<EOF
   > exclude a
   > EOF
   $ hg convert --filemap filemap source source-filemap-hg
   initializing destination source-filemap-hg repository
   scanning source...
   sorting...
   converting...
   1 Initial add: a, c, e
   0 rename a into b, create a, rename c into d
   $ hg -R source-filemap-hg manifest -r tip
   b
   d
   f
 
 convert from lightweight checkout
 
   $ bzr checkout --lightweight source source-light
   $ hg convert -s bzr source-light source-light-hg
   initializing destination source-light-hg repository
   warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.
   $TESTTMP/test-createandrename/source-light does not look like a Bazaar repository
   abort: source-light: missing or unsupported repository
   [255]
 
 extract timestamps that look just like hg's {date|isodate}:
 yyyy-mm-dd HH:MM zzzz (no seconds!)
 compare timestamps
 
   $ cd source
   $ bzr log | \
   >   sed '/timestamp/!d;s/.\{15\}\([0-9: -]\{16\}\):.. \(.[0-9]\{4\}\)/\1 \2/' \
   >   > ../bzr-timestamps
   $ cd ..
   $ hg -R source-hg log --template "{date|isodate}\n" > hg-timestamps
   $ cmp bzr-timestamps hg-timestamps || diff -u bzr-timestamps hg-timestamps
   $ cd ..
 
 merge
 
   $ mkdir test-merge
   $ cd test-merge
   $ cat > helper.py <<EOF
   > import sys
   > from bzrlib import workingtree
   > wt = workingtree.WorkingTree.open('.')
   > 
   > message, stamp = sys.argv[1:]
   > wt.commit(message, timestamp=int(stamp))
   > EOF
   $ bzr init -q source
   $ cd source
   $ echo content > a
   $ echo content2 > b
   $ bzr add -q a b
   $ bzr commit -q -m 'Initial add'
   $ cd ..
   $ bzr branch -q source source-improve
   $ cd source
   $ echo more >> a
   $ "$PYTHON" ../helper.py 'Editing a' 100
   $ cd ../source-improve
   $ echo content3 >> b
   $ "$PYTHON" ../helper.py 'Editing b' 200
   $ cd ../source
   $ bzr merge -q ../source-improve
   $ bzr commit -q -m 'Merged improve branch'
   $ cd ..
   $ hg convert --datesort source source-hg
   initializing destination source-hg repository
   scanning source...
   sorting...
   converting...
   3 Initial add
   2 Editing a
   1 Editing b
   0 Merged improve branch
   $ glog -R source-hg
-  o    3@source "Merged improve branch" files+: [], files-: [], files: [b]
+  o    3@source "Merged improve branch" files+: [], files-: [], files: []
   |\
   | o  2@source-improve "Editing b" files+: [], files-: [], files: [b]
   | |
   o |  1@source "Editing a" files+: [], files-: [], files: [a]
   |/
   o  0@source "Initial add" files+: [a b], files-: [], files: []
   
   $ cd ..
 
 #if symlink execbit
 
 symlinks and executable files
 
   $ mkdir test-symlinks
   $ cd test-symlinks
   $ bzr init -q source
   $ cd source
   $ touch program
   $ chmod +x program
   $ ln -s program altname
   $ mkdir d
   $ echo a > d/a
   $ ln -s a syma
   $ bzr add -q altname program syma d/a
   $ bzr commit -q -m 'Initial setup'
   $ touch newprog
   $ chmod +x newprog
   $ rm altname
   $ ln -s newprog altname
   $ chmod -x program
   $ bzr add -q newprog
   $ bzr commit -q -m 'Symlink changed, x bits changed'
   $ cd ..
   $ hg convert source source-hg
   initializing destination source-hg repository
   scanning source...
   sorting...
   converting...
   1 Initial setup
   0 Symlink changed, x bits changed
   $ manifest source-hg 0
   % manifest of 0
   644 @ altname
   644   d/a
   755 * program
   644 @ syma
   $ manifest source-hg tip
   % manifest of tip
   644 @ altname
   644   d/a
   755 * newprog
   644   program
   644 @ syma
 
 test the symlinks can be recreated
 
   $ cd source-hg
   $ hg up
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg cat syma; echo
   a
   $ cd ../..
 
 #endif
 
 Multiple branches
 
   $ bzr init-repo -q --no-trees repo
   $ bzr init -q repo/trunk
   $ bzr co repo/trunk repo-trunk
   $ cd repo-trunk
   $ echo a > a
   $ bzr add -q a
   $ bzr ci -qm adda
   $ bzr tag trunk-tag
   Created tag trunk-tag.
   $ bzr switch -b branch
   Tree is up to date at revision 1.
   Switched to branch: *repo/branch/ (glob)
   $ sleep 1
   $ echo b > b
   $ bzr add -q b
   $ bzr ci -qm addb
   $ bzr tag branch-tag
   Created tag branch-tag.
   $ bzr switch --force ../repo/trunk
   Updated to revision 1.
   Switched to branch: */repo/trunk/ (glob)
   $ sleep 1
   $ echo a >> a
   $ bzr ci -qm changea
   $ cd ..
   $ hg convert --datesort repo repo-bzr
   initializing destination repo-bzr repository
   scanning source...
   sorting...
   converting...
   2 adda
   1 addb
   0 changea
   updating tags
   $ (cd repo-bzr; glog)
   o  3@default "update tags" files+: [.hgtags], files-: [], files: []
   |
   o  2@default "changea" files+: [], files-: [], files: [a]
   |
   | o  1@branch "addb" files+: [b], files-: [], files: []
   |/
   o  0@default "adda" files+: [a], files-: [], files: []
   
 
 Test tags (converted identifiers are not stable because bzr ones are
 not and get incorporated in extra fields).
 
   $ hg -R repo-bzr tags
   tip                                3:* (glob)
   branch-tag                         1:* (glob)
   trunk-tag                          0:* (glob)
 
 Nested repositories (issue3254)
 
   $ bzr init-repo -q --no-trees repo/inner
   $ bzr init -q repo/inner/trunk
   $ bzr co repo/inner/trunk inner-trunk
   $ cd inner-trunk
   $ echo b > b
   $ bzr add -q b
   $ bzr ci -qm addb
   $ cd ..
   $ hg convert --datesort repo noinner-bzr
   initializing destination noinner-bzr repository
   scanning source...
   sorting...
   converting...
   2 adda
   1 addb
   0 changea
   updating tags

tests/test-template-keywords.t

@@ -1,1380 +1,1380 b''
 Test template keywords
 ======================
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ hg add a
   $ echo line 1 > b
   $ echo line 2 >> b
   $ hg commit -l b -d '1000000 0' -u 'User Name <user@hostname>'
 
   $ hg add b
   $ echo other 1 > c
   $ echo other 2 >> c
   $ echo >> c
   $ echo other 3 >> c
   $ hg commit -l c -d '1100000 0' -u 'A. N. Other <other@place>'
 
   $ hg add c
   $ hg commit -m 'no person' -d '1200000 0' -u 'other@place'
   $ echo c >> c
   $ hg commit -m 'no user, no domain' -d '1300000 0' -u 'person'
 
   $ echo foo > .hg/branch
   $ hg commit -m 'new branch' -d '1400000 0' -u 'person'
 
   $ hg co -q 3
   $ echo other 4 >> d
   $ hg add d
   $ hg commit -m 'new head' -d '1500000 0' -u 'person'
 
   $ hg merge -q foo
   $ hg commit -m 'merge' -d '1500001 0' -u 'person'
 
 Second branch starting at nullrev:
 
   $ hg update null
   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   $ echo second > second
   $ hg add second
   $ hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
   created new head
 
   $ echo third > third
   $ hg add third
   $ hg mv second fourth
   $ hg commit -m third -d "2020-01-01 10:01"
 
 Working-directory revision has special identifiers, though they are still
 experimental:
 
   $ hg log -r 'wdir()' -T '{rev}:{node}\n'
   2147483647:ffffffffffffffffffffffffffffffffffffffff
 
   $ hg log -r 'wdir()' -Tjson --debug
   [
    {
     "added": [],
     "bookmarks": [],
     "branch": "default",
     "date": [0, 0],
     "desc": "",
     "extra": {"branch": "default"},
     "manifest": "ffffffffffffffffffffffffffffffffffffffff",
     "modified": [],
     "node": "ffffffffffffffffffffffffffffffffffffffff",
     "parents": ["95c24699272ef57d062b8bccc32c878bf841784a"],
     "phase": "draft",
     "removed": [],
     "rev": 2147483647,
     "tags": [],
     "user": "test"
    }
   ]
 
   $ hg log -r 'wdir()' -T '{manifest}\n'
   2147483647:ffffffffffff
 
 However, for negrev, we refuse to output anything (as well as for null)
 
   $ hg log -r 'wdir() + null' -T 'bla{negrev}nk\n'
   blank
   blank
 
 Changectx-derived keywords are disabled within {manifest} as {node} changes:
 
   $ hg log -r0 -T 'outer:{p1node} {manifest % "inner:{p1node}"}\n'
   outer:0000000000000000000000000000000000000000 inner:
 
 Check that {phase} works correctly on parents:
 
   $ cat << EOF > parentphase
   > changeset_debug = '{rev} ({phase}):{parents}\n'
   > parent = ' {rev} ({phase})'
   > EOF
   $ hg phase -r 5 --public
   $ hg phase -r 7 --secret --force
   $ hg log --debug -G --style ./parentphase
   @  8 (secret): 7 (secret) -1 (public)
   |
   o  7 (secret): -1 (public) -1 (public)
   
   o    6 (draft): 5 (public) 4 (draft)
   |\
   | o  5 (public): 3 (public) -1 (public)
   | |
   o |  4 (draft): 3 (public) -1 (public)
   |/
   o  3 (public): 2 (public) -1 (public)
   |
   o  2 (public): 1 (public) -1 (public)
   |
   o  1 (public): 0 (public) -1 (public)
   |
   o  0 (public): -1 (public) -1 (public)
   
 
 Keys work:
 
   $ for key in author branch branches date desc file_adds file_dels file_mods \
   >         file_copies file_copies_switch files \
   >         manifest node parents rev tags diffstat extras \
   >         p1rev p2rev p1node p2node user; do
   >     for mode in '' --verbose --debug; do
   >         hg log $mode --template "$key$mode: {$key}\n"
   >     done
   > done
   author: test
   author: User Name <user@hostname>
   author: person
   author: person
   author: person
   author: person
   author: other@place
   author: A. N. Other <other@place>
   author: User Name <user@hostname>
   author--verbose: test
   author--verbose: User Name <user@hostname>
   author--verbose: person
   author--verbose: person
   author--verbose: person
   author--verbose: person
   author--verbose: other@place
   author--verbose: A. N. Other <other@place>
   author--verbose: User Name <user@hostname>
   author--debug: test
   author--debug: User Name <user@hostname>
   author--debug: person
   author--debug: person
   author--debug: person
   author--debug: person
   author--debug: other@place
   author--debug: A. N. Other <other@place>
   author--debug: User Name <user@hostname>
   branch: default
   branch: default
   branch: default
   branch: default
   branch: foo
   branch: default
   branch: default
   branch: default
   branch: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: foo
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--verbose: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: foo
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branch--debug: default
   branches: 
   branches: 
   branches: 
   branches: 
   branches: foo
   branches: 
   branches: 
   branches: 
   branches: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: foo
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--verbose: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: foo
   branches--debug: 
   branches--debug: 
   branches--debug: 
   branches--debug: 
   date: 1577872860.00
   date: 1000000.00
   date: 1500001.00
   date: 1500000.00
   date: 1400000.00
   date: 1300000.00
   date: 1200000.00
   date: 1100000.00
   date: 1000000.00
   date--verbose: 1577872860.00
   date--verbose: 1000000.00
   date--verbose: 1500001.00
   date--verbose: 1500000.00
   date--verbose: 1400000.00
   date--verbose: 1300000.00
   date--verbose: 1200000.00
   date--verbose: 1100000.00
   date--verbose: 1000000.00
   date--debug: 1577872860.00
   date--debug: 1000000.00
   date--debug: 1500001.00
   date--debug: 1500000.00
   date--debug: 1400000.00
   date--debug: 1300000.00
   date--debug: 1200000.00
   date--debug: 1100000.00
   date--debug: 1000000.00
   desc: third
   desc: second
   desc: merge
   desc: new head
   desc: new branch
   desc: no user, no domain
   desc: no person
   desc: other 1
   other 2
   
   other 3
   desc: line 1
   line 2
   desc--verbose: third
   desc--verbose: second
   desc--verbose: merge
   desc--verbose: new head
   desc--verbose: new branch
   desc--verbose: no user, no domain
   desc--verbose: no person
   desc--verbose: other 1
   other 2
   
   other 3
   desc--verbose: line 1
   line 2
   desc--debug: third
   desc--debug: second
   desc--debug: merge
   desc--debug: new head
   desc--debug: new branch
   desc--debug: no user, no domain
   desc--debug: no person
   desc--debug: other 1
   other 2
   
   other 3
   desc--debug: line 1
   line 2
   file_adds: fourth third
   file_adds: second
   file_adds: 
   file_adds: d
   file_adds: 
   file_adds: 
   file_adds: c
   file_adds: b
   file_adds: a
   file_adds--verbose: fourth third
   file_adds--verbose: second
   file_adds--verbose: 
   file_adds--verbose: d
   file_adds--verbose: 
   file_adds--verbose: 
   file_adds--verbose: c
   file_adds--verbose: b
   file_adds--verbose: a
   file_adds--debug: fourth third
   file_adds--debug: second
   file_adds--debug: 
   file_adds--debug: d
   file_adds--debug: 
   file_adds--debug: 
   file_adds--debug: c
   file_adds--debug: b
   file_adds--debug: a
   file_dels: second
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels: 
   file_dels--verbose: second
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--verbose: 
   file_dels--debug: second
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_dels--debug: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods: c
   file_mods: 
   file_mods: 
   file_mods: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: c
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--verbose: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: c
   file_mods--debug: 
   file_mods--debug: 
   file_mods--debug: 
   file_copies: fourth (second)
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies: 
   file_copies--verbose: fourth (second)
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--verbose: 
   file_copies--debug: fourth (second)
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies--debug: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--verbose: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   file_copies_switch--debug: 
   files: fourth second third
   files: second
   files: 
   files: d
   files: 
   files: c
   files: c
   files: b
   files: a
   files--verbose: fourth second third
   files--verbose: second
   files--verbose: 
   files--verbose: d
   files--verbose: 
   files--verbose: c
   files--verbose: c
   files--verbose: b
   files--verbose: a
   files--debug: fourth second third
   files--debug: second
   files--debug: 
   files--debug: d
   files--debug: 
   files--debug: c
   files--debug: c
   files--debug: b
   files--debug: a
   manifest: 6:94961b75a2da
   manifest: 5:f2dbc354b94e
   manifest: 4:4dc3def4f9b4
   manifest: 4:4dc3def4f9b4
   manifest: 3:cb5a1327723b
   manifest: 3:cb5a1327723b
   manifest: 2:6e0e82995c35
   manifest: 1:4e8d705b1e53
   manifest: 0:a0c8bcbbb45c
   manifest--verbose: 6:94961b75a2da
   manifest--verbose: 5:f2dbc354b94e
   manifest--verbose: 4:4dc3def4f9b4
   manifest--verbose: 4:4dc3def4f9b4
   manifest--verbose: 3:cb5a1327723b
   manifest--verbose: 3:cb5a1327723b
   manifest--verbose: 2:6e0e82995c35
   manifest--verbose: 1:4e8d705b1e53
   manifest--verbose: 0:a0c8bcbbb45c
   manifest--debug: 6:94961b75a2da554b4df6fb599e5bfc7d48de0c64
   manifest--debug: 5:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
   manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
   manifest--debug: 4:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
   manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
   manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
   manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
   manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
   node: 95c24699272ef57d062b8bccc32c878bf841784a
   node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node: 13207e5a10d9fd28ec424934298e176197f2c67f
   node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node: 97054abb4ab824450e9164180baf491ae0078465
   node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node: 1e4e1b8f71e05681d422154f5421e385fec3454f
   node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a
   node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node--verbose: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
   node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node--verbose: 97054abb4ab824450e9164180baf491ae0078465
   node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
   node--debug: 95c24699272ef57d062b8bccc32c878bf841784a
   node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   node--debug: d41e714fe50d9e4a5f11b4d595d543481b5f980b
   node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
   node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   node--debug: 97054abb4ab824450e9164180baf491ae0078465
   node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
   parents: 
   parents: -1:000000000000 
   parents: 5:13207e5a10d9 4:bbe44766e73d 
   parents: 3:10e46f2dcbf4 
   parents: 
   parents: 
   parents: 
   parents: 
   parents: 
   parents--verbose: 
   parents--verbose: -1:000000000000 
   parents--verbose: 5:13207e5a10d9 4:bbe44766e73d 
   parents--verbose: 3:10e46f2dcbf4 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--verbose: 
   parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 
   parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
   parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:bbe44766e73d5f11ed2177f1838de10c53ef3e74 
   parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
   parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 
   parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 
   parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 
   parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 
   parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 
   rev: 8
   rev: 7
   rev: 6
   rev: 5
   rev: 4
   rev: 3
   rev: 2
   rev: 1
   rev: 0
   rev--verbose: 8
   rev--verbose: 7
   rev--verbose: 6
   rev--verbose: 5
   rev--verbose: 4
   rev--verbose: 3
   rev--verbose: 2
   rev--verbose: 1
   rev--verbose: 0
   rev--debug: 8
   rev--debug: 7
   rev--debug: 6
   rev--debug: 5
   rev--debug: 4
   rev--debug: 3
   rev--debug: 2
   rev--debug: 1
   rev--debug: 0
   tags: tip
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags: 
   tags--verbose: tip
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--verbose: 
   tags--debug: tip
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   tags--debug: 
   diffstat: 3: +2/-1
   diffstat: 1: +1/-0
   diffstat: 0: +0/-0
   diffstat: 1: +1/-0
   diffstat: 0: +0/-0
   diffstat: 1: +1/-0
   diffstat: 1: +4/-0
   diffstat: 1: +2/-0
   diffstat: 1: +1/-0
   diffstat--verbose: 3: +2/-1
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 0: +0/-0
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 0: +0/-0
   diffstat--verbose: 1: +1/-0
   diffstat--verbose: 1: +4/-0
   diffstat--verbose: 1: +2/-0
   diffstat--verbose: 1: +1/-0
   diffstat--debug: 3: +2/-1
   diffstat--debug: 1: +1/-0
   diffstat--debug: 0: +0/-0
   diffstat--debug: 1: +1/-0
   diffstat--debug: 0: +0/-0
   diffstat--debug: 1: +1/-0
   diffstat--debug: 1: +4/-0
   diffstat--debug: 1: +2/-0
   diffstat--debug: 1: +1/-0
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=foo
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=foo
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--verbose: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=foo
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   extras--debug: branch=default
   p1rev: 7
   p1rev: -1
   p1rev: 5
   p1rev: 3
   p1rev: 3
   p1rev: 2
   p1rev: 1
   p1rev: 0
   p1rev: -1
   p1rev--verbose: 7
   p1rev--verbose: -1
   p1rev--verbose: 5
   p1rev--verbose: 3
   p1rev--verbose: 3
   p1rev--verbose: 2
   p1rev--verbose: 1
   p1rev--verbose: 0
   p1rev--verbose: -1
   p1rev--debug: 7
   p1rev--debug: -1
   p1rev--debug: 5
   p1rev--debug: 3
   p1rev--debug: 3
   p1rev--debug: 2
   p1rev--debug: 1
   p1rev--debug: 0
   p1rev--debug: -1
   p2rev: -1
   p2rev: -1
   p2rev: 4
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: 4
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--verbose: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: 4
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p2rev--debug: -1
   p1node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node: 0000000000000000000000000000000000000000
   p1node: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node: 97054abb4ab824450e9164180baf491ae0078465
   p1node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node: 0000000000000000000000000000000000000000
   p1node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node--verbose: 0000000000000000000000000000000000000000
   p1node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--verbose: 97054abb4ab824450e9164180baf491ae0078465
   p1node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node--verbose: 0000000000000000000000000000000000000000
   p1node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
   p1node--debug: 0000000000000000000000000000000000000000
   p1node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
   p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
   p1node--debug: 97054abb4ab824450e9164180baf491ae0078465
   p1node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
   p1node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
   p1node--debug: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--verbose: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: bbe44766e73d5f11ed2177f1838de10c53ef3e74
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   p2node--debug: 0000000000000000000000000000000000000000
   user: test
   user: User Name <user@hostname>
   user: person
   user: person
   user: person
   user: person
   user: other@place
   user: A. N. Other <other@place>
   user: User Name <user@hostname>
   user--verbose: test
   user--verbose: User Name <user@hostname>
   user--verbose: person
   user--verbose: person
   user--verbose: person
   user--verbose: person
   user--verbose: other@place
   user--verbose: A. N. Other <other@place>
   user--verbose: User Name <user@hostname>
   user--debug: test
   user--debug: User Name <user@hostname>
   user--debug: person
   user--debug: person
   user--debug: person
   user--debug: person
   user--debug: other@place
   user--debug: A. N. Other <other@place>
   user--debug: User Name <user@hostname>
 
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a
   $ hg add a
   $ hg ci -m future
 
 Add a commit that does all possible modifications at once
 
   $ echo modify >> third
   $ touch b
   $ hg add b
   $ hg mv fourth fifth
   $ hg rm a
   $ hg ci -m "Modify, add, remove, rename"
 
 Test files list:
 
   $ hg log -l1 -T '{join(file_mods, " ")}\n'
   third
   $ hg log -l1 -T '{file_mods % "{file}\n"}'
   third
   $ hg log -l1 -T '{file_mods % "{path}\n"}'
   third
 
   $ hg log -l1 -T '{join(files, " ")}\n'
   a b fifth fourth third
   $ hg log -l1 -T '{files % "{file}\n"}'
   a
   b
   fifth
   fourth
   third
   $ hg log -l1 -T '{files % "{path}\n"}'
   a
   b
   fifth
   fourth
   third
 
 Test files lists on merge commit:
 
   $ hg co '.^' -q
   $ touch c
   $ hg add c
   $ hg ci -qm 'add file'
   $ hg merge 10 -q
   $ hg ci -m 'merge'
   $ hg log -l1 -T '{files}\n'
   a fourth
   $ hg log -l1 -T '{file_mods}\n'
-  third
+  
   $ hg log -l1 -T '{file_adds}\n'
-  b fifth
+  
   $ hg log -l1 -T '{file_dels}\n'
   a fourth
 
 Test file copies dict:
 
   $ hg log -r8 -T '{join(file_copies, " ")}\n'
   fourth (second)
   $ hg log -r8 -T '{file_copies % "{name} <- {source}\n"}'
   fourth <- second
   $ hg log -r8 -T '{file_copies % "{path} <- {source}\n"}'
   fourth <- second
 
   $ hg log -r8 -T '{join(file_copies_switch, " ")}\n'
   
   $ hg log -r8 -C -T '{join(file_copies_switch, " ")}\n'
   fourth (second)
   $ hg log -r8 -C -T '{file_copies_switch % "{name} <- {source}\n"}'
   fourth <- second
   $ hg log -r8 -C -T '{file_copies_switch % "{path} <- {source}\n"}'
   fourth <- second
 
 Test file attributes:
 
   $ hg log -r10 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}'
   R     a
   A   0 b
   A   7 fifth
   R     fourth
   M  13 third
 
 Test file status including clean ones:
 
   $ hg log -r9 -T '{files("**") % "{status} {path}\n"}'
   A a
   C fourth
   C third
 
 Test index keyword:
 
   $ hg log -r 10:9 -T '{index + 10}{files % " {index}:{file}"}\n'
   10 0:a 1:b 2:fifth 3:fourth 4:third
   11 0:a
 
   $ hg branches -T '{index} {branch}\n'
   0 default
   1 foo
 
 p1/p2 keywords:
 
   $ hg log -r4:7 -GT '{rev} p1:{p1} p2:{p2} p1.rev:{p1.rev} p2.node:{p2.node}\n'
   o  7 p1:-1:000000000000 p2:-1:000000000000 p1.rev:-1 p2.node:0000000000000000000000000000000000000000
   
   o    6 p1:5:13207e5a10d9 p2:4:bbe44766e73d p1.rev:5 p2.node:bbe44766e73d5f11ed2177f1838de10c53ef3e74
   |\
   | o  5 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
   | |
   | ~
   o  4 p1:3:10e46f2dcbf4 p2:-1:000000000000 p1.rev:3 p2.node:0000000000000000000000000000000000000000
   |
   ~
 
 TODO: no idea what should be displayed as a JSON representation
   $ hg log -r6 -T 'p1:{p1|json}\np2:{p2|json}\n'
   p1:{}
   p2:{}
 
 ui verbosity:
 
   $ hg log -l1 -T '{verbosity}\n'
   
   $ hg log -l1 -T '{verbosity}\n' --debug
   debug
   $ hg log -l1 -T '{verbosity}\n' --quiet
   quiet
   $ hg log -l1 -T '{verbosity}\n' --verbose
   verbose
 
   $ cd ..
 
 latesttag:
 
   $ hg init latesttag
   $ cd latesttag
 
   $ echo a > file
   $ hg ci -Am a -d '0 0'
   adding file
 
   $ echo b >> file
   $ hg ci -m b -d '1 0'
 
   $ echo c >> head1
   $ hg ci -Am h1c -d '2 0'
   adding head1
 
   $ hg update -q 1
   $ echo d >> head2
   $ hg ci -Am h2d -d '3 0'
   adding head2
   created new head
 
   $ echo e >> head2
   $ hg ci -m h2e -d '4 0'
 
   $ hg merge -q
   $ hg ci -m merge -d '5 -3600'
 
 No tag set:
 
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @    5: null+5
   |\
   | o  4: null+4
   | |
   | o  3: null+3
   | |
   o |  2: null+3
   |/
   o  1: null+2
   |
   o  0: null+1
   
 
 One common tag: longest path wins for {latesttagdistance}:
 
   $ hg tag -r 1 -m t1 -d '6 0' t1
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  6: t1+4
   |
   o    5: t1+3
   |\
   | o  4: t1+2
   | |
   | o  3: t1+1
   | |
   o |  2: t1+1
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 One ancestor tag: closest wins:
 
   $ hg tag -r 2 -m t2 -d '7 0' t2
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  7: t2+3
   |
   o  6: t2+2
   |
   o    5: t2+1
   |\
   | o  4: t1+2
   | |
   | o  3: t1+1
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 Two branch tags: more recent wins if same number of changes:
 
   $ hg tag -r 3 -m t3 -d '8 0' t3
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  8: t3+5
   |
   o  7: t3+4
   |
   o  6: t3+3
   |
   o    5: t3+2
   |\
   | o  4: t3+1
   | |
   | o  3: t3+0
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
 Two branch tags: fewest changes wins:
 
   $ hg tag -r 4 -m t4 -d '4 0' t4 # older than t2, but should not matter
   $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   @  9: t4+5,6
   |
   o  8: t4+4,5
   |
   o  7: t4+3,4
   |
   o  6: t4+2,3
   |
   o    5: t4+1,2
   |\
   | o  4: t4+0,0
   | |
   | o  3: t3+0,0
   | |
   o |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
 Merged tag overrides:
 
   $ hg tag -r 5 -m t5 -d '9 0' t5
   $ hg tag -r 3 -m at3 -d '10 0' at3
   $ hg log -G --template '{rev}: {latesttag}+{latesttagdistance}\n'
   @  11: t5+6
   |
   o  10: t5+5
   |
   o  9: t5+4
   |
   o  8: t5+3
   |
   o  7: t5+2
   |
   o  6: t5+1
   |
   o    5: t5+0
   |\
   | o  4: t4+0
   | |
   | o  3: at3:t3+0
   | |
   o |  2: t2+0
   |/
   o  1: t1+0
   |
   o  0: null+1
   
 
   $ hg log -G --template "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   @  11: t5+6,6
   |
   o  10: t5+5,5
   |
   o  9: t5+4,4
   |
   o  8: t5+3,3
   |
   o  7: t5+2,2
   |
   o  6: t5+1,1
   |
   o    5: t5+0,0
   |\
   | o  4: t4+0,0
   | |
   | o  3: at3+0,0 t3+0,0
   | |
   o |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
 Tags of working-directory parents (issue6055):
 
   $ hg update -q 3
   $ echo a > head3
   $ hg ci -qAm h3a
   $ hg merge -q 2
   $ hg log -Gr'::wdir()' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   o    2147483647: at3+2,3 t3+2,3
   |\
   | @  12: at3+1,1 t3+1,1
   | |
   | o  3: at3+0,0 t3+0,0
   | |
   @ |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
   $ hg ci -m merge
   $ hg log -Gr'::.' -T "{rev}: {latesttag % '{tag}+{distance},{changes} '}\n"
   @    13: at3+2,3 t3+2,3
   |\
   | o  12: at3+1,1 t3+1,1
   | |
   | o  3: at3+0,0 t3+0,0
   | |
   o |  2: t2+0,0
   |/
   o  1: t1+0,0
   |
   o  0: null+1,1
   
 
   $ cd ..
 
 Set up repository containing template fragments in commit metadata:
 
   $ hg init r
   $ cd r
   $ echo a > a
   $ hg ci -Am '{rev}'
   adding a
 
   $ hg branch -q 'text.{rev}'
   $ echo aa >> aa
   $ hg ci -u '{node|short}' -m 'desc to be wrapped desc to be wrapped'
 
 Test termwidth:
 
   $ COLUMNS=25 hg log -l1 --template '{fill(desc, termwidth, "{node|short}:", "termwidth.{rev}:")}'
   bcc7ff960b8e:desc to be
   termwidth.1:wrapped desc
   termwidth.1:to be wrapped (no-eol)
 
 Just one more commit:
 
   $ echo b > b
   $ hg ci -qAm b
 
 Test 'originalnode'
 
   $ hg log -r 1 -T '{revset("null") % "{node|short} {originalnode|short}"}\n'
   000000000000 bcc7ff960b8e
   $ hg log -r 0 -T '{manifest % "{node} {originalnode}"}\n'
   a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 f7769ec2ab975ad19684098ad1ffd9b81ecc71a1
 
 Test active bookmark templating
 
   $ hg book foo
   $ hg book bar
   $ hg log --template "{rev} {bookmarks % '{bookmark}{ifeq(bookmark, active, \"*\")} '}\n"
   2 bar* foo 
   1 
   0 
   $ hg log --template "{rev} {activebookmark}\n"
   2 bar
   1 
   0 
   $ hg bookmarks --inactive bar
   $ hg log --template "{rev} {activebookmark}\n"
   2 
   1 
   0 
   $ hg book -r1 baz
   $ hg log --template "{rev} {join(bookmarks, ' ')}\n"
   2 bar foo
   1 baz
   0 
   $ hg log --template "{rev} {ifcontains('foo', bookmarks, 't', 'f')}\n"
   2 t
   1 f
   0 f
 
 Test namespaces dict
 
   $ hg --config extensions.revnamesext=$TESTDIR/revnamesext.py log -T '{rev}\n{namespaces % " {namespace} color={colorname} builtin={builtin}\n  {join(names, ",")}\n"}\n'
   2
    bookmarks color=bookmark builtin=True
     bar,foo
    tags color=tag builtin=True
     tip
    branches color=branch builtin=True
     text.{rev}
    revnames color=revname builtin=False
     r2
   
   1
    bookmarks color=bookmark builtin=True
     baz
    tags color=tag builtin=True
     
    branches color=branch builtin=True
     text.{rev}
    revnames color=revname builtin=False
     r1
   
   0
    bookmarks color=bookmark builtin=True
     
    tags color=tag builtin=True
     
    branches color=branch builtin=True
     default
    revnames color=revname builtin=False
     r0
   
   $ hg log -r2 -T '{namespaces % "{namespace}: {names}\n"}'
   bookmarks: bar foo
   tags: tip
   branches: text.{rev}
   $ hg log -r2 -T '{namespaces % "{namespace}:\n{names % " {name}\n"}"}'
   bookmarks:
    bar
    foo
   tags:
    tip
   branches:
    text.{rev}
   $ hg log -r2 -T '{get(namespaces, "bookmarks") % "{name}\n"}'
   bar
   foo
   $ hg log -r2 -T '{namespaces.bookmarks % "{bookmark}\n"}'
   bar
   foo
 
   $ cd ..
 
 Test 'graphwidth' in 'hg log' on various topologies. The key here is that the
 printed graphwidths 3, 5, 7, etc. should all line up in their respective
 columns. We don't care about other aspects of the graph rendering here.
 
   $ hg init graphwidth
   $ cd graphwidth
 
   $ wrappabletext="a a a a a a a a a a a a"
 
   $ printf "first\n" > file
   $ hg add file
   $ hg commit -m "$wrappabletext"
 
   $ printf "first\nsecond\n" > file
   $ hg commit -m "$wrappabletext"
 
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ printf "third\nfirst\n" > file
   $ hg commit -m "$wrappabletext"
   created new head
 
   $ hg merge
   merging file
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   | @  5
   |/
   o  3
   
   $ hg commit -m "$wrappabletext"
 
   $ hg log --graph -T "{graphwidth}"
   @    5
   |\
   | o  5
   | |
   o |  5
   |/
   o  3
   
 
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ printf "third\nfirst\nsecond\n" > file
   $ hg commit -m "$wrappabletext"
   created new head
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   | o    7
   | |\
   +---o  7
   | |
   | o  5
   |/
   o  3
   
 
   $ hg log --graph -T "{graphwidth}" -r 3
   o    5
   |\
   ~ ~
 
   $ hg log --graph -T "{graphwidth}" -r 1
   o  3
   |
   ~
 
   $ hg merge
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg commit -m "$wrappabletext"
 
   $ printf "seventh\n" >> file
   $ hg commit -m "$wrappabletext"
 
   $ hg log --graph -T "{graphwidth}"
   @  3
   |
   o    5
   |\
   | o  5
   | |
   o |    7
   |\ \
   | o |  7
   | |/
   o /  5
   |/
   o  3
   
 
 The point of graphwidth is to allow wrapping that accounts for the space taken
 by the graph.
 
   $ COLUMNS=10 hg log --graph -T "{fill(desc, termwidth - graphwidth)}"
   @  a a a a
   |  a a a a
   |  a a a a
   o    a a a
   |\   a a a
   | |  a a a
   | |  a a a
   | o  a a a
   | |  a a a
   | |  a a a
   | |  a a a
   o |    a a
   |\ \   a a
   | | |  a a
   | | |  a a
   | | |  a a
   | | |  a a
   | o |  a a
   | |/   a a
   | |    a a
   | |    a a
   | |    a a
   | |    a a
   o |  a a a
   |/   a a a
   |    a a a
   |    a a a
   o  a a a a
      a a a a
      a a a a
 
 Something tricky happens when there are elided nodes; the next drawn row of
 edges can be more than one column wider, but the graph width only increases by
 one column. The remaining columns are added in between the nodes.
 
   $ hg log --graph -T "{graphwidth}" -r "0|2|4|5"
   o    5
   |\
   | \
   | :\
   o : :  7
   :/ /
   : o  5
   :/
   o  3
   
 
   $ cd ..