diff -r 68c910fa9ee2 -r 21f129354dd0 mercurial/formatter.py
--- a/mercurial/formatter.py	Wed Apr 12 21:10:47 2017 +0900
+++ b/mercurial/formatter.py	Wed Apr 05 22:25:36 2017 +0900
@@ -329,8 +329,7 @@
         data = list(data)
         def f():
             yield _plainconverter.formatlist(data, name, fmt, sep)
-        return templatekw._hybrid(f(), data, lambda x: {name: x},
-                                  lambda d: fmt % d[name])
+        return templatekw.hybridlist(data, name=name, fmt=fmt, gen=f())
 
 class templateformatter(baseformatter):
     def __init__(self, ui, out, topic, opts):