# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1432140246 18000
# Node ID 525fbf24b51be9c9aae73842dda383a92cea5757
# Parent  8dc5ee5b7b091413f01b2c2de4374c6f7228cd74
bundle2: stop capturing output for ssh again

This backout 36111f98f23d since we can have real time output with ssh
again. The tests change is not backed-out because it was a test output
fix.

diff -r 8dc5ee5b7b09 -r 525fbf24b51b mercurial/exchange.py
--- a/mercurial/exchange.py	Wed May 20 11:41:48 2015 -0500
+++ b/mercurial/exchange.py	Wed May 20 11:44:06 2015 -0500
@@ -1358,7 +1358,7 @@
     # quick fix for output mismatch with bundle2 in 3.4
     captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture',
                                        False)
-    if url.startswith('remote:'):
+    if url.startswith('remote:http:') or url.startswith('remote:https:'):
         captureoutput = True
     try:
         check_heads(repo, heads, 'uploading changes')
diff -r 8dc5ee5b7b09 -r 525fbf24b51b tests/test-bundle2-pushback.t
--- a/tests/test-bundle2-pushback.t	Wed May 20 11:41:48 2015 -0500
+++ b/tests/test-bundle2-pushback.t	Wed May 20 11:44:06 2015 -0500
@@ -63,11 +63,11 @@
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
-  remote: pushback not enabled
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
+  remote: pushback not enabled
   $ hg bookmark
   no bookmarks set