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