formatter: pass in template spec to templateformatter as argument

Prepare for the next patch, which will unify handling of the formatter
names and the template names.

hgext/patchbomb.py

@@ -1,1003 +1,1003 b''
 # patchbomb.py - sending Mercurial changesets as patch emails
 #
 #  Copyright 2005-2009 Matt Mackall <[e-mail]> and others
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 '''command to send changesets as (a series of) patch emails
 
 The series is started off with a "[PATCH 0 of N]" introduction, which
 describes the series as a whole.
 
 Each patch email has a Subject line of "[PATCH M of N] ...", using the
 first line of the changeset description as the subject text. The
 message contains two or three body parts:
 
 - The changeset description.
 - [Optional] The result of running diffstat on the patch.
 - The patch itself, as generated by :hg:`export`.
 
 Each message refers to the first in the series using the In-Reply-To
 and References headers, so they will show up as a sequence in threaded
 mail and news readers, and in mail archives.
 
 To configure other defaults, add a section like this to your
 configuration file::
 
   [email]
   from = My Name <my@email>
   to = recipient1, recipient2, ...
   cc = cc1, cc2, ...
   bcc = bcc1, bcc2, ...
   reply-to = address1, address2, ...
 
 Use ``[patchbomb]`` as configuration section name if you need to
 override global ``[email]`` address settings.
 
 Then you can use the :hg:`email` command to mail a series of
 changesets as a patchbomb.
 
 You can also either configure the method option in the email section
 to be a sendmail compatible mailer or fill out the [smtp] section so
 that the patchbomb extension can automatically send patchbombs
 directly from the commandline. See the [email] and [smtp] sections in
 hgrc(5) for details.
 
 By default, :hg:`email` will prompt for a ``To`` or ``CC`` header if
 you do not supply one via configuration or the command line.  You can
 override this to never prompt by configuring an empty value::
 
   [email]
   cc =
 
 You can control the default inclusion of an introduction message with the
 ``patchbomb.intro`` configuration option. The configuration is always
 overwritten by command line flags like --intro and --desc::
 
   [patchbomb]
   intro=auto   # include introduction message if more than 1 patch (default)
   intro=never  # never include an introduction message
   intro=always # always include an introduction message
 
 You can specify a template for flags to be added in subject prefixes. Flags
 specified by --flag option are exported as ``{flags}`` keyword::
 
   [patchbomb]
   flagtemplate = "{separate(' ',
                             ifeq(branch, 'default', '', branch|upper),
                             flags)}"
 
 You can set patchbomb to always ask for confirmation by setting
 ``patchbomb.confirm`` to true.
 '''
 from __future__ import absolute_import
 
 import email.encoders as emailencoders
 import email.generator as emailgen
 import email.mime.base as emimebase
 import email.mime.multipart as emimemultipart
 import email.utils as eutil
 import errno
 import os
 import socket
 
 from mercurial.i18n import _
 from mercurial.pycompat import open
 from mercurial import (
     cmdutil,
     commands,
     encoding,
     error,
     formatter,
     hg,
     mail,
     node as nodemod,
     patch,
     pycompat,
     registrar,
     scmutil,
     templater,
     util,
 )
 from mercurial.utils import dateutil
 
 stringio = util.stringio
 
 cmdtable = {}
 command = registrar.command(cmdtable)
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
 configitem(
     b'patchbomb', b'bundletype', default=None,
 )
 configitem(
     b'patchbomb', b'bcc', default=None,
 )
 configitem(
     b'patchbomb', b'cc', default=None,
 )
 configitem(
     b'patchbomb', b'confirm', default=False,
 )
 configitem(
     b'patchbomb', b'flagtemplate', default=None,
 )
 configitem(
     b'patchbomb', b'from', default=None,
 )
 configitem(
     b'patchbomb', b'intro', default=b'auto',
 )
 configitem(
     b'patchbomb', b'publicurl', default=None,
 )
 configitem(
     b'patchbomb', b'reply-to', default=None,
 )
 configitem(
     b'patchbomb', b'to', default=None,
 )
 
 if pycompat.ispy3:
     _bytesgenerator = emailgen.BytesGenerator
 else:
     _bytesgenerator = emailgen.Generator
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = b'ships-with-hg-core'
 
 
 def _addpullheader(seq, ctx):
     """Add a header pointing to a public URL where the changeset is available
     """
     repo = ctx.repo()
     # experimental config: patchbomb.publicurl
     # waiting for some logic that check that the changeset are available on the
     # destination before patchbombing anything.
     publicurl = repo.ui.config(b'patchbomb', b'publicurl')
     if publicurl:
         return b'Available At %s\n' b'#              hg pull %s -r %s' % (
             publicurl,
             publicurl,
             ctx,
         )
     return None
 
 
 def uisetup(ui):
     cmdutil.extraexport.append(b'pullurl')
     cmdutil.extraexportmap[b'pullurl'] = _addpullheader
 
 
 def reposetup(ui, repo):
     if not repo.local():
         return
     repo._wlockfreeprefix.add(b'last-email.txt')
 
 
 def prompt(ui, prompt, default=None, rest=b':'):
     if default:
         prompt += b' [%s]' % default
     return ui.prompt(prompt + rest, default)
 
 
 def introwanted(ui, opts, number):
     '''is an introductory message apparently wanted?'''
     introconfig = ui.config(b'patchbomb', b'intro')
     if opts.get(b'intro') or opts.get(b'desc'):
         intro = True
     elif introconfig == b'always':
         intro = True
     elif introconfig == b'never':
         intro = False
     elif introconfig == b'auto':
         intro = number > 1
     else:
         ui.write_err(
             _(b'warning: invalid patchbomb.intro value "%s"\n') % introconfig
         )
         ui.write_err(_(b'(should be one of always, never, auto)\n'))
         intro = number > 1
     return intro
 
 
 def _formatflags(ui, repo, rev, flags):
     """build flag string optionally by template"""
     tmpl = ui.config(b'patchbomb', b'flagtemplate')
     if not tmpl:
         return b' '.join(flags)
     out = util.stringio()
-    opts = {b'template': templater.unquotestring(tmpl)}
-    with formatter.templateformatter(ui, out, b'patchbombflag', opts) as fm:
+    spec = formatter.templatespec(b'', templater.unquotestring(tmpl), None)
+    with formatter.templateformatter(ui, out, b'patchbombflag', {}, spec) as fm:
         fm.startitem()
         fm.context(ctx=repo[rev])
         fm.write(b'flags', b'%s', fm.formatlist(flags, name=b'flag'))
     return out.getvalue()
 
 
 def _formatprefix(ui, repo, rev, flags, idx, total, numbered):
     """build prefix to patch subject"""
     flag = _formatflags(ui, repo, rev, flags)
     if flag:
         flag = b' ' + flag
 
     if not numbered:
         return b'[PATCH%s]' % flag
     else:
         tlen = len(b"%d" % total)
         return b'[PATCH %0*d of %d%s]' % (tlen, idx, total, flag)
 
 
 def makepatch(
     ui,
     repo,
     rev,
     patchlines,
     opts,
     _charsets,
     idx,
     total,
     numbered,
     patchname=None,
 ):
 
     desc = []
     node = None
     body = b''
 
     for line in patchlines:
         if line.startswith(b'#'):
             if line.startswith(b'# Node ID'):
                 node = line.split()[-1]
             continue
         if line.startswith(b'diff -r') or line.startswith(b'diff --git'):
             break
         desc.append(line)
 
     if not patchname and not node:
         raise ValueError
 
     if opts.get(b'attach') and not opts.get(b'body'):
         body = (
             b'\n'.join(desc[1:]).strip()
             or b'Patch subject is complete summary.'
         )
         body += b'\n\n\n'
 
     if opts.get(b'plain'):
         while patchlines and patchlines[0].startswith(b'# '):
             patchlines.pop(0)
         if patchlines:
             patchlines.pop(0)
         while patchlines and not patchlines[0].strip():
             patchlines.pop(0)
 
     ds = patch.diffstat(patchlines)
     if opts.get(b'diffstat'):
         body += ds + b'\n\n'
 
     addattachment = opts.get(b'attach') or opts.get(b'inline')
     if not addattachment or opts.get(b'body'):
         body += b'\n'.join(patchlines)
 
     if addattachment:
         msg = emimemultipart.MIMEMultipart()
         if body:
             msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(b'test')))
         p = mail.mimetextpatch(
             b'\n'.join(patchlines), b'x-patch', opts.get(b'test')
         )
         binnode = nodemod.bin(node)
         # if node is mq patch, it will have the patch file's name as a tag
         if not patchname:
             patchtags = [
                 t
                 for t in repo.nodetags(binnode)
                 if t.endswith(b'.patch') or t.endswith(b'.diff')
             ]
             if patchtags:
                 patchname = patchtags[0]
             elif total > 1:
                 patchname = cmdutil.makefilename(
                     repo[node], b'%b-%n.patch', seqno=idx, total=total
                 )
             else:
                 patchname = cmdutil.makefilename(repo[node], b'%b.patch')
         disposition = r'inline'
         if opts.get(b'attach'):
             disposition = r'attachment'
         p[r'Content-Disposition'] = (
             disposition + r'; filename=' + encoding.strfromlocal(patchname)
         )
         msg.attach(p)
     else:
         msg = mail.mimetextpatch(body, display=opts.get(b'test'))
 
     prefix = _formatprefix(
         ui, repo, rev, opts.get(b'flag'), idx, total, numbered
     )
     subj = desc[0].strip().rstrip(b'. ')
     if not numbered:
         subj = b' '.join([prefix, opts.get(b'subject') or subj])
     else:
         subj = b' '.join([prefix, subj])
     msg[b'Subject'] = mail.headencode(ui, subj, _charsets, opts.get(b'test'))
     msg[b'X-Mercurial-Node'] = node
     msg[b'X-Mercurial-Series-Index'] = b'%i' % idx
     msg[b'X-Mercurial-Series-Total'] = b'%i' % total
     return msg, subj, ds
 
 
 def _getpatches(repo, revs, **opts):
     """return a list of patches for a list of revisions
 
     Each patch in the list is itself a list of lines.
     """
     ui = repo.ui
     prev = repo[b'.'].rev()
     for r in revs:
         if r == prev and (repo[None].files() or repo[None].deleted()):
             ui.warn(
                 _(b'warning: working directory has ' b'uncommitted changes\n')
             )
         output = stringio()
         cmdutil.exportfile(
             repo, [r], output, opts=patch.difffeatureopts(ui, opts, git=True)
         )
         yield output.getvalue().split(b'\n')
 
 
 def _getbundle(repo, dest, **opts):
     """return a bundle containing changesets missing in "dest"
 
     The `opts` keyword-arguments are the same as the one accepted by the
     `bundle` command.
 
     The bundle is a returned as a single in-memory binary blob.
     """
     ui = repo.ui
     tmpdir = pycompat.mkdtemp(prefix=b'hg-email-bundle-')
     tmpfn = os.path.join(tmpdir, b'bundle')
     btype = ui.config(b'patchbomb', b'bundletype')
     if btype:
         opts[r'type'] = btype
     try:
         commands.bundle(ui, repo, tmpfn, dest, **opts)
         return util.readfile(tmpfn)
     finally:
         try:
             os.unlink(tmpfn)
         except OSError:
             pass
         os.rmdir(tmpdir)
 
 
 def _getdescription(repo, defaultbody, sender, **opts):
     """obtain the body of the introduction message and return it
 
     This is also used for the body of email with an attached bundle.
 
     The body can be obtained either from the command line option or entered by
     the user through the editor.
     """
     ui = repo.ui
     if opts.get(r'desc'):
         body = open(opts.get(r'desc')).read()
     else:
         ui.write(
             _(b'\nWrite the introductory message for the ' b'patch series.\n\n')
         )
         body = ui.edit(
             defaultbody, sender, repopath=repo.path, action=b'patchbombbody'
         )
         # Save series description in case sendmail fails
         msgfile = repo.vfs(b'last-email.txt', b'wb')
         msgfile.write(body)
         msgfile.close()
     return body
 
 
 def _getbundlemsgs(repo, sender, bundle, **opts):
     """Get the full email for sending a given bundle
 
     This function returns a list of "email" tuples (subject, content, None).
     The list is always one message long in that case.
     """
     ui = repo.ui
     _charsets = mail._charsets(ui)
     subj = opts.get(r'subject') or prompt(
         ui, b'Subject:', b'A bundle for your repository'
     )
 
     body = _getdescription(repo, b'', sender, **opts)
     msg = emimemultipart.MIMEMultipart()
     if body:
         msg.attach(mail.mimeencode(ui, body, _charsets, opts.get(r'test')))
     datapart = emimebase.MIMEBase(r'application', r'x-mercurial-bundle')
     datapart.set_payload(bundle)
     bundlename = b'%s.hg' % opts.get(r'bundlename', b'bundle')
     datapart.add_header(
         r'Content-Disposition',
         r'attachment',
         filename=encoding.strfromlocal(bundlename),
     )
     emailencoders.encode_base64(datapart)
     msg.attach(datapart)
     msg[b'Subject'] = mail.headencode(ui, subj, _charsets, opts.get(r'test'))
     return [(msg, subj, None)]
 
 
 def _makeintro(repo, sender, revs, patches, **opts):
     """make an introduction email, asking the user for content if needed
 
     email is returned as (subject, body, cumulative-diffstat)"""
     ui = repo.ui
     _charsets = mail._charsets(ui)
 
     # use the last revision which is likely to be a bookmarked head
     prefix = _formatprefix(
         ui, repo, revs.last(), opts.get(r'flag'), 0, len(patches), numbered=True
     )
     subj = opts.get(r'subject') or prompt(
         ui, b'(optional) Subject: ', rest=prefix, default=b''
     )
     if not subj:
         return None  # skip intro if the user doesn't bother
 
     subj = prefix + b' ' + subj
 
     body = b''
     if opts.get(r'diffstat'):
         # generate a cumulative diffstat of the whole patch series
         diffstat = patch.diffstat(sum(patches, []))
         body = b'\n' + diffstat
     else:
         diffstat = None
 
     body = _getdescription(repo, body, sender, **opts)
     msg = mail.mimeencode(ui, body, _charsets, opts.get(r'test'))
     msg[b'Subject'] = mail.headencode(ui, subj, _charsets, opts.get(r'test'))
     return (msg, subj, diffstat)
 
 
 def _getpatchmsgs(repo, sender, revs, patchnames=None, **opts):
     """return a list of emails from a list of patches
 
     This involves introduction message creation if necessary.
 
     This function returns a list of "email" tuples (subject, content, None).
     """
     bytesopts = pycompat.byteskwargs(opts)
     ui = repo.ui
     _charsets = mail._charsets(ui)
     patches = list(_getpatches(repo, revs, **opts))
     msgs = []
 
     ui.write(_(b'this patch series consists of %d patches.\n\n') % len(patches))
 
     # build the intro message, or skip it if the user declines
     if introwanted(ui, bytesopts, len(patches)):
         msg = _makeintro(repo, sender, revs, patches, **opts)
         if msg:
             msgs.append(msg)
 
     # are we going to send more than one message?
     numbered = len(msgs) + len(patches) > 1
 
     # now generate the actual patch messages
     name = None
     assert len(revs) == len(patches)
     for i, (r, p) in enumerate(zip(revs, patches)):
         if patchnames:
             name = patchnames[i]
         msg = makepatch(
             ui,
             repo,
             r,
             p,
             bytesopts,
             _charsets,
             i + 1,
             len(patches),
             numbered,
             name,
         )
         msgs.append(msg)
 
     return msgs
 
 
 def _getoutgoing(repo, dest, revs):
     '''Return the revisions present locally but not in dest'''
     ui = repo.ui
     url = ui.expandpath(dest or b'default-push', dest or b'default')
     url = hg.parseurl(url)[0]
     ui.status(_(b'comparing with %s\n') % util.hidepassword(url))
 
     revs = [r for r in revs if r >= 0]
     if not revs:
         revs = [repo.changelog.tiprev()]
     revs = repo.revs(b'outgoing(%s) and ::%ld', dest or b'', revs)
     if not revs:
         ui.status(_(b"no changes found\n"))
     return revs
 
 
 def _msgid(node, timestamp):
     hostname = encoding.strtolocal(socket.getfqdn())
     hostname = encoding.environ.get(b'HGHOSTNAME', hostname)
     return b'<%s.%d@%s>' % (node, timestamp, hostname)
 
 
 emailopts = [
     (b'', b'body', None, _(b'send patches as inline message text (default)')),
     (b'a', b'attach', None, _(b'send patches as attachments')),
     (b'i', b'inline', None, _(b'send patches as inline attachments')),
     (
         b'',
         b'bcc',
         [],
         _(b'email addresses of blind carbon copy recipients'),
         _(b'EMAIL'),
     ),
     (b'c', b'cc', [], _(b'email addresses of copy recipients'), _(b'EMAIL')),
     (b'', b'confirm', None, _(b'ask for confirmation before sending')),
     (b'd', b'diffstat', None, _(b'add diffstat output to messages')),
     (
         b'',
         b'date',
         b'',
         _(b'use the given date as the sending date'),
         _(b'DATE'),
     ),
     (
         b'',
         b'desc',
         b'',
         _(b'use the given file as the series description'),
         _(b'FILE'),
     ),
     (b'f', b'from', b'', _(b'email address of sender'), _(b'EMAIL')),
     (b'n', b'test', None, _(b'print messages that would be sent')),
     (
         b'm',
         b'mbox',
         b'',
         _(b'write messages to mbox file instead of sending them'),
         _(b'FILE'),
     ),
     (
         b'',
         b'reply-to',
         [],
         _(b'email addresses replies should be sent to'),
         _(b'EMAIL'),
     ),
     (
         b's',
         b'subject',
         b'',
         _(b'subject of first message (intro or single patch)'),
         _(b'TEXT'),
     ),
     (
         b'',
         b'in-reply-to',
         b'',
         _(b'message identifier to reply to'),
         _(b'MSGID'),
     ),
     (b'', b'flag', [], _(b'flags to add in subject prefixes'), _(b'FLAG')),
     (b't', b'to', [], _(b'email addresses of recipients'), _(b'EMAIL')),
 ]
 
 
 @command(
     b'email',
     [
         (b'g', b'git', None, _(b'use git extended diff format')),
         (b'', b'plain', None, _(b'omit hg patch header')),
         (
             b'o',
             b'outgoing',
             None,
             _(b'send changes not found in the target repository'),
         ),
         (
             b'b',
             b'bundle',
             None,
             _(b'send changes not in target as a binary bundle'),
         ),
         (
             b'B',
             b'bookmark',
             b'',
             _(b'send changes only reachable by given bookmark'),
             _(b'BOOKMARK'),
         ),
         (
             b'',
             b'bundlename',
             b'bundle',
             _(b'name of the bundle attachment file'),
             _(b'NAME'),
         ),
         (b'r', b'rev', [], _(b'a revision to send'), _(b'REV')),
         (
             b'',
             b'force',
             None,
             _(
                 b'run even when remote repository is unrelated '
                 b'(with -b/--bundle)'
             ),
         ),
         (
             b'',
             b'base',
             [],
             _(
                 b'a base changeset to specify instead of a destination '
                 b'(with -b/--bundle)'
             ),
             _(b'REV'),
         ),
         (
             b'',
             b'intro',
             None,
             _(b'send an introduction email for a single patch'),
         ),
     ]
     + emailopts
     + cmdutil.remoteopts,
     _(b'hg email [OPTION]... [DEST]...'),
     helpcategory=command.CATEGORY_IMPORT_EXPORT,
 )
 def email(ui, repo, *revs, **opts):
     '''send changesets by email
 
     By default, diffs are sent in the format generated by
     :hg:`export`, one per message. The series starts with a "[PATCH 0
     of N]" introduction, which describes the series as a whole.
 
     Each patch email has a Subject line of "[PATCH M of N] ...", using
     the first line of the changeset description as the subject text.
     The message contains two or three parts. First, the changeset
     description.
 
     With the -d/--diffstat option, if the diffstat program is
     installed, the result of running diffstat on the patch is inserted.
 
     Finally, the patch itself, as generated by :hg:`export`.
 
     With the -d/--diffstat or --confirm options, you will be presented
     with a final summary of all messages and asked for confirmation before
     the messages are sent.
 
     By default the patch is included as text in the email body for
     easy reviewing. Using the -a/--attach option will instead create
     an attachment for the patch. With -i/--inline an inline attachment
     will be created. You can include a patch both as text in the email
     body and as a regular or an inline attachment by combining the
     -a/--attach or -i/--inline with the --body option.
 
     With -B/--bookmark changesets reachable by the given bookmark are
     selected.
 
     With -o/--outgoing, emails will be generated for patches not found
     in the destination repository (or only those which are ancestors
     of the specified revisions if any are provided)
 
     With -b/--bundle, changesets are selected as for --outgoing, but a
     single email containing a binary Mercurial bundle as an attachment
     will be sent. Use the ``patchbomb.bundletype`` config option to
     control the bundle type as with :hg:`bundle --type`.
 
     With -m/--mbox, instead of previewing each patchbomb message in a
     pager or sending the messages directly, it will create a UNIX
     mailbox file with the patch emails. This mailbox file can be
     previewed with any mail user agent which supports UNIX mbox
     files.
 
     With -n/--test, all steps will run, but mail will not be sent.
     You will be prompted for an email recipient address, a subject and
     an introductory message describing the patches of your patchbomb.
     Then when all is done, patchbomb messages are displayed.
 
     In case email sending fails, you will find a backup of your series
     introductory message in ``.hg/last-email.txt``.
 
     The default behavior of this command can be customized through
     configuration. (See :hg:`help patchbomb` for details)
 
     Examples::
 
       hg email -r 3000          # send patch 3000 only
       hg email -r 3000 -r 3001  # send patches 3000 and 3001
       hg email -r 3000:3005     # send patches 3000 through 3005
       hg email 3000             # send patch 3000 (deprecated)
 
       hg email -o               # send all patches not in default
       hg email -o DEST          # send all patches not in DEST
       hg email -o -r 3000       # send all ancestors of 3000 not in default
       hg email -o -r 3000 DEST  # send all ancestors of 3000 not in DEST
 
       hg email -B feature       # send all ancestors of feature bookmark
 
       hg email -b               # send bundle of all patches not in default
       hg email -b DEST          # send bundle of all patches not in DEST
       hg email -b -r 3000       # bundle of all ancestors of 3000 not in default
       hg email -b -r 3000 DEST  # bundle of all ancestors of 3000 not in DEST
 
       hg email -o -m mbox &&    # generate an mbox file...
         mutt -R -f mbox         # ... and view it with mutt
       hg email -o -m mbox &&    # generate an mbox file ...
         formail -s sendmail \\   # ... and use formail to send from the mbox
           -bm -t < mbox         # ... using sendmail
 
     Before using this command, you will need to enable email in your
     hgrc. See the [email] section in hgrc(5) for details.
     '''
     opts = pycompat.byteskwargs(opts)
 
     _charsets = mail._charsets(ui)
 
     bundle = opts.get(b'bundle')
     date = opts.get(b'date')
     mbox = opts.get(b'mbox')
     outgoing = opts.get(b'outgoing')
     rev = opts.get(b'rev')
     bookmark = opts.get(b'bookmark')
 
     if not (opts.get(b'test') or mbox):
         # really sending
         mail.validateconfig(ui)
 
     if not (revs or rev or outgoing or bundle or bookmark):
         raise error.Abort(
             _(b'specify at least one changeset with -B, -r or -o')
         )
 
     if outgoing and bundle:
         raise error.Abort(
             _(
                 b"--outgoing mode always on with --bundle;"
                 b" do not re-specify --outgoing"
             )
         )
     if rev and bookmark:
         raise error.Abort(_(b"-r and -B are mutually exclusive"))
 
     if outgoing or bundle:
         if len(revs) > 1:
             raise error.Abort(_(b"too many destinations"))
         if revs:
             dest = revs[0]
         else:
             dest = None
         revs = []
 
     if rev:
         if revs:
             raise error.Abort(_(b'use only one form to specify the revision'))
         revs = rev
     elif bookmark:
         if bookmark not in repo._bookmarks:
             raise error.Abort(_(b"bookmark '%s' not found") % bookmark)
         revs = scmutil.bookmarkrevs(repo, bookmark)
 
     revs = scmutil.revrange(repo, revs)
     if outgoing:
         revs = _getoutgoing(repo, dest, revs)
     if bundle:
         opts[b'revs'] = [b"%d" % r for r in revs]
 
     # check if revision exist on the public destination
     publicurl = repo.ui.config(b'patchbomb', b'publicurl')
     if publicurl:
         repo.ui.debug(b'checking that revision exist in the public repo\n')
         try:
             publicpeer = hg.peer(repo, {}, publicurl)
         except error.RepoError:
             repo.ui.write_err(
                 _(b'unable to access public repo: %s\n') % publicurl
             )
             raise
         if not publicpeer.capable(b'known'):
             repo.ui.debug(b'skipping existence checks: public repo too old\n')
         else:
             out = [repo[r] for r in revs]
             known = publicpeer.known(h.node() for h in out)
             missing = []
             for idx, h in enumerate(out):
                 if not known[idx]:
                     missing.append(h)
             if missing:
                 if len(missing) > 1:
                     msg = _(b'public "%s" is missing %s and %i others')
                     msg %= (publicurl, missing[0], len(missing) - 1)
                 else:
                     msg = _(b'public url %s is missing %s')
                     msg %= (publicurl, missing[0])
                 missingrevs = [ctx.rev() for ctx in missing]
                 revhint = b' '.join(
                     b'-r %s' % h for h in repo.set(b'heads(%ld)', missingrevs)
                 )
                 hint = _(b"use 'hg push %s %s'") % (publicurl, revhint)
                 raise error.Abort(msg, hint=hint)
 
     # start
     if date:
         start_time = dateutil.parsedate(date)
     else:
         start_time = dateutil.makedate()
 
     def genmsgid(id):
         return _msgid(id[:20], int(start_time[0]))
 
     # deprecated config: patchbomb.from
     sender = (
         opts.get(b'from')
         or ui.config(b'email', b'from')
         or ui.config(b'patchbomb', b'from')
         or prompt(ui, b'From', ui.username())
     )
 
     if bundle:
         stropts = pycompat.strkwargs(opts)
         bundledata = _getbundle(repo, dest, **stropts)
         bundleopts = stropts.copy()
         bundleopts.pop(r'bundle', None)  # already processed
         msgs = _getbundlemsgs(repo, sender, bundledata, **bundleopts)
     else:
         msgs = _getpatchmsgs(repo, sender, revs, **pycompat.strkwargs(opts))
 
     showaddrs = []
 
     def getaddrs(header, ask=False, default=None):
         configkey = header.lower()
         opt = header.replace(b'-', b'_').lower()
         addrs = opts.get(opt)
         if addrs:
             showaddrs.append(b'%s: %s' % (header, b', '.join(addrs)))
             return mail.addrlistencode(ui, addrs, _charsets, opts.get(b'test'))
 
         # not on the command line: fallback to config and then maybe ask
         addr = ui.config(b'email', configkey) or ui.config(
             b'patchbomb', configkey
         )
         if not addr:
             specified = ui.hasconfig(b'email', configkey) or ui.hasconfig(
                 b'patchbomb', configkey
             )
             if not specified and ask:
                 addr = prompt(ui, header, default=default)
         if addr:
             showaddrs.append(b'%s: %s' % (header, addr))
             return mail.addrlistencode(ui, [addr], _charsets, opts.get(b'test'))
         elif default:
             return mail.addrlistencode(
                 ui, [default], _charsets, opts.get(b'test')
             )
         return []
 
     to = getaddrs(b'To', ask=True)
     if not to:
         # we can get here in non-interactive mode
         raise error.Abort(_(b'no recipient addresses provided'))
     cc = getaddrs(b'Cc', ask=True, default=b'')
     bcc = getaddrs(b'Bcc')
     replyto = getaddrs(b'Reply-To')
 
     confirm = ui.configbool(b'patchbomb', b'confirm')
     confirm |= bool(opts.get(b'diffstat') or opts.get(b'confirm'))
 
     if confirm:
         ui.write(_(b'\nFinal summary:\n\n'), label=b'patchbomb.finalsummary')
         ui.write((b'From: %s\n' % sender), label=b'patchbomb.from')
         for addr in showaddrs:
             ui.write(b'%s\n' % addr, label=b'patchbomb.to')
         for m, subj, ds in msgs:
             ui.write((b'Subject: %s\n' % subj), label=b'patchbomb.subject')
             if ds:
                 ui.write(ds, label=b'patchbomb.diffstats')
         ui.write(b'\n')
         if ui.promptchoice(
             _(b'are you sure you want to send (yn)?' b'$$ &Yes $$ &No')
         ):
             raise error.Abort(_(b'patchbomb canceled'))
 
     ui.write(b'\n')
 
     parent = opts.get(b'in_reply_to') or None
     # angle brackets may be omitted, they're not semantically part of the msg-id
     if parent is not None:
         if not parent.startswith(b'<'):
             parent = b'<' + parent
         if not parent.endswith(b'>'):
             parent += b'>'
 
     sender_addr = eutil.parseaddr(encoding.strfromlocal(sender))[1]
     sender = mail.addressencode(ui, sender, _charsets, opts.get(b'test'))
     sendmail = None
     firstpatch = None
     progress = ui.makeprogress(
         _(b'sending'), unit=_(b'emails'), total=len(msgs)
     )
     for i, (m, subj, ds) in enumerate(msgs):
         try:
             m[b'Message-Id'] = genmsgid(m[b'X-Mercurial-Node'])
             if not firstpatch:
                 firstpatch = m[b'Message-Id']
             m[b'X-Mercurial-Series-Id'] = firstpatch
         except TypeError:
             m[b'Message-Id'] = genmsgid(b'patchbomb')
         if parent:
             m[b'In-Reply-To'] = parent
             m[b'References'] = parent
         if not parent or b'X-Mercurial-Node' not in m:
             parent = m[b'Message-Id']
 
         m[b'User-Agent'] = b'Mercurial-patchbomb/%s' % util.version()
         m[b'Date'] = eutil.formatdate(start_time[0], localtime=True)
 
         start_time = (start_time[0] + 1, start_time[1])
         m[b'From'] = sender
         m[b'To'] = b', '.join(to)
         if cc:
             m[b'Cc'] = b', '.join(cc)
         if bcc:
             m[b'Bcc'] = b', '.join(bcc)
         if replyto:
             m[b'Reply-To'] = b', '.join(replyto)
         # Fix up all headers to be native strings.
         # TODO(durin42): this should probably be cleaned up above in the future.
         if pycompat.ispy3:
             for hdr, val in list(m.items()):
                 change = False
                 if isinstance(hdr, bytes):
                     del m[hdr]
                     hdr = pycompat.strurl(hdr)
                     change = True
                 if isinstance(val, bytes):
                     val = pycompat.strurl(val)
                     if not change:
                         # prevent duplicate headers
                         del m[hdr]
                     change = True
                 if change:
                     m[hdr] = val
         if opts.get(b'test'):
             ui.status(_(b'displaying '), subj, b' ...\n')
             ui.pager(b'email')
             generator = _bytesgenerator(ui, mangle_from_=False)
             try:
                 generator.flatten(m, 0)
                 ui.write(b'\n')
             except IOError as inst:
                 if inst.errno != errno.EPIPE:
                     raise
         else:
             if not sendmail:
                 sendmail = mail.connect(ui, mbox=mbox)
             ui.status(_(b'sending '), subj, b' ...\n')
             progress.update(i, item=subj)
             if not mbox:
                 # Exim does not remove the Bcc field
                 del m[b'Bcc']
             fp = stringio()
             generator = _bytesgenerator(fp, mangle_from_=False)
             generator.flatten(m, 0)
             alldests = to + bcc + cc
             alldests = [encoding.strfromlocal(d) for d in alldests]
             sendmail(sender_addr, alldests, fp.getvalue())
 
     progress.complete()

mercurial/formatter.py

@@ -1,762 +1,762 b''
 # formatter.py - generic output formatting for mercurial
 #
 # Copyright 2012 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.
 
 """Generic output formatting for Mercurial
 
 The formatter provides API to show data in various ways. The following
 functions should be used in place of ui.write():
 
 - fm.write() for unconditional output
 - fm.condwrite() to show some extra data conditionally in plain output
 - fm.context() to provide changectx to template output
 - fm.data() to provide extra data to JSON or template output
 - fm.plain() to show raw text that isn't provided to JSON or template output
 
 To show structured data (e.g. date tuples, dicts, lists), apply fm.format*()
 beforehand so the data is converted to the appropriate data type. Use
 fm.isplain() if you need to convert or format data conditionally which isn't
 supported by the formatter API.
 
 To build nested structure (i.e. a list of dicts), use fm.nested().
 
 See also https://www.mercurial-scm.org/wiki/GenericTemplatingPlan
 
 fm.condwrite() vs 'if cond:':
 
 In most cases, use fm.condwrite() so users can selectively show the data
 in template output. If it's costly to build data, use plain 'if cond:' with
 fm.write().
 
 fm.nested() vs fm.formatdict() (or fm.formatlist()):
 
 fm.nested() should be used to form a tree structure (a list of dicts of
 lists of dicts...) which can be accessed through template keywords, e.g.
 "{foo % "{bar % {...}} {baz % {...}}"}". On the other hand, fm.formatdict()
 exports a dict-type object to template, which can be accessed by e.g.
 "{get(foo, key)}" function.
 
 Doctest helper:
 
 >>> def show(fn, verbose=False, **opts):
 ...     import sys
 ...     from . import ui as uimod
 ...     ui = uimod.ui()
 ...     ui.verbose = verbose
 ...     ui.pushbuffer()
 ...     try:
 ...         return fn(ui, ui.formatter(pycompat.sysbytes(fn.__name__),
 ...                   pycompat.byteskwargs(opts)))
 ...     finally:
 ...         print(pycompat.sysstr(ui.popbuffer()), end='')
 
 Basic example:
 
 >>> def files(ui, fm):
 ...     files = [(b'foo', 123, (0, 0)), (b'bar', 456, (1, 0))]
 ...     for f in files:
 ...         fm.startitem()
 ...         fm.write(b'path', b'%s', f[0])
 ...         fm.condwrite(ui.verbose, b'date', b'  %s',
 ...                      fm.formatdate(f[2], b'%Y-%m-%d %H:%M:%S'))
 ...         fm.data(size=f[1])
 ...         fm.plain(b'\\n')
 ...     fm.end()
 >>> show(files)
 foo
 bar
 >>> show(files, verbose=True)
 foo  1970-01-01 00:00:00
 bar  1970-01-01 00:00:01
 >>> show(files, template=b'json')
 [
  {
   "date": [0, 0],
   "path": "foo",
   "size": 123
  },
  {
   "date": [1, 0],
   "path": "bar",
   "size": 456
  }
 ]
 >>> show(files, template=b'path: {path}\\ndate: {date|rfc3339date}\\n')
 path: foo
 date: 1970-01-01T00:00:00+00:00
 path: bar
 date: 1970-01-01T00:00:01+00:00
 
 Nested example:
 
 >>> def subrepos(ui, fm):
 ...     fm.startitem()
 ...     fm.write(b'reponame', b'[%s]\\n', b'baz')
 ...     files(ui, fm.nested(b'files', tmpl=b'{reponame}'))
 ...     fm.end()
 >>> show(subrepos)
 [baz]
 foo
 bar
 >>> show(subrepos, template=b'{reponame}: {join(files % "{path}", ", ")}\\n')
 baz: foo, bar
 """
 
 from __future__ import absolute_import, print_function
 
 import contextlib
 import itertools
 import os
 
 from .i18n import _
 from .node import (
     hex,
     short,
 )
 from .thirdparty import attr
 
 from . import (
     error,
     pycompat,
     templatefilters,
     templatekw,
     templater,
     templateutil,
     util,
 )
 from .utils import (
     cborutil,
     dateutil,
     stringutil,
 )
 
 pickle = util.pickle
 
 
 class _nullconverter(object):
     '''convert non-primitive data types to be processed by formatter'''
 
     # set to True if context object should be stored as item
     storecontext = False
 
     @staticmethod
     def wrapnested(data, tmpl, sep):
         '''wrap nested data by appropriate type'''
         return data
 
     @staticmethod
     def formatdate(date, fmt):
         '''convert date tuple to appropriate format'''
         # timestamp can be float, but the canonical form should be int
         ts, tz = date
         return (int(ts), tz)
 
     @staticmethod
     def formatdict(data, key, value, fmt, sep):
         '''convert dict or key-value pairs to appropriate dict format'''
         # use plain dict instead of util.sortdict so that data can be
         # serialized as a builtin dict in pickle output
         return dict(data)
 
     @staticmethod
     def formatlist(data, name, fmt, sep):
         '''convert iterable to appropriate list format'''
         return list(data)
 
 
 class baseformatter(object):
     def __init__(self, ui, topic, opts, converter):
         self._ui = ui
         self._topic = topic
         self._opts = opts
         self._converter = converter
         self._item = None
         # function to convert node to string suitable for this output
         self.hexfunc = hex
 
     def __enter__(self):
         return self
 
     def __exit__(self, exctype, excvalue, traceback):
         if exctype is None:
             self.end()
 
     def _showitem(self):
         '''show a formatted item once all data is collected'''
 
     def startitem(self):
         '''begin an item in the format list'''
         if self._item is not None:
             self._showitem()
         self._item = {}
 
     def formatdate(self, date, fmt=b'%a %b %d %H:%M:%S %Y %1%2'):
         '''convert date tuple to appropriate format'''
         return self._converter.formatdate(date, fmt)
 
     def formatdict(self, data, key=b'key', value=b'value', fmt=None, sep=b' '):
         '''convert dict or key-value pairs to appropriate dict format'''
         return self._converter.formatdict(data, key, value, fmt, sep)
 
     def formatlist(self, data, name, fmt=None, sep=b' '):
         '''convert iterable to appropriate list format'''
         # name is mandatory argument for now, but it could be optional if
         # we have default template keyword, e.g. {item}
         return self._converter.formatlist(data, name, fmt, sep)
 
     def context(self, **ctxs):
         '''insert context objects to be used to render template keywords'''
         ctxs = pycompat.byteskwargs(ctxs)
         assert all(k in {b'repo', b'ctx', b'fctx'} for k in ctxs)
         if self._converter.storecontext:
             # populate missing resources in fctx -> ctx -> repo order
             if b'fctx' in ctxs and b'ctx' not in ctxs:
                 ctxs[b'ctx'] = ctxs[b'fctx'].changectx()
             if b'ctx' in ctxs and b'repo' not in ctxs:
                 ctxs[b'repo'] = ctxs[b'ctx'].repo()
             self._item.update(ctxs)
 
     def datahint(self):
         '''set of field names to be referenced'''
         return set()
 
     def data(self, **data):
         '''insert data into item that's not shown in default output'''
         data = pycompat.byteskwargs(data)
         self._item.update(data)
 
     def write(self, fields, deftext, *fielddata, **opts):
         '''do default text output while assigning data to item'''
         fieldkeys = fields.split()
         assert len(fieldkeys) == len(fielddata), (fieldkeys, fielddata)
         self._item.update(zip(fieldkeys, fielddata))
 
     def condwrite(self, cond, fields, deftext, *fielddata, **opts):
         '''do conditional write (primarily for plain formatter)'''
         fieldkeys = fields.split()
         assert len(fieldkeys) == len(fielddata)
         self._item.update(zip(fieldkeys, fielddata))
 
     def plain(self, text, **opts):
         '''show raw text for non-templated mode'''
 
     def isplain(self):
         '''check for plain formatter usage'''
         return False
 
     def nested(self, field, tmpl=None, sep=b''):
         '''sub formatter to store nested data in the specified field'''
         data = []
         self._item[field] = self._converter.wrapnested(data, tmpl, sep)
         return _nestedformatter(self._ui, self._converter, data)
 
     def end(self):
         '''end output for the formatter'''
         if self._item is not None:
             self._showitem()
 
 
 def nullformatter(ui, topic, opts):
     '''formatter that prints nothing'''
     return baseformatter(ui, topic, opts, converter=_nullconverter)
 
 
 class _nestedformatter(baseformatter):
     '''build sub items and store them in the parent formatter'''
 
     def __init__(self, ui, converter, data):
         baseformatter.__init__(
             self, ui, topic=b'', opts={}, converter=converter
         )
         self._data = data
 
     def _showitem(self):
         self._data.append(self._item)
 
 
 def _iteritems(data):
     '''iterate key-value pairs in stable order'''
     if isinstance(data, dict):
         return sorted(data.iteritems())
     return data
 
 
 class _plainconverter(object):
     '''convert non-primitive data types to text'''
 
     storecontext = False
 
     @staticmethod
     def wrapnested(data, tmpl, sep):
         raise error.ProgrammingError(b'plainformatter should never be nested')
 
     @staticmethod
     def formatdate(date, fmt):
         '''stringify date tuple in the given format'''
         return dateutil.datestr(date, fmt)
 
     @staticmethod
     def formatdict(data, key, value, fmt, sep):
         '''stringify key-value pairs separated by sep'''
         prefmt = pycompat.identity
         if fmt is None:
             fmt = b'%s=%s'
             prefmt = pycompat.bytestr
         return sep.join(
             fmt % (prefmt(k), prefmt(v)) for k, v in _iteritems(data)
         )
 
     @staticmethod
     def formatlist(data, name, fmt, sep):
         '''stringify iterable separated by sep'''
         prefmt = pycompat.identity
         if fmt is None:
             fmt = b'%s'
             prefmt = pycompat.bytestr
         return sep.join(fmt % prefmt(e) for e in data)
 
 
 class plainformatter(baseformatter):
     '''the default text output scheme'''
 
     def __init__(self, ui, out, topic, opts):
         baseformatter.__init__(self, ui, topic, opts, _plainconverter)
         if ui.debugflag:
             self.hexfunc = hex
         else:
             self.hexfunc = short
         if ui is out:
             self._write = ui.write
         else:
             self._write = lambda s, **opts: out.write(s)
 
     def startitem(self):
         pass
 
     def data(self, **data):
         pass
 
     def write(self, fields, deftext, *fielddata, **opts):
         self._write(deftext % fielddata, **opts)
 
     def condwrite(self, cond, fields, deftext, *fielddata, **opts):
         '''do conditional write'''
         if cond:
             self._write(deftext % fielddata, **opts)
 
     def plain(self, text, **opts):
         self._write(text, **opts)
 
     def isplain(self):
         return True
 
     def nested(self, field, tmpl=None, sep=b''):
         # nested data will be directly written to ui
         return self
 
     def end(self):
         pass
 
 
 class debugformatter(baseformatter):
     def __init__(self, ui, out, topic, opts):
         baseformatter.__init__(self, ui, topic, opts, _nullconverter)
         self._out = out
         self._out.write(b"%s = [\n" % self._topic)
 
     def _showitem(self):
         self._out.write(
             b'    %s,\n' % stringutil.pprint(self._item, indent=4, level=1)
         )
 
     def end(self):
         baseformatter.end(self)
         self._out.write(b"]\n")
 
 
 class pickleformatter(baseformatter):
     def __init__(self, ui, out, topic, opts):
         baseformatter.__init__(self, ui, topic, opts, _nullconverter)
         self._out = out
         self._data = []
 
     def _showitem(self):
         self._data.append(self._item)
 
     def end(self):
         baseformatter.end(self)
         self._out.write(pickle.dumps(self._data))
 
 
 class cborformatter(baseformatter):
     '''serialize items as an indefinite-length CBOR array'''
 
     def __init__(self, ui, out, topic, opts):
         baseformatter.__init__(self, ui, topic, opts, _nullconverter)
         self._out = out
         self._out.write(cborutil.BEGIN_INDEFINITE_ARRAY)
 
     def _showitem(self):
         self._out.write(b''.join(cborutil.streamencode(self._item)))
 
     def end(self):
         baseformatter.end(self)
         self._out.write(cborutil.BREAK)
 
 
 class jsonformatter(baseformatter):
     def __init__(self, ui, out, topic, opts):
         baseformatter.__init__(self, ui, topic, opts, _nullconverter)
         self._out = out
         self._out.write(b"[")
         self._first = True
 
     def _showitem(self):
         if self._first:
             self._first = False
         else:
             self._out.write(b",")
 
         self._out.write(b"\n {\n")
         first = True
         for k, v in sorted(self._item.items()):
             if first:
                 first = False
             else:
                 self._out.write(b",\n")
             u = templatefilters.json(v, paranoid=False)
             self._out.write(b'  "%s": %s' % (k, u))
         self._out.write(b"\n }")
 
     def end(self):
         baseformatter.end(self)
         self._out.write(b"\n]\n")
 
 
 class _templateconverter(object):
     '''convert non-primitive data types to be processed by templater'''
 
     storecontext = True
 
     @staticmethod
     def wrapnested(data, tmpl, sep):
         '''wrap nested data by templatable type'''
         return templateutil.mappinglist(data, tmpl=tmpl, sep=sep)
 
     @staticmethod
     def formatdate(date, fmt):
         '''return date tuple'''
         return templateutil.date(date)
 
     @staticmethod
     def formatdict(data, key, value, fmt, sep):
         '''build object that can be evaluated as either plain string or dict'''
         data = util.sortdict(_iteritems(data))
 
         def f():
             yield _plainconverter.formatdict(data, key, value, fmt, sep)
 
         return templateutil.hybriddict(
             data, key=key, value=value, fmt=fmt, gen=f
         )
 
     @staticmethod
     def formatlist(data, name, fmt, sep):
         '''build object that can be evaluated as either plain string or list'''
         data = list(data)
 
         def f():
             yield _plainconverter.formatlist(data, name, fmt, sep)
 
         return templateutil.hybridlist(data, name=name, fmt=fmt, gen=f)
 
 
 class templateformatter(baseformatter):
-    def __init__(self, ui, out, topic, opts):
+    def __init__(self, ui, out, topic, opts, spec):
         baseformatter.__init__(self, ui, topic, opts, _templateconverter)
         self._out = out
-        spec = lookuptemplate(ui, topic, opts.get(b'template', b''))
         self._tref = spec.ref
         self._t = loadtemplater(
             ui,
             spec,
             defaults=templatekw.keywords,
             resources=templateresources(ui),
             cache=templatekw.defaulttempl,
         )
         self._parts = templatepartsmap(
             spec, self._t, [b'docheader', b'docfooter', b'separator']
         )
         self._counter = itertools.count()
         self._renderitem(b'docheader', {})
 
     def _showitem(self):
         item = self._item.copy()
         item[b'index'] = index = next(self._counter)
         if index > 0:
             self._renderitem(b'separator', {})
         self._renderitem(self._tref, item)
 
     def _renderitem(self, part, item):
         if part not in self._parts:
             return
         ref = self._parts[part]
         self._out.write(self._t.render(ref, item))
 
     @util.propertycache
     def _symbolsused(self):
         return self._t.symbolsused(self._tref)
 
     def datahint(self):
         '''set of field names to be referenced from the template'''
         return self._symbolsused[0]
 
     def end(self):
         baseformatter.end(self)
         self._renderitem(b'docfooter', {})
 
 
 @attr.s(frozen=True)
 class templatespec(object):
     ref = attr.ib()
     tmpl = attr.ib()
     mapfile = attr.ib()
 
 
 def lookuptemplate(ui, topic, tmpl):
     """Find the template matching the given -T/--template spec 'tmpl'
 
     'tmpl' can be any of the following:
 
      - a literal template (e.g. '{rev}')
      - a map-file name or path (e.g. 'changelog')
      - a reference to [templates] in config file
      - a path to raw template file
 
     A map file defines a stand-alone template environment. If a map file
     selected, all templates defined in the file will be loaded, and the
     template matching the given topic will be rendered. Aliases won't be
     loaded from user config, but from the map file.
 
     If no map file selected, all templates in [templates] section will be
     available as well as aliases in [templatealias].
     """
 
     # looks like a literal template?
     if b'{' in tmpl:
         return templatespec(b'', tmpl, None)
 
     # perhaps a stock style?
     if not os.path.split(tmpl)[0]:
         mapname = templater.templatepath(
             b'map-cmdline.' + tmpl
         ) or templater.templatepath(tmpl)
         if mapname and os.path.isfile(mapname):
             return templatespec(topic, None, mapname)
 
     # perhaps it's a reference to [templates]
     if ui.config(b'templates', tmpl):
         return templatespec(tmpl, None, None)
 
     if tmpl == b'list':
         ui.write(_(b"available styles: %s\n") % templater.stylelist())
         raise error.Abort(_(b"specify a template"))
 
     # perhaps it's a path to a map or a template
     if (b'/' in tmpl or b'\\' in tmpl) and os.path.isfile(tmpl):
         # is it a mapfile for a style?
         if os.path.basename(tmpl).startswith(b"map-"):
             return templatespec(topic, None, os.path.realpath(tmpl))
         with util.posixfile(tmpl, b'rb') as f:
             tmpl = f.read()
         return templatespec(b'', tmpl, None)
 
     # constant string?
     return templatespec(b'', tmpl, None)
 
 
 def templatepartsmap(spec, t, partnames):
     """Create a mapping of {part: ref}"""
     partsmap = {spec.ref: spec.ref}  # initial ref must exist in t
     if spec.mapfile:
         partsmap.update((p, p) for p in partnames if p in t)
     elif spec.ref:
         for part in partnames:
             ref = b'%s:%s' % (spec.ref, part)  # select config sub-section
             if ref in t:
                 partsmap[part] = ref
     return partsmap
 
 
 def loadtemplater(ui, spec, defaults=None, resources=None, cache=None):
     """Create a templater from either a literal template or loading from
     a map file"""
     assert not (spec.tmpl and spec.mapfile)
     if spec.mapfile:
         frommapfile = templater.templater.frommapfile
         return frommapfile(
             spec.mapfile, defaults=defaults, resources=resources, cache=cache
         )
     return maketemplater(
         ui, spec.tmpl, defaults=defaults, resources=resources, cache=cache
     )
 
 
 def maketemplater(ui, tmpl, defaults=None, resources=None, cache=None):
     """Create a templater from a string template 'tmpl'"""
     aliases = ui.configitems(b'templatealias')
     t = templater.templater(
         defaults=defaults, resources=resources, cache=cache, aliases=aliases
     )
     t.cache.update(
         (k, templater.unquotestring(v)) for k, v in ui.configitems(b'templates')
     )
     if tmpl:
         t.cache[b''] = tmpl
     return t
 
 
 # marker to denote a resource to be loaded on demand based on mapping values
 # (e.g. (ctx, path) -> fctx)
 _placeholder = object()
 
 
 class templateresources(templater.resourcemapper):
     """Resource mapper designed for the default templatekw and function"""
 
     def __init__(self, ui, repo=None):
         self._resmap = {
             b'cache': {},  # for templatekw/funcs to store reusable data
             b'repo': repo,
             b'ui': ui,
         }
 
     def availablekeys(self, mapping):
         return {
             k for k in self.knownkeys() if self._getsome(mapping, k) is not None
         }
 
     def knownkeys(self):
         return {b'cache', b'ctx', b'fctx', b'repo', b'revcache', b'ui'}
 
     def lookup(self, mapping, key):
         if key not in self.knownkeys():
             return None
         v = self._getsome(mapping, key)
         if v is _placeholder:
             v = mapping[key] = self._loadermap[key](self, mapping)
         return v
 
     def populatemap(self, context, origmapping, newmapping):
         mapping = {}
         if self._hasnodespec(newmapping):
             mapping[b'revcache'] = {}  # per-ctx cache
         if self._hasnodespec(origmapping) and self._hasnodespec(newmapping):
             orignode = templateutil.runsymbol(context, origmapping, b'node')
             mapping[b'originalnode'] = orignode
         # put marker to override 'ctx'/'fctx' in mapping if any, and flag
         # its existence to be reported by availablekeys()
         if b'ctx' not in newmapping and self._hasliteral(newmapping, b'node'):
             mapping[b'ctx'] = _placeholder
         if b'fctx' not in newmapping and self._hasliteral(newmapping, b'path'):
             mapping[b'fctx'] = _placeholder
         return mapping
 
     def _getsome(self, mapping, key):
         v = mapping.get(key)
         if v is not None:
             return v
         return self._resmap.get(key)
 
     def _hasliteral(self, mapping, key):
         """Test if a literal value is set or unset in the given mapping"""
         return key in mapping and not callable(mapping[key])
 
     def _getliteral(self, mapping, key):
         """Return value of the given name if it is a literal"""
         v = mapping.get(key)
         if callable(v):
             return None
         return v
 
     def _hasnodespec(self, mapping):
         """Test if context revision is set or unset in the given mapping"""
         return b'node' in mapping or b'ctx' in mapping
 
     def _loadctx(self, mapping):
         repo = self._getsome(mapping, b'repo')
         node = self._getliteral(mapping, b'node')
         if repo is None or node is None:
             return
         try:
             return repo[node]
         except error.RepoLookupError:
             return None  # maybe hidden/non-existent node
 
     def _loadfctx(self, mapping):
         ctx = self._getsome(mapping, b'ctx')
         path = self._getliteral(mapping, b'path')
         if ctx is None or path is None:
             return None
         try:
             return ctx[path]
         except error.LookupError:
             return None  # maybe removed file?
 
     _loadermap = {
         b'ctx': _loadctx,
         b'fctx': _loadfctx,
     }
 
 
 def formatter(ui, out, topic, opts):
     template = opts.get(b"template", b"")
     if template == b"cbor":
         return cborformatter(ui, out, topic, opts)
     elif template == b"json":
         return jsonformatter(ui, out, topic, opts)
     elif template == b"pickle":
         return pickleformatter(ui, out, topic, opts)
     elif template == b"debug":
         return debugformatter(ui, out, topic, opts)
     elif template != b"":
-        return templateformatter(ui, out, topic, opts)
+        spec = lookuptemplate(ui, topic, opts.get(b'template', b''))
+        return templateformatter(ui, out, topic, opts, spec)
     # developer config: ui.formatdebug
     elif ui.configbool(b'ui', b'formatdebug'):
         return debugformatter(ui, out, topic, opts)
     # deprecated config: ui.formatjson
     elif ui.configbool(b'ui', b'formatjson'):
         return jsonformatter(ui, out, topic, opts)
     return plainformatter(ui, out, topic, opts)
 
 
 @contextlib.contextmanager
 def openformatter(ui, filename, topic, opts):
     """Create a formatter that writes outputs to the specified file
 
     Must be invoked using the 'with' statement.
     """
     with util.posixfile(filename, b'wb') as out:
         with formatter(ui, out, topic, opts) as fm:
             yield fm
 
 
 @contextlib.contextmanager
 def _neverending(fm):
     yield fm
 
 
 def maybereopen(fm, filename):
     """Create a formatter backed by file if filename specified, else return
     the given formatter
 
     Must be invoked using the 'with' statement. This will never call fm.end()
     of the given formatter.
     """
     if filename:
         return openformatter(fm._ui, filename, fm._topic, fm._opts)
     else:
         return _neverending(fm)