Patchwork bundle2: issue remote output as "status" (issue4612)

login
register
mail settings
Submitter Pierre-Yves David
Date April 23, 2015, 11:56 p.m.
Message ID <265f72f7d36a9b55a57b.1429833389@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/8777/
State Accepted
Headers show

Comments

Pierre-Yves David - April 23, 2015, 11:56 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1429832808 -3600
#      Fri Apr 24 00:46:48 2015 +0100
# Branch stable
# Node ID 265f72f7d36a9b55a57b37968eece10fa766ba94
# Parent  1f9127c9239b9c39c676bb09752db1e2ca6c26f7
bundle2: issue remote output as "status" (issue4612)

Remote output should be silenced by --quiet. The issue was found while running
`test-largefiles-cache.t` so it will get tested once we switch bundle2 by
default.
Matt Mackall - April 24, 2015, 6:49 p.m.
On Fri, 2015-04-24 at 00:56 +0100, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1429832808 -3600
> #      Fri Apr 24 00:46:48 2015 +0100
> # Branch stable
> # Node ID 265f72f7d36a9b55a57b37968eece10fa766ba94
> # Parent  1f9127c9239b9c39c676bb09752db1e2ca6c26f7
> bundle2: issue remote output as "status" (issue4612)

Queued for stable, thanks.

Patch

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1169,11 +1169,11 @@  def handlecheckheads(op, inpart):
 
 @parthandler('output')
 def handleoutput(op, inpart):
     """forward output captured on the server to the client"""
     for line in inpart.read().splitlines():
-        op.ui.write(('remote: %s\n' % line))
+        op.ui.status(('remote: %s\n' % line))
 
 @parthandler('replycaps')
 def handlereplycaps(op, inpart):
     """Notify that a reply bundle should be created