Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 4355:10edaed7f909
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 16 Apr 2007 12:37:30 -0500 |
parents | 0d51eb296fb9 051fb8c2567c |
children | e89f9afc462b |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Apr 16 09:52:37 2007 -0500 +++ b/mercurial/cmdutil.py Mon Apr 16 12:37:30 2007 -0500 @@ -225,7 +225,7 @@ return 1 return 0 - def show(self, rev=0, changenode=None, copies=None, **props): + def show(self, rev=0, changenode=None, copies=(), **props): if self.buffered: self.ui.pushbuffer() self._show(rev, changenode, copies, props) @@ -321,10 +321,14 @@ def __init__(self, ui, repo, patch, mapfile, buffered): changeset_printer.__init__(self, ui, repo, patch, buffered) - self.t = templater.templater(mapfile, templater.common_filters, - cache={'parent': '{rev}:{node|short} ', - 'manifest': '{rev}:{node|short}', - 'filecopy': '{name} ({source})'}) + filters = templater.common_filters.copy() + filters['formatnode'] = (ui.debugflag and (lambda x: x) + or (lambda x: x[:12])) + self.t = templater.templater(mapfile, filters, + cache={ + 'parent': '{rev}:{node|formatnode} ', + 'manifest': '{rev}:{node|formatnode}', + 'filecopy': '{name} ({source})'}) def use_template(self, t): '''set template string to use'''