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

[Martin Geisler]

Sean Farley <sean.michael.farley at gmail.com> writes:

> # 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,

I believe you need to move the i18n comment below label so that it
remains adjacent to the line with _().

-- 
Martin Geisler

http://google.com/+MartinGeisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20140825/7a715e09/attachment.pgp>