# HG changeset patch # User Denis Laxalde # Date 1483787276 -3600 # Node ID 32f160ceb99dc0537751a65948a3817868e40516 # Parent 42c75b4fa46a5969cee73f300e98601d5dba4ba8 log: drop unnecessary ui.note label from "trouble: " line Follow-up on f05ede08dcf7 and 6d0b1a69f98c. diff -r 42c75b4fa46a -r 32f160ceb99d mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Jan 04 16:47:49 2017 +0100 +++ b/mercurial/cmdutil.py Sat Jan 07 12:07:56 2017 +0100 @@ -1263,7 +1263,7 @@ if ctx.troubled(): # i18n: column positioning for "hg log" self.ui.write(_("trouble: %s\n") % ', '.join(ctx.troubles()), - label='ui.note log.trouble') + label='log.trouble') if self.ui.debugflag: files = ctx.p1().status(ctx)[:3] diff -r 42c75b4fa46a -r 32f160ceb99d mercurial/templates/map-cmdline.default --- a/mercurial/templates/map-cmdline.default Wed Jan 04 16:47:49 2017 +0100 +++ b/mercurial/templates/map-cmdline.default Sat Jan 07 12:07:56 2017 +0100 @@ -66,7 +66,7 @@ ldate = '{label("log.date", "date: {date|date}")}\n' -ltroubles = '{if(troubles, "{label('ui.note log.trouble', +ltroubles = '{if(troubles, "{label('log.trouble', 'trouble: {join(troubles, ", ")}')}\n")}' extra = '{label("ui.debug log.extra",