[PATCH] log: use correct phase info for parent field (issue4347)

Sean Farley sean.michael.farley at gmail.com
Sat Aug 23 17:03:35 CDT 2014


# HG changeset patch
# User Sean Farley <sean.michael.farley at gmail.com>
# Date 1408831388 18000
#      Sat Aug 23 17:03:08 2014 -0500
# Branch stable
# Node ID 277808d61336777372fbe054708ab857bbf72fb1
# Parent  510cafe720043af3d0c11b4b70345b63b54d17b1
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.

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -878,12 +878,13 @@ 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:
             # i18n: column positioning for "hg log"
+            label = 'log.parent changeset.%s' % self.repo[parent[0]].phasestr()
             self.ui.write(_("parent:      %d:%s\n") % parent,
-                          label='log.parent changeset.%s' % ctx.phasestr())
+                          label=label)
 
         if self.ui.debugflag:
             mnode = ctx.manifestnode()
             # i18n: column positioning for "hg log"
             self.ui.write(_("manifest:    %d:%s\n") %


More information about the Mercurial-devel mailing list