Mercurial > hg
changeset 30720:32f160ceb99d
log: drop unnecessary ui.note label from "trouble: " line
Follow-up on f05ede08dcf7 and 6d0b1a69f98c.
| author | Denis Laxalde <denis@laxalde.org> |
|---|---|
| date | Sat, 07 Jan 2017 12:07:56 +0100 |
| parents | 42c75b4fa46a |
| children | 4ab19763d71c |
| files | mercurial/cmdutil.py mercurial/templates/map-cmdline.default |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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]
--- 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",