[PATCH 4 of 4 V2] bundle2: stop capturing output for ssh again
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Wed Jun 3 20:57:59 CDT 2015
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1432140246 18000
# Wed May 20 11:44:06 2015 -0500
# Node ID ecffd0116e6d09dab8ccd73a4df98212dc7d84ed
# Parent 5037e99ddc08fb409eaed395fd5c0a460317eec6
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 --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -1356,11 +1356,11 @@ def unbundle(repo, cg, heads, source, ur
wlock = lock = tr = None
recordout = None
# 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')
# push can proceed
if util.safehasattr(cg, 'params'):
diff --git a/tests/test-bundle2-pushback.t b/tests/test-bundle2-pushback.t
--- a/tests/test-bundle2-pushback.t
+++ b/tests/test-bundle2-pushback.t
@@ -61,15 +61,15 @@ Without config
$ hg commit -Am 1
adding f1
$ 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
$ cd ../server
$ hg tglog
More information about the Mercurial-devel
mailing list