##// END OF EJS Templates
ssh: capture output with bundle2 again (issue4642)...
Pierre-Yves David -
r25192:36111f98 stable
parent child Browse files
Show More
@@ -1288,7 +1288,7 b' def unbundle(repo, cg, heads, source, ur'
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')
@@ -694,7 +694,6 b' Check output capture control.'
694 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
694 $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
695 pushing to ssh://user@dummy/other
695 pushing to ssh://user@dummy/other
696 searching for changes
696 searching for changes
697 abort: pretxnchangegroup hook exited with status 1
698 remote: adding changesets
697 remote: adding changesets
699 remote: adding manifests
698 remote: adding manifests
700 remote: adding file changes
699 remote: adding file changes
@@ -703,6 +702,7 b' Check output capture control.'
703 remote: transaction abort!
702 remote: transaction abort!
704 remote: Cleaning up the mess...
703 remote: Cleaning up the mess...
705 remote: rollback completed
704 remote: rollback completed
705 abort: pretxnchangegroup hook exited with status 1
706 [255]
706 [255]
707 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
707 $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
708 pushing to http://localhost:$HGPORT2/
708 pushing to http://localhost:$HGPORT2/
General Comments 0
You need to be logged in to leave comments. Login now