diff -r 8fba319750c2 -r 6ff6e1d6b5b8 mercurial/templater.py --- a/mercurial/templater.py Wed Feb 28 15:20:41 2018 -0500 +++ b/mercurial/templater.py Thu Mar 08 23:10:46 2018 +0900 @@ -1118,8 +1118,6 @@ # template engine -stringify = templatefilters.stringify - def _flatten(thing): '''yield a single stream from a possibly nested set of iterators''' thing = templatekw.unwraphybrid(thing) @@ -1366,7 +1364,7 @@ def render(self, mapping): """Render the default unnamed template and return result as string""" mapping = pycompat.strkwargs(mapping) - return stringify(self('', **mapping)) + return templateutil.stringify(self('', **mapping)) def __call__(self, t, **mapping): mapping = pycompat.byteskwargs(mapping)