Show More
@@ -354,7 +354,7 b' def _processpart(op, part):' | |||
|
354 | 354 | # itself represents a defect of a different variety). |
|
355 | 355 | output = None |
|
356 | 356 | if op.reply is not None: |
|
357 | op.ui.pushbuffer(error=True) | |
|
357 | op.ui.pushbuffer(error=True, subproc=True) | |
|
358 | 358 | output = '' |
|
359 | 359 | try: |
|
360 | 360 | handler(op, part) |
@@ -1303,7 +1303,7 b' def unbundle(repo, cg, heads, source, ur' | |||
|
1303 | 1303 | exc.duringunbundle2 = True |
|
1304 | 1304 | if r is not None: |
|
1305 | 1305 | parts = exc._bundle2salvagedoutput = r.salvageoutput() |
|
1306 | repo.ui.pushbuffer(error=True) | |
|
1306 | repo.ui.pushbuffer(error=True, subproc=True) | |
|
1307 | 1307 | def recordout(output): |
|
1308 | 1308 | part = bundle2.bundlepart('output', data=output, |
|
1309 | 1309 | mandatory=False) |
@@ -549,6 +549,7 b' Doing the actual push: hook abort' | |||
|
549 | 549 | > reason = |
|
550 | 550 | > [hooks] |
|
551 | 551 | > pretxnclose.failpush = false |
|
552 | > txnabort.failpush = echo 'Cleaning up the mess...' | |
|
552 | 553 | > EOF |
|
553 | 554 | |
|
554 | 555 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
@@ -564,6 +565,7 b' Doing the actual push: hook abort' | |||
|
564 | 565 | remote: adding file changes |
|
565 | 566 | remote: added 1 changesets with 1 changes to 1 files |
|
566 | 567 | remote: transaction abort! |
|
568 | remote: Cleaning up the mess... | |
|
567 | 569 | remote: rollback completed |
|
568 | 570 | abort: pretxnclose.failpush hook exited with status 1 |
|
569 | 571 | [255] |
@@ -576,6 +578,7 b' Doing the actual push: hook abort' | |||
|
576 | 578 | remote: adding file changes |
|
577 | 579 | remote: added 1 changesets with 1 changes to 1 files |
|
578 | 580 | remote: transaction abort! |
|
581 | remote: Cleaning up the mess... | |
|
579 | 582 | remote: rollback completed |
|
580 | 583 | abort: pretxnclose.failpush hook exited with status 1 |
|
581 | 584 | remote: pre-close-tip:e7ec4e813ba6 draft |
@@ -589,6 +592,7 b' Doing the actual push: hook abort' | |||
|
589 | 592 | remote: adding file changes |
|
590 | 593 | remote: added 1 changesets with 1 changes to 1 files |
|
591 | 594 | remote: transaction abort! |
|
595 | remote: Cleaning up the mess... | |
|
592 | 596 | remote: rollback completed |
|
593 | 597 | abort: pretxnclose.failpush hook exited with status 1 |
|
594 | 598 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now