Patchwork [1,of,2] log: drop unnecessary ui.note label from "trouble: " line

login
register
mail settings
Submitter Denis Laxalde
Date Jan. 7, 2017, 11:29 a.m.
Message ID <e9057e86529463d4f4f0.1483788550@marimba>
Download mbox | patch
Permalink /patch/18131/
State Accepted
Headers show

Comments

Denis Laxalde - Jan. 7, 2017, 11:29 a.m.
# HG changeset patch
# User Denis Laxalde <denis@laxalde.org>
# Date 1483787276 -3600
#      Sat Jan 07 12:07:56 2017 +0100
# Node ID e9057e86529463d4f4f0414bac8bf4dd2a290b0f
# Parent  3de9df6ee5bf7601aa3870f18304bbeb3ce351af
log: drop unnecessary ui.note label from "trouble: " line

Follow-up on f05ede08dcf7 and 6d0b1a69f98c.
Yuya Nishihara - Jan. 7, 2017, 1:32 p.m.
On Sat, 07 Jan 2017 12:29:10 +0100, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis@laxalde.org>
> # Date 1483787276 -3600
> #      Sat Jan 07 12:07:56 2017 +0100
> # Node ID e9057e86529463d4f4f0414bac8bf4dd2a290b0f
> # Parent  3de9df6ee5bf7601aa3870f18304bbeb3ce351af
> log: drop unnecessary ui.note label from "trouble: " line

Queued these, thanks!

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1263,7 +1263,7 @@  class changeset_printer(object):
         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 --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default
--- a/mercurial/templates/map-cmdline.default
+++ b/mercurial/templates/map-cmdline.default
@@ -66,7 +66,7 @@  summary = '{if(desc|strip, "{label('log.
 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",