Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 22301:f6371cc62d2a stable
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 | d4bc38f6eab7 |
| children | 0c838e7459a5 |
comparison
equal
deleted
inserted
replaced
| 22281:05ea941aafdc | 22301:f6371cc62d2a |
|---|---|
| 877 if self.ui.debugflag and ctx.phase(): | 877 if self.ui.debugflag and ctx.phase(): |
| 878 # i18n: column positioning for "hg log" | 878 # i18n: column positioning for "hg log" |
| 879 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | 879 self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
| 880 label='log.phase') | 880 label='log.phase') |
| 881 for parent in parents: | 881 for parent in parents: |
| 882 label = 'log.parent changeset.%s' % self.repo[parent[0]].phasestr() | |
| 882 # i18n: column positioning for "hg log" | 883 # i18n: column positioning for "hg log" |
| 883 self.ui.write(_("parent: %d:%s\n") % parent, | 884 self.ui.write(_("parent: %d:%s\n") % parent, |
| 884 label='log.parent changeset.%s' % ctx.phasestr()) | 885 label=label) |
| 885 | 886 |
| 886 if self.ui.debugflag: | 887 if self.ui.debugflag: |
| 887 mnode = ctx.manifestnode() | 888 mnode = ctx.manifestnode() |
| 888 # i18n: column positioning for "hg log" | 889 # i18n: column positioning for "hg log" |
| 889 self.ui.write(_("manifest: %d:%s\n") % | 890 self.ui.write(_("manifest: %d:%s\n") % |