Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 25101:91c2278c68a3 | 25192:36111f98f23d |
|---|---|
| 1286 wlock = lock = tr = None | 1286 wlock = lock = tr = None |
| 1287 recordout = None | 1287 recordout = None |
| 1288 # quick fix for output mismatch with bundle2 in 3.4 | 1288 # quick fix for output mismatch with bundle2 in 3.4 |
| 1289 captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture', | 1289 captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture', |
| 1290 False) | 1290 False) |
| 1291 if url.startswith('remote:http:') or url.startswith('remote:https:'): | 1291 if url.startswith('remote:'): |
| 1292 captureoutput = True | 1292 captureoutput = True |
| 1293 try: | 1293 try: |
| 1294 check_heads(repo, heads, 'uploading changes') | 1294 check_heads(repo, heads, 'uploading changes') |
| 1295 # push can proceed | 1295 # push can proceed |
| 1296 if util.safehasattr(cg, 'params'): | 1296 if util.safehasattr(cg, 'params'): |