Show More
@@ -1115,7 +1115,7 b' class changeset_printer(object):' | |||||
1115 | else: |
|
1115 | else: | |
1116 | hexfunc = short |
|
1116 | hexfunc = short | |
1117 |
|
1117 | |||
1118 | parents = [(p, hexfunc(log.node(p))) |
|
1118 | parents = [self.repo[p] | |
1119 | for p in self._meaningful_parentrevs(log, rev)] |
|
1119 | for p in self._meaningful_parentrevs(log, rev)] | |
1120 |
|
1120 | |||
1121 | # i18n: column positioning for "hg log" |
|
1121 | # i18n: column positioning for "hg log" | |
@@ -1145,10 +1145,11 b' class changeset_printer(object):' | |||||
1145 | # i18n: column positioning for "hg log" |
|
1145 | # i18n: column positioning for "hg log" | |
1146 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
1146 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |
1147 | label='log.phase') |
|
1147 | label='log.phase') | |
1148 |
for p |
|
1148 | for pctx in parents: | |
1149 |
label = 'log.parent changeset.%s' % |
|
1149 | label = 'log.parent changeset.%s' % pctx.phasestr() | |
1150 | # i18n: column positioning for "hg log" |
|
1150 | # i18n: column positioning for "hg log" | |
1151 |
self.ui.write(_("parent: %d:%s\n") |
|
1151 | self.ui.write(_("parent: %d:%s\n") | |
|
1152 | % (pctx.rev(), hexfunc(pctx.node())), | |||
1152 | label=label) |
|
1153 | label=label) | |
1153 |
|
1154 | |||
1154 | if self.ui.debugflag: |
|
1155 | if self.ui.debugflag: |
General Comments 0
You need to be logged in to leave comments.
Login now