mercurial: tests/test-bundle2-exchange.t@38392d5bde8e (annotated)

36217 1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	1	#testcases sshv1 sshv2
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	2
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	3	#if sshv2
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	4	$ cat >> $HGRCPATH << EOF
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	5	> [experimental]
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	6	> sshpeer.advertise-v2 = true
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	7	> sshserver.support-v2 = true
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	8	> EOF
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	9	#endif
1ee1a42bfdae tests: test using both versions of SSH protocol Gregory Szorc <gregory.szorc@gmail.com> parents: 35811 diff changeset	10
22660 978cce51cc5f bundle2: split test in two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22659 diff changeset	11	Test exchange of common information using bundle2
978cce51cc5f bundle2: split test in two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22659 diff changeset	12
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	13
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	14	$ getmainid() {
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	15	> hg -R main log --template '{node}\n' --rev "$1"
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	16	> }
20801 9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	17
22660 978cce51cc5f bundle2: split test in two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22659 diff changeset	18	enable obsolescence
20801 9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	19
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	20	$ cp $HGRCPATH $TESTTMP/hgrc.orig
23759 cdfc47266e53 test-bundle2-exchange: create temp script in $TESTTMP, not $TESTDIR Martin von Zweigbergk <martinvonz@google.com> parents: 23672 diff changeset	21	$ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF
23672 7853e8603f4a tests: make a multi-statement hook in bundle2-exchange Windows compatible Matt Harbison <matt_harbison@yahoo.com> parents: 23648 diff changeset	22	> echo pushkey: lock state after \"\$HG_NAMESPACE\"
7853e8603f4a tests: make a multi-statement hook in bundle2-exchange Windows compatible Matt Harbison <matt_harbison@yahoo.com> parents: 23648 diff changeset	23	> hg debuglock
7853e8603f4a tests: make a multi-statement hook in bundle2-exchange Windows compatible Matt Harbison <matt_harbison@yahoo.com> parents: 23648 diff changeset	24	> EOF
7853e8603f4a tests: make a multi-statement hook in bundle2-exchange Windows compatible Matt Harbison <matt_harbison@yahoo.com> parents: 23648 diff changeset	25
20801 9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	26	$ cat >> $HGRCPATH << EOF
21147 2a246e737f92 bundle2: move bundle2 config option to section "experimental" Pierre-Yves David <pierre-yves.david@fb.com> parents: 21146 diff changeset	27	> [experimental]
34866 1644623ab096 config: use 'experimental.evolution.create-markers' Boris Feld <boris.feld@octobus.net> parents: 34836 diff changeset	28	> evolution.createmarkers=True
34868 44797aedfb35 config: use 'experimental.evolution.exchange' Boris Feld <boris.feld@octobus.net> parents: 34866 diff changeset	29	> evolution.exchange=True
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	30	> bundle2-output-capture=True
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	31	> [ui]
33335 72f051f9a7d8 tests: quote $PYTHON for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 33286 diff changeset	32	> ssh="$PYTHON" "$TESTDIR/dummyssh"
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	33	> logtemplate={rev}:{node\|short} {phase} {author} {bookmarks} {desc\|firstline}
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	34	> [web]
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	35	> push_ssl = false
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	36	> allow_push = *
21648 c26a11cdafeb bundle2: use non-publishing repo in test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21647 diff changeset	37	> [phases]
c26a11cdafeb bundle2: use non-publishing repo in test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21647 diff changeset	38	> publish=False
22938 4f2222f86612 test-bundle2: test that we got appropriate hook called with appropriate data Pierre-Yves David <pierre-yves.david@fb.com> parents: 22660 diff changeset	39	> [hooks]
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	40	> pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node\|short} {phase} {bookmarks}\n"
8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	41	> txnclose.tip = hg log -r tip -T "postclose-tip:{node\|short} {phase} {bookmarks}\n"
25478 d19787db6fe0 tests: simplify printenv calls Matt Mackall <mpm@selenic.com> parents: 25476 diff changeset	42	> txnclose.env = sh -c "HG_LOCAL= printenv.py txnclose"
23759 cdfc47266e53 test-bundle2-exchange: create temp script in $TESTTMP, not $TESTDIR Martin von Zweigbergk <martinvonz@google.com> parents: 23672 diff changeset	43	> pushkey= sh "$TESTTMP/bundle2-pushkey-hook.sh"
20801 9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	44	> EOF
9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	45
9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	46	The extension requires a repo (currently unused)
9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	47
9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	48	$ hg init main
9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	49	$ cd main
20803 88db3e615319 bundle2: make sure the unbundler refuse non bundle2 stream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20802 diff changeset	50	$ touch a
88db3e615319 bundle2: make sure the unbundler refuse non bundle2 stream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20802 diff changeset	51	$ hg add a
88db3e615319 bundle2: make sure the unbundler refuse non bundle2 stream Pierre-Yves David <pierre-yves.david@fb.com> parents: 20802 diff changeset	52	$ hg commit -m 'a'
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	53	pre-close-tip:3903775176ed draft
8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	54	postclose-tip:3903775176ed draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	55	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
20801 9c5183cb9bca bundle2: very first version of a bundle2 bundler Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56
20950 c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	57	$ hg unbundle $TESTDIR/bundles/rebase.hg
c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	58	adding changesets
c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	59	adding manifests
c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	60	adding file changes
c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	61	added 8 changesets with 7 changes to 7 files (+3 heads)
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	62	pre-close-tip:02de42196ebe draft
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 38603 diff changeset	63	new changesets cd010b8cd998:02de42196ebe (8 drafts)
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	64	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	65	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	66	bundle:/tests/bundles/rebase.hg HG_URL=bundle:/tests/bundles/rebase.hg (glob)
20950 c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	67	(run 'hg heads' to see heads, 'hg merge' to merge)
c7ceae0faf69 bundle2: first crude version of bundling changeset with bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20949 diff changeset	68
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	69	$ cd ..
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	70
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	71	Real world exchange
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	72	=====================
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	73
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	74	Add more obsolescence information
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	75
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	76	$ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	77	pre-close-tip:02de42196ebe draft
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	78	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	79	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	80	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	81	$ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	82	pre-close-tip:02de42196ebe draft
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	83	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	84	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	85	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	86
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	87	clone --pull
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	88
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	89	$ hg -R main phase --public cd010b8cd998
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	90	pre-close-tip:02de42196ebe draft
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	91	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	92	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	93	$ hg clone main other --pull --rev 9520eea781bc
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	94	adding changesets
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	95	adding manifests
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	96	adding file changes
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	97	added 2 changesets with 2 changes to 2 files
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	98	pre-close-tip:9520eea781bc draft
22354 a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22350 diff changeset	99	1 new obsolescence markers
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 38603 diff changeset	100	new changesets cd010b8cd998:9520eea781bc (1 drafts)
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	101	postclose-tip:9520eea781bc draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	102	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	103	file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	104	updating to branch default
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	105	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	106	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	107	@ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	108	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	109	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	110
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	111	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	112	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	113
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	114	pull
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	115
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	116	$ hg -R main phase --public 9520eea781bc
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	117	pre-close-tip:02de42196ebe draft
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	118	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	119	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	120	$ hg -R other pull -r 24b6387c8c8c
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35264 diff changeset	121	pulling from $TESTTMP/main
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	122	searching for changes
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	123	adding changesets
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	124	adding manifests
12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	125	adding file changes
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	126	added 1 changesets with 1 changes to 1 files (+1 heads)
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	127	pre-close-tip:24b6387c8c8c draft
22354 a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22350 diff changeset	128	1 new obsolescence markers
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 38603 diff changeset	129	new changesets 24b6387c8c8c (1 drafts)
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	130	postclose-tip:24b6387c8c8c draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	131	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	132	file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
20955 12f161f08d74 bundle2: allow pulling changegroups using bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 20952 diff changeset	133	(run 'hg heads' to see heads, 'hg merge' to merge)
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	134	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	135	o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	136	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	137	\| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	138	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	139	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	140
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	141	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	142	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	143	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	144
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	145	pull empty (with phase movement)
3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	146
3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	147	$ hg -R main phase --public 24b6387c8c8c
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	148	pre-close-tip:02de42196ebe draft
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	149	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	150	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	151	$ hg -R other pull -r 24b6387c8c8c
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35264 diff changeset	152	pulling from $TESTTMP/main
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	153	no changes found
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	154	pre-close-tip:24b6387c8c8c public
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	155	1 local changesets published
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	156	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	157	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	158	file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	159	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	160	o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	161	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	162	\| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	163	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	164	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	165
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	166	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	167	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	168	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	169
21584 4dca1a06e7ee bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21547 diff changeset	170	pull empty
4dca1a06e7ee bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21547 diff changeset	171
4dca1a06e7ee bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21547 diff changeset	172	$ hg -R other pull -r 24b6387c8c8c
35393 4441705b7111 tests: remove (glob) annotations that were only for '\' matches Matt Harbison <matt_harbison@yahoo.com> parents: 35264 diff changeset	173	pulling from $TESTTMP/main
21584 4dca1a06e7ee bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21547 diff changeset	174	no changes found
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	175	pre-close-tip:24b6387c8c8c public
1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	176	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	177	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:$ID$ HG_TXNNAME=pull
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	178	file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob)
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	179	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	180	o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	181	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	182	\| @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	183	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	184	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	185
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	186	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	187	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	188	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21584 4dca1a06e7ee bundle2: fix bundle2 pulling all revs on empty pulls Durham Goode <durham@fb.com> parents: 21547 diff changeset	189
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	190	add extra data to test their exchange during push
3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	191
3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	192	$ hg -R main bookmark --rev eea13746799a book_eea1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	193	pre-close-tip:02de42196ebe draft
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	194	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	195	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	196	$ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	197	pre-close-tip:02de42196ebe draft
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	198	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	199	postclose-tip:02de42196ebe draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	200	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	201	$ hg -R main bookmark --rev 02de42196ebe book_02de
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	202	pre-close-tip:02de42196ebe draft book_02de
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	203	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	204	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	205	$ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	206	pre-close-tip:02de42196ebe draft book_02de
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	207	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	208	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	209	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	210	$ hg -R main bookmark --rev 42ccdea3bb16 book_42cc
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	211	pre-close-tip:02de42196ebe draft book_02de
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	212	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	213	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	214	$ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	215	pre-close-tip:02de42196ebe draft book_02de
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	216	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	217	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	218	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	219	$ hg -R main bookmark --rev 5fddd98957c8 book_5fdd
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	220	pre-close-tip:02de42196ebe draft book_02de
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	221	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	222	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	223	$ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	224	pre-close-tip:02de42196ebe draft book_02de
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	225	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	226	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	227	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	228	$ hg -R main bookmark --rev 32af7686d403 book_32af
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	229	pre-close-tip:02de42196ebe draft book_02de
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	230	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	231	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	232	$ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	233	pre-close-tip:02de42196ebe draft book_02de
42893 34a46d48d24e debugobsolete: also issue the "new obsmarkers" messsage Pierre-Yves David <pierre-yves.david@octobus.net> parents: 40369 diff changeset	234	1 new obsolescence markers
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	235	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	236	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	237
3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	238	$ hg -R other bookmark --rev cd010b8cd998 book_eea1
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	239	pre-close-tip:24b6387c8c8c public
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	240	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	241	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	242	$ hg -R other bookmark --rev cd010b8cd998 book_02de
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	243	pre-close-tip:24b6387c8c8c public
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	244	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	245	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	246	$ hg -R other bookmark --rev cd010b8cd998 book_42cc
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	247	pre-close-tip:24b6387c8c8c public
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	248	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	249	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	250	$ hg -R other bookmark --rev cd010b8cd998 book_5fdd
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	251	pre-close-tip:24b6387c8c8c public
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	252	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	253	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	254	$ hg -R other bookmark --rev cd010b8cd998 book_32af
25744 e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	255	pre-close-tip:24b6387c8c8c public
e78a80f8f51e bookmarks: change bookmark within a transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 25495 diff changeset	256	postclose-tip:24b6387c8c8c public
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	257	txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	258
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	259	$ hg -R main phase --public eea13746799a
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	260	pre-close-tip:02de42196ebe draft book_02de
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	261	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	262	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	263
3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	264	push
3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	265	$ hg -R main push other --rev eea13746799a --bookmark book_eea1
21061 62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	266	pushing to other
62d35f251c60 bundle2: allow using bundle2 for push Pierre-Yves David <pierre-yves.david@fb.com> parents: 21019 diff changeset	267	searching for changes
21131 b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	268	remote: adding changesets
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	269	remote: adding manifests
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	270	remote: adding file changes
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	271	remote: added 1 changesets with 0 changes to 0 files (-1 heads)
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	272	remote: pre-close-tip:eea13746799a public book_eea1
22350 6d113cc7a31a push: only push obsmarkers relevant to the "pushed subset" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22347 diff changeset	273	remote: 1 new obsolescence markers
35811 e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777) Boris Feld <boris.feld@octobus.net> parents: 35655 diff changeset	274	remote: pushkey: lock state after "bookmarks"
35655 2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	275	remote: lock: free
2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	276	remote: wlock: free
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	277	remote: postclose-tip:eea13746799a public book_eea1
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	278	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
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	279	updating bookmark book_eea1
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	280	pre-close-tip:02de42196ebe draft book_02de
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	281	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	282	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	283	file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob)
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	284	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	285	o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	286	\|\
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	287	\| o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	288	\| \|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	289	@ \| 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	290	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	291	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	292
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	293	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	294	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	295	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	296	3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	297
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	298	pull over ssh
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	299
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	300	$ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	301	pulling from ssh://user@dummy/main
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	302	searching for changes
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	303	adding changesets
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	304	adding manifests
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	305	adding file changes
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	306	added 1 changesets with 1 changes to 1 files (+1 heads)
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	307	updating bookmark book_02de
23361 936b0ff34346 phases: read pending data when appropriate Pierre-Yves David <pierre-yves.david@fb.com> parents: 23360 diff changeset	308	pre-close-tip:02de42196ebe draft book_02de
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	309	1 new obsolescence markers
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 38603 diff changeset	310	new changesets 02de42196ebe (1 drafts)
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	311	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	312	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	313	ssh://user@dummy/main HG_URL=ssh://user@dummy/main
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	314	(run 'hg heads' to see heads, 'hg merge' to merge)
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	315	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	316	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	317	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	318	3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	319	4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	320
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	321	pull over http
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	322
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	323	$ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	324	$ cat main.pid >> $DAEMON_PIDS
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	325
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	326	$ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	327	pulling from http://localhost:$HGPORT/
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	328	searching for changes
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	329	adding changesets
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	330	adding manifests
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	331	adding file changes
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	332	added 1 changesets with 1 changes to 1 files (+1 heads)
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	333	updating bookmark book_42cc
23361 936b0ff34346 phases: read pending data when appropriate Pierre-Yves David <pierre-yves.david@fb.com> parents: 23360 diff changeset	334	pre-close-tip:42ccdea3bb16 draft book_42cc
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	335	1 new obsolescence markers
39480 89630d0b3e23 phase: report number of non-public changeset alongside the new range Boris Feld <boris.feld@octobus.net> parents: 38603 diff changeset	336	new changesets 42ccdea3bb16 (1 drafts)
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	337	postclose-tip:42ccdea3bb16 draft book_42cc
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	338	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
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	339	http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	340	(run 'hg heads .' to see heads, 'hg merge' to merge)
0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	341	$ cat main-error.log
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	342	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	343	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	344	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	345	3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	346	4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	347	5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	348
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	349	push over ssh
21069 0a9cae236738 bundle2: allow bundle2 for pulling over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21062 diff changeset	350
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	351	$ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 --bookmark book_5fdd
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	352	pushing to ssh://user@dummy/other
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	353	searching for changes
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	354	remote: adding changesets
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	355	remote: adding manifests
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	356	remote: adding file changes
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	357	remote: added 1 changesets with 1 changes to 1 files
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	358	remote: pre-close-tip:5fddd98957c8 draft book_5fdd
22354 a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22350 diff changeset	359	remote: 1 new obsolescence markers
35811 e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777) Boris Feld <boris.feld@octobus.net> parents: 35655 diff changeset	360	remote: pushkey: lock state after "bookmarks"
35655 2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	361	remote: lock: free
2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	362	remote: wlock: free
23359 1b2957b27203 test-bundle2: check visible data in pre/post-transaction hooks Pierre-Yves David <pierre-yves.david@fb.com> parents: 23358 diff changeset	363	remote: postclose-tip:5fddd98957c8 draft book_5fdd
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	364	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
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	365	updating bookmark book_5fdd
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	366	pre-close-tip:02de42196ebe draft book_02de
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	367	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	368	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	369	ssh://user@dummy/other HG_URL=ssh://user@dummy/other
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	370	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	371	o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	372	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	373	o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	374	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	375	\| o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	376	\| \|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	377	\| \| o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	378	\| \|/\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	379	\| o \| 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	380	\|/ /
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	381	\| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	382	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	383	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	384
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	385	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	386	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	387	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	388	3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	389	4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	390	5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	391	6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	392
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	393	push over http
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	394
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	395	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	396	$ cat other.pid >> $DAEMON_PIDS
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	397
21649 3bfadd70550b bundle2: add more phase movement in the test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21648 diff changeset	398	$ hg -R main phase --public 32af7686d403
24822 8678b1eafbcf changelog: fix readpending if no pending data exist (issue4609) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24799 diff changeset	399	pre-close-tip:02de42196ebe draft book_02de
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	400	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	401	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_PHASES_MOVED=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=phase
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	402	$ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	403	pushing to http://localhost:$HGPORT2/
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	404	searching for changes
21131 b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	405	remote: adding changesets
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	406	remote: adding manifests
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	407	remote: adding file changes
b7435117d951 bundle2: capture remote stdout while unbundling Pierre-Yves David <pierre-yves.david@fb.com> parents: 21130 diff changeset	408	remote: added 1 changesets with 1 changes to 1 files
42894 38392d5bde8e transaction: issue "new obsmarkers" message at the end of the transaction Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42893 diff changeset	409	remote: pre-close-tip:32af7686d403 public book_32af
22354 a89add6c6b2f bundle2: pull obsmarkers relevant to the pulled set through bundle2 Pierre-Yves David <pierre-yves.david@fb.com> parents: 22350 diff changeset	410	remote: 1 new obsolescence markers
35811 e35320ce8043 bookmarks: fix pushkey compatibility mode (issue5777) Boris Feld <boris.feld@octobus.net> parents: 35655 diff changeset	411	remote: pushkey: lock state after "bookmarks"
35655 2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	412	remote: lock: free
2f54a3e228ff bookmark: run 'pushkey' hooks after bookmark move, not 'prepushkey' Boris Feld <boris.feld@octobus.net> parents: 35393 diff changeset	413	remote: wlock: free
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	414	remote: postclose-tip:32af7686d403 public book_32af
31812 71e3eec9b9fb tests: fix missing (glob) annotations in test-bundle2-exchange.t Augie Fackler <augie@google.com> parents: 31747 diff changeset	415	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)
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	416	updating bookmark book_32af
23437 94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	417	pre-close-tip:02de42196ebe draft book_02de
94e2862dbcfb push: elevate phase transaction to cover entire operation Eric Sumner <ericsumner@fb.com> parents: 23389 diff changeset	418	postclose-tip:02de42196ebe draft book_02de
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	419	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_SOURCE=push-response HG_TXNID=TXN:$ID$ HG_TXNNAME=push-response
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	420	http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	421	$ cat other-error.log
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	422
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	423	Check final content.
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	424
438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	425	$ hg -R other log -G
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	426	o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af D
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	427	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	428	o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	429	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	430	o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	431	\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	432	\| o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	433	\| \|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	434	\| \| o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G
21647 1a6909f4ebb0 bundle2: use a smarter template for test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21628 diff changeset	435	\| \|/\|
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	436	\| o \| 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F
21647 1a6909f4ebb0 bundle2: use a smarter template for test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21628 diff changeset	437	\|/ /
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	438	\| @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E
21647 1a6909f4ebb0 bundle2: use a smarter template for test Pierre-Yves David <pierre-yves.david@fb.com> parents: 21628 diff changeset	439	\|/
22241 3dc3cf8d0e73 test-bundle2: add bookmark movement to the push test Pierre-Yves David <pierre-yves.david@fb.com> parents: 22090 diff changeset	440	o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A
21075 438803e4bd97 bundle2: support for push over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 21069 diff changeset	441
22323 b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	442	$ hg -R other debugobsolete
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	443	1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	444	2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	445	3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	446	4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	447	5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	448	6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
b31d29b2a7f2 test-bundle2: add obsolescence information to be exchanged Pierre-Yves David <pierre-yves.david@fb.com> parents: 22241 diff changeset	449	7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	450
23358 1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	451	(check that no 'pending' files remain)
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	452
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	453	$ ls -1 other/.hg/bookmarks*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	454	other/.hg/bookmarks
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	455	$ ls -1 other/.hg/store/phaseroots*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	456	other/.hg/store/phaseroots
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	457	$ ls -1 other/.hg/store/00changelog.i*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	458	other/.hg/store/00changelog.i
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	459
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	460	Error Handling
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	461	==============
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	462
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	463	Check that errors are properly returned to the client during push.
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	464
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	465	Setting up
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	466
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	467	$ cat > failpush.py << EOF
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	468	> """A small extension that makes push fails when using bundle2
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	469	>
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	470	> used to test error handling in bundle2
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	471	> """
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	472	>
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26566 diff changeset	473	> from mercurial import error
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	474	> from mercurial import bundle2
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	475	> from mercurial import exchange
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	476	> from mercurial import extensions
34763 7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	477	> from mercurial import registrar
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	478	> cmdtable = {}
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	479	> command = registrar.command(cmdtable)
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	480	>
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	481	> configtable = {}
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	482	> configitem = registrar.configitem(configtable)
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	483	> configitem(b'failpush', b'reason',
34763 7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	484	> default=None,
7c52a65010b1 configitems: register the test 'failpush.reason' config Boris Feld <boris.feld@octobus.net> parents: 34661 diff changeset	485	> )
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	486	>
21905 7923648ad915 bundle2-test: use the new way to extend push content Pierre-Yves David <pierre-yves.david@fb.com> parents: 21649 diff changeset	487	> def _pushbundle2failpart(pushop, bundler):
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	488	> reason = pushop.ui.config(b'failpush', b'reason')
21178 9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	489	> part = None
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	490	> if reason == b'abort':
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	491	> bundler.newpart(b'test:abort')
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	492	> if reason == b'unknown':
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	493	> bundler.newpart(b'test:unknown')
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	494	> if reason == b'race':
21186 9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	495	> # 20 Bytes of crap
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	496	> bundler.newpart(b'check:heads', data=b'01234567890123456789')
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	497	>
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	498	> @bundle2.parthandler(b"test:abort")
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	499	> def handleabort(op, part):
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	500	> raise error.Abort(b'Abandon ship!', hint=b"don't panic")
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	501	>
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	502	> def uisetup(ui):
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	503	> exchange.b2partsgenmapping[b'failpart'] = _pushbundle2failpart
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	504	> exchange.b2partsgenorder.insert(0, b'failpart')
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	505	>
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	506	> EOF
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	507
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	508	$ cd main
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	509	$ hg up tip
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	510	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	511	$ echo 'I' > I
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	512	$ hg add I
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	513	$ hg ci -m 'I'
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	514	pre-close-tip:e7ec4e813ba6 draft
8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	515	postclose-tip:e7ec4e813ba6 draft
31747 aff7b32b3c05 hook: add hook name information to external hook Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31746 diff changeset	516	txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=commit
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	517	$ hg id
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	518	e7ec4e813ba6 tip
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	519	$ cd ..
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	520
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	521	$ cat << EOF >> $HGRCPATH
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	522	> [extensions]
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	523	> failpush=$TESTTMP/failpush.py
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	524	> EOF
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	525
25474 8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls Matt Mackall <mpm@selenic.com> parents: 25472 diff changeset	526	$ killdaemons.py
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	527	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	528	$ cat other.pid >> $DAEMON_PIDS
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	529
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	530	Doing the actual push: Abort error
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	531
21178 9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	532	$ cat << EOF >> $HGRCPATH
9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	533	> [failpush]
9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	534	> reason = abort
9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	535	> EOF
9a813e703172 bundle2: make error testing more modular Pierre-Yves David <pierre-yves.david@fb.com> parents: 21177 diff changeset	536
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	537	$ hg -R main push other -r e7ec4e813ba6
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	538	pushing to other
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	539	searching for changes
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	540	abort: Abandon ship!
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	541	(don't panic)
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	542	[255]
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	543
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	544	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	545	pushing to ssh://user@dummy/other
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	546	searching for changes
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	547	remote: Abandon ship!
30908 4c8dcb491974 bundle2: keep hint close to the primary message when remote abort Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29780 diff changeset	548	remote: (don't panic)
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	549	abort: push failed on remote
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	550	[255]
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	551
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	552	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	553	pushing to http://localhost:$HGPORT2/
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	554	searching for changes
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	555	remote: Abandon ship!
30908 4c8dcb491974 bundle2: keep hint close to the primary message when remote abort Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29780 diff changeset	556	remote: (don't panic)
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	557	abort: push failed on remote
21177 952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	558	[255]
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	559
952af771bc17 bundle2: gracefully handle abort during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21147 diff changeset	560
21183 4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	561	Doing the actual push: unknown mandatory parts
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	562
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	563	$ cat << EOF >> $HGRCPATH
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	564	> [failpush]
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	565	> reason = unknown
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	566	> EOF
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	567
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	568	$ hg -R main push other -r e7ec4e813ba6
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	569	pushing to other
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	570	searching for changes
21617 0cfda08afd24 bundle2: rename UnknownPartError to BundleValueError Pierre-Yves David <pierre-yves.david@fb.com> parents: 21605 diff changeset	571	abort: missing support for test:unknown
21183 4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	572	[255]
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	573
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	574	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	575	pushing to ssh://user@dummy/other
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	576	searching for changes
21617 0cfda08afd24 bundle2: rename UnknownPartError to BundleValueError Pierre-Yves David <pierre-yves.david@fb.com> parents: 21605 diff changeset	577	abort: missing support for test:unknown
21183 4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	578	[255]
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	579
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	580	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	581	pushing to http://localhost:$HGPORT2/
4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	582	searching for changes
21617 0cfda08afd24 bundle2: rename UnknownPartError to BundleValueError Pierre-Yves David <pierre-yves.david@fb.com> parents: 21605 diff changeset	583	abort: missing support for test:unknown
21183 4345274adc4b bundle2: gracefully handle UnknownPartError during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21178 diff changeset	584	[255]
21186 9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	585
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	586	Doing the actual push: race
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	587
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	588	$ cat << EOF >> $HGRCPATH
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	589	> [failpush]
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	590	> reason = race
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	591	> EOF
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	592
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	593	$ hg -R main push other -r e7ec4e813ba6
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	594	pushing to other
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	595	searching for changes
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	596	abort: push failed:
40147 58ebf5083843 push: add "remote" to 'repository changed while pushing' messages (issue5971) Taapas Agrawal <taapas2897@gmail.com> parents: 39480 diff changeset	597	'remote repository changed while pushing - please try again'
21186 9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	598	[255]
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	599
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	600	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	601	pushing to ssh://user@dummy/other
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	602	searching for changes
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	603	abort: push failed:
40147 58ebf5083843 push: add "remote" to 'repository changed while pushing' messages (issue5971) Taapas Agrawal <taapas2897@gmail.com> parents: 39480 diff changeset	604	'remote repository changed while pushing - please try again'
21186 9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	605	[255]
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	606
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	607	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	608	pushing to http://localhost:$HGPORT2/
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	609	searching for changes
9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	610	abort: push failed:
40147 58ebf5083843 push: add "remote" to 'repository changed while pushing' messages (issue5971) Taapas Agrawal <taapas2897@gmail.com> parents: 39480 diff changeset	611	'remote repository changed while pushing - please try again'
21186 9f3652e851f8 bundle2: gracefully handle PushRaced error during unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 21185 diff changeset	612	[255]
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	613
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	614	Doing the actual push: hook abort
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	615
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	616	$ cat << EOF >> $HGRCPATH
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	617	> [failpush]
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	618	> reason =
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	619	> [hooks]
24860 263ec70769cb test-bundle2-exchange: make hooks compatible with Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24851 diff changeset	620	> pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false"
263ec70769cb test-bundle2-exchange: make hooks compatible with Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24851 diff changeset	621	> txnabort.failpush = sh -c "echo 'Cleaning up the mess...'"
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	622	> EOF
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	623
25474 8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls Matt Mackall <mpm@selenic.com> parents: 25472 diff changeset	624	$ killdaemons.py
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	625	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	626	$ cat other.pid >> $DAEMON_PIDS
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	627
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	628	$ hg -R main push other -r e7ec4e813ba6
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	629	pushing to other
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	630	searching for changes
24799 d99d7e3f5cda bundle2-localpeer: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24797 diff changeset	631	remote: adding changesets
d99d7e3f5cda bundle2-localpeer: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24797 diff changeset	632	remote: adding manifests
d99d7e3f5cda bundle2-localpeer: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24797 diff changeset	633	remote: adding file changes
d99d7e3f5cda bundle2-localpeer: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24797 diff changeset	634	remote: added 1 changesets with 1 changes to 1 files
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	635	remote: pre-close-tip:e7ec4e813ba6 draft
6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	636	remote: You shall not pass!
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	637	remote: transaction abort!
24849 aff2aca3420e bundle2: also capture hook output during processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24847 diff changeset	638	remote: Cleaning up the mess...
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	639	remote: rollback completed
24285 8e13cc0825f1 bundle2: test hooking using the new transaction-level hook Pierre-Yves David <pierre-yves.david@fb.com> parents: 23759 diff changeset	640	abort: pretxnclose.failpush hook exited with status 1
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	641	[255]
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	642
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	643	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	644	pushing to ssh://user@dummy/other
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	645	searching for changes
24797 0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	646	remote: adding changesets
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	647	remote: adding manifests
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	648	remote: adding file changes
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	649	remote: added 1 changesets with 1 changes to 1 files
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	650	remote: pre-close-tip:e7ec4e813ba6 draft
6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	651	remote: You shall not pass!
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	652	remote: transaction abort!
24849 aff2aca3420e bundle2: also capture hook output during processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24847 diff changeset	653	remote: Cleaning up the mess...
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	654	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	655	remote: pretxnclose.failpush hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	656	abort: push failed on remote
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	657	[255]
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	658
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	659	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	660	pushing to http://localhost:$HGPORT2/
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	661	searching for changes
24797 0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	662	remote: adding changesets
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	663	remote: adding manifests
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	664	remote: adding file changes
0c4d5e01b31f bundle2-wireproto: properly propagate the server output on error (issue4594) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24752 diff changeset	665	remote: added 1 changesets with 1 changes to 1 files
24850 6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	666	remote: pre-close-tip:e7ec4e813ba6 draft
6b81309d15a7 bundle2: capture output issue during transaction close Pierre-Yves David <pierre-yves.david@fb.com> parents: 24849 diff changeset	667	remote: You shall not pass!
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	668	remote: transaction abort!
24849 aff2aca3420e bundle2: also capture hook output during processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24847 diff changeset	669	remote: Cleaning up the mess...
24847 b705e5ab3b07 bundle2: capture transaction rollback message output (issue4614) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24822 diff changeset	670	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	671	remote: pretxnclose.failpush hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	672	abort: push failed on remote
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	673	[255]
bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	674
23358 1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	675	(check that no 'pending' files remain)
21187 bcfd44abad93 bundle2: gracefully handle hook abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 21186 diff changeset	676
23358 1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	677	$ ls -1 other/.hg/bookmarks*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	678	other/.hg/bookmarks
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	679	$ ls -1 other/.hg/store/phaseroots*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	680	other/.hg/store/phaseroots
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	681	$ ls -1 other/.hg/store/00changelog.i*
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	682	other/.hg/store/00changelog.i
1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23222 diff changeset	683
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	684	Check error from hook during the unbundling process itself
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	685
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	686	$ cat << EOF >> $HGRCPATH
24860 263ec70769cb test-bundle2-exchange: make hooks compatible with Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24851 diff changeset	687	> pretxnchangegroup = sh -c "echo 'Fail early!'; false"
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	688	> EOF
25474 8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls Matt Mackall <mpm@selenic.com> parents: 25472 diff changeset	689	$ killdaemons.py # reload http config
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	690	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	691	$ cat other.pid >> $DAEMON_PIDS
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	692
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	693	$ hg -R main push other -r e7ec4e813ba6
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	694	pushing to other
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	695	searching for changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	696	remote: adding changesets
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	697	remote: adding manifests
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	698	remote: adding file changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	699	remote: added 1 changesets with 1 changes to 1 files
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	700	remote: Fail early!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	701	remote: transaction abort!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	702	remote: Cleaning up the mess...
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	703	remote: rollback completed
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	704	abort: pretxnchangegroup hook exited with status 1
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	705	[255]
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	706	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	707	pushing to ssh://user@dummy/other
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	708	searching for changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	709	remote: adding changesets
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	710	remote: adding manifests
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	711	remote: adding file changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	712	remote: added 1 changesets with 1 changes to 1 files
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	713	remote: Fail early!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	714	remote: transaction abort!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	715	remote: Cleaning up the mess...
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	716	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	717	remote: pretxnchangegroup hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	718	abort: push failed on remote
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	719	[255]
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	720	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	721	pushing to http://localhost:$HGPORT2/
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	722	searching for changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	723	remote: adding changesets
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	724	remote: adding manifests
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	725	remote: adding file changes
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	726	remote: added 1 changesets with 1 changes to 1 files
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	727	remote: Fail early!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	728	remote: transaction abort!
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	729	remote: Cleaning up the mess...
df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	730	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	731	remote: pretxnchangegroup hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	732	abort: push failed on remote
24851 df0ce98c882f bundle2: also save output when error happens during part processing Pierre-Yves David <pierre-yves.david@fb.com> parents: 24850 diff changeset	733	[255]
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	734
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	735	Check output capture control.
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	736
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	737	(should be still forced for http, disabled for local and ssh)
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	738
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	739	$ cat >> $HGRCPATH << EOF
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	740	> [experimental]
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	741	> bundle2-output-capture=False
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	742	> EOF
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	743
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	744	$ hg -R main push other -r e7ec4e813ba6
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	745	pushing to other
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	746	searching for changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	747	adding changesets
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	748	adding manifests
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	749	adding file changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	750	added 1 changesets with 1 changes to 1 files
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	751	Fail early!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	752	transaction abort!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	753	Cleaning up the mess...
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	754	rollback completed
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	755	abort: pretxnchangegroup hook exited with status 1
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	756	[255]
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	757	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	758	pushing to ssh://user@dummy/other
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	759	searching for changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	760	remote: adding changesets
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	761	remote: adding manifests
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	762	remote: adding file changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	763	remote: added 1 changesets with 1 changes to 1 files
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	764	remote: Fail early!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	765	remote: transaction abort!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	766	remote: Cleaning up the mess...
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	767	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	768	remote: pretxnchangegroup hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	769	abort: push failed on remote
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	770	[255]
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	771	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	772	pushing to http://localhost:$HGPORT2/
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	773	searching for changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	774	remote: adding changesets
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	775	remote: adding manifests
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	776	remote: adding file changes
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	777	remote: added 1 changesets with 1 changes to 1 files
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	778	remote: Fail early!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	779	remote: transaction abort!
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	780	remote: Cleaning up the mess...
e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	781	remote: rollback completed
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	782	remote: pretxnchangegroup hook exited with status 1
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	783	abort: push failed on remote
24878 e530cde6d115 bundle2: disable ouput capture unless we use http (issue4613 issue4615) Pierre-Yves David <pierre-yves.david@fb.com> parents: 24860 diff changeset	784	[255]
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	785
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	786	Check abort from mandatory pushkey
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	787
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	788	$ cat > mandatorypart.py << EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	789	> from mercurial import exchange
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	790	> from mercurial import pushkey
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	791	> from mercurial import node
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	792	> from mercurial import error
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	793	> @exchange.b2partsgenerator(b'failingpuskey')
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	794	> def addfailingpushey(pushop, bundler):
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	795	> enc = pushkey.encode
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	796	> part = bundler.newpart(b'pushkey')
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	797	> part.addparam(b'namespace', enc(b'phases'))
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	798	> part.addparam(b'key', enc(b'cd010b8cd998f3981a5a8115f94f8da4ab506089'))
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	799	> part.addparam(b'old', enc(b'0')) # successful update
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	800	> part.addparam(b'new', enc(b'0'))
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	801	> def fail(pushop, exc):
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	802	> raise error.Abort(b'Correct phase push failed (because hooks)')
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	803	> pushop.pkfailcb[part.id] = fail
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	804	> EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	805	$ cat >> $HGRCPATH << EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	806	> [hooks]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	807	> pretxnchangegroup=
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	808	> pretxnclose.failpush=
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	809	> prepushkey.failpush = sh -c "echo 'do not push the key !'; false"
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	810	> [extensions]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	811	> mandatorypart=$TESTTMP/mandatorypart.py
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	812	> EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	813	$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	814	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	815	$ cat other.pid >> $DAEMON_PIDS
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	816
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	817	(Failure from a hook)
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	818
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	819	$ hg -R main push other -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	820	pushing to other
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	821	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	822	adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	823	adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	824	adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	825	added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	826	do not push the key !
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	827	pushkey-abort: prepushkey.failpush hook exited with status 1
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	828	transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	829	Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	830	rollback completed
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	831	abort: Correct phase push failed (because hooks)
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	832	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	833	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	834	pushing to ssh://user@dummy/other
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	835	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	836	remote: adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	837	remote: adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	838	remote: adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	839	remote: added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	840	remote: do not push the key !
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	841	remote: pushkey-abort: prepushkey.failpush hook exited with status 1
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	842	remote: transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	843	remote: Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	844	remote: rollback completed
25493 d8e7b0781ad7 bundle2: convey PushkeyFailed error over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	845	abort: Correct phase push failed (because hooks)
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	846	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	847	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	848	pushing to http://localhost:$HGPORT2/
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	849	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	850	remote: adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	851	remote: adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	852	remote: adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	853	remote: added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	854	remote: do not push the key !
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	855	remote: pushkey-abort: prepushkey.failpush hook exited with status 1
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	856	remote: transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	857	remote: Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	858	remote: rollback completed
25493 d8e7b0781ad7 bundle2: convey PushkeyFailed error over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	859	abort: Correct phase push failed (because hooks)
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	860	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	861
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	862	(Failure from a the pushkey)
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	863
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	864	$ cat > mandatorypart.py << EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	865	> from mercurial import exchange
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	866	> from mercurial import pushkey
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	867	> from mercurial import node
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	868	> from mercurial import error
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	869	> @exchange.b2partsgenerator(b'failingpuskey')
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	870	> def addfailingpushey(pushop, bundler):
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	871	> enc = pushkey.encode
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	872	> part = bundler.newpart(b'pushkey')
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	873	> part.addparam(b'namespace', enc(b'phases'))
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	874	> part.addparam(b'key', enc(b'cd010b8cd998f3981a5a8115f94f8da4ab506089'))
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	875	> part.addparam(b'old', enc(b'4')) # will fail
affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	876	> part.addparam(b'new', enc(b'3'))
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	877	> def fail(pushop, exc):
37748 affcecf20c15 tests: update inline extensions in test-bundle2-exchange.t to py3 Augie Fackler <augie@google.com> parents: 37454 diff changeset	878	> raise error.Abort(b'Clown phase push failed')
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	879	> pushop.pkfailcb[part.id] = fail
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	880	> EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	881	$ cat >> $HGRCPATH << EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	882	> [hooks]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	883	> prepushkey.failpush =
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	884	> EOF
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	885	$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config
28549 e01bd7385f4f tests: reorder hg serve commands Jun Wu <quark@fb.com> parents: 27739 diff changeset	886	$ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	887	$ cat other.pid >> $DAEMON_PIDS
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	888
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	889	$ hg -R main push other -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	890	pushing to other
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	891	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	892	adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	893	adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	894	adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	895	added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	896	transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	897	Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	898	rollback completed
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	899	pushkey: lock state after "phases"
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	900	lock: free
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	901	wlock: free
25485 8182163ae983 push: catch and process PushkeyFailed error Pierre-Yves David <pierre-yves.david@fb.com> parents: 25481 diff changeset	902	abort: Clown phase push failed
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	903	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	904	$ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	905	pushing to ssh://user@dummy/other
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	906	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	907	remote: adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	908	remote: adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	909	remote: adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	910	remote: added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	911	remote: transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	912	remote: Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	913	remote: rollback completed
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	914	remote: pushkey: lock state after "phases"
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	915	remote: lock: free
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	916	remote: wlock: free
25493 d8e7b0781ad7 bundle2: convey PushkeyFailed error over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	917	abort: Clown phase push failed
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	918	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	919	$ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	920	pushing to http://localhost:$HGPORT2/
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	921	searching for changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	922	remote: adding changesets
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	923	remote: adding manifests
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	924	remote: adding file changes
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	925	remote: added 1 changesets with 1 changes to 1 files
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	926	remote: transaction abort!
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	927	remote: Cleaning up the mess...
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	928	remote: rollback completed
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	929	remote: pushkey: lock state after "phases"
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	930	remote: lock: free
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	931	remote: wlock: free
25493 d8e7b0781ad7 bundle2: convey PushkeyFailed error over the wire Pierre-Yves David <pierre-yves.david@fb.com> parents: 25485 diff changeset	932	abort: Clown phase push failed
25481 6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	933	[255]
6de96cb31176 bundle2: abort when a mandatory pushkey part fails Pierre-Yves David <pierre-yves.david@fb.com> parents: 25478 diff changeset	934
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	935	Test lazily acquiring the lock during unbundle
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	936	$ cp $TESTTMP/hgrc.orig $HGRCPATH
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	937	$ cat >> $HGRCPATH <<EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	938	> [ui]
33335 72f051f9a7d8 tests: quote $PYTHON for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 33286 diff changeset	939	> ssh="$PYTHON" "$TESTDIR/dummyssh"
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	940	> EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	941
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	942	$ cat >> $TESTTMP/locktester.py <<EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	943	> import os
40369 ef6cab7930b3 py3: fix module imports in tests, as flagged by test-check-module-imports.t Matt Harbison <matt_harbison@yahoo.com> parents: 40147 diff changeset	944	> from mercurial import bundle2, error, extensions
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	945	> def checklock(orig, repo, args, *kwargs):
38603 4df549d0f1fd py3: byte-stringify literals in extension in test-bundle2-exchange.t Yuya Nishihara <yuya@tcha.org> parents: 38250 diff changeset	946	> if repo.svfs.lexists(b"lock"):
4df549d0f1fd py3: byte-stringify literals in extension in test-bundle2-exchange.t Yuya Nishihara <yuya@tcha.org> parents: 38250 diff changeset	947	> raise error.Abort(b"Lock should not be taken")
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	948	> return orig(repo, args, *kwargs)
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	949	> def extsetup(ui):
38603 4df549d0f1fd py3: byte-stringify literals in extension in test-bundle2-exchange.t Yuya Nishihara <yuya@tcha.org> parents: 38250 diff changeset	950	> extensions.wrapfunction(bundle2, b'processbundle', checklock)
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	951	> EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	952
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	953	$ hg init lazylock
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	954	$ cat >> lazylock/.hg/hgrc <<EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	955	> [extensions]
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	956	> locktester=$TESTTMP/locktester.py
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	957	> EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	958
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	959	$ hg clone -q ssh://user@dummy/lazylock lazylockclient
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	960	$ cd lazylockclient
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	961	$ touch a && hg ci -Aqm a
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	962	$ hg push
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	963	pushing to ssh://user@dummy/lazylock
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	964	searching for changes
26829 58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	965	remote: Lock should not be taken
58f1645f72c3 bundle2: attribute remote failures to remote (issue4788) Gregory Szorc <gregory.szorc@gmail.com> parents: 26587 diff changeset	966	abort: push failed on remote
26566 58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	967	[255]
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	968
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	969	$ cat >> ../lazylock/.hg/hgrc <<EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	970	> [experimental]
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	971	> bundle2lazylocking=True
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	972	> EOF
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	973	$ hg push
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	974	pushing to ssh://user@dummy/lazylock
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	975	searching for changes
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	976	remote: adding changesets
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	977	remote: adding manifests
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	978	remote: adding file changes
58880acd2369 bundle2: allow lazily acquiring the lock Durham Goode <durham@fb.com> parents: 25744 diff changeset	979	remote: added 1 changesets with 1 changes to 1 files
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	980
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	981	$ cd ..
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	982
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	983	Servers can disable bundle1 for clone/pull operations
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	984
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	985	$ killdaemons.py
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	986	$ hg init bundle2onlyserver
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	987	$ cd bundle2onlyserver
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	988	$ cat > .hg/hgrc << EOF
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	989	> [server]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	990	> bundle1.pull = false
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	991	> EOF
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	992
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	993	$ touch foo
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	994	$ hg -q commit -A -m initial
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	995
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	996	$ hg serve -p $HGPORT -d --pid-file=hg.pid
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	997	$ cat hg.pid >> $DAEMON_PIDS
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	998
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	999	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1000	requesting all changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1001	abort: remote error:
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1002	incompatible Mercurial client; bundle2 required
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1003	(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1004	[255]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1005	$ killdaemons.py
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1006	$ cd ..
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1007
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1008	bundle1 can still pull non-generaldelta repos when generaldelta bundle1 disabled
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1009
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1010	$ hg --config format.usegeneraldelta=false init notgdserver
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1011	$ cd notgdserver
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1012	$ cat > .hg/hgrc << EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1013	> [server]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1014	> bundle1gd.pull = false
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1015	> EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1016
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1017	$ touch foo
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1018	$ hg -q commit -A -m initial
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1019	$ hg serve -p $HGPORT -d --pid-file=hg.pid
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1020	$ cat hg.pid >> $DAEMON_PIDS
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1021
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1022	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-1
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1023	requesting all changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1024	adding changesets
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1025	adding manifests
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1026	adding file changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1027	added 1 changesets with 1 changes to 1 files
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34483 diff changeset	1028	new changesets 96ee1d7354c4
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1029	updating to branch default
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1030	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1031
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1032	$ killdaemons.py
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1033	$ cd ../bundle2onlyserver
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1034
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1035	bundle1 pull can be disabled for generaldelta repos only
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1036
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1037	$ cat > .hg/hgrc << EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1038	> [server]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1039	> bundle1gd.pull = false
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1040	> EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1041
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1042	$ hg serve -p $HGPORT -d --pid-file=hg.pid
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1043	$ cat hg.pid >> $DAEMON_PIDS
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1044	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1045	requesting all changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1046	abort: remote error:
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1047	incompatible Mercurial client; bundle2 required
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1048	(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1049	[255]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1050
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1051	$ killdaemons.py
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1052
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1053	Verify the global server.bundle1 option works
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1054
30911 f3c5a8a4dfd0 bundle-tests: operate from outside a repository Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30910 diff changeset	1055	$ cd ..
f3c5a8a4dfd0 bundle-tests: operate from outside a repository Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30910 diff changeset	1056	$ cat > bundle2onlyserver/.hg/hgrc << EOF
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1057	> [server]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1058	> bundle1 = false
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1059	> EOF
34483 a6d95a8b7243 serve: make tests compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 33773 diff changeset	1060	$ hg serve -R bundle2onlyserver -p $HGPORT -d --pid-file=hg.pid
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1061	$ cat hg.pid >> $DAEMON_PIDS
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1062	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT not-bundle2
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1063	requesting all changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1064	abort: remote error:
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1065	incompatible Mercurial client; bundle2 required
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1066	(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1067	[255]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1068	$ killdaemons.py
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1069
30912 3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1070	$ hg --config devel.legacy.exchange=bundle1 clone ssh://user@dummy/bundle2onlyserver not-bundle2-ssh
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1071	requesting all changes
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1072	adding changesets
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1073	remote: abort: incompatible Mercurial client; bundle2 required
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1074	remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1075	transaction abort!
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1076	rollback completed
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1077	abort: stream ended unexpectedly (got 0 bytes, expected 4)
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1078	[255]
3d4afc2fdcd7 bundle1: fix bundle1-denied reporting for pull over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30911 diff changeset	1079
30911 f3c5a8a4dfd0 bundle-tests: operate from outside a repository Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30910 diff changeset	1080	$ cat > bundle2onlyserver/.hg/hgrc << EOF
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1081	> [server]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1082	> bundle1gd = false
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1083	> EOF
34483 a6d95a8b7243 serve: make tests compatible with chg Saurabh Singh <singhsrb@fb.com> parents: 33773 diff changeset	1084	$ hg serve -R bundle2onlyserver -p $HGPORT -d --pid-file=hg.pid
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1085	$ cat hg.pid >> $DAEMON_PIDS
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1086
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1087	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1088	requesting all changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1089	abort: remote error:
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1090	incompatible Mercurial client; bundle2 required
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1091	(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1092	[255]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1093
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1094	$ killdaemons.py
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1095
30911 f3c5a8a4dfd0 bundle-tests: operate from outside a repository Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30910 diff changeset	1096	$ cd notgdserver
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1097	$ cat > .hg/hgrc << EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1098	> [server]
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1099	> bundle1gd = false
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1100	> EOF
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1101	$ hg serve -p $HGPORT -d --pid-file=hg.pid
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1102	$ cat hg.pid >> $DAEMON_PIDS
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1103
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1104	$ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-2
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1105	requesting all changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1106	adding changesets
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1107	adding manifests
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1108	adding file changes
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1109	added 1 changesets with 1 changes to 1 files
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34483 diff changeset	1110	new changesets 96ee1d7354c4
27633 37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1111	updating to branch default
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1112	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1113
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1114	$ killdaemons.py
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1115	$ cd ../bundle2onlyserver
37d7cf569cf3 wireproto: support disabling bundle1 only if repo is generaldelta Gregory Szorc <gregory.szorc@gmail.com> parents: 27246 diff changeset	1116
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1117	Verify bundle1 pushes can be disabled
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1118
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1119	$ cat > .hg/hgrc << EOF
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1120	> [server]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1121	> bundle1.push = false
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1122	> [web]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1123	> allow_push = *
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1124	> push_ssl = false
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1125	> EOF
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1126
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1127	$ hg serve -p $HGPORT -d --pid-file=hg.pid -E error.log
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1128	$ cat hg.pid >> $DAEMON_PIDS
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1129	$ cd ..
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1130
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1131	$ hg clone http://localhost:$HGPORT bundle2-only
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1132	requesting all changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1133	adding changesets
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1134	adding manifests
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1135	adding file changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1136	added 1 changesets with 1 changes to 1 files
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 34483 diff changeset	1137	new changesets 96ee1d7354c4
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1138	updating to branch default
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1139	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1140	$ cd bundle2-only
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1141	$ echo commit > foo
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1142	$ hg commit -m commit
29685 06e642d7f76c tests: use 'legacy.exchange' option in 'test-bundle2-exchange.t' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29672 diff changeset	1143	$ hg --config devel.legacy.exchange=bundle1 push
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1144	pushing to http://localhost:$HGPORT/
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1145	searching for changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1146	abort: remote error:
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1147	incompatible Mercurial client; bundle2 required
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1148	(see https://www.mercurial-scm.org/wiki/IncompatibleClient)
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1149	[255]
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1150
30909 d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1151	(also check with ssh)
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1152
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1153	$ hg --config devel.legacy.exchange=bundle1 push ssh://user@dummy/bundle2onlyserver
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1154	pushing to ssh://user@dummy/bundle2onlyserver
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1155	searching for changes
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1156	remote: abort: incompatible Mercurial client; bundle2 required
30910 accaa04f951c bundle1: display server abort hint during unbundle Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30909 diff changeset	1157	remote: (see https://www.mercurial-scm.org/wiki/IncompatibleClient)
30909 d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1158	[1]
d554e624c5fe bundle1: fix bundle1-denied reporting for push over ssh Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 30908 diff changeset	1159
27246 b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1160	$ hg push
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1161	pushing to http://localhost:$HGPORT/
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1162	searching for changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1163	remote: adding changesets
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1164	remote: adding manifests
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1165	remote: adding file changes
b288fb2724bf wireproto: config options to disable bundle1 Gregory Szorc <gregory.szorc@gmail.com> parents: 26829 diff changeset	1166	remote: added 1 changesets with 1 changes to 1 files

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Sun, 14 Oct 2018 12:59:02 +0200
changeset 42894	38392d5bde8e
parent 42893	34a46d48d24e
child 42897	d7304434390f
permissions	-rw-r--r--