changeset 28954 | f97a0bcfd7a1 |
parent 28630 | bf35644b9f3a |
child 28955 | 78759f78a44e |
--- a/mercurial/formatter.py Sun Apr 03 23:18:30 2016 +0900 +++ b/mercurial/formatter.py Sun Apr 03 23:26:48 2016 +0900 @@ -190,7 +190,10 @@ def gettemplater(ui, topic, spec): tmpl, mapfile = lookuptemplate(ui, topic, spec) - t = templater.templater(mapfile, {}) + assert not (tmpl and mapfile) + if mapfile: + return templater.templater.frommapfile(mapfile) + t = templater.templater() if tmpl: t.cache[topic] = tmpl return t