Patchwork [2,of,3,STABLE] repair: avoid string concatenation by + operator

login
register
mail settings
Submitter Katsunori FUJIWARA
Date April 25, 2015, 2:49 p.m.
Message ID <ebaf09a1ac2c4e5afd12.1429973351@juju>
Download mbox | patch
Permalink /patch/8789/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - April 25, 2015, 2:49 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1429973093 -32400
#      Sat Apr 25 23:44:53 2015 +0900
# Branch stable
# Node ID ebaf09a1ac2c4e5afd127372cfca611f630b3e36
# Parent  f7cb3b9559426621d1ff23acac85ea3b4869c399
repair: avoid string concatenation by + operator

String concatenation by "+" operator causes failure of extracting
messages to be translated.

Python automatically concatenates strings separated by whitespaces
into one string.

Patch

diff --git a/mercurial/repair.py b/mercurial/repair.py
--- a/mercurial/repair.py
+++ b/mercurial/repair.py
@@ -18,7 +18,7 @@  def _bundle(repo, bases, heads, node, su
     if usebundle2:
         cgversion = repo.ui.config('experimental', 'strip-bundle2-version')
         if cgversion not in changegroup.packermap:
-            repo.ui.warn(_('unknown strip-bundle2-version value %r; ' +
+            repo.ui.warn(_('unknown strip-bundle2-version value %r; '
                             'should be one of %r\n') %
                          (cgversion, sorted(changegroup.packermap.keys()),))
             cgversion = '01'