--- a/mercurial/cmdutil.py Tue Jan 03 10:56:41 2017 +0100
+++ b/mercurial/cmdutil.py Mon Oct 10 12:06:58 2016 +0200
@@ -1144,6 +1144,10 @@
def _changesetlabels(ctx):
labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
+ if ctx.troubled():
+ labels.append('changeset.troubled')
+ for trouble in ctx.troubles():
+ labels.append('trouble.%s' % trouble)
return ' '.join(labels)
class changeset_printer(object):
@@ -1252,6 +1256,10 @@
self.ui.write(_("date: %s\n") % date,
label='log.date')
+ if ctx.troubled():
+ self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()),
+ label='ui.note log.trouble')
+
if self.ui.debugflag:
files = ctx.p1().status(ctx)[:3]
for key, value in zip([# i18n: column positioning for "hg log"