templatekw: fix extras, manifest and showlist args (issue1989)

Removing the explicit parameters from keywords signature is easier than copying
and reproducing the original argument list.

mercurial/cmdutil.py

@@ -1,1173 +1,1174
 # cmdutil.py - help for command processing in mercurial
 #
 # 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, incorporated herein by reference.
 
 from node import hex, nullid, nullrev, short
 from i18n import _
 import os, sys, errno, re, glob, tempfile, time
 import mdiff, bdiff, util, templater, patch, error, encoding, templatekw
 import match as _match
 
 revrangesep = ':'
 
 def findpossible(cmd, table, strict=False):
     """
     Return cmd -> (aliases, command table entry)
     for each matching command.
     Return debug commands (or their aliases) only if no normal command matches.
     """
     choice = {}
     debugchoice = {}
     for e in table.keys():
         aliases = e.lstrip("^").split("|")
         found = None
         if cmd in aliases:
             found = cmd
         elif not strict:
             for a in aliases:
                 if a.startswith(cmd):
                     found = a
                     break
         if found is not None:
             if aliases[0].startswith("debug") or found.startswith("debug"):
                 debugchoice[found] = (aliases, table[e])
             else:
                 choice[found] = (aliases, table[e])
 
     if not choice and debugchoice:
         choice = debugchoice
 
     return choice
 
 def findcmd(cmd, table, strict=True):
     """Return (aliases, command table entry) for command string."""
     choice = findpossible(cmd, table, strict)
 
     if cmd in choice:
         return choice[cmd]
 
     if len(choice) > 1:
         clist = choice.keys()
         clist.sort()
         raise error.AmbiguousCommand(cmd, clist)
 
     if choice:
         return choice.values()[0]
 
     raise error.UnknownCommand(cmd)
 
 def bail_if_changed(repo):
     if repo.dirstate.parents()[1] != nullid:
         raise util.Abort(_('outstanding uncommitted merge'))
     modified, added, removed, deleted = repo.status()[:4]
     if modified or added or removed or deleted:
         raise util.Abort(_("outstanding uncommitted changes"))
 
 def logmessage(opts):
     """ get the log message according to -m and -l option """
     message = opts.get('message')
     logfile = opts.get('logfile')
 
     if message and logfile:
         raise util.Abort(_('options --message and --logfile are mutually '
                            'exclusive'))
     if not message and logfile:
         try:
             if logfile == '-':
                 message = sys.stdin.read()
             else:
                 message = open(logfile).read()
         except IOError, inst:
             raise util.Abort(_("can't read commit message '%s': %s") %
                              (logfile, inst.strerror))
     return message
 
 def loglimit(opts):
     """get the log limit according to option -l/--limit"""
     limit = opts.get('limit')
     if limit:
         try:
             limit = int(limit)
         except ValueError:
             raise util.Abort(_('limit must be a positive integer'))
         if limit <= 0: raise util.Abort(_('limit must be positive'))
     else:
         limit = None
     return limit
 
 def remoteui(src, opts):
     'build a remote ui from ui or repo and opts'
     if hasattr(src, 'baseui'): # looks like a repository
         dst = src.baseui.copy() # drop repo-specific config
         src = src.ui # copy target options from repo
     else: # assume it's a global ui object
         dst = src.copy() # keep all global options
 
     # copy ssh-specific options
     for o in 'ssh', 'remotecmd':
         v = opts.get(o) or src.config('ui', o)
         if v:
             dst.setconfig("ui", o, v)
 
     # copy bundle-specific options
     r = src.config('bundle', 'mainreporoot')
     if r:
         dst.setconfig('bundle', 'mainreporoot', r)
 
     # copy auth section settings
     for key, val in src.configitems('auth'):
         dst.setconfig('auth', key, val)
 
     return dst
 
 def revpair(repo, revs):
     '''return pair of nodes, given list of revisions. second item can
     be None, meaning use working dir.'''
 
     def revfix(repo, val, defval):
         if not val and val != 0 and defval is not None:
             val = defval
         return repo.lookup(val)
 
     if not revs:
         return repo.dirstate.parents()[0], None
     end = None
     if len(revs) == 1:
         if revrangesep in revs[0]:
             start, end = revs[0].split(revrangesep, 1)
             start = revfix(repo, start, 0)
             end = revfix(repo, end, len(repo) - 1)
         else:
             start = revfix(repo, revs[0], None)
     elif len(revs) == 2:
         if revrangesep in revs[0] or revrangesep in revs[1]:
             raise util.Abort(_('too many revisions specified'))
         start = revfix(repo, revs[0], None)
         end = revfix(repo, revs[1], None)
     else:
         raise util.Abort(_('too many revisions specified'))
     return start, end
 
 def revrange(repo, revs):
     """Yield revision as strings from a list of revision specifications."""
 
     def revfix(repo, val, defval):
         if not val and val != 0 and defval is not None:
             return defval
         return repo.changelog.rev(repo.lookup(val))
 
     seen, l = set(), []
     for spec in revs:
         if revrangesep in spec:
             start, end = spec.split(revrangesep, 1)
             start = revfix(repo, start, 0)
             end = revfix(repo, end, len(repo) - 1)
             step = start > end and -1 or 1
             for rev in xrange(start, end+step, step):
                 if rev in seen:
                     continue
                 seen.add(rev)
                 l.append(rev)
         else:
             rev = revfix(repo, spec, None)
             if rev in seen:
                 continue
             seen.add(rev)
             l.append(rev)
 
     return l
 
 def make_filename(repo, pat, node,
                   total=None, seqno=None, revwidth=None, pathname=None):
     node_expander = {
         'H': lambda: hex(node),
         'R': lambda: str(repo.changelog.rev(node)),
         'h': lambda: short(node),
         }
     expander = {
         '%': lambda: '%',
         'b': lambda: os.path.basename(repo.root),
         }
 
     try:
         if node:
             expander.update(node_expander)
         if node:
             expander['r'] = (lambda:
                     str(repo.changelog.rev(node)).zfill(revwidth or 0))
         if total is not None:
             expander['N'] = lambda: str(total)
         if seqno is not None:
             expander['n'] = lambda: str(seqno)
         if total is not None and seqno is not None:
             expander['n'] = lambda: str(seqno).zfill(len(str(total)))
         if pathname is not None:
             expander['s'] = lambda: os.path.basename(pathname)
             expander['d'] = lambda: os.path.dirname(pathname) or '.'
             expander['p'] = lambda: pathname
 
         newname = []
         patlen = len(pat)
         i = 0
         while i < patlen:
             c = pat[i]
             if c == '%':
                 i += 1
                 c = pat[i]
                 c = expander[c]()
             newname.append(c)
             i += 1
         return ''.join(newname)
     except KeyError, inst:
         raise util.Abort(_("invalid format spec '%%%s' in output filename") %
                          inst.args[0])
 
 def make_file(repo, pat, node=None,
               total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
 
     writable = 'w' in mode or 'a' in mode
 
     if not pat or pat == '-':
         return writable and sys.stdout or sys.stdin
     if hasattr(pat, 'write') and writable:
         return pat
     if hasattr(pat, 'read') and 'r' in mode:
         return pat
     return open(make_filename(repo, pat, node, total, seqno, revwidth,
                               pathname),
                 mode)
 
 def expandpats(pats):
     if not util.expandglobs:
         return list(pats)
     ret = []
     for p in pats:
         kind, name = _match._patsplit(p, None)
         if kind is None:
             try:
                 globbed = glob.glob(name)
             except re.error:
                 globbed = [name]
             if globbed:
                 ret.extend(globbed)
                 continue
         ret.append(p)
     return ret
 
 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
     if not globbed and default == 'relpath':
         pats = expandpats(pats or [])
     m = _match.match(repo.root, repo.getcwd(), pats,
                     opts.get('include'), opts.get('exclude'), default)
     def badfn(f, msg):
         repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
     m.bad = badfn
     return m
 
 def matchall(repo):
     return _match.always(repo.root, repo.getcwd())
 
 def matchfiles(repo, files):
     return _match.exact(repo.root, repo.getcwd(), files)
 
 def findrenames(repo, added, removed, threshold):
     '''find renamed files -- yields (before, after, score) tuples'''
     copies = {}
     ctx = repo['.']
     for r in removed:
         if r not in ctx:
             continue
         fctx = ctx.filectx(r)
 
         def score(text):
             if not len(text):
                 return 0.0
             if not fctx.cmp(text):
                 return 1.0
             if threshold == 1.0:
                 return 0.0
             orig = fctx.data()
             # bdiff.blocks() returns blocks of matching lines
             # count the number of bytes in each
             equal = 0
             alines = mdiff.splitnewlines(text)
             matches = bdiff.blocks(text, orig)
             for x1, x2, y1, y2 in matches:
                 for line in alines[x1:x2]:
                     equal += len(line)
 
             lengths = len(text) + len(orig)
             return equal * 2.0 / lengths
 
         for a in added:
             bestscore = copies.get(a, (None, threshold))[1]
             myscore = score(repo.wread(a))
             if myscore >= bestscore:
                 copies[a] = (r, myscore)
 
     for dest, v in copies.iteritems():
         source, score = v
         yield source, dest, score
 
 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
     if dry_run is None:
         dry_run = opts.get('dry_run')
     if similarity is None:
         similarity = float(opts.get('similarity') or 0)
     # we'd use status here, except handling of symlinks and ignore is tricky
     added, unknown, deleted, removed = [], [], [], []
     audit_path = util.path_auditor(repo.root)
     m = match(repo, pats, opts)
     for abs in repo.walk(m):
         target = repo.wjoin(abs)
         good = True
         try:
             audit_path(abs)
         except:
             good = False
         rel = m.rel(abs)
         exact = m.exact(abs)
         if good and abs not in repo.dirstate:
             unknown.append(abs)
             if repo.ui.verbose or not exact:
                 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
         elif repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
             or (os.path.isdir(target) and not os.path.islink(target))):
             deleted.append(abs)
             if repo.ui.verbose or not exact:
                 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
         # for finding renames
         elif repo.dirstate[abs] == 'r':
             removed.append(abs)
         elif repo.dirstate[abs] == 'a':
             added.append(abs)
     if not dry_run:
         repo.remove(deleted)
         repo.add(unknown)
     if similarity > 0:
         for old, new, score in findrenames(repo, added + unknown,
                                            removed + deleted, similarity):
             if repo.ui.verbose or not m.exact(old) or not m.exact(new):
                 repo.ui.status(_('recording removal of %s as rename to %s '
                                  '(%d%% similar)\n') %
                                (m.rel(old), m.rel(new), score * 100))
             if not dry_run:
                 repo.copy(old, new)
 
 def copy(ui, repo, pats, opts, rename=False):
     # called with the repo lock held
     #
     # hgsep => pathname that uses "/" to separate directories
     # ossep => pathname that uses os.sep to separate directories
     cwd = repo.getcwd()
     targets = {}
     after = opts.get("after")
     dryrun = opts.get("dry_run")
 
     def walkpat(pat):
         srcs = []
         m = match(repo, [pat], opts, globbed=True)
         for abs in repo.walk(m):
             state = repo.dirstate[abs]
             rel = m.rel(abs)
             exact = m.exact(abs)
             if state in '?r':
                 if exact and state == '?':
                     ui.warn(_('%s: not copying - file is not managed\n') % rel)
                 if exact and state == 'r':
                     ui.warn(_('%s: not copying - file has been marked for'
                               ' remove\n') % rel)
                 continue
             # abs: hgsep
             # rel: ossep
             srcs.append((abs, rel, exact))
         return srcs
 
     # abssrc: hgsep
     # relsrc: ossep
     # otarget: ossep
     def copyfile(abssrc, relsrc, otarget, exact):
         abstarget = util.canonpath(repo.root, cwd, otarget)
         reltarget = repo.pathto(abstarget, cwd)
         target = repo.wjoin(abstarget)
         src = repo.wjoin(abssrc)
         state = repo.dirstate[abstarget]
 
         # check for collisions
         prevsrc = targets.get(abstarget)
         if prevsrc is not None:
             ui.warn(_('%s: not overwriting - %s collides with %s\n') %
                     (reltarget, repo.pathto(abssrc, cwd),
                      repo.pathto(prevsrc, cwd)))
             return
 
         # check for overwrites
         exists = os.path.exists(target)
         if not after and exists or after and state in 'mn':
             if not opts['force']:
                 ui.warn(_('%s: not overwriting - file exists\n') %
                         reltarget)
                 return
 
         if after:
             if not exists:
                 return
         elif not dryrun:
             try:
                 if exists:
                     os.unlink(target)
                 targetdir = os.path.dirname(target) or '.'
                 if not os.path.isdir(targetdir):
                     os.makedirs(targetdir)
                 util.copyfile(src, target)
             except IOError, inst:
                 if inst.errno == errno.ENOENT:
                     ui.warn(_('%s: deleted in working copy\n') % relsrc)
                 else:
                     ui.warn(_('%s: cannot copy - %s\n') %
                             (relsrc, inst.strerror))
                     return True # report a failure
 
         if ui.verbose or not exact:
             if rename:
                 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
             else:
                 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
 
         targets[abstarget] = abssrc
 
         # fix up dirstate
         origsrc = repo.dirstate.copied(abssrc) or abssrc
         if abstarget == origsrc: # copying back a copy?
             if state not in 'mn' and not dryrun:
                 repo.dirstate.normallookup(abstarget)
         else:
             if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
                 if not ui.quiet:
                     ui.warn(_("%s has not been committed yet, so no copy "
                               "data will be stored for %s.\n")
                             % (repo.pathto(origsrc, cwd), reltarget))
                 if repo.dirstate[abstarget] in '?r' and not dryrun:
                     repo.add([abstarget])
             elif not dryrun:
                 repo.copy(origsrc, abstarget)
 
         if rename and not dryrun:
             repo.remove([abssrc], not after)
 
     # pat: ossep
     # dest ossep
     # srcs: list of (hgsep, hgsep, ossep, bool)
     # return: function that takes hgsep and returns ossep
     def targetpathfn(pat, dest, srcs):
         if os.path.isdir(pat):
             abspfx = util.canonpath(repo.root, cwd, pat)
             abspfx = util.localpath(abspfx)
             if destdirexists:
                 striplen = len(os.path.split(abspfx)[0])
             else:
                 striplen = len(abspfx)
             if striplen:
                 striplen += len(os.sep)
             res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
         elif destdirexists:
             res = lambda p: os.path.join(dest,
                                          os.path.basename(util.localpath(p)))
         else:
             res = lambda p: dest
         return res
 
     # pat: ossep
     # dest ossep
     # srcs: list of (hgsep, hgsep, ossep, bool)
     # return: function that takes hgsep and returns ossep
     def targetpathafterfn(pat, dest, srcs):
         if _match.patkind(pat):
             # a mercurial pattern
             res = lambda p: os.path.join(dest,
                                          os.path.basename(util.localpath(p)))
         else:
             abspfx = util.canonpath(repo.root, cwd, pat)
             if len(abspfx) < len(srcs[0][0]):
                 # A directory. Either the target path contains the last
                 # component of the source path or it does not.
                 def evalpath(striplen):
                     score = 0
                     for s in srcs:
                         t = os.path.join(dest, util.localpath(s[0])[striplen:])
                         if os.path.exists(t):
                             score += 1
                     return score
 
                 abspfx = util.localpath(abspfx)
                 striplen = len(abspfx)
                 if striplen:
                     striplen += len(os.sep)
                 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
                     score = evalpath(striplen)
                     striplen1 = len(os.path.split(abspfx)[0])
                     if striplen1:
                         striplen1 += len(os.sep)
                     if evalpath(striplen1) > score:
                         striplen = striplen1
                 res = lambda p: os.path.join(dest,
                                              util.localpath(p)[striplen:])
             else:
                 # a file
                 if destdirexists:
                     res = lambda p: os.path.join(dest,
                                         os.path.basename(util.localpath(p)))
                 else:
                     res = lambda p: dest
         return res
 
 
     pats = expandpats(pats)
     if not pats:
         raise util.Abort(_('no source or destination specified'))
     if len(pats) == 1:
         raise util.Abort(_('no destination specified'))
     dest = pats.pop()
     destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
     if not destdirexists:
         if len(pats) > 1 or _match.patkind(pats[0]):
             raise util.Abort(_('with multiple sources, destination must be an '
                                'existing directory'))
         if util.endswithsep(dest):
             raise util.Abort(_('destination %s is not a directory') % dest)
 
     tfn = targetpathfn
     if after:
         tfn = targetpathafterfn
     copylist = []
     for pat in pats:
         srcs = walkpat(pat)
         if not srcs:
             continue
         copylist.append((tfn(pat, dest, srcs), srcs))
     if not copylist:
         raise util.Abort(_('no files to copy'))
 
     errors = 0
     for targetpath, srcs in copylist:
         for abssrc, relsrc, exact in srcs:
             if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
                 errors += 1
 
     if errors:
         ui.warn(_('(consider using --after)\n'))
 
     return errors
 
 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None,
     runargs=None, appendpid=False):
     '''Run a command as a service.'''
 
     if opts['daemon'] and not opts['daemon_pipefds']:
         # Signal child process startup with file removal
         lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-')
         os.close(lockfd)        
         try:
             if not runargs:
                 runargs = util.hgcmd() + sys.argv[1:]
             runargs.append('--daemon-pipefds=%s' % lockpath)
             # Don't pass --cwd to the child process, because we've already
             # changed directory.
             for i in xrange(1,len(runargs)):
                 if runargs[i].startswith('--cwd='):
                     del runargs[i]
                     break
                 elif runargs[i].startswith('--cwd'):
                     del runargs[i:i+2]
                     break
             pid = util.spawndetached(runargs)  
             while os.path.exists(lockpath):
                 time.sleep(0.1)
         finally:
             try:
                 os.unlink(lockpath)
             except OSError, e:
                 if e.errno != errno.ENOENT:
                     raise
         if parentfn:
             return parentfn(pid)
         else:
             return
 
     if initfn:
         initfn()
 
     if opts['pid_file']:
         mode = appendpid and 'a' or 'w'
         fp = open(opts['pid_file'], mode)
         fp.write(str(os.getpid()) + '\n')
         fp.close()
 
     if opts['daemon_pipefds']:
         lockpath = opts['daemon_pipefds']
         try:
             os.setsid()
         except AttributeError:
             pass
         os.unlink(lockpath)
         util.hidewindow()
         sys.stdout.flush()
         sys.stderr.flush()
 
         nullfd = os.open(util.nulldev, os.O_RDWR)
         logfilefd = nullfd
         if logfile:
             logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
         os.dup2(nullfd, 0)
         os.dup2(logfilefd, 1)
         os.dup2(logfilefd, 2)
         if nullfd not in (0, 1, 2):
             os.close(nullfd)
         if logfile and logfilefd not in (0, 1, 2):
             os.close(logfilefd)
 
     if runfn:
         return runfn()
 
 class changeset_printer(object):
     '''show changeset information when templating not requested.'''
 
     def __init__(self, ui, repo, patch, diffopts, buffered):
         self.ui = ui
         self.repo = repo
         self.buffered = buffered
         self.patch = patch
         self.diffopts = diffopts
         self.header = {}
         self.hunk = {}
         self.lastheader = None
         self.footer = None
 
     def flush(self, 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]
             return 1
         return 0
 
     def close(self):
         if self.footer:
             self.ui.write(self.footer)
 
     def show(self, ctx, copies=None, **props):
         if self.buffered:
             self.ui.pushbuffer()
             self._show(ctx, copies, props)
             self.hunk[ctx.rev()] = self.ui.popbuffer()
         else:
             self._show(ctx, copies, props)
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
         changenode = ctx.node()
         rev = ctx.rev()
 
         if self.ui.quiet:
             self.ui.write("%d:%s\n" % (rev, short(changenode)))
             return
 
         log = self.repo.changelog
         date = util.datestr(ctx.date())
 
         hexfunc = self.ui.debugflag and hex or short
 
         parents = [(p, hexfunc(log.node(p)))
                    for p in self._meaningful_parentrevs(log, rev)]
 
         self.ui.write(_("changeset:   %d:%s\n") % (rev, hexfunc(changenode)))
 
         branch = ctx.branch()
         # don't show the default branch name
         if branch != 'default':
             branch = encoding.tolocal(branch)
             self.ui.write(_("branch:      %s\n") % branch)
         for tag in self.repo.nodetags(changenode):
             self.ui.write(_("tag:         %s\n") % tag)
         for parent in parents:
             self.ui.write(_("parent:      %d:%s\n") % parent)
 
         if self.ui.debugflag:
             mnode = ctx.manifestnode()
             self.ui.write(_("manifest:    %d:%s\n") %
                           (self.repo.manifest.rev(mnode), hex(mnode)))
         self.ui.write(_("user:        %s\n") % ctx.user())
         self.ui.write(_("date:        %s\n") % date)
 
         if self.ui.debugflag:
             files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
             for key, value in zip([_("files:"), _("files+:"), _("files-:")],
                                   files):
                 if value:
                     self.ui.write("%-12s %s\n" % (key, " ".join(value)))
         elif ctx.files() and self.ui.verbose:
             self.ui.write(_("files:       %s\n") % " ".join(ctx.files()))
         if copies and self.ui.verbose:
             copies = ['%s (%s)' % c for c in copies]
             self.ui.write(_("copies:      %s\n") % ' '.join(copies))
 
         extra = ctx.extra()
         if extra and self.ui.debugflag:
             for key, value in sorted(extra.items()):
                 self.ui.write(_("extra:       %s=%s\n")
                               % (key, value.encode('string_escape')))
 
         description = ctx.description().strip()
         if description:
             if self.ui.verbose:
                 self.ui.write(_("description:\n"))
                 self.ui.write(description)
                 self.ui.write("\n\n")
             else:
                 self.ui.write(_("summary:     %s\n") %
                               description.splitlines()[0])
         self.ui.write("\n")
 
         self.showpatch(changenode)
 
     def showpatch(self, node):
         if self.patch:
             prev = self.repo.changelog.parents(node)[0]
             chunks = patch.diff(self.repo, prev, node, match=self.patch,
                                 opts=patch.diffopts(self.ui, self.diffopts))
             for chunk in chunks:
                 self.ui.write(chunk)
             self.ui.write("\n")
 
     def _meaningful_parentrevs(self, log, rev):
         """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 = log.parentrevs(rev)
         if not self.ui.debugflag and parents[1] == nullrev:
             if parents[0] >= rev - 1:
                 parents = []
             else:
                 parents = [parents[0]]
         return parents
 
 
 class changeset_templater(changeset_printer):
     '''format changeset information.'''
 
     def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
         changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
         formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
         defaulttempl = {
             'parent': '{rev}:{node|formatnode} ',
             'manifest': '{rev}:{node|formatnode}',
             'file_copy': '{name} ({source})',
             'extra': '{key}={value|stringescape}'
             }
         # filecopy is preserved for compatibility reasons
         defaulttempl['filecopy'] = defaulttempl['file_copy']
         self.t = templater.templater(mapfile, {'formatnode': formatnode},
                                      cache=defaulttempl)
         self.cache = {}
 
     def use_template(self, t):
         '''set template string to use'''
         self.t.cache['changeset'] = t
 
     def _meaningful_parentrevs(self, ctx):
         """Return list of meaningful (or all if debug) parentrevs for rev.
         """
         parents = ctx.parents()
         if len(parents) > 1:
             return parents
         if self.ui.debugflag:
             return [parents[0], self.repo['null']]
         if parents[0].rev() >= ctx.rev() - 1:
             return []
         return parents
 
     def _show(self, ctx, copies, props):
         '''show a single changeset or file revision'''
 
         showlist = templatekw.showlist
 
         # showparents() behaviour depends on ui trace level which
         # causes unexpected behaviours at templating level and makes
         # it harder to extract it in a standalone function. Its
         # behaviour cannot be changed so leave it here for now.
-        def showparents(repo, ctx, templ, **args):
+        def showparents(**args):
+            ctx = args['ctx']
             parents = [[('rev', p.rev()), ('node', p.hex())]
                        for p in self._meaningful_parentrevs(ctx)]
-            return showlist(templ, 'parent', parents, **args)
+            return showlist('parent', parents, **args)
 
         props = props.copy()
         props.update(templatekw.keywords)
         props['parents'] = showparents
         props['templ'] = self.t
         props['ctx'] = ctx
         props['repo'] = self.repo
         props['revcache'] = {'copies': copies}
         props['cache'] = self.cache
 
         # find correct templates for current mode
 
         tmplmodes = [
             (True, None),
             (self.ui.verbose, 'verbose'),
             (self.ui.quiet, 'quiet'),
             (self.ui.debugflag, 'debug'),
         ]
 
         types = {'header': '', 'footer':'', 'changeset': 'changeset'}
         for mode, postfix  in tmplmodes:
             for type in types:
                 cur = postfix and ('%s_%s' % (type, postfix)) or type
                 if mode and cur in self.t:
                     types[type] = cur
 
         try:
 
             # write header
             if types['header']:
                 h = templater.stringify(self.t(types['header'], **props))
                 if self.buffered:
                     self.header[ctx.rev()] = h
                 else:
                     self.ui.write(h)
 
             # write changeset metadata, then patch if requested
             key = types['changeset']
             self.ui.write(templater.stringify(self.t(key, **props)))
             self.showpatch(ctx.node())
 
             if types['footer']:
                 if not self.footer:
                     self.footer = templater.stringify(self.t(types['footer'],
                                                       **props))
 
         except KeyError, inst:
             msg = _("%s: no key named '%s'")
             raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
         except SyntaxError, inst:
             raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
 
 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
     """show one changeset using template or regular display.
 
     Display format will be the first non-empty hit of:
     1. option 'template'
     2. option 'style'
     3. [ui] setting 'logtemplate'
     4. [ui] setting 'style'
     If all of these values are either the unset or the empty string,
     regular display via changeset_printer() is done.
     """
     # options
     patch = False
     if opts.get('patch'):
         patch = matchfn or matchall(repo)
 
     tmpl = opts.get('template')
     style = None
     if tmpl:
         tmpl = templater.parsestring(tmpl, quoted=False)
     else:
         style = opts.get('style')
 
     # ui settings
     if not (tmpl or style):
         tmpl = ui.config('ui', 'logtemplate')
         if tmpl:
             tmpl = templater.parsestring(tmpl)
         else:
             style = util.expandpath(ui.config('ui', 'style', ''))
 
     if not (tmpl or style):
         return changeset_printer(ui, repo, patch, opts, buffered)
 
     mapfile = None
     if style and not tmpl:
         mapfile = style
         if not os.path.split(mapfile)[0]:
             mapname = (templater.templatepath('map-cmdline.' + mapfile)
                        or templater.templatepath(mapfile))
             if mapname: mapfile = mapname
 
     try:
         t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
     except SyntaxError, inst:
         raise util.Abort(inst.args[0])
     if tmpl: t.use_template(tmpl)
     return t
 
 def finddate(ui, repo, date):
     """Find the tipmost changeset that matches the given date spec"""
 
     df = util.matchdate(date)
     m = matchall(repo)
     results = {}
 
     def prep(ctx, fns):
         d = ctx.date()
         if df(d[0]):
             results[ctx.rev()] = d
 
     for ctx in walkchangerevs(repo, m, {'rev': None}, prep):
         rev = ctx.rev()
         if rev in results:
             ui.status(_("Found revision %s from %s\n") %
                       (rev, util.datestr(results[rev])))
             return str(rev)
 
     raise util.Abort(_("revision matching date not found"))
 
 def walkchangerevs(repo, match, opts, prepare):
     '''Iterate over files and the revs in which they changed.
 
     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.'''
 
     def increasing_windows(start, end, windowsize=8, sizelimit=512):
         if start < end:
             while start < end:
                 yield start, min(windowsize, end-start)
                 start += windowsize
                 if windowsize < sizelimit:
                     windowsize *= 2
         else:
             while start > end:
                 yield start, min(windowsize, start-end-1)
                 start -= windowsize
                 if windowsize < sizelimit:
                     windowsize *= 2
 
     follow = opts.get('follow') or opts.get('follow_first')
 
     if not len(repo):
         return []
 
     if follow:
         defrange = '%s:0' % repo['.'].rev()
     else:
         defrange = '-1:0'
     revs = revrange(repo, opts['rev'] or [defrange])
     wanted = set()
     slowpath = match.anypats() or (match.files() and opts.get('removed'))
     fncache = {}
     change = util.cachefunc(repo.changectx)
 
     if not slowpath and not match.files():
         # No files, no patterns.  Display all revs.
         wanted = set(revs)
     copies = []
 
     if not slowpath:
         # Only files, no patterns.  Check the history of each file.
         def filerevgen(filelog, node):
             cl_count = len(repo)
             if node is None:
                 last = len(filelog) - 1
             else:
                 last = filelog.rev(node)
             for i, window in increasing_windows(last, nullrev):
                 revs = []
                 for j in xrange(i - window, i + 1):
                     n = filelog.node(j)
                     revs.append((filelog.linkrev(j),
                                  follow and filelog.renamed(n)))
                 for rev in reversed(revs):
                     # only yield rev for which we have the changelog, it can
                     # happen while doing "hg log" during a pull or commit
                     if rev[0] < cl_count:
                         yield rev
         def iterfiles():
             for filename in match.files():
                 yield filename, None
             for filename_node in copies:
                 yield filename_node
         minrev, maxrev = min(revs), max(revs)
         for file_, node in iterfiles():
             filelog = repo.file(file_)
             if not len(filelog):
                 if node is None:
                     # A zero count may be a directory or deleted file, so
                     # try to find matching entries on the slow path.
                     if follow:
                         raise util.Abort(_('cannot follow nonexistent file: "%s"') % file_)
                     slowpath = True
                     break
                 else:
                     continue
             for rev, copied in filerevgen(filelog, node):
                 if rev <= maxrev:
                     if rev < minrev:
                         break
                     fncache.setdefault(rev, [])
                     fncache[rev].append(file_)
                     wanted.add(rev)
                     if follow and copied:
                         copies.append(copied)
     if slowpath:
         if follow:
             raise util.Abort(_('can only follow copies/renames for explicit '
                                'filenames'))
 
         # The slow path checks files modified in every changeset.
         def changerevgen():
             for i, window in increasing_windows(len(repo) - 1, nullrev):
                 for j in xrange(i - window, i + 1):
                     yield change(j)
 
         for ctx in changerevgen():
             matches = filter(match, ctx.files())
             if matches:
                 fncache[ctx.rev()] = matches
                 wanted.add(ctx.rev())
 
     class followfilter(object):
         def __init__(self, onlyfirst=False):
             self.startrev = nullrev
             self.roots = set()
             self.onlyfirst = onlyfirst
 
         def match(self, rev):
             def realparents(rev):
                 if self.onlyfirst:
                     return repo.changelog.parentrevs(rev)[0:1]
                 else:
                     return filter(lambda x: x != nullrev,
                                   repo.changelog.parentrevs(rev))
 
             if self.startrev == nullrev:
                 self.startrev = rev
                 return True
 
             if rev > self.startrev:
                 # forward: all descendants
                 if not self.roots:
                     self.roots.add(self.startrev)
                 for parent in realparents(rev):
                     if parent in self.roots:
                         self.roots.add(rev)
                         return True
             else:
                 # backwards: all parents
                 if not self.roots:
                     self.roots.update(realparents(self.startrev))
                 if rev in self.roots:
                     self.roots.remove(rev)
                     self.roots.update(realparents(rev))
                     return True
 
             return False
 
     # it might be worthwhile to do this in the iterator if the rev range
     # is descending and the prune args are all within that range
     for rev in opts.get('prune', ()):
         rev = repo.changelog.rev(repo.lookup(rev))
         ff = followfilter()
         stop = min(revs[0], revs[-1])
         for x in xrange(rev, stop-1, -1):
             if ff.match(x):
                 wanted.discard(x)
 
     def iterate():
         if follow and not match.files():
             ff = followfilter(onlyfirst=opts.get('follow_first'))
             def want(rev):
                 return ff.match(rev) and rev in wanted
         else:
             def want(rev):
                 return rev in wanted
 
         for i, window in increasing_windows(0, len(revs)):
             change = util.cachefunc(repo.changectx)
             nrevs = [rev for rev in revs[i:i+window] if want(rev)]
             for rev in sorted(nrevs):
                 fns = fncache.get(rev)
                 ctx = change(rev)
                 if not fns:
                     def fns_generator():
                         for f in ctx.files():
                             if match(f):
                                 yield f
                     fns = fns_generator()
                 prepare(ctx, fns)
             for rev in nrevs:
                 yield change(rev)
     return iterate()
 
 def commit(ui, repo, commitfunc, pats, opts):
     '''commit the specified files or all outstanding changes'''
     date = opts.get('date')
     if date:
         opts['date'] = util.parsedate(date)
     message = logmessage(opts)
 
     # extract addremove carefully -- this function can be called from a command
     # that doesn't support addremove
     if opts.get('addremove'):
         addremove(repo, pats, opts)
 
     return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
 
 def commiteditor(repo, ctx, subs):
     if ctx.description():
         return ctx.description()
     return commitforceeditor(repo, ctx, subs)
 
 def commitforceeditor(repo, ctx, subs):
     edittext = []
     modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
     if ctx.description():
         edittext.append(ctx.description())
     edittext.append("")
     edittext.append("") # Empty line between message and comments.
     edittext.append(_("HG: Enter commit message."
                       "  Lines beginning with 'HG:' are removed."))
     edittext.append(_("HG: Leave message empty to abort commit."))
     edittext.append("HG: --")
     edittext.append(_("HG: user: %s") % ctx.user())
     if ctx.p2():
         edittext.append(_("HG: branch merge"))
     if ctx.branch():
         edittext.append(_("HG: branch '%s'")
                         % encoding.tolocal(ctx.branch()))
     edittext.extend([_("HG: subrepo %s") % s for s in subs])
     edittext.extend([_("HG: added %s") % f for f in added])
     edittext.extend([_("HG: changed %s") % f for f in modified])
     edittext.extend([_("HG: removed %s") % f for f in removed])
     if not added and not modified and not removed:
         edittext.append(_("HG: no files changed"))
     edittext.append("")
     # run editor in the repository root
     olddir = os.getcwd()
     os.chdir(repo.root)
     text = repo.ui.edit("\n".join(edittext), ctx.user())
     text = re.sub("(?m)^HG:.*\n", "", text)
     os.chdir(olddir)
 
     if not text.strip():
         raise util.Abort(_("empty commit message"))
 
     return text

mercurial/templatekw.py

@@ -1,249 +1,264
 # 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, incorporated herein by reference.
 
 from node import hex
 import encoding, patch, util, error
 
-def showlist(templ, name, values, plural=None, **args):
+def showlist(name, values, plural=None, **args):
     '''expand set of values.
     name is name of key in template map.
     values is list of strings or dicts.
     plural is plural of name, if not simply name + 's'.
 
     expansion works like this, given name 'foo'.
 
     if values is empty, expand 'no_foos'.
 
     if 'foo' not in template map, return values as a string,
     joined by space.
 
     expand 'start_foos'.
 
     for each value, expand 'foo'. if 'last_foo' in template
     map, expand it instead of 'foo' for last key.
 
     expand 'end_foos'.
     '''
+    templ = args['templ']
     if plural: names = plural
     else: names = name + 's'
     if not values:
         noname = 'no_' + names
         if noname in templ:
             yield templ(noname, **args)
         return
     if name not in templ:
         if isinstance(values[0], str):
             yield ' '.join(values)
         else:
             for v in values:
                 yield dict(v, **args)
         return
     startname = 'start_' + names
     if startname in templ:
         yield templ(startname, **args)
     vargs = args.copy()
     def one(v, tag=name):
         try:
             vargs.update(v)
         except (AttributeError, ValueError):
             try:
                 for a, b in v:
                     vargs[a] = b
             except ValueError:
                 vargs[name] = v
         return templ(tag, **vargs)
     lastname = 'last_' + name
     if lastname in templ:
         last = values.pop()
     else:
         last = None
     for v in values:
         yield one(v)
     if last is not None:
         yield one(last, tag=lastname)
     endname = 'end_' + names
     if endname in templ:
         yield templ(endname, **args)
 
 def getfiles(repo, ctx, revcache):
     if 'files' not in revcache:
         revcache['files'] = repo.status(ctx.parents()[0].node(),
                                         ctx.node())[:3]
     return revcache['files']
 
 def getlatesttags(repo, ctx, cache):
     '''return date, distance and name for the latest tag of rev'''
 
     if 'latesttags' not in cache:
         # Cache mapping from rev to a tuple with tag date, tag
         # distance and tag name
         cache['latesttags'] = {-1: (0, 0, 'null')}
     latesttags = cache['latesttags']
 
     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) == 'global']
         if tags:
             latesttags[rev] = ctx.date()[0], 0, ':'.join(sorted(tags))
             continue
         try:
             # The tuples are laid out so the right one can be found by
             # comparison.
             pdate, pdist, ptag = max(
                 latesttags[p.rev()] for p in ctx.parents())
         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 getrenamedfn(repo, endrev=None):
     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
                 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].renamed()
         except error.LookupError:
             return None
 
     return getrenamed
 
 
 def showauthor(repo, ctx, templ, **args):
     return ctx.user()
 
-def showbranches(repo, ctx, templ, **args):
-    branch = ctx.branch()
+def showbranches(**args):
+    branch = args['ctx'].branch()
     if branch != 'default':
         branch = encoding.tolocal(branch)
-        return showlist(templ, 'branch', [branch], plural='branches', **args)
+        return showlist('branch', [branch], plural='branches', **args)
 
 def showdate(repo, ctx, templ, **args):
     return ctx.date()
 
 def showdescription(repo, ctx, templ, **args):
     return ctx.description().strip()
 
 def showdiffstat(repo, ctx, templ, **args):
     diff = patch.diff(repo, ctx.parents()[0].node(), ctx.node())
     files, adds, removes = 0, 0, 0
     for i in patch.diffstatdata(util.iterlines(diff)):
         files += 1
         adds += i[1]
         removes += i[2]
     return '%s: +%s/-%s' % (files, adds, removes)
 
-def showextras(repo, ctx, templ, **args):
-    for key, value in sorted(ctx.extra().items()):
+def showextras(**args):
+    templ = args['templ']
+    for key, value in sorted(args['ctx'].extra().items()):
         args = args.copy()
         args.update(dict(key=key, value=value))
         yield templ('extra', **args)
 
-def showfileadds(repo, ctx, templ, revcache, **args):
-    return showlist(templ, 'file_add', getfiles(repo, ctx, revcache)[1], **args)
+def showfileadds(**args):
+    repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
+    return showlist('file_add', getfiles(repo, ctx, revcache)[1], **args)
 
-def showfilecopies(repo, ctx, templ, cache, revcache, **args):
-    copies = revcache.get('copies')
+def showfilecopies(**args):
+    cache, ctx= args['cache'], args['ctx']
+    copies = args['revcache'].get('copies')
     if copies is None:
         if 'getrenamed' not in cache:
-            cache['getrenamed'] = getrenamedfn(repo)
+            cache['getrenamed'] = getrenamedfn(args['repo'])
         copies = []
         getrenamed = cache['getrenamed']
         for fn in ctx.files():
             rename = getrenamed(fn, ctx.rev())
             if rename:
                 copies.append((fn, rename[0]))
             
     c = [{'name': x[0], 'source': x[1]} for x in copies]
-    return showlist(templ, 'file_copy', c, plural='file_copies', **args)
+    return showlist('file_copy', c, plural='file_copies', **args)
 
 # showfilecopiesswitch() displays file copies only if copy records are
 # provided before calling the templater, usually with a --copies
 # command line switch.
-def showfilecopiesswitch(repo, ctx, templ, cache, revcache, **args):
-    copies = revcache.get('copies') or []
+def showfilecopiesswitch(**args):
+    copies = args['revcache'].get('copies') or []
     c = [{'name': x[0], 'source': x[1]} for x in copies]
-    return showlist(templ, 'file_copy', c, plural='file_copies', **args)
+    return showlist('file_copy', c, plural='file_copies', **args)
 
-def showfiledels(repo, ctx, templ, revcache, **args):
-    return showlist(templ, 'file_del', getfiles(repo, ctx, revcache)[2], **args)
+def showfiledels(**args):
+    repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
+    return showlist('file_del', getfiles(repo, ctx, revcache)[2], **args)
 
-def showfilemods(repo, ctx, templ, revcache, **args):
-    return showlist(templ, 'file_mod', getfiles(repo, ctx, revcache)[0], **args)
+def showfilemods(**args):
+    repo, ctx, revcache = args['repo'], args['ctx'], args['revcache']
+    return showlist('file_mod', getfiles(repo, ctx, revcache)[0], **args)
 
-def showfiles(repo, ctx, templ, **args):
-    return showlist(templ, 'file', ctx.files(), **args)
+def showfiles(**args):
+    return showlist('file', args['ctx'].files(), **args)
 
 def showlatesttag(repo, ctx, templ, cache, **args):
     return getlatesttags(repo, ctx, cache)[2]
 
 def showlatesttagdistance(repo, ctx, templ, cache, **args):
     return getlatesttags(repo, ctx, cache)[1]
 
-def showmanifest(repo, ctx, templ, **args):
+def showmanifest(**args):
+    repo, ctx, templ = args['repo'], args['ctx'], args['templ']
     args = args.copy()
     args.update(dict(rev=repo.manifest.rev(ctx.changeset()[0]),
                      node=hex(ctx.changeset()[0])))
     return templ('manifest', **args)
 
 def shownode(repo, ctx, templ, **args):
     return ctx.hex()
 
 def showrev(repo, ctx, templ, **args):
     return ctx.rev()
 
-def showtags(repo, ctx, templ, **args):
-    return showlist(templ, 'tag', ctx.tags(), **args)
+def showtags(**args):
+    return showlist('tag', args['ctx'].tags(), **args)
 
+# keywords are callables like:
+# fn(repo, ctx, templ, cache, revcache, **args)
+# with:
+# repo - current repository instance
+# ctx - the changectx being displayed
+# templ - the templater instance
+# cache - a cache dictionary for the whole templater run
+# revcache - a cache dictionary for the current revision
 keywords = {
     'author': showauthor,
     'branches': showbranches,
     'date': showdate,
     'desc': showdescription,
     'diffstat': showdiffstat,
     'extras': showextras,
     'file_adds': showfileadds,
     'file_copies': showfilecopies,
     'file_copies_switch': showfilecopiesswitch,
     'file_dels': showfiledels,
     'file_mods': showfilemods,
     'files': showfiles,
     'latesttag': showlatesttag,
     'latesttagdistance': showlatesttagdistance,
     'manifest': showmanifest,
     'node': shownode,
     'rev': showrev,
     'tags': showtags,
 }
 

tests/test-command-template

@@ -1,198 +1,207
 #!/bin/sh
 
 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
 echo second > second
 hg add second
 hg commit -m second -d '1000000 0' -u 'User Name <user@hostname>'
 echo third > third
 hg add third
 hg mv second fourth
 hg commit -m third -d "2020-01-01 10:01"
 
 # make sure user/global hgrc does not affect tests
 echo '[ui]' > .hg/hgrc
 echo 'logtemplate =' >> .hg/hgrc
 echo 'style =' >> .hg/hgrc
 
 echo '# default style is like normal output'
 echo '#  normal'
 hg log > log.out
 hg log --style default > style.out
 cmp log.out style.out || diff -u log.out style.out
 echo '#  verbose'
 hg log -v > log.out
 hg log -v --style default > style.out
 cmp log.out style.out || diff -u log.out style.out
 echo '#  debug'
 hg log --debug > log.out
 hg log --debug --style default > style.out
 cmp log.out style.out || diff -u log.out style.out
 
 echo '# revision with no copies (used to print a traceback)'
 hg tip -v --template '\n'
 
 echo '# compact style works'
 hg log --style compact
 hg log -v --style compact
 hg log --debug --style compact
 
 # Test xml styles
 echo '# xml style works (--style xml)'
 hg log --style xml
 echo '# xml style works (-v --style xml)'
 hg log -v --style xml
 echo '# xml style works (--debug --style xml)'
 hg log --debug --style xml
 
 echo '# error if style not readable'
 touch q
 chmod 0 q
 hg log --style ./q
 
 echo '# error if no style'
 hg log --style notexist
 
 echo '# error if style missing key'
 echo 'q = q' > t
 hg log --style ./t
 
 echo '# error if include fails'
 echo 'changeset = q' >> t
 hg log --style ./t
 
 echo '# include works'
 rm q
 echo '{rev}' > q
 hg log --style ./t
 
 echo '# ui.style works'
 echo '[ui]' > .hg/hgrc
 echo 'style = t' >> .hg/hgrc
 hg log
 
 echo '# issue338'
 hg log --style=changelog > changelog
 cat changelog
 
 echo "# keys work"
 for key in author branches date desc file_adds file_dels file_mods \
         file_copies file_copies_switch files \
         manifest node parents rev tags diffstat extras; do
     for mode in '' --verbose --debug; do
         hg log $mode --template "$key$mode: {$key}\n"
     done
 done
 
 echo '# filters work'
 hg log --template '{author|domain}\n'
 hg log --template '{author|person}\n'
 hg log --template '{author|user}\n'
 hg log --template '{date|age}\n' > /dev/null || exit 1
 hg log -l1 --template '{date|age}\n' 
 hg log --template '{date|date}\n'
 hg log --template '{date|isodate}\n'
 hg log --template '{date|isodatesec}\n'
 hg log --template '{date|rfc822date}\n'
 hg log --template '{desc|firstline}\n'
 hg log --template '{node|short}\n'
 hg log --template '<changeset author="{author|xmlescape}"/>\n'
 
 echo '# formatnode filter works'
 echo '#  quiet'
 hg -q log -r 0 --template '{node|formatnode}\n'
 echo '#  normal'
 hg log -r 0 --template '{node|formatnode}\n'
 echo '#  verbose'
 hg -v log -r 0 --template '{node|formatnode}\n'
 echo '#  debug'
 hg --debug log -r 0 --template '{node|formatnode}\n'
 
 echo '# error on syntax'
 echo 'x = "f' >> t
 hg log
 
 cd ..
 
 echo '# latesttag'
 hg init latesttag
 cd latesttag
 
 echo a > file
 hg ci -Am a -d '0 0'
 
 echo b >> file
 hg ci -m b -d '1 0'
 
 echo c >> head1
 hg ci -Am h1c -d '2 0'
 
 hg update -q 1
 echo d >> head2
 hg ci -Am h2d -d '3 0'
 
 echo e >> head2
 hg ci -m h2e -d '4 0'
 
 hg merge -q
 hg ci -m merge -d '5 0'
 
 echo '# No tag set'
 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
 
 echo '# one common tag: longuest path wins'
 hg tag -r 1 -m t1 -d '6 0' t1
 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
 
 echo '# one ancestor tag: more recent wins'
 hg tag -r 2 -m t2 -d '7 0' t2
 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
 
 echo '# two branch tags: more recent wins'
 hg tag -r 3 -m t3 -d '8 0' t3
 hg log --template '{rev}: {latesttag}+{latesttagdistance}\n'
 
 echo '# 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 --template '{rev}: {latesttag}+{latesttagdistance}\n'
 cd ..
 
 echo '# style path expansion (issue1948)'
 mkdir -p home/styles
 cat > home/styles/teststyle <<EOF
 changeset = 'test {rev}:{node|short}\n'
 EOF
 HOME=`pwd`/home; export HOME
 cat > latesttag/.hg/hgrc <<EOF
 [ui]
 style = ~/styles/teststyle
 EOF
 hg -R latesttag tip
 
+echo '# test recursive showlist template (issue1989)'
+cat > style1989 <<EOF
+changeset = '{file_mods}{manifest}{extras}'
+file_mod  = 'M|{author|person}\n'
+manifest = '{rev},{author}\n'
+extra = '{key}: {author}\n'
+EOF
+hg -R latesttag log -r tip --style=style1989
+
 echo '# done'

tests/test-command-template.out

@@ -1,1069 +1,1073
 created new head
 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
 created new head
 # default style is like normal output
 #  normal
 #  verbose
 #  debug
 # revision with no copies (used to print a traceback)
 
 # compact style works
 8[tip]   3bdecc1cde0c   2020-01-01 10:01 +0000   test
   third
 
 7:-1   29114dbae42b   1970-01-12 13:46 +0000   user
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   other
   other 1
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   user
   line 1
 
 8[tip]   3bdecc1cde0c   2020-01-01 10:01 +0000   test
   third
 
 7:-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2   97054abb4ab8   1970-01-14 21:20 +0000   other@place
   no person
 
 1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
   other 1
 other 2
 
 other 3
 
 0   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
   line 1
 line 2
 
 8[tip]:7,-1   3bdecc1cde0c   2020-01-01 10:01 +0000   test
   third
 
 7:-1,-1   29114dbae42b   1970-01-12 13:46 +0000   User Name <user@hostname>
   second
 
 6:5,4   c7b487c6c50e   1970-01-18 08:40 +0000   person
   merge
 
 5:3,-1   13207e5a10d9   1970-01-18 08:40 +0000   person
   new head
 
 4:3,-1   32a18f097fcc   1970-01-17 04:53 +0000   person
   new branch
 
 3:2,-1   10e46f2dcbf4   1970-01-16 01:06 +0000   person
   no user, no domain
 
 2:1,-1   97054abb4ab8   1970-01-14 21:20 +0000   other@place
   no person
 
 1:0,-1   b608e9d1a3f0   1970-01-13 17:33 +0000   A. N. Other <other@place>
   other 1
 other 2
 
 other 3
 
 0:-1,-1   1e4e1b8f71e0   1970-01-12 13:46 +0000   User Name <user@hostname>
   line 1
 line 2
 
 # xml style works (--style xml)
 <?xml version="1.0"?>
 <log>
 <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
 <tag>tip</tag>
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 </logentry>
 </log>
 # xml style works (-v --style xml)
 <?xml version="1.0"?>
 <log>
 <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
 <tag>tip</tag>
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 <paths>
 <path action="A">fourth</path>
 <path action="A">third</path>
 <path action="R">second</path>
 </paths>
 <copies>
 <copy source="second">fourth</copy>
 </copies>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 <paths>
 <path action="A">second</path>
 </paths>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 <paths>
 </paths>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 <paths>
 <path action="A">d</path>
 </paths>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 <paths>
 </paths>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 <paths>
 <path action="M">c</path>
 </paths>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 <paths>
 <path action="A">c</path>
 </paths>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 <paths>
 <path action="A">b</path>
 </paths>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 <paths>
 <path action="A">a</path>
 </paths>
 </logentry>
 </log>
 # xml style works (--debug --style xml)
 <?xml version="1.0"?>
 <log>
 <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57">
 <tag>tip</tag>
 <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="test">test</author>
 <date>2020-01-01T10:01:00+00:00</date>
 <msg xml:space="preserve">third</msg>
 <paths>
 <path action="A">fourth</path>
 <path action="A">third</path>
 <path action="R">second</path>
 </paths>
 <copies>
 <copy source="second">fourth</copy>
 </copies>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">second</msg>
 <paths>
 <path action="A">second</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f">
 <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" />
 <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:01+00:00</date>
 <msg xml:space="preserve">merge</msg>
 <paths>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f">
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-18T08:40:00+00:00</date>
 <msg xml:space="preserve">new head</msg>
 <paths>
 <path action="A">d</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4">
 <branch>foo</branch>
 <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-17T04:53:20+00:00</date>
 <msg xml:space="preserve">new branch</msg>
 <paths>
 </paths>
 <extra key="branch">foo</extra>
 </logentry>
 <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47">
 <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="person">person</author>
 <date>1970-01-16T01:06:40+00:00</date>
 <msg xml:space="preserve">no user, no domain</msg>
 <paths>
 <path action="M">c</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465">
 <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="other@place">other</author>
 <date>1970-01-14T21:20:00+00:00</date>
 <msg xml:space="preserve">no person</msg>
 <paths>
 <path action="A">c</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965">
 <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="other@place">A. N. Other</author>
 <date>1970-01-13T17:33:20+00:00</date>
 <msg xml:space="preserve">other 1
 other 2
 
 other 3</msg>
 <paths>
 <path action="A">b</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f">
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <parent revision="-1" node="0000000000000000000000000000000000000000" />
 <author email="user@hostname">User Name</author>
 <date>1970-01-12T13:46:40+00:00</date>
 <msg xml:space="preserve">line 1
 line 2</msg>
 <paths>
 <path action="A">a</path>
 </paths>
 <extra key="branch">default</extra>
 </logentry>
 </log>
 # error if style not readable
 abort: Permission denied: ./q
 # error if no style
 abort: style not found: notexist
 # error if style missing key
 abort: ./t: no key named 'changeset'
 # error if include fails
 abort: template file ./q: Permission denied
 # include works
 8
 7
 6
 5
 4
 3
 2
 1
 0
 # ui.style works
 8
 7
 6
 5
 4
 3
 2
 1
 0
 # issue338
 2020-01-01  test  <test>
 
 	* fourth, second, third:
 	third
 	[3bdecc1cde0c] [tip]
 
 1970-01-12  User Name  <user@hostname>
 
 	* second:
 	second
 	[29114dbae42b]
 
 1970-01-18  person  <person>
 
 	* merge
 	[c7b487c6c50e]
 
 	* d:
 	new head
 	[13207e5a10d9]
 
 1970-01-17  person  <person>
 
 	* new branch
 	[32a18f097fcc] <foo>
 
 1970-01-16  person  <person>
 
 	* c:
 	no user, no domain
 	[10e46f2dcbf4]
 
 1970-01-14  other  <other@place>
 
 	* c:
 	no person
 	[97054abb4ab8]
 
 1970-01-13  A. N. Other  <other@place>
 
 	* b:
 	other 1 other 2
 
 	other 3
 	[b608e9d1a3f0]
 
 1970-01-12  User Name  <user@hostname>
 
 	* a:
 	line 1 line 2
 	[1e4e1b8f71e0]
 
 # keys work
 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>
 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: 8:79c71159cb0a
 manifest: 7:f2dbc354b94e
 manifest: 6:91015e9dbdd7
 manifest: 5:4dc3def4f9b4
 manifest: 4:90ae8dda64e1
 manifest: 3:cb5a1327723b
 manifest: 2:6e0e82995c35
 manifest: 1:4e8d705b1e53
 manifest: 0:a0c8bcbbb45c
 manifest--verbose: 8:79c71159cb0a
 manifest--verbose: 7:f2dbc354b94e
 manifest--verbose: 6:91015e9dbdd7
 manifest--verbose: 5:4dc3def4f9b4
 manifest--verbose: 4:90ae8dda64e1
 manifest--verbose: 3:cb5a1327723b
 manifest--verbose: 2:6e0e82995c35
 manifest--verbose: 1:4e8d705b1e53
 manifest--verbose: 0:a0c8bcbbb45c
 manifest--debug: 8:79c71159cb0a1a84add78e7922a1e5e7be34c499
 manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf
 manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf
 manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216
 manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363
 manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc
 manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1
 manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55
 manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 node: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
 node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node: 13207e5a10d9fd28ec424934298e176197f2c67f
 node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node: 97054abb4ab824450e9164180baf491ae0078465
 node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node: 1e4e1b8f71e05681d422154f5421e385fec3454f
 node--verbose: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
 node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--verbose: 97054abb4ab824450e9164180baf491ae0078465
 node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f
 node--debug: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57
 node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453
 node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f
 node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f
 node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4
 node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47
 node--debug: 97054abb4ab824450e9164180baf491ae0078465
 node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965
 node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f
 parents: 
 parents: -1:000000000000 
 parents: 5:13207e5a10d9 4:32a18f097fcc 
 parents: 3:10e46f2dcbf4 
 parents: 
 parents: 
 parents: 
 parents: 
 parents: 
 parents--verbose: 
 parents--verbose: -1:000000000000 
 parents--verbose: 5:13207e5a10d9 4:32a18f097fcc 
 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:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 
 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
 # filters work
 
 hostname
 
 
 
 
 place
 place
 hostname
 test
 User Name
 person
 person
 person
 person
 other
 A. N. Other
 User Name
 test
 user
 person
 person
 person
 person
 other
 other
 user
 in the future
 Wed Jan 01 10:01:00 2020 +0000
 Mon Jan 12 13:46:40 1970 +0000
 Sun Jan 18 08:40:01 1970 +0000
 Sun Jan 18 08:40:00 1970 +0000
 Sat Jan 17 04:53:20 1970 +0000
 Fri Jan 16 01:06:40 1970 +0000
 Wed Jan 14 21:20:00 1970 +0000
 Tue Jan 13 17:33:20 1970 +0000
 Mon Jan 12 13:46:40 1970 +0000
 2020-01-01 10:01 +0000
 1970-01-12 13:46 +0000
 1970-01-18 08:40 +0000
 1970-01-18 08:40 +0000
 1970-01-17 04:53 +0000
 1970-01-16 01:06 +0000
 1970-01-14 21:20 +0000
 1970-01-13 17:33 +0000
 1970-01-12 13:46 +0000
 2020-01-01 10:01:00 +0000
 1970-01-12 13:46:40 +0000
 1970-01-18 08:40:01 +0000
 1970-01-18 08:40:00 +0000
 1970-01-17 04:53:20 +0000
 1970-01-16 01:06:40 +0000
 1970-01-14 21:20:00 +0000
 1970-01-13 17:33:20 +0000
 1970-01-12 13:46:40 +0000
 Wed, 01 Jan 2020 10:01:00 +0000
 Mon, 12 Jan 1970 13:46:40 +0000
 Sun, 18 Jan 1970 08:40:01 +0000
 Sun, 18 Jan 1970 08:40:00 +0000
 Sat, 17 Jan 1970 04:53:20 +0000
 Fri, 16 Jan 1970 01:06:40 +0000
 Wed, 14 Jan 1970 21:20:00 +0000
 Tue, 13 Jan 1970 17:33:20 +0000
 Mon, 12 Jan 1970 13:46:40 +0000
 third
 second
 merge
 new head
 new branch
 no user, no domain
 no person
 other 1
 line 1
 3bdecc1cde0c
 29114dbae42b
 c7b487c6c50e
 13207e5a10d9
 32a18f097fcc
 10e46f2dcbf4
 97054abb4ab8
 b608e9d1a3f0
 1e4e1b8f71e0
 <changeset author="test"/>
 <changeset author="User Name &lt;user@hostname&gt;"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="person"/>
 <changeset author="other@place"/>
 <changeset author="A. N. Other &lt;other@place&gt;"/>
 <changeset author="User Name &lt;user@hostname&gt;"/>
 # formatnode filter works
 #  quiet
 1e4e1b8f71e0
 #  normal
 1e4e1b8f71e0
 #  verbose
 1e4e1b8f71e0
 #  debug
 1e4e1b8f71e05681d422154f5421e385fec3454f
 # error on syntax
 abort: t:3: unmatched quotes
 # latesttag
 adding file
 adding head1
 adding head2
 created new head
 # No tag set
 5: null+5
 4: null+4
 3: null+3
 2: null+3
 1: null+2
 0: null+1
 # one common tag: longuest path wins
 6: t1+4
 5: t1+3
 4: t1+2
 3: t1+1
 2: t1+1
 1: t1+0
 0: null+1
 # one ancestor tag: more recent wins
 7: t2+3
 6: t2+2
 5: t2+1
 4: t1+2
 3: t1+1
 2: t2+0
 1: t1+0
 0: null+1
 # two branch tags: more recent wins
 8: t3+5
 7: t3+4
 6: t3+3
 5: t3+2
 4: t3+1
 3: t3+0
 2: t2+0
 1: t1+0
 0: null+1
 # merged tag overrides
 10: t5+5
 9: t5+4
 8: t5+3
 7: t5+2
 6: t5+1
 5: t5+0
 4: at3:t3+1
 3: at3:t3+0
 2: t2+0
 1: t1+0
 0: null+1
 # style path expansion (issue1948)
 test 10:dee8f28249af
+# test recursive showlist template (issue1989)
+M|test
+10,test
+branch: test
 # done