Patchwork [1,of,2] sparse: do not include operator in i18n strings

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 4, 2018, 12:14 p.m.
Message ID <b2afb0058fd7143c12cb.1533384865@mimosa>
Download mbox | patch
Permalink /patch/33233/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 4, 2018, 12:14 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1533370263 -32400
#      Sat Aug 04 17:11:03 2018 +0900
# Node ID b2afb0058fd7143c12cb6ef3466ec85ee71ba8ce
# Parent  a01200b25da69bf3e0d78200abe1bdfc8d18a5db
sparse: do not include operator in i18n strings
Pulkit Goyal - Aug. 4, 2018, 5:22 p.m.
On Sat, Aug 4, 2018 at 5:44 PM Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1533370263 -32400
> #      Sat Aug 04 17:11:03 2018 +0900
> # Node ID b2afb0058fd7143c12cb6ef3466ec85ee71ba8ce
> # Parent  a01200b25da69bf3e0d78200abe1bdfc8d18a5db
> sparse: do not include operator in i18n strings
>

Queued this series. Many thanks!

Patch

diff --git a/mercurial/sparse.py b/mercurial/sparse.py
--- a/mercurial/sparse.py
+++ b/mercurial/sparse.py
@@ -56,7 +56,7 @@  def parseconfig(ui, raw, action):
         elif line == '[include]':
             if havesection and current != includes:
                 # TODO pass filename into this API so we can report it.
-                raise error.Abort(_('%s config cannot have includes ' +
+                raise error.Abort(_('%s config cannot have includes '
                                     'after excludes') % action)
             havesection = True
             current = includes
@@ -72,7 +72,7 @@  def parseconfig(ui, raw, action):
                                          'to declare the entry type'))
 
             if line.strip().startswith('/'):
-                ui.warn(_('warning: %s profile cannot use' +
+                ui.warn(_('warning: %s profile cannot use'
                           ' paths starting with /, ignoring %s\n')
                         % (action, line))
                 continue