Mercurial > hg-stable
changeset 25423:525fbf24b51b
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.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 20 May 2015 11:44:06 -0500 |
| parents | 8dc5ee5b7b09 |
| children | 69609f43c752 |
| files | mercurial/exchange.py tests/test-bundle2-pushback.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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')
--- 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