Mercurial > hg

changeset 22301:f6371cc62d2a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: use correct phase info for parent field (issue4347) Previously, there was a copy / paste error with using the current changeset's phase information. We now look up the parent context explicitly. The line was too long so it is stored into a variable first.
author Sean Farley <sean.michael.farley@gmail.com>
date Sat, 23 Aug 2014 17:03:08 -0500
parents 05ea941aafdc
children 9472284df4eb
files mercurial/cmdutil.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Mon Aug 25 15:10:09 2014 +0200
+++ b/mercurial/cmdutil.py	Sat Aug 23 17:03:08 2014 -0500
@@ -879,9 +879,10 @@
             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()
             # i18n: column positioning for "hg log"
             self.ui.write(_("parent:      %d:%s\n") % parent,
-                          label='log.parent changeset.%s' % ctx.phasestr())
+                          label=label)
 
         if self.ui.debugflag:
             mnode = ctx.manifestnode()