test-bundle2-exchange.t
1152 lines
| 42.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bundle2-exchange.t
|
r36235 | #testcases sshv1 sshv2 | ||
#if sshv2 | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [experimental] | ||||
> sshpeer.advertise-v2 = true | ||||
> sshserver.support-v2 = true | ||||
> EOF | ||||
#endif | ||||
|
r22660 | Test exchange of common information using bundle2 | ||
$ getmainid() { | ||||
> hg -R main log --template '{node}\n' --rev "$1" | ||||
> } | ||||
enable obsolescence | ||||
|
r26566 | $ cp $HGRCPATH $TESTTMP/hgrc.orig | ||
|
r23759 | $ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF | ||
|
r23672 | > echo pushkey: lock state after \"\$HG_NAMESPACE\" | ||
> hg debuglock | ||||
> EOF | ||||
|
r22660 | $ cat >> $HGRCPATH << EOF | ||
> [experimental] | ||||
|
r34867 | > evolution.createmarkers=True | ||
|
r34869 | > evolution.exchange=True | ||
|
r24878 | > bundle2-output-capture=True | ||
|
r22660 | > [ui] | ||
|
r46350 | > [command-templates] | ||
> log={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | ||||
|
r22660 | > [web] | ||
> push_ssl = false | ||||
> allow_push = * | ||||
> [phases] | ||||
> publish=False | ||||
|
r22938 | > [hooks] | ||
|
r24285 | > pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node|short} {phase} {bookmarks}\n" | ||
> txnclose.tip = hg log -r tip -T "postclose-tip:{node|short} {phase} {bookmarks}\n" | ||||
|
r25478 | > txnclose.env = sh -c "HG_LOCAL= printenv.py txnclose" | ||
|
r23759 | > pushkey= sh "$TESTTMP/bundle2-pushkey-hook.sh" | ||
|
r22660 | > EOF | ||
The extension requires a repo (currently unused) | ||||
$ hg init main | ||||
$ cd main | ||||
$ touch a | ||||
$ hg add a | ||||
$ hg commit -m 'a' | ||||
|
r24285 | pre-close-tip:3903775176ed draft | ||
postclose-tip:3903775176ed draft | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=commit | ||
|
r22660 | |||
$ hg unbundle $TESTDIR/bundles/rebase.hg | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
r43167 | pre-close-tip:02de42196ebe draft | |||
|
r22660 | added 8 changesets with 7 changes to 7 files (+3 heads) | ||
|
r39516 | new changesets cd010b8cd998:02de42196ebe (8 drafts) | ||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:$ID$ HG_TXNNAME=unbundle | ||
|
r24285 | bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) | ||
|
r22660 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ cd .. | ||||
Real world exchange | ||||
===================== | ||||
Add more obsolescence information | ||||
$ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` | ||||
r43164 | pre-close-tip:02de42196ebe draft | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` | ||
r43164 | pre-close-tip:02de42196ebe draft | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | |||
clone --pull | ||||
$ hg -R main phase --public cd010b8cd998 | ||||
|
r24822 | pre-close-tip:02de42196ebe draft | ||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase | ||
|
r22660 | $ hg clone main other --pull --rev 9520eea781bc | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
r43167 | pre-close-tip:9520eea781bc draft | |||
|
r22660 | added 2 changesets with 2 changes to 2 files | ||
1 new obsolescence markers | ||||
|
r39516 | new changesets cd010b8cd998:9520eea781bc (1 drafts) | ||
|
r23359 | postclose-tip:9520eea781bc draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | ||
|
r22660 | updating to branch default | ||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R other log -G | ||||
@ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
| | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
pull | ||||
$ hg -R main phase --public 9520eea781bc | ||||
|
r24822 | pre-close-tip:02de42196ebe draft | ||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase | ||
|
r22660 | $ hg -R other pull -r 24b6387c8c8c | ||
|
r35394 | pulling from $TESTTMP/main | ||
|
r22660 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
r43167 | pre-close-tip:24b6387c8c8c draft | |||
|
r22660 | added 1 changesets with 1 changes to 1 files (+1 heads) | ||
1 new obsolescence markers | ||||
|
r39516 | new changesets 24b6387c8c8c (1 drafts) | ||
|
r23359 | postclose-tip:24b6387c8c8c draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | ||
|
r22660 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg -R other log -G | ||||
o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
| | ||||
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
pull empty (with phase movement) | ||||
$ hg -R main phase --public 24b6387c8c8c | ||||
|
r24822 | pre-close-tip:02de42196ebe draft | ||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase | ||
|
r22660 | $ hg -R other pull -r 24b6387c8c8c | ||
|
r35394 | pulling from $TESTTMP/main | ||
|
r22660 | no changes found | ||
|
r24822 | pre-close-tip:24b6387c8c8c public | ||
|
r38268 | 1 local changesets published | ||
|
r23359 | postclose-tip:24b6387c8c8c public | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | ||
|
r22660 | $ hg -R other log -G | ||
o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
| | ||||
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
pull empty | ||||
$ hg -R other pull -r 24b6387c8c8c | ||||
|
r35394 | pulling from $TESTTMP/main | ||
|
r22660 | no changes found | ||
|
r23359 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | ||
|
r22660 | $ hg -R other log -G | ||
o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
| | ||||
| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
add extra data to test their exchange during push | ||||
$ hg -R main bookmark --rev eea13746799a book_eea1 | ||||
|
r25744 | pre-close-tip:02de42196ebe draft | ||
postclose-tip:02de42196ebe draft | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` | ||
r43164 | pre-close-tip:02de42196ebe draft | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | $ hg -R main bookmark --rev 02de42196ebe book_02de | ||
|
r25744 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` | ||
r43164 | pre-close-tip:02de42196ebe draft book_02de | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc | ||
|
r25744 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16` | ||
r43164 | pre-close-tip:02de42196ebe draft book_02de | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd | ||
|
r25744 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8` | ||
r43164 | pre-close-tip:02de42196ebe draft book_02de | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | $ hg -R main bookmark --rev 32af7686d403 book_32af | ||
|
r25744 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` | ||
r43164 | pre-close-tip:02de42196ebe draft book_02de | |||
r43163 | 1 new obsolescence markers | |||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete | ||
|
r22660 | |||
$ hg -R other bookmark --rev cd010b8cd998 book_eea1 | ||||
|
r25744 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R other bookmark --rev cd010b8cd998 book_02de | ||
|
r25744 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R other bookmark --rev cd010b8cd998 book_42cc | ||
|
r25744 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R other bookmark --rev cd010b8cd998 book_5fdd | ||
|
r25744 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | $ hg -R other bookmark --rev cd010b8cd998 book_32af | ||
|
r25744 | pre-close-tip:24b6387c8c8c public | ||
postclose-tip:24b6387c8c8c public | ||||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark | ||
|
r22660 | |||
$ hg -R main phase --public eea13746799a | ||||
|
r24822 | pre-close-tip:02de42196ebe draft book_02de | ||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase | ||
|
r22660 | |||
push | ||||
$ hg -R main push other --rev eea13746799a --bookmark book_eea1 | ||||
pushing to other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
r43167 | remote: pre-close-tip:eea13746799a public book_eea1 | |||
|
r22660 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) | ||
remote: 1 new obsolescence markers | ||||
|
r35829 | remote: pushkey: lock state after "bookmarks" | ||
|
r35673 | remote: lock: free | ||
remote: wlock: free | ||||
|
r24850 | remote: postclose-tip:eea13746799a public book_eea1 | ||
|
r31747 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:$ID$ HG_TXNNAME=push HG_URL=file:$TESTTMP/other | ||
|
r22660 | updating bookmark book_eea1 | ||
|
r23437 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response | ||
|
r24285 | file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob) | ||
|
r22660 | $ hg -R other log -G | ||
o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | ||||
|\ | ||||
| o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
| | | ||||
@ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
pull over ssh | ||||
$ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de | ||||
pulling from ssh://user@dummy/main | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
updating bookmark book_02de | ||||
|
r23361 | pre-close-tip:02de42196ebe draft book_02de | ||
r43167 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
r43164 | 1 new obsolescence markers | |||
|
r39516 | new changesets 02de42196ebe (1 drafts) | ||
|
r23359 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | ssh://user@dummy/main HG_URL=ssh://user@dummy/main | ||
|
r22660 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
pull over http | ||||
|
r28549 | $ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log | ||
|
r22660 | $ cat main.pid >> $DAEMON_PIDS | ||
$ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc | ||||
pulling from http://localhost:$HGPORT/ | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
updating bookmark book_42cc | ||||
|
r23361 | pre-close-tip:42ccdea3bb16 draft book_42cc | ||
r43167 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
r43164 | 1 new obsolescence markers | |||
|
r39516 | new changesets 42ccdea3bb16 (1 drafts) | ||
|
r23359 | postclose-tip:42ccdea3bb16 draft book_42cc | ||
|
r31747 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull | ||
|
r24285 | http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/ | ||
|
r22660 | (run 'hg heads .' to see heads, 'hg merge' to merge) | ||
$ cat main-error.log | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
push over ssh | ||||
$ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 --bookmark book_5fdd | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
r43167 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd | |||
|
r22660 | remote: added 1 changesets with 1 changes to 1 files | ||
remote: 1 new obsolescence markers | ||||
|
r35829 | remote: pushkey: lock state after "bookmarks" | ||
|
r35673 | remote: lock: free | ||
remote: wlock: free | ||||
|
r23359 | remote: postclose-tip:5fddd98957c8 draft book_5fdd | ||
|
r31747 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:ssh:$LOCALIP | ||
|
r24850 | updating bookmark book_5fdd | ||
|
r23437 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response | ||
|
r24285 | ssh://user@dummy/other HG_URL=ssh://user@dummy/other | ||
|
r22660 | $ hg -R other log -G | ||
o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | ||||
| | ||||
o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | ||||
| | ||||
| o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | ||||
| | | ||||
| | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | ||||
| |/| | ||||
| o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
|/ / | ||||
| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
push over http | ||||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r22660 | $ cat other.pid >> $DAEMON_PIDS | ||
$ hg -R main phase --public 32af7686d403 | ||||
|
r24822 | pre-close-tip:02de42196ebe draft book_02de | ||
|
r24285 | postclose-tip:02de42196ebe draft book_02de | ||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase | ||
|
r22660 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af | ||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
r43167 | remote: pre-close-tip:32af7686d403 public book_32af | |||
|
r22660 | remote: added 1 changesets with 1 changes to 1 files | ||
remote: 1 new obsolescence markers | ||||
|
r35829 | remote: pushkey: lock state after "bookmarks" | ||
|
r35673 | remote: lock: free | ||
remote: wlock: free | ||||
|
r24850 | remote: postclose-tip:32af7686d403 public book_32af | ||
|
r31812 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:$ID$ HG_TXNNAME=serve HG_URL=remote:http:$LOCALIP: (glob) | ||
|
r22660 | updating bookmark book_32af | ||
|
r23437 | pre-close-tip:02de42196ebe draft book_02de | ||
postclose-tip:02de42196ebe draft book_02de | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response | ||
|
r24285 | http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/ | ||
|
r22660 | $ cat other-error.log | ||
Check final content. | ||||
$ hg -R other log -G | ||||
o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af D | ||||
| | ||||
o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | ||||
| | ||||
o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | ||||
| | ||||
| o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | ||||
| | | ||||
| | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | ||||
| |/| | ||||
| o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | ||||
|/ / | ||||
| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | ||||
|/ | ||||
o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | ||||
$ hg -R other debugobsolete | ||||
1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | ||||
|
r23358 | (check that no 'pending' files remain) | ||
$ ls -1 other/.hg/bookmarks* | ||||
other/.hg/bookmarks | ||||
$ ls -1 other/.hg/store/phaseroots* | ||||
other/.hg/store/phaseroots | ||||
$ ls -1 other/.hg/store/00changelog.i* | ||||
other/.hg/store/00changelog.i | ||||
|
r22660 | Error Handling | ||
============== | ||||
Check that errors are properly returned to the client during push. | ||||
Setting up | ||||
$ cat > failpush.py << EOF | ||||
> """A small extension that makes push fails when using bundle2 | ||||
> | ||||
> used to test error handling in bundle2 | ||||
> """ | ||||
> | ||||
|
r26587 | > from mercurial import error | ||
|
r22660 | > from mercurial import bundle2 | ||
> from mercurial import exchange | ||||
> from mercurial import extensions | ||||
|
r34764 | > from mercurial import registrar | ||
> cmdtable = {} | ||||
> command = registrar.command(cmdtable) | ||||
> | ||||
> configtable = {} | ||||
> configitem = registrar.configitem(configtable) | ||||
|
r37766 | > configitem(b'failpush', b'reason', | ||
|
r34764 | > default=None, | ||
> ) | ||||
|
r22660 | > | ||
> def _pushbundle2failpart(pushop, bundler): | ||||
|
r37766 | > reason = pushop.ui.config(b'failpush', b'reason') | ||
|
r22660 | > part = None | ||
|
r37766 | > if reason == b'abort': | ||
> bundler.newpart(b'test:abort') | ||||
> if reason == b'unknown': | ||||
> bundler.newpart(b'test:unknown') | ||||
> if reason == b'race': | ||||
|
r22660 | > # 20 Bytes of crap | ||
|
r37766 | > bundler.newpart(b'check:heads', data=b'01234567890123456789') | ||
|
r22660 | > | ||
|
r37766 | > @bundle2.parthandler(b"test:abort") | ||
|
r22660 | > def handleabort(op, part): | ||
|
r37766 | > raise error.Abort(b'Abandon ship!', hint=b"don't panic") | ||
|
r22660 | > | ||
> def uisetup(ui): | ||||
|
r37766 | > exchange.b2partsgenmapping[b'failpart'] = _pushbundle2failpart | ||
> exchange.b2partsgenorder.insert(0, b'failpart') | ||||
|
r22660 | > | ||
> EOF | ||||
$ cd main | ||||
$ hg up tip | ||||
3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'I' > I | ||||
$ hg add I | ||||
$ hg ci -m 'I' | ||||
|
r24285 | pre-close-tip:e7ec4e813ba6 draft | ||
postclose-tip:e7ec4e813ba6 draft | ||||
|
r31747 | txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit | ||
|
r22660 | $ hg id | ||
e7ec4e813ba6 tip | ||||
$ cd .. | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [extensions] | ||||
> failpush=$TESTTMP/failpush.py | ||||
> EOF | ||||
|
r25474 | $ killdaemons.py | ||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r22660 | $ cat other.pid >> $DAEMON_PIDS | ||
Doing the actual push: Abort error | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = abort | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
abort: Abandon ship! | ||||
(don't panic) | ||||
[255] | ||||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
|
r26829 | remote: Abandon ship! | ||
|
r30908 | remote: (don't panic) | ||
|
r26829 | abort: push failed on remote | ||
|
r47739 | [100] | ||
|
r22660 | |||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
|
r26829 | remote: Abandon ship! | ||
|
r30908 | remote: (don't panic) | ||
|
r26829 | abort: push failed on remote | ||
|
r47739 | [100] | ||
|
r22660 | |||
Doing the actual push: unknown mandatory parts | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = unknown | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
abort: missing support for test:unknown | ||||
|
r47739 | [100] | ||
|
r22660 | |||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: missing support for test:unknown | ||||
|
r47739 | [100] | ||
|
r22660 | |||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: missing support for test:unknown | ||||
|
r47739 | [100] | ||
|
r22660 | |||
Doing the actual push: race | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = race | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
abort: push failed: | ||||
|
r40182 | 'remote repository changed while pushing - please try again' | ||
|
r22660 | [255] | ||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
abort: push failed: | ||||
|
r40182 | 'remote repository changed while pushing - please try again' | ||
|
r22660 | [255] | ||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
abort: push failed: | ||||
|
r40182 | 'remote repository changed while pushing - please try again' | ||
|
r22660 | [255] | ||
Doing the actual push: hook abort | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [failpush] | ||||
> reason = | ||||
> [hooks] | ||||
|
r24860 | > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" | ||
> txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" | ||||
|
r22660 | > EOF | ||
|
r25474 | $ killdaemons.py | ||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r22660 | $ cat other.pid >> $DAEMON_PIDS | ||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
|
r24799 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
|
r24850 | remote: pre-close-tip:e7ec4e813ba6 draft | ||
remote: You shall not pass! | ||||
|
r24847 | remote: transaction abort! | ||
|
r24849 | remote: Cleaning up the mess... | ||
|
r24847 | remote: rollback completed | ||
|
r24285 | abort: pretxnclose.failpush hook exited with status 1 | ||
|
r47145 | [40] | ||
|
r22660 | |||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
|
r24797 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
|
r24850 | remote: pre-close-tip:e7ec4e813ba6 draft | ||
remote: You shall not pass! | ||||
|
r24847 | remote: transaction abort! | ||
|
r24849 | remote: Cleaning up the mess... | ||
|
r24847 | remote: rollback completed | ||
|
r26829 | remote: pretxnclose.failpush hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r22660 | |||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
|
r24797 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
|
r24850 | remote: pre-close-tip:e7ec4e813ba6 draft | ||
remote: You shall not pass! | ||||
|
r24847 | remote: transaction abort! | ||
|
r24849 | remote: Cleaning up the mess... | ||
|
r24847 | remote: rollback completed | ||
|
r26829 | remote: pretxnclose.failpush hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r22660 | |||
|
r23358 | (check that no 'pending' files remain) | ||
|
r22660 | |||
|
r23358 | $ ls -1 other/.hg/bookmarks* | ||
other/.hg/bookmarks | ||||
$ ls -1 other/.hg/store/phaseroots* | ||||
other/.hg/store/phaseroots | ||||
$ ls -1 other/.hg/store/00changelog.i* | ||||
other/.hg/store/00changelog.i | ||||
|
r24851 | Check error from hook during the unbundling process itself | ||
$ cat << EOF >> $HGRCPATH | ||||
|
r24860 | > pretxnchangegroup = sh -c "echo 'Fail early!'; false" | ||
|
r24851 | > EOF | ||
|
r25474 | $ killdaemons.py # reload http config | ||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r24851 | $ cat other.pid >> $DAEMON_PIDS | ||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: Fail early! | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
abort: pretxnchangegroup hook exited with status 1 | ||||
|
r47145 | [40] | ||
|
r24851 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: Fail early! | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r26829 | remote: pretxnchangegroup hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r24851 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: Fail early! | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r26829 | remote: pretxnchangegroup hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r24878 | |||
Check output capture control. | ||||
(should be still forced for http, disabled for local and ssh) | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [experimental] | ||||
> bundle2-output-capture=False | ||||
> EOF | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
Fail early! | ||||
transaction abort! | ||||
Cleaning up the mess... | ||||
rollback completed | ||||
abort: pretxnchangegroup hook exited with status 1 | ||||
|
r47145 | [40] | ||
|
r24878 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
r48388 | remote: Fail early! (no-py3 chg !) | |||
|
r24878 | remote: adding changesets | ||
remote: adding manifests | ||||
remote: adding file changes | ||||
r48388 | remote: Fail early! (py3 !) | |||
remote: Fail early! (no-py3 no-chg !) | ||||
|
r24878 | remote: transaction abort! | ||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r26829 | remote: pretxnchangegroup hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r24878 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: Fail early! | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r26829 | remote: pretxnchangegroup hook exited with status 1 | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r25481 | |||
Check abort from mandatory pushkey | ||||
$ cat > mandatorypart.py << EOF | ||||
> from mercurial import exchange | ||||
> from mercurial import pushkey | ||||
> from mercurial import node | ||||
|
r25485 | > from mercurial import error | ||
|
r37766 | > @exchange.b2partsgenerator(b'failingpuskey') | ||
|
r25481 | > def addfailingpushey(pushop, bundler): | ||
> enc = pushkey.encode | ||||
|
r37766 | > part = bundler.newpart(b'pushkey') | ||
> part.addparam(b'namespace', enc(b'phases')) | ||||
> part.addparam(b'key', enc(b'cd010b8cd998f3981a5a8115f94f8da4ab506089')) | ||||
> part.addparam(b'old', enc(b'0')) # successful update | ||||
> part.addparam(b'new', enc(b'0')) | ||||
|
r25485 | > def fail(pushop, exc): | ||
|
r37766 | > raise error.Abort(b'Correct phase push failed (because hooks)') | ||
|
r25485 | > pushop.pkfailcb[part.id] = fail | ||
|
r25481 | > EOF | ||
$ cat >> $HGRCPATH << EOF | ||||
> [hooks] | ||||
> pretxnchangegroup= | ||||
> pretxnclose.failpush= | ||||
> prepushkey.failpush = sh -c "echo 'do not push the key !'; false" | ||||
> [extensions] | ||||
> mandatorypart=$TESTTMP/mandatorypart.py | ||||
> EOF | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config | ||||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r25481 | $ cat other.pid >> $DAEMON_PIDS | ||
(Failure from a hook) | ||||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
do not push the key ! | ||||
pushkey-abort: prepushkey.failpush hook exited with status 1 | ||||
transaction abort! | ||||
Cleaning up the mess... | ||||
rollback completed | ||||
|
r25485 | abort: Correct phase push failed (because hooks) | ||
|
r25481 | [255] | ||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: do not push the key ! | ||||
remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r25493 | abort: Correct phase push failed (because hooks) | ||
|
r25481 | [255] | ||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: do not push the key ! | ||||
remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
|
r25493 | abort: Correct phase push failed (because hooks) | ||
|
r25481 | [255] | ||
(Failure from a the pushkey) | ||||
$ cat > mandatorypart.py << EOF | ||||
> from mercurial import exchange | ||||
> from mercurial import pushkey | ||||
> from mercurial import node | ||||
|
r25485 | > from mercurial import error | ||
|
r37766 | > @exchange.b2partsgenerator(b'failingpuskey') | ||
|
r25481 | > def addfailingpushey(pushop, bundler): | ||
> enc = pushkey.encode | ||||
|
r37766 | > part = bundler.newpart(b'pushkey') | ||
> part.addparam(b'namespace', enc(b'phases')) | ||||
> part.addparam(b'key', enc(b'cd010b8cd998f3981a5a8115f94f8da4ab506089')) | ||||
> part.addparam(b'old', enc(b'4')) # will fail | ||||
> part.addparam(b'new', enc(b'3')) | ||||
|
r25485 | > def fail(pushop, exc): | ||
|
r37766 | > raise error.Abort(b'Clown phase push failed') | ||
|
r25485 | > pushop.pkfailcb[part.id] = fail | ||
|
r25481 | > EOF | ||
$ cat >> $HGRCPATH << EOF | ||||
> [hooks] | ||||
> prepushkey.failpush = | ||||
> EOF | ||||
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config | ||||
|
r28549 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | ||
|
r25481 | $ cat other.pid >> $DAEMON_PIDS | ||
$ hg -R main push other -r e7ec4e813ba6 | ||||
pushing to other | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
transaction abort! | ||||
Cleaning up the mess... | ||||
rollback completed | ||||
pushkey: lock state after "phases" | ||||
lock: free | ||||
wlock: free | ||||
|
r25485 | abort: Clown phase push failed | ||
|
r25481 | [255] | ||
$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | ||||
pushing to ssh://user@dummy/other | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
remote: pushkey: lock state after "phases" | ||||
remote: lock: free | ||||
remote: wlock: free | ||||
|
r25493 | abort: Clown phase push failed | ||
|
r25481 | [255] | ||
$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | ||||
pushing to http://localhost:$HGPORT2/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: transaction abort! | ||||
remote: Cleaning up the mess... | ||||
remote: rollback completed | ||||
remote: pushkey: lock state after "phases" | ||||
remote: lock: free | ||||
remote: wlock: free | ||||
|
r25493 | abort: Clown phase push failed | ||
|
r25481 | [255] | ||
|
r26566 | Test lazily acquiring the lock during unbundle | ||
$ cp $TESTTMP/hgrc.orig $HGRCPATH | ||||
$ cat >> $HGRCPATH <<EOF | ||||
> [ui] | ||||
> EOF | ||||
$ cat >> $TESTTMP/locktester.py <<EOF | ||||
> import os | ||||
|
r40405 | > from mercurial import bundle2, error, extensions | ||
|
r26566 | > def checklock(orig, repo, *args, **kwargs): | ||
|
r38622 | > if repo.svfs.lexists(b"lock"): | ||
> raise error.Abort(b"Lock should not be taken") | ||||
|
r26566 | > return orig(repo, *args, **kwargs) | ||
> def extsetup(ui): | ||||
|
r38622 | > extensions.wrapfunction(bundle2, b'processbundle', checklock) | ||
|
r26566 | > EOF | ||
$ hg init lazylock | ||||
$ cat >> lazylock/.hg/hgrc <<EOF | ||||
> [extensions] | ||||
> locktester=$TESTTMP/locktester.py | ||||
> EOF | ||||
$ hg clone -q ssh://user@dummy/lazylock lazylockclient | ||||
$ cd lazylockclient | ||||
$ touch a && hg ci -Aqm a | ||||
$ hg push | ||||
pushing to ssh://user@dummy/lazylock | ||||
searching for changes | ||||
|
r26829 | remote: Lock should not be taken | ||
abort: push failed on remote | ||||
|
r47739 | [100] | ||
|
r26566 | |||
$ cat >> ../lazylock/.hg/hgrc <<EOF | ||||
> [experimental] | ||||
> bundle2lazylocking=True | ||||
> EOF | ||||
$ hg push | ||||
pushing to ssh://user@dummy/lazylock | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 1 changes to 1 files | ||||
|
r27246 | |||
$ cd .. | ||||
Servers can disable bundle1 for clone/pull operations | ||||
$ killdaemons.py | ||||
$ hg init bundle2onlyserver | ||||
$ cd bundle2onlyserver | ||||
$ cat > .hg/hgrc << EOF | ||||
> [server] | ||||
> bundle1.pull = false | ||||
> EOF | ||||
$ touch foo | ||||
$ hg -q commit -A -m initial | ||||
$ hg serve -p $HGPORT -d --pid-file=hg.pid | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | ||
|
r27246 | requesting all changes | ||
abort: remote error: | ||||
incompatible Mercurial client; bundle2 required | ||||
(see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
|
r46443 | [100] | ||
|
r27246 | $ killdaemons.py | ||
|
r27633 | $ cd .. | ||
bundle1 can still pull non-generaldelta repos when generaldelta bundle1 disabled | ||||
$ hg --config format.usegeneraldelta=false init notgdserver | ||||
$ cd notgdserver | ||||
$ cat > .hg/hgrc << EOF | ||||
> [server] | ||||
> bundle1gd.pull = false | ||||
> EOF | ||||
$ touch foo | ||||
$ hg -q commit -A -m initial | ||||
$ hg serve -p $HGPORT -d --pid-file=hg.pid | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-1 | ||
|
r27633 | requesting all changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets 96ee1d7354c4 | ||
|
r27633 | updating to branch default | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ killdaemons.py | ||||
$ cd ../bundle2onlyserver | ||||
bundle1 pull can be disabled for generaldelta repos only | ||||
$ cat > .hg/hgrc << EOF | ||||
> [server] | ||||
> bundle1gd.pull = false | ||||
> EOF | ||||
$ hg serve -p $HGPORT -d --pid-file=hg.pid | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | ||
|
r27633 | requesting all changes | ||
abort: remote error: | ||||
incompatible Mercurial client; bundle2 required | ||||
(see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
|
r46443 | [100] | ||
|
r27633 | |||
$ killdaemons.py | ||||
|
r27246 | |||
Verify the global server.bundle1 option works | ||||
|
r30911 | $ cd .. | ||
$ cat > bundle2onlyserver/.hg/hgrc << EOF | ||||
|
r27246 | > [server] | ||
> bundle1 = false | ||||
> EOF | ||||
|
r34484 | $ hg serve -R bundle2onlyserver -p $HGPORT -d --pid-file=hg.pid | ||
|
r27246 | $ cat hg.pid >> $DAEMON_PIDS | ||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT not-bundle2 | ||
|
r27246 | requesting all changes | ||
abort: remote error: | ||||
incompatible Mercurial client; bundle2 required | ||||
(see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
|
r46443 | [100] | ||
|
r27246 | $ killdaemons.py | ||
|
r30912 | $ hg --config devel.legacy.exchange=bundle1 clone ssh://user@dummy/bundle2onlyserver not-bundle2-ssh | ||
requesting all changes | ||||
adding changesets | ||||
remote: abort: incompatible Mercurial client; bundle2 required | ||||
remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
transaction abort! | ||||
rollback completed | ||||
abort: stream ended unexpectedly (got 0 bytes, expected 4) | ||||
[255] | ||||
|
r30911 | $ cat > bundle2onlyserver/.hg/hgrc << EOF | ||
|
r27633 | > [server] | ||
> bundle1gd = false | ||||
> EOF | ||||
|
r34484 | $ hg serve -R bundle2onlyserver -p $HGPORT -d --pid-file=hg.pid | ||
|
r27633 | $ cat hg.pid >> $DAEMON_PIDS | ||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | ||
|
r27633 | requesting all changes | ||
abort: remote error: | ||||
incompatible Mercurial client; bundle2 required | ||||
(see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
|
r46443 | [100] | ||
|
r27633 | |||
$ killdaemons.py | ||||
|
r30911 | $ cd notgdserver | ||
|
r27633 | $ cat > .hg/hgrc << EOF | ||
> [server] | ||||
> bundle1gd = false | ||||
> EOF | ||||
$ hg serve -p $HGPORT -d --pid-file=hg.pid | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-2 | ||
|
r27633 | requesting all changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets 96ee1d7354c4 | ||
|
r27633 | updating to branch default | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ killdaemons.py | ||||
$ cd ../bundle2onlyserver | ||||
|
r27246 | Verify bundle1 pushes can be disabled | ||
$ cat > .hg/hgrc << EOF | ||||
> [server] | ||||
> bundle1.push = false | ||||
> [web] | ||||
> allow_push = * | ||||
> push_ssl = false | ||||
> EOF | ||||
$ hg serve -p $HGPORT -d --pid-file=hg.pid -E error.log | ||||
$ cat hg.pid >> $DAEMON_PIDS | ||||
$ cd .. | ||||
$ hg clone http://localhost:$HGPORT bundle2-only | ||||
requesting all changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r34662 | new changesets 96ee1d7354c4 | ||
|
r27246 | updating to branch default | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd bundle2-only | ||||
$ echo commit > foo | ||||
$ hg commit -m commit | ||||
|
r29685 | $ hg --config devel.legacy.exchange=bundle1 push | ||
|
r27246 | pushing to http://localhost:$HGPORT/ | ||
searching for changes | ||||
abort: remote error: | ||||
incompatible Mercurial client; bundle2 required | ||||
(see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||||
|
r46443 | [100] | ||
|
r27246 | |||
|
r30909 | (also check with ssh) | ||
$ hg --config devel.legacy.exchange=bundle1 push ssh://user@dummy/bundle2onlyserver | ||||
pushing to ssh://user@dummy/bundle2onlyserver | ||||
searching for changes | ||||
remote: abort: incompatible Mercurial client; bundle2 required | ||||
|
r30910 | remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | ||
|
r30909 | [1] | ||
|
r27246 | $ hg push | ||
pushing to http://localhost:$HGPORT/ | ||||
searching for changes | ||||
remote: adding changesets | ||||
remote: adding manifests | ||||
remote: adding file changes | ||||
remote: added 1 changesets with 1 changes to 1 files | ||||