Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 36991:317382151ac3
templater: rename .render(mapping) to .renderdefault(mapping) (API)
I'm going to add templ.render(t, mapping) and templ.generate(t, mapping) in
place of stringify(templ(t, **mapping)) and templ(t, **mapping) respectively.
.. api::
The ``render(mapping)`` method of the templater has been renamed to
``renderdefault(mapping)``.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 17 Mar 2018 11:23:04 +0900 |
| parents | a4a95bd7158d |
| children | 3723b42ff953 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sat Mar 17 15:22:14 2018 +0900 +++ b/mercurial/filemerge.py Sat Mar 17 11:23:04 2018 +0900 @@ -563,7 +563,7 @@ ctx = ctx.p1() props = {'ctx': ctx} - templateresult = template.render(props) + templateresult = template.renderdefault(props) label = ('%s:' % label).ljust(pad + 1) mark = '%s %s' % (label, templateresult)