Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/cmdutil.py
changeset 24483 870d2eb82f6d
parent 24480 3df7fc75afc5
child 24484 ca62ae364b86 
--- a/mercurial/cmdutil.py	Thu Mar 26 23:56:18 2015 +0900
+++ b/mercurial/cmdutil.py	Sat Mar 14 17:19:04 2015 +0900
@@ -1115,7 +1115,7 @@
         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 @@
             # 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:
Mercurial