# HG changeset patch
# User Yuya Nishihara <y...@tcha.org>
# Date 1492864688 -32400
# Sat Apr 22 21:38:08 2017 +0900
# Node ID 2126758ba0a19d028d59add12f8420ede690dfc9
# Parent 9107c695a656eaec6ccc02416660236e912a455c
formatter: extract helper function to render template
diff --git a/mercurial/formatter.py b/mercurial/formatter.py
--- a/mercurial/formatter.py
+++ b/mercurial/formatter.py
@@ -357,23 +357,28 @@ class templateformatter(baseformatter):
ctxs = pycompat.byteskwargs(ctxs)
assert all(k == 'ctx' for k in ctxs)
self._item.update(ctxs)
+
def _showitem(self):
+ item = self._item.copy()
+ item['index'] = next(self._counter)
+ self._renderitem(self._tref, item)
+
+ def _renderitem(self, ref, item):
# TODO: add support for filectx. probably each template keyword or
# function will have to declare dependent resources. e.g.
# @templatekeyword(..., requires=('ctx',))
props = {}
- if 'ctx' in self._item:
+ if 'ctx' in item:
props.update(templatekw.keywords)
- props['index'] = next(self._counter)
# explicitly-defined fields precede templatekw
- props.update(self._item)
- if 'ctx' in self._item:
+ props.update(item)
+ if 'ctx' in item:
# but template resources must be always available
props['templ'] = self._t
props['repo'] = props['ctx'].repo()
props['revcache'] = {}
props = pycompat.strkwargs(props)
- g = self._t(self._tref, ui=self._ui, cache=self._cache, **props)
+ g = self._t(ref, ui=self._ui, cache=self._cache, **props)
self._out.write(templater.stringify(g))
templatespec = collections.namedtuple(r'templatespec',
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
