diff -r 61b60b28c381 -r 6d79e9109908 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Sat Apr 22 21:29:00 2017 +0900
+++ b/mercurial/cmdutil.py	Sat Apr 22 21:16:08 2017 +0900
@@ -1603,6 +1603,10 @@
                     cur = t + postfix
                     if mode and cur in self.t:
                         self._parts[t] = cur
+        else:
+            partnames = [p for p in self._parts.keys() if p != tmplspec.ref]
+            m = formatter.templatepartsmap(tmplspec, self.t, partnames)
+            self._parts.update(m)
 
         if self._parts['docheader']:
             self.ui.write(templater.stringify(self.t(self._parts['docheader'])))