--- a/mercurial/formatter.py Thu Mar 08 23:10:46 2018 +0900
+++ b/mercurial/formatter.py Thu Mar 08 23:15:09 2018 +0900
@@ -359,14 +359,15 @@
data = util.sortdict(_iteritems(data))
def f():
yield _plainconverter.formatdict(data, key, value, fmt, sep)
- return templatekw.hybriddict(data, key=key, value=value, fmt=fmt, gen=f)
+ 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 templatekw.hybridlist(data, name=name, fmt=fmt, gen=f)
+ return templateutil.hybridlist(data, name=name, fmt=fmt, gen=f)
class templateformatter(baseformatter):
def __init__(self, ui, out, topic, opts):