Show More
@@ -229,6 +229,8 b' def callcatch(ui, func):' | |||||
229 | detailed_exit_code = 20 |
|
229 | detailed_exit_code = 20 | |
230 | elif isinstance(inst, error.ConfigError): |
|
230 | elif isinstance(inst, error.ConfigError): | |
231 | detailed_exit_code = 30 |
|
231 | detailed_exit_code = 30 | |
|
232 | elif isinstance(inst, error.HookAbort): | |||
|
233 | detailed_exit_code = 40 | |||
232 | elif isinstance(inst, error.SecurityError): |
|
234 | elif isinstance(inst, error.SecurityError): | |
233 | detailed_exit_code = 150 |
|
235 | detailed_exit_code = 150 | |
234 | elif isinstance(inst, error.CanceledError): |
|
236 | elif isinstance(inst, error.CanceledError): |
@@ -1177,7 +1177,7 b' Local push' | |||||
1177 | searching for changes |
|
1177 | searching for changes | |
1178 | no changes found |
|
1178 | no changes found | |
1179 | abort: prepushkey hook exited with status 1 |
|
1179 | abort: prepushkey hook exited with status 1 | |
1180 |
[ |
|
1180 | [40] | |
1181 |
|
1181 | |||
1182 | #endif |
|
1182 | #endif | |
1183 |
|
1183 |
@@ -1125,7 +1125,7 b' repositories visible to an external hook' | |||||
1125 | transaction abort! |
|
1125 | transaction abort! | |
1126 | rollback completed |
|
1126 | rollback completed | |
1127 | abort: pretxnclose hook exited with status 1 |
|
1127 | abort: pretxnclose hook exited with status 1 | |
1128 |
[ |
|
1128 | [40] | |
1129 | $ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending |
|
1129 | $ cp .hg/bookmarks.pending.saved .hg/bookmarks.pending | |
1130 |
|
1130 | |||
1131 | (check visible bookmarks while transaction running in repo) |
|
1131 | (check visible bookmarks while transaction running in repo) | |
@@ -1158,7 +1158,7 b' repositories visible to an external hook' | |||||
1158 | transaction abort! |
|
1158 | transaction abort! | |
1159 | rollback completed |
|
1159 | rollback completed | |
1160 | abort: pretxnclose hook exited with status 1 |
|
1160 | abort: pretxnclose hook exited with status 1 | |
1161 |
[ |
|
1161 | [40] | |
1162 |
|
1162 | |||
1163 | Check pretxnclose-bookmark can abort a transaction |
|
1163 | Check pretxnclose-bookmark can abort a transaction | |
1164 | -------------------------------------------------- |
|
1164 | -------------------------------------------------- | |
@@ -1242,7 +1242,7 b' attempt to create on a default changeset' | |||||
1242 | transaction abort! |
|
1242 | transaction abort! | |
1243 | rollback completed |
|
1243 | rollback completed | |
1244 | abort: pretxnclose-bookmark.force-public hook exited with status 1 |
|
1244 | abort: pretxnclose-bookmark.force-public hook exited with status 1 | |
1245 |
[ |
|
1245 | [40] | |
1246 |
|
1246 | |||
1247 | create on a public changeset |
|
1247 | create on a public changeset | |
1248 |
|
1248 | |||
@@ -1254,4 +1254,4 b' move to the other branch' | |||||
1254 | transaction abort! |
|
1254 | transaction abort! | |
1255 | rollback completed |
|
1255 | rollback completed | |
1256 | abort: pretxnclose-bookmark.force-forward hook exited with status 1 |
|
1256 | abort: pretxnclose-bookmark.force-forward hook exited with status 1 | |
1257 |
[ |
|
1257 | [40] |
@@ -638,7 +638,7 b' Doing the actual push: hook abort' | |||||
638 | remote: Cleaning up the mess... |
|
638 | remote: Cleaning up the mess... | |
639 | remote: rollback completed |
|
639 | remote: rollback completed | |
640 | abort: pretxnclose.failpush hook exited with status 1 |
|
640 | abort: pretxnclose.failpush hook exited with status 1 | |
641 |
[ |
|
641 | [40] | |
642 |
|
642 | |||
643 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
643 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
644 | pushing to ssh://user@dummy/other |
|
644 | pushing to ssh://user@dummy/other | |
@@ -699,7 +699,7 b' Check error from hook during the unbundl' | |||||
699 | remote: Cleaning up the mess... |
|
699 | remote: Cleaning up the mess... | |
700 | remote: rollback completed |
|
700 | remote: rollback completed | |
701 | abort: pretxnchangegroup hook exited with status 1 |
|
701 | abort: pretxnchangegroup hook exited with status 1 | |
702 |
[ |
|
702 | [40] | |
703 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
703 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
704 | pushing to ssh://user@dummy/other |
|
704 | pushing to ssh://user@dummy/other | |
705 | searching for changes |
|
705 | searching for changes | |
@@ -747,7 +747,7 b' Check output capture control.' | |||||
747 | Cleaning up the mess... |
|
747 | Cleaning up the mess... | |
748 | rollback completed |
|
748 | rollback completed | |
749 | abort: pretxnchangegroup hook exited with status 1 |
|
749 | abort: pretxnchangegroup hook exited with status 1 | |
750 |
[ |
|
750 | [40] | |
751 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
751 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
752 | pushing to ssh://user@dummy/other |
|
752 | pushing to ssh://user@dummy/other | |
753 | searching for changes |
|
753 | searching for changes |
@@ -522,7 +522,7 b' changelog and manifest would have invali' | |||||
522 | transaction abort! |
|
522 | transaction abort! | |
523 | rollback completed |
|
523 | rollback completed | |
524 | abort: pretxncommit hook exited with status 1 |
|
524 | abort: pretxncommit hook exited with status 1 | |
525 |
[ |
|
525 | [40] | |
526 | *** runcommand verify |
|
526 | *** runcommand verify | |
527 | checking changesets |
|
527 | checking changesets | |
528 | checking manifests |
|
528 | checking manifests | |
@@ -1013,7 +1013,7 b' cases.' | |||||
1013 | transaction abort! |
|
1013 | transaction abort! | |
1014 | rollback completed |
|
1014 | rollback completed | |
1015 | abort: pretxncommit hook exited with status 1 |
|
1015 | abort: pretxncommit hook exited with status 1 | |
1016 |
[ |
|
1016 | [40] | |
1017 | *** runcommand log |
|
1017 | *** runcommand log | |
1018 | *** runcommand verify -q |
|
1018 | *** runcommand verify -q | |
1019 |
|
1019 | |||
@@ -1057,7 +1057,7 b' cases.' | |||||
1057 | transaction abort! |
|
1057 | transaction abort! | |
1058 | rollback completed |
|
1058 | rollback completed | |
1059 | abort: pretxncommit hook exited with status 1 |
|
1059 | abort: pretxncommit hook exited with status 1 | |
1060 |
[ |
|
1060 | [40] | |
1061 | *** runcommand log |
|
1061 | *** runcommand log | |
1062 | 0 bar (bar) |
|
1062 | 0 bar (bar) | |
1063 | *** runcommand verify -q |
|
1063 | *** runcommand verify -q |
@@ -209,7 +209,7 b' at first, test saving last-message.txt' | |||||
209 | transaction abort! |
|
209 | transaction abort! | |
210 | rollback completed |
|
210 | rollback completed | |
211 | abort: pretxncommit.test-saving-last-message hook exited with status 1 |
|
211 | abort: pretxncommit.test-saving-last-message hook exited with status 1 | |
212 |
[ |
|
212 | [40] | |
213 | $ cat .hg/last-message.txt |
|
213 | $ cat .hg/last-message.txt | |
214 | message given from command line (no-eol) |
|
214 | message given from command line (no-eol) | |
215 |
|
215 | |||
@@ -234,7 +234,7 b' at first, test saving last-message.txt' | |||||
234 | transaction abort! |
|
234 | transaction abort! | |
235 | rollback completed |
|
235 | rollback completed | |
236 | abort: pretxncommit.test-saving-last-message hook exited with status 1 |
|
236 | abort: pretxncommit.test-saving-last-message hook exited with status 1 | |
237 |
[ |
|
237 | [40] | |
238 |
|
238 | |||
239 | $ cat .hg/last-message.txt |
|
239 | $ cat .hg/last-message.txt | |
240 | another precious commit message |
|
240 | another precious commit message |
@@ -154,7 +154,7 b' Early options must come first if HGPLAIN' | |||||
154 |
|
154 | |||
155 | $ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default |
|
155 | $ HGPLAIN=+strictflags hg --config='hooks.pre-log=false' log -b default | |
156 | abort: pre-log hook exited with status 1 |
|
156 | abort: pre-log hook exited with status 1 | |
157 |
[ |
|
157 | [40] | |
158 | $ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default |
|
158 | $ HGPLAIN=+strictflags hg --cwd .. -q -Ra log -b default | |
159 | 0:cb9a9f314b8b |
|
159 | 0:cb9a9f314b8b | |
160 | $ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default |
|
160 | $ HGPLAIN=+strictflags hg --cwd .. -q --repository a log -b default | |
@@ -166,7 +166,7 b' For compatibility reasons, HGPLAIN=+stri' | |||||
166 |
|
166 | |||
167 | $ HGPLAIN= hg log --config='hooks.pre-log=false' -b default |
|
167 | $ HGPLAIN= hg log --config='hooks.pre-log=false' -b default | |
168 | abort: pre-log hook exited with status 1 |
|
168 | abort: pre-log hook exited with status 1 | |
169 |
[ |
|
169 | [40] | |
170 | $ HGPLAINEXCEPT= hg log --cwd .. -q -Ra -b default |
|
170 | $ HGPLAINEXCEPT= hg log --cwd .. -q -Ra -b default | |
171 | 0:cb9a9f314b8b |
|
171 | 0:cb9a9f314b8b | |
172 |
|
172 |
@@ -375,7 +375,7 b' check saving last-message.txt, at first' | |||||
375 | note: commit message saved in .hg/last-message.txt |
|
375 | note: commit message saved in .hg/last-message.txt | |
376 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
|
376 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | |
377 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
377 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
378 |
[ |
|
378 | [40] | |
379 | $ cat .hg/last-message.txt |
|
379 | $ cat .hg/last-message.txt | |
380 | f |
|
380 | f | |
381 |
|
381 | |||
@@ -400,7 +400,7 b' action)' | |||||
400 | note: commit message saved in .hg/last-message.txt |
|
400 | note: commit message saved in .hg/last-message.txt | |
401 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
|
401 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | |
402 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
402 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
403 |
[ |
|
403 | [40] | |
404 |
|
404 | |||
405 | $ cat >> .hg/hgrc <<EOF |
|
405 | $ cat >> .hg/hgrc <<EOF | |
406 | > [hooks] |
|
406 | > [hooks] |
@@ -202,7 +202,7 b' check saving last-message.txt' | |||||
202 | transaction abort! |
|
202 | transaction abort! | |
203 | rollback completed |
|
203 | rollback completed | |
204 | abort: pretxncommit.abortfolding hook failed |
|
204 | abort: pretxncommit.abortfolding hook failed | |
205 |
[ |
|
205 | [40] | |
206 |
|
206 | |||
207 | $ cat .hg/last-message.txt |
|
207 | $ cat .hg/last-message.txt | |
208 | f |
|
208 | f |
@@ -227,7 +227,7 b' test generic hooks' | |||||
227 | HG_PATS=[] |
|
227 | HG_PATS=[] | |
228 |
|
228 | |||
229 | abort: pre-identify hook exited with status 1 |
|
229 | abort: pre-identify hook exited with status 1 | |
230 |
[ |
|
230 | [40] | |
231 | $ hg cat b |
|
231 | $ hg cat b | |
232 | pre-cat hook: HG_ARGS=cat b |
|
232 | pre-cat hook: HG_ARGS=cat b | |
233 | HG_HOOKNAME=pre-cat |
|
233 | HG_HOOKNAME=pre-cat | |
@@ -390,7 +390,7 b' pretag hook can forbid tagging' | |||||
390 | HG_TAG=fa |
|
390 | HG_TAG=fa | |
391 |
|
391 | |||
392 | abort: pretag.forbid hook exited with status 1 |
|
392 | abort: pretag.forbid hook exited with status 1 | |
393 |
[ |
|
393 | [40] | |
394 | $ hg tag -l fla |
|
394 | $ hg tag -l fla | |
395 | pretag hook: HG_HOOKNAME=pretag |
|
395 | pretag hook: HG_HOOKNAME=pretag | |
396 | HG_HOOKTYPE=pretag |
|
396 | HG_HOOKTYPE=pretag | |
@@ -405,7 +405,7 b' pretag hook can forbid tagging' | |||||
405 | HG_TAG=fla |
|
405 | HG_TAG=fla | |
406 |
|
406 | |||
407 | abort: pretag.forbid hook exited with status 1 |
|
407 | abort: pretag.forbid hook exited with status 1 | |
408 |
[ |
|
408 | [40] | |
409 |
|
409 | |||
410 | pretxncommit hook can see changeset, can roll back txn, changeset no |
|
410 | pretxncommit hook can see changeset, can roll back txn, changeset no | |
411 | more there after |
|
411 | more there after | |
@@ -451,7 +451,7 b' more there after' | |||||
451 |
|
451 | |||
452 | rollback completed |
|
452 | rollback completed | |
453 | abort: pretxncommit.forbid1 hook exited with status 1 |
|
453 | abort: pretxncommit.forbid1 hook exited with status 1 | |
454 |
[ |
|
454 | [40] | |
455 | $ hg -q tip |
|
455 | $ hg -q tip | |
456 | 4:539e4b31b6dc |
|
456 | 4:539e4b31b6dc | |
457 |
|
457 | |||
@@ -485,7 +485,7 b' precommit hook can prevent commit' | |||||
485 | HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 |
|
485 | HG_PARENT1=539e4b31b6dc99b3cfbaa6b53cbc1c1f9a1e3a10 | |
486 |
|
486 | |||
487 | abort: precommit.forbid hook exited with status 1 |
|
487 | abort: precommit.forbid hook exited with status 1 | |
488 |
[ |
|
488 | [40] | |
489 | $ hg -q tip |
|
489 | $ hg -q tip | |
490 | 4:539e4b31b6dc |
|
490 | 4:539e4b31b6dc | |
491 |
|
491 | |||
@@ -644,7 +644,7 b' test that prepushkey can prevent incomin' | |||||
644 | HG_URL=file:$TESTTMP/a |
|
644 | HG_URL=file:$TESTTMP/a | |
645 |
|
645 | |||
646 | abort: prepushkey hook exited with status 1 |
|
646 | abort: prepushkey hook exited with status 1 | |
647 |
[ |
|
647 | [40] | |
648 | $ cd ../a |
|
648 | $ cd ../a | |
649 |
|
649 | |||
650 | test that prelistkeys can prevent listing keys |
|
650 | test that prelistkeys can prevent listing keys | |
@@ -679,7 +679,7 b' test that prelistkeys can prevent listin' | |||||
679 | HG_NAMESPACE=bookmarks |
|
679 | HG_NAMESPACE=bookmarks | |
680 |
|
680 | |||
681 | abort: prelistkeys hook exited with status 1 |
|
681 | abort: prelistkeys hook exited with status 1 | |
682 |
[ |
|
682 | [40] | |
683 | $ cd ../a |
|
683 | $ cd ../a | |
684 | $ rm .hg/hgrc |
|
684 | $ rm .hg/hgrc | |
685 |
|
685 | |||
@@ -704,7 +704,7 b' prechangegroup hook can prevent incoming' | |||||
704 | HG_URL=file:$TESTTMP/a |
|
704 | HG_URL=file:$TESTTMP/a | |
705 |
|
705 | |||
706 | abort: prechangegroup.forbid hook exited with status 1 |
|
706 | abort: prechangegroup.forbid hook exited with status 1 | |
707 |
[ |
|
707 | [40] | |
708 |
|
708 | |||
709 | pretxnchangegroup hook can see incoming changes, can roll back txn, |
|
709 | pretxnchangegroup hook can see incoming changes, can roll back txn, | |
710 | incoming changes no longer there after |
|
710 | incoming changes no longer there after | |
@@ -735,7 +735,7 b' incoming changes no longer there after' | |||||
735 | transaction abort! |
|
735 | transaction abort! | |
736 | rollback completed |
|
736 | rollback completed | |
737 | abort: pretxnchangegroup.forbid1 hook exited with status 1 |
|
737 | abort: pretxnchangegroup.forbid1 hook exited with status 1 | |
738 |
[ |
|
738 | [40] | |
739 | $ hg -q tip |
|
739 | $ hg -q tip | |
740 | 3:07f3376c1e65 |
|
740 | 3:07f3376c1e65 | |
741 |
|
741 | |||
@@ -786,7 +786,7 b' preoutgoing hook can prevent outgoing ch' | |||||
786 | HG_SOURCE=pull |
|
786 | HG_SOURCE=pull | |
787 |
|
787 | |||
788 | abort: preoutgoing.forbid hook exited with status 1 |
|
788 | abort: preoutgoing.forbid hook exited with status 1 | |
789 |
[ |
|
789 | [40] | |
790 |
|
790 | |||
791 | outgoing hooks work for local clones |
|
791 | outgoing hooks work for local clones | |
792 |
|
792 | |||
@@ -825,7 +825,7 b' preoutgoing hook can prevent outgoing ch' | |||||
825 | HG_SOURCE=clone |
|
825 | HG_SOURCE=clone | |
826 |
|
826 | |||
827 | abort: preoutgoing.forbid hook exited with status 1 |
|
827 | abort: preoutgoing.forbid hook exited with status 1 | |
828 |
[ |
|
828 | [40] | |
829 |
|
829 | |||
830 | $ cd "$TESTTMP/b" |
|
830 | $ cd "$TESTTMP/b" | |
831 |
|
831 | |||
@@ -915,7 +915,7 b' test python hooks' | |||||
915 | hooktype preoutgoing |
|
915 | hooktype preoutgoing | |
916 | source pull |
|
916 | source pull | |
917 | abort: preoutgoing.fail hook failed |
|
917 | abort: preoutgoing.fail hook failed | |
918 |
[ |
|
918 | [40] | |
919 |
|
919 | |||
920 | $ echo '[hooks]' > ../a/.hg/hgrc |
|
920 | $ echo '[hooks]' > ../a/.hg/hgrc | |
921 | $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc |
|
921 | $ echo 'preoutgoing.uncallable = python:hooktests.uncallable' >> ../a/.hg/hgrc | |
@@ -1283,7 +1283,7 b' pretxnclose hook failure should abort th' | |||||
1283 | rollback completed |
|
1283 | rollback completed | |
1284 | strip failed, backup bundle stored in * (glob) |
|
1284 | strip failed, backup bundle stored in * (glob) | |
1285 | abort: pretxnclose.error hook exited with status 1 |
|
1285 | abort: pretxnclose.error hook exited with status 1 | |
1286 |
[ |
|
1286 | [40] | |
1287 | $ hg recover |
|
1287 | $ hg recover | |
1288 | no interrupted transaction available |
|
1288 | no interrupted transaction available | |
1289 | [1] |
|
1289 | [1] | |
@@ -1306,7 +1306,7 b' repositories visible to an external hook' | |||||
1306 | transaction abort! |
|
1306 | transaction abort! | |
1307 | rollback completed |
|
1307 | rollback completed | |
1308 | abort: pretxnclose hook exited with status 1 |
|
1308 | abort: pretxnclose hook exited with status 1 | |
1309 |
[ |
|
1309 | [40] | |
1310 | $ cp .hg/store/00changelog.i.a.saved .hg/store/00changelog.i.a |
|
1310 | $ cp .hg/store/00changelog.i.a.saved .hg/store/00changelog.i.a | |
1311 |
|
1311 | |||
1312 | (check (in)visibility of new changeset while transaction running in |
|
1312 | (check (in)visibility of new changeset while transaction running in | |
@@ -1331,7 +1331,7 b' repo)' | |||||
1331 | transaction abort! |
|
1331 | transaction abort! | |
1332 | rollback completed |
|
1332 | rollback completed | |
1333 | abort: pretxnclose hook exited with status 1 |
|
1333 | abort: pretxnclose hook exited with status 1 | |
1334 |
[ |
|
1334 | [40] | |
1335 |
|
1335 | |||
1336 | Hook from untrusted hgrc are reported as failure |
|
1336 | Hook from untrusted hgrc are reported as failure | |
1337 | ================================================ |
|
1337 | ================================================ | |
@@ -1382,7 +1382,7 b' Non-blocking hook' | |||||
1382 | rollback completed |
|
1382 | rollback completed | |
1383 | abort: untrusted hook pretxnclose.testing not executed |
|
1383 | abort: untrusted hook pretxnclose.testing not executed | |
1384 | (see 'hg help config.trusted') |
|
1384 | (see 'hg help config.trusted') | |
1385 |
[ |
|
1385 | [40] | |
1386 | $ hg log |
|
1386 | $ hg log | |
1387 | changeset: 0:3903775176ed |
|
1387 | changeset: 0:3903775176ed | |
1388 | tag: tip |
|
1388 | tag: tip |
@@ -27,7 +27,7 b'' | |||||
27 | transaction abort! |
|
27 | transaction abort! | |
28 | rollback completed |
|
28 | rollback completed | |
29 | abort: pretxncommit.cr hook failed |
|
29 | abort: pretxncommit.cr hook failed | |
30 |
[ |
|
30 | [40] | |
31 | $ hg cat f | f --hexdump |
|
31 | $ hg cat f | f --hexdump | |
32 |
|
32 | |||
33 | 0000: 68 65 6c 6c 6f 0a |hello.| |
|
33 | 0000: 68 65 6c 6c 6f 0a |hello.| |
@@ -377,7 +377,7 b' executable set to python script that fai' | |||||
377 | merging f |
|
377 | merging f | |
378 | some fail message |
|
378 | some fail message | |
379 | abort: $TESTTMP/mybrokenmerge.py hook failed |
|
379 | abort: $TESTTMP/mybrokenmerge.py hook failed | |
380 |
[ |
|
380 | [40] | |
381 | $ aftermerge |
|
381 | $ aftermerge | |
382 | # cat f |
|
382 | # cat f | |
383 | revision 1 |
|
383 | revision 1 |
@@ -235,7 +235,7 b" and that combination of '--edit' and '--" | |||||
235 | rollback completed |
|
235 | rollback completed | |
236 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
236 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
237 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
237 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
238 |
[ |
|
238 | [40] | |
239 | $ cat .hg/last-message.txt |
|
239 | $ cat .hg/last-message.txt | |
240 | original message |
|
240 | original message | |
241 |
|
241 |
@@ -310,7 +310,7 b' Test saving last-message.txt' | |||||
310 | note: commit message saved in .hg/last-message.txt |
|
310 | note: commit message saved in .hg/last-message.txt | |
311 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
|
311 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | |
312 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
312 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
313 |
[ |
|
313 | [40] | |
314 | $ cat .hg/last-message.txt |
|
314 | $ cat .hg/last-message.txt | |
315 |
|
315 | |||
316 |
|
316 |
@@ -191,7 +191,7 b' Test saving last-message.txt:' | |||||
191 | rollback completed |
|
191 | rollback completed | |
192 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
192 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
193 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
193 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
194 |
[ |
|
194 | [40] | |
195 | $ cat .hg/last-message.txt |
|
195 | $ cat .hg/last-message.txt | |
196 | Fifth commit message |
|
196 | Fifth commit message | |
197 | This is the 5th log message |
|
197 | This is the 5th log message | |
@@ -235,7 +235,7 b' external process' | |||||
235 | rollback completed |
|
235 | rollback completed | |
236 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
236 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
237 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
237 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
238 |
[ |
|
238 | [40] | |
239 |
|
239 | |||
240 | (rebuilding at failure of qrefresh bases on rev #0, and it causes |
|
240 | (rebuilding at failure of qrefresh bases on rev #0, and it causes | |
241 | dropping status of "file2") |
|
241 | dropping status of "file2") | |
@@ -273,7 +273,7 b' dropping status of "file2")' | |||||
273 | rollback completed |
|
273 | rollback completed | |
274 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
274 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
275 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
275 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
276 |
[ |
|
276 | [40] | |
277 |
|
277 | |||
278 | $ sh "$TESTTMP/checkvisibility.sh" |
|
278 | $ sh "$TESTTMP/checkvisibility.sh" | |
279 | ==== |
|
279 | ==== | |
@@ -315,7 +315,7 b' dropping status of "file2")' | |||||
315 | rollback completed |
|
315 | rollback completed | |
316 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
316 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
317 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
317 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
318 |
[ |
|
318 | [40] | |
319 |
|
319 | |||
320 | $ sh "$TESTTMP/checkvisibility.sh" |
|
320 | $ sh "$TESTTMP/checkvisibility.sh" | |
321 | ==== |
|
321 | ==== |
@@ -78,7 +78,7 b' Interrupting the pull is safe' | |||||
78 | transaction abort! |
|
78 | transaction abort! | |
79 | rollback completed |
|
79 | rollback completed | |
80 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
80 | abort: pretxnchangegroup.bad hook exited with status 1 | |
81 |
[ |
|
81 | [40] | |
82 | $ hg id |
|
82 | $ hg id | |
83 | 223311e70a6f tip |
|
83 | 223311e70a6f tip | |
84 |
|
84 |
@@ -431,7 +431,7 b' Widening that fails can be recovered fro' | |||||
431 | transaction abort! |
|
431 | transaction abort! | |
432 | rollback completed |
|
432 | rollback completed | |
433 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
433 | abort: pretxnchangegroup.bad hook exited with status 1 | |
434 |
[ |
|
434 | [40] | |
435 | $ hg l |
|
435 | $ hg l | |
436 | $ hg bookmarks |
|
436 | $ hg bookmarks | |
437 | no bookmarks set |
|
437 | no bookmarks set |
@@ -757,7 +757,7 b' repositories visible to an external hook' | |||||
757 | transaction abort! |
|
757 | transaction abort! | |
758 | rollback completed |
|
758 | rollback completed | |
759 | abort: pretxnclose hook exited with status 1 |
|
759 | abort: pretxnclose hook exited with status 1 | |
760 |
[ |
|
760 | [40] | |
761 | $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending |
|
761 | $ cp .hg/store/phaseroots.pending.saved .hg/store/phaseroots.pending | |
762 |
|
762 | |||
763 | (check (in)visibility of phaseroot while transaction running in repo) |
|
763 | (check (in)visibility of phaseroot while transaction running in repo) | |
@@ -780,7 +780,7 b' repositories visible to an external hook' | |||||
780 | transaction abort! |
|
780 | transaction abort! | |
781 | rollback completed |
|
781 | rollback completed | |
782 | abort: pretxnclose hook exited with status 1 |
|
782 | abort: pretxnclose hook exited with status 1 | |
783 |
[ |
|
783 | [40] | |
784 |
|
784 | |||
785 | Check that pretxnclose-phase hook can control phase movement |
|
785 | Check that pretxnclose-phase hook can control phase movement | |
786 |
|
786 | |||
@@ -854,12 +854,12 b' Try various actions. only the draft move' | |||||
854 | transaction abort! |
|
854 | transaction abort! | |
855 | rollback completed |
|
855 | rollback completed | |
856 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
|
856 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 | |
857 |
[ |
|
857 | [40] | |
858 | $ hg phase --public a603bfb5a83e |
|
858 | $ hg phase --public a603bfb5a83e | |
859 | transaction abort! |
|
859 | transaction abort! | |
860 | rollback completed |
|
860 | rollback completed | |
861 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
|
861 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 | |
862 |
[ |
|
862 | [40] | |
863 | $ hg phase --draft 17a481b3bccb |
|
863 | $ hg phase --draft 17a481b3bccb | |
864 | test-debug-phase: move rev 3: 2 -> 1 |
|
864 | test-debug-phase: move rev 3: 2 -> 1 | |
865 | test-debug-phase: move rev 4: 2 -> 1 |
|
865 | test-debug-phase: move rev 4: 2 -> 1 | |
@@ -871,7 +871,7 b' Try various actions. only the draft move' | |||||
871 | transaction abort! |
|
871 | transaction abort! | |
872 | rollback completed |
|
872 | rollback completed | |
873 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 |
|
873 | abort: pretxnclose-phase.nopublish_D hook exited with status 1 | |
874 |
[ |
|
874 | [40] | |
875 |
|
875 | |||
876 | $ cd .. |
|
876 | $ cd .. | |
877 |
|
877 |
@@ -350,7 +350,7 b' two dirstate parents. We should not get ' | |||||
350 | M A |
|
350 | M A | |
351 | rebasing 6:a0b2430ebfb8 tip "F" |
|
351 | rebasing 6:a0b2430ebfb8 tip "F" | |
352 | abort: precommit hook exited with status 1 |
|
352 | abort: precommit hook exited with status 1 | |
353 |
[ |
|
353 | [40] | |
354 | $ hg tglogp |
|
354 | $ hg tglogp | |
355 | @ 7: 401ccec5e39f secret 'C' |
|
355 | @ 7: 401ccec5e39f secret 'C' | |
356 | | |
|
356 | | | |
@@ -401,7 +401,7 b' two dirstate parents. We should not get ' | |||||
401 | transaction abort! |
|
401 | transaction abort! | |
402 | rollback completed |
|
402 | rollback completed | |
403 | abort: pretxncommit hook exited with status 1 |
|
403 | abort: pretxncommit hook exited with status 1 | |
404 |
[ |
|
404 | [40] | |
405 | $ hg tglogp |
|
405 | $ hg tglogp | |
406 | @ 7: 401ccec5e39f secret 'C' |
|
406 | @ 7: 401ccec5e39f secret 'C' | |
407 | | |
|
407 | | | |
@@ -451,7 +451,7 b' two dirstate parents. We should not get ' | |||||
451 | transaction abort! |
|
451 | transaction abort! | |
452 | rollback completed |
|
452 | rollback completed | |
453 | abort: pretxnclose hook exited with status 1 |
|
453 | abort: pretxnclose hook exited with status 1 | |
454 |
[ |
|
454 | [40] | |
455 | $ hg tglogp |
|
455 | $ hg tglogp | |
456 | @ 7: 401ccec5e39f secret 'C' |
|
456 | @ 7: 401ccec5e39f secret 'C' | |
457 | | |
|
457 | | |
@@ -103,7 +103,7 b' rollback by pretxncommit saves commit me' | |||||
103 | transaction abort! |
|
103 | transaction abort! | |
104 | rollback completed |
|
104 | rollback completed | |
105 | abort: pretxncommit hook exited with status * (glob) |
|
105 | abort: pretxncommit hook exited with status * (glob) | |
106 |
[ |
|
106 | [40] | |
107 | $ cat .hg/last-message.txt ; echo |
|
107 | $ cat .hg/last-message.txt ; echo | |
108 | precious commit message |
|
108 | precious commit message | |
109 |
|
109 | |||
@@ -118,7 +118,7 b' same thing, but run $EDITOR' | |||||
118 | note: commit message saved in .hg/last-message.txt |
|
118 | note: commit message saved in .hg/last-message.txt | |
119 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
|
119 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | |
120 | abort: pretxncommit hook exited with status * (glob) |
|
120 | abort: pretxncommit hook exited with status * (glob) | |
121 |
[ |
|
121 | [40] | |
122 | $ cat .hg/last-message.txt |
|
122 | $ cat .hg/last-message.txt | |
123 | another precious commit message |
|
123 | another precious commit message | |
124 |
|
124 | |||
@@ -380,7 +380,7 b' An I/O error writing "transaction abort"' | |||||
380 | warn during abort |
|
380 | warn during abort | |
381 | rollback completed |
|
381 | rollback completed | |
382 | abort: pretxncommit hook exited with status 1 |
|
382 | abort: pretxncommit hook exited with status 1 | |
383 |
[ |
|
383 | [40] | |
384 |
|
384 | |||
385 | $ hg commit -m 'commit 1' |
|
385 | $ hg commit -m 'commit 1' | |
386 | warn during pretxncommit |
|
386 | warn during pretxncommit | |
@@ -405,7 +405,7 b' An I/O error during txnabort should stil' | |||||
405 | transaction abort! |
|
405 | transaction abort! | |
406 | rollback completed |
|
406 | rollback completed | |
407 | abort: pretxncommit hook exited with status 1 |
|
407 | abort: pretxncommit hook exited with status 1 | |
408 |
[ |
|
408 | [40] | |
409 |
|
409 | |||
410 | $ hg commit -m 'commit 1' |
|
410 | $ hg commit -m 'commit 1' | |
411 | warn during pretxncommit |
|
411 | warn during pretxncommit | |
@@ -431,7 +431,7 b' An I/O error writing "rollback completed' | |||||
431 | transaction abort! |
|
431 | transaction abort! | |
432 | warn during abort |
|
432 | warn during abort | |
433 | abort: pretxncommit hook exited with status 1 |
|
433 | abort: pretxncommit hook exited with status 1 | |
434 |
[ |
|
434 | [40] | |
435 |
|
435 | |||
436 | $ hg verify |
|
436 | $ hg verify | |
437 | checking changesets |
|
437 | checking changesets |
@@ -102,7 +102,7 b' Therefore, this test scenario ignores ch' | |||||
102 | transaction abort! |
|
102 | transaction abort! | |
103 | rollback completed |
|
103 | rollback completed | |
104 | abort: pretxnclose hook exited with status 1 |
|
104 | abort: pretxnclose hook exited with status 1 | |
105 |
[ |
|
105 | [40] | |
106 | $ hg book bm1 |
|
106 | $ hg book bm1 | |
107 |
|
107 | |||
108 | FYI, in contrast to above test, bmX is invisible in repo1 (= shared |
|
108 | FYI, in contrast to above test, bmX is invisible in repo1 (= shared | |
@@ -127,7 +127,7 b' src), because (1) HG_PENDING refers only' | |||||
127 | transaction abort! |
|
127 | transaction abort! | |
128 | rollback completed |
|
128 | rollback completed | |
129 | abort: pretxnclose hook exited with status 1 |
|
129 | abort: pretxnclose hook exited with status 1 | |
130 |
[ |
|
130 | [40] | |
131 | $ hg book bm3 |
|
131 | $ hg book bm3 | |
132 |
|
132 | |||
133 | clean up bm2 since it's uninteresting (not shared in the vfs case and |
|
133 | clean up bm2 since it's uninteresting (not shared in the vfs case and | |
@@ -249,7 +249,7 b' verify that bookmarks are not written on' | |||||
249 | no changes found |
|
249 | no changes found | |
250 | adding remote bookmark bm3 |
|
250 | adding remote bookmark bm3 | |
251 | abort: forced failure by extension |
|
251 | abort: forced failure by extension | |
252 |
[ |
|
252 | [40] | |
253 | $ hg boo |
|
253 | $ hg boo | |
254 | bm1 3:b87954705719 |
|
254 | bm1 3:b87954705719 | |
255 | bm4 5:92793bfc8cad |
|
255 | bm4 5:92793bfc8cad |
@@ -427,7 +427,7 b' Failed hook while applying "saveheads" b' | |||||
427 | strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) |
|
427 | strip failed, unrecovered changes stored in '$TESTTMP/test/.hg/strip-backup/*-temp.hg' (glob) | |
428 | (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) |
|
428 | (fix the problem, then recover the changesets with "hg unbundle '$TESTTMP/test/.hg/strip-backup/*-temp.hg'") (glob) | |
429 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
429 | abort: pretxnchangegroup.bad hook exited with status 1 | |
430 |
[ |
|
430 | [40] | |
431 | $ restore |
|
431 | $ restore | |
432 | $ hg log -G |
|
432 | $ hg log -G | |
433 | o changeset: 4:443431ffac4f |
|
433 | o changeset: 4:443431ffac4f |
@@ -290,7 +290,7 b' at first, test saving last-message.txt' | |||||
290 | $ rm -f .hg/last-message.txt |
|
290 | $ rm -f .hg/last-message.txt | |
291 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e |
|
291 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg tag custom-tag -e | |
292 | abort: pretag.test-saving-lastmessage hook exited with status 1 |
|
292 | abort: pretag.test-saving-lastmessage hook exited with status 1 | |
293 |
[ |
|
293 | [40] | |
294 | $ test -f .hg/last-message.txt |
|
294 | $ test -f .hg/last-message.txt | |
295 | [1] |
|
295 | [1] | |
296 |
|
296 | |||
@@ -325,7 +325,7 b" regardless of '--message')" | |||||
325 | note: commit message saved in .hg/last-message.txt |
|
325 | note: commit message saved in .hg/last-message.txt | |
326 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
|
326 | note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it | |
327 | abort: pretxncommit.unexpectedabort hook exited with status 1 |
|
327 | abort: pretxncommit.unexpectedabort hook exited with status 1 | |
328 |
[ |
|
328 | [40] | |
329 | $ cat .hg/last-message.txt |
|
329 | $ cat .hg/last-message.txt | |
330 | custom tag message |
|
330 | custom tag message | |
331 | second line |
|
331 | second line |
@@ -1091,7 +1091,7 b' revision restores dirstate correctly.' | |||||
1091 | transaction abort! |
|
1091 | transaction abort! | |
1092 | rollback completed |
|
1092 | rollback completed | |
1093 | abort: pretxncommit.abort hook exited with status 1 |
|
1093 | abort: pretxncommit.abort hook exited with status 1 | |
1094 |
[ |
|
1094 | [40] | |
1095 | $ cat >> .hg/hgrc <<EOF |
|
1095 | $ cat >> .hg/hgrc <<EOF | |
1096 | > [hooks] |
|
1096 | > [hooks] | |
1097 | > pretxncommit.abort = ! |
|
1097 | > pretxncommit.abort = ! |
@@ -38,7 +38,7 b' commit should fail' | |||||
38 | transaction abort! |
|
38 | transaction abort! | |
39 | rollback completed |
|
39 | rollback completed | |
40 | abort: pretxncommit.crlf hook failed |
|
40 | abort: pretxncommit.crlf hook failed | |
41 |
[ |
|
41 | [40] | |
42 |
|
42 | |||
43 | $ mv .hg/hgrc .hg/hgrc.bak |
|
43 | $ mv .hg/hgrc .hg/hgrc.bak | |
44 |
|
44 | |||
@@ -77,7 +77,7 b' push should fail' | |||||
77 | transaction abort! |
|
77 | transaction abort! | |
78 | rollback completed |
|
78 | rollback completed | |
79 | abort: pretxnchangegroup.crlf hook failed |
|
79 | abort: pretxnchangegroup.crlf hook failed | |
80 |
[ |
|
80 | [40] | |
81 |
|
81 | |||
82 | $ mv .hg/hgrc.bak .hg/hgrc |
|
82 | $ mv .hg/hgrc.bak .hg/hgrc | |
83 | $ echo hello > f |
|
83 | $ echo hello > f | |
@@ -109,7 +109,7 b' and now for something completely differe' | |||||
109 | transaction abort! |
|
109 | transaction abort! | |
110 | rollback completed |
|
110 | rollback completed | |
111 | abort: pretxncommit.crlf hook failed |
|
111 | abort: pretxncommit.crlf hook failed | |
112 |
[ |
|
112 | [40] | |
113 | $ hg revert -a |
|
113 | $ hg revert -a | |
114 | forgetting d/f2 |
|
114 | forgetting d/f2 | |
115 | $ rm d/f2 |
|
115 | $ rm d/f2 | |
@@ -286,7 +286,7 b' and now for something completely differe' | |||||
286 | transaction abort! |
|
286 | transaction abort! | |
287 | rollback completed |
|
287 | rollback completed | |
288 | abort: pretxnchangegroup.crlf hook failed |
|
288 | abort: pretxnchangegroup.crlf hook failed | |
289 |
[ |
|
289 | [40] | |
290 |
|
290 | |||
291 | $ hg log -v |
|
291 | $ hg log -v | |
292 | changeset: 5:f0b1c8d75fce |
|
292 | changeset: 5:f0b1c8d75fce |
General Comments 0
You need to be logged in to leave comments.
Login now