# HG changeset patch # User Yuya Nishihara # Date 2015-03-14 08:19:04 # Node ID 870d2eb82f6df16e00eb811fad3a22635b6632d3 # Parent 3eb9045396b08632072bf63033a5bf65334c53f2 changeset_printer: use context objects consistently to show parents This prepares for merging changeset_printer._maningful_parentrevs() with changeset_templater's. diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1115,7 +1115,7 @@ class changeset_printer(object): else: hexfunc = short - parents = [(p, hexfunc(log.node(p))) + parents = [self.repo[p] for p in self._meaningful_parentrevs(log, rev)] # i18n: column positioning for "hg log" @@ -1145,10 +1145,11 @@ class changeset_printer(object): # i18n: column positioning for "hg log" self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), label='log.phase') - for parent in parents: - label = 'log.parent changeset.%s' % self.repo[parent[0]].phasestr() + for pctx in parents: + label = 'log.parent changeset.%s' % pctx.phasestr() # i18n: column positioning for "hg log" - self.ui.write(_("parent: %d:%s\n") % parent, + self.ui.write(_("parent: %d:%s\n") + % (pctx.rev(), hexfunc(pctx.node())), label=label) if self.ui.debugflag: