Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 20667:e96e9f805c19
changeset_templater: remove use_template method
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 08 Mar 2014 16:14:08 -0600 |
parents | e3eb480a9391 |
children | 3a35ba2681ec |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Mar 08 16:01:58 2014 -0600 +++ b/mercurial/cmdutil.py Sat Mar 08 16:14:08 2014 -0600 @@ -948,7 +948,7 @@ class changeset_templater(changeset_printer): '''format changeset information.''' - def __init__(self, ui, repo, patch, diffopts, mapfile, buffered): + def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) defaulttempl = { @@ -961,11 +961,10 @@ defaulttempl['filecopy'] = defaulttempl['file_copy'] self.t = templater.templater(mapfile, {'formatnode': formatnode}, cache=defaulttempl) - self.cache = {} + if tmpl: + self.t.cache['changeset'] = tmpl - def use_template(self, t): - '''set template string to use''' - self.t.cache['changeset'] = t + self.cache = {} def _meaningful_parentrevs(self, ctx): """Return list of meaningful (or all if debug) parentrevs for rev. @@ -1096,11 +1095,9 @@ return changeset_printer(ui, repo, patch, opts, buffered) try: - t = changeset_templater(ui, repo, patch, opts, mapfile, buffered) + t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) except SyntaxError, inst: raise util.Abort(inst.args[0]) - if tmpl: - t.use_template(tmpl) return t def showmarker(ui, marker):