comparison mercurial/exchange.py @ 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 ff955e7b1085
children 443d3decbdde
comparison
equal deleted inserted replaced
25422:8dc5ee5b7b09 25423:525fbf24b51b
1356 wlock = lock = tr = None 1356 wlock = lock = tr = None
1357 recordout = None 1357 recordout = None
1358 # quick fix for output mismatch with bundle2 in 3.4 1358 # quick fix for output mismatch with bundle2 in 3.4
1359 captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture', 1359 captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture',
1360 False) 1360 False)
1361 if url.startswith('remote:'): 1361 if url.startswith('remote:http:') or url.startswith('remote:https:'):
1362 captureoutput = True 1362 captureoutput = True
1363 try: 1363 try:
1364 check_heads(repo, heads, 'uploading changes') 1364 check_heads(repo, heads, 'uploading changes')
1365 # push can proceed 1365 # push can proceed
1366 if util.safehasattr(cg, 'params'): 1366 if util.safehasattr(cg, 'params'):