diff mercurial/exchange.py @ 25192:36111f98f23d stable

ssh: capture output with bundle2 again (issue4642) I just discovered that we are not displaying ssh server output in real time anymore. So we can just fall back to the bundle2 output capture for now. This fix the race condition issue we where seeing in tests. Re-instating real time output for ssh would fix the issue too but lets get the test to pass first.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 18 May 2015 22:35:27 -0500
parents e530cde6d115
children 472a685a4961
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu May 14 21:35:06 2015 -0700
+++ b/mercurial/exchange.py	Mon May 18 22:35:27 2015 -0500
@@ -1288,7 +1288,7 @@
     # quick fix for output mismatch with bundle2 in 3.4
     captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture',
                                        False)
-    if url.startswith('remote:http:') or url.startswith('remote:https:'):
+    if url.startswith('remote:'):
         captureoutput = True
     try:
         check_heads(repo, heads, 'uploading changes')