[PATCH STABLE] bundle2: localize "remote: "

Gregory Szorc gregory.szorc at gmail.com
Tue Aug 30 20:33:33 UTC 2016


# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1472588883 25200
#      Tue Aug 30 13:28:03 2016 -0700
# Branch stable
# Node ID f7ec2b2f002750a7748dc5d0375035e181d1c3b0
# Parent  9a9629b9416c262ff62bbd17568fcd2a2e09b4be
bundle2: localize "remote: "

We localize "remote: " everywhere else. This unlocalized use was
introduced in b7435117d951.

This issue was discovered by Akihiko Odaki and reported at
https://bugzilla.mozilla.org/show_bug.cgi?id=1298651.

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1466,17 +1466,17 @@ def handlecheckheads(op, inpart):
     if sorted(heads) != sorted(op.repo.heads()):
         raise error.PushRaced('repository changed while pushing - '
                               'please try again')
 
 @parthandler('output')
 def handleoutput(op, inpart):
     """forward output captured on the server to the client"""
     for line in inpart.read().splitlines():
-        op.ui.status(('remote: %s\n' % line))
+        op.ui.status('%s%s\n' % (_('remote: '), line))
 
 @parthandler('replycaps')
 def handlereplycaps(op, inpart):
     """Notify that a reply bundle should be created
 
     The payload contains the capabilities information for the reply"""
     caps = decodecaps(inpart.read())
     if op.reply is None:


More information about the Mercurial-devel mailing list