Mercurial > hg
annotate tests/test-bundle2-exchange.t @ 24787:9d5c27890790
largefiles: for update -C, only update largefiles when necessary
Before, a --clean update with largefiles would use the "optimization" that it
didn't read hashes from standin files before and after the update. Instead of
trusting the content of the standin files, it would rehash all the actual
largefiles that lfdirstate reported clean and update the standins that didn't
have the expected content. It could thus in some "impossible" situations
automatically recover from some "largefile got out sync with its standin"
issues (even there apparently still were weird corner cases where it could
fail). This extra checking is similar to what core --clean intentionally do
not do, and it made update --clean unbearable slow.
Usually in core Mercurial, --clean will rely on the dirstate to find the files
it should update. (It is thus intentionally possible (when trying to trick the
system or if there should be bugs) to end up in situations where --clean not
will restore the working directory content correctly.) Checking every file when
we "know" it is ok is however not an option - that would be too slow.
Instead, trust the content of the standin files. Use the same logic for --clean
as for linear updates and trust the dirstate and that our "logic" will keep
them in sync. It is much cheaper to just rehash the largefiles reported dirty
by a status walk and read all standins than to hash largefiles.
Most of the changes are just a change of indentation now when the different
kinds of updates no longer are handled that differently. Standins for added
files are however only written when doing a normal update, while deleted and
removed files only will be updated for --clean updates.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 15 Apr 2015 15:22:16 -0400 |
parents | 5640efd1b160 |
children | 0c4d5e01b31f |
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 |
23759
cdfc47266e53
test-bundle2-exchange: create temp script in $TESTTMP, not $TESTDIR
Martin von Zweigbergk <martinvonz@google.com>
parents:
23672
diff
changeset
|
10 $ 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
|
11 > 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
|
12 > hg debuglock |
7853e8603f4a
tests: make a multi-statement hook in bundle2-exchange Windows compatible
Matt Harbison <matt_harbison@yahoo.com>
parents:
23648
diff
changeset
|
13 > EOF |
7853e8603f4a
tests: make a multi-statement hook in bundle2-exchange Windows compatible
Matt Harbison <matt_harbison@yahoo.com>
parents:
23648
diff
changeset
|
14 |
20801
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 $ 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
|
16 > [experimental] |
22955
fab9dda0f2a3
obsolete: update tests to use obsolete options
Durham Goode <durham@fb.com>
parents:
22941
diff
changeset
|
17 > evolution=createmarkers,exchange |
21147
2a246e737f92
bundle2: move bundle2 config option to section "experimental"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21146
diff
changeset
|
18 > bundle2-exp=True |
21069
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
19 > [ui] |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
20 > 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
|
21 > 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
|
22 > [web] |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
23 > push_ssl = false |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
24 > allow_push = * |
21648
c26a11cdafeb
bundle2: use non-publishing repo in test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21647
diff
changeset
|
25 > [phases] |
c26a11cdafeb
bundle2: use non-publishing repo in test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21647
diff
changeset
|
26 > 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
|
27 > [hooks] |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
28 > 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
|
29 > txnclose.tip = hg log -r tip -T "postclose-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
|
30 > txnclose.env = sh -c "HG_LOCAL= python \"$TESTDIR/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
|
31 > 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
|
32 > EOF |
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 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
|
35 |
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 $ hg init main |
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 $ 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
|
38 $ touch a |
88db3e615319
bundle2: make sure the unbundler refuse non bundle2 stream
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20802
diff
changeset
|
39 $ 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
|
40 $ 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
|
41 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
|
42 postclose-tip:3903775176ed draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
43 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob) |
20801
9c5183cb9bca
bundle2: very first version of a bundle2 bundler
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
20950
c7ceae0faf69
bundle2: first crude version of bundling changeset with bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20949
diff
changeset
|
45 $ 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
|
46 adding changesets |
c7ceae0faf69
bundle2: first crude version of bundling changeset with bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20949
diff
changeset
|
47 adding manifests |
c7ceae0faf69
bundle2: first crude version of bundling changeset with bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20949
diff
changeset
|
48 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
|
49 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
|
50 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
|
51 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
52 txnclose hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:* HG_TXNNAME=unbundle (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
53 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
|
54 (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
|
55 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
56 $ cd .. |
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
57 |
20955
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
58 Real world exchange |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
59 ===================== |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
60 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
61 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
|
62 |
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
63 $ 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
|
64 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
|
65 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
66 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
67 $ 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
|
68 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
|
69 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
70 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
20955
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
71 |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
72 clone --pull |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
73 |
21649
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
74 $ hg -R main phase --public cd010b8cd998 |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
75 pre-close-tip:000000000000 public |
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
76 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
77 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
20955
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
78 $ 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
|
79 adding changesets |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
80 adding manifests |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
81 adding file changes |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
82 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
|
83 1 new obsolescence markers |
23361
936b0ff34346
phases: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23360
diff
changeset
|
84 pre-close-tip:9520eea781bc draft |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
85 postclose-tip:9520eea781bc draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
86 txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
87 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
|
88 updating to branch default |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
89 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
|
90 $ 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
|
91 @ 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
|
92 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
93 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
|
94 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
95 $ 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
|
96 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
|
97 |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
98 pull |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
99 |
21649
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
100 $ hg -R main phase --public 9520eea781bc |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
101 pre-close-tip:000000000000 public |
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
102 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
103 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
21061
62d35f251c60
bundle2: allow using bundle2 for push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21019
diff
changeset
|
104 $ hg -R other pull -r 24b6387c8c8c |
20955
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
105 pulling from $TESTTMP/main (glob) |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
106 searching for changes |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
107 adding changesets |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
108 adding manifests |
12f161f08d74
bundle2: allow pulling changegroups using bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20952
diff
changeset
|
109 adding file changes |
21061
62d35f251c60
bundle2: allow using bundle2 for push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21019
diff
changeset
|
110 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
|
111 1 new obsolescence markers |
23361
936b0ff34346
phases: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23360
diff
changeset
|
112 pre-close-tip:24b6387c8c8c draft |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
113 postclose-tip:24b6387c8c8c draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
114 txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
115 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
|
116 (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
|
117 $ 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
|
118 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
|
119 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
120 | @ 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
|
121 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
122 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
|
123 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
124 $ 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
|
125 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
|
126 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
|
127 |
21649
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
128 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
|
129 |
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
130 $ hg -R main phase --public 24b6387c8c8c |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
131 pre-close-tip:000000000000 public |
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
132 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
133 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
21649
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
134 $ hg -R other pull -r 24b6387c8c8c |
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
135 pulling from $TESTTMP/main (glob) |
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
136 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
|
137 pre-close-tip:000000000000 public |
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
138 postclose-tip:24b6387c8c8c public |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
139 txnclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
140 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
|
141 $ 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
|
142 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
|
143 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
144 | @ 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
|
145 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
146 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
|
147 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
148 $ 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
|
149 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
|
150 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
|
151 |
21584
4dca1a06e7ee
bundle2: fix bundle2 pulling all revs on empty pulls
Durham Goode <durham@fb.com>
parents:
21547
diff
changeset
|
152 pull empty |
4dca1a06e7ee
bundle2: fix bundle2 pulling all revs on empty pulls
Durham Goode <durham@fb.com>
parents:
21547
diff
changeset
|
153 |
4dca1a06e7ee
bundle2: fix bundle2 pulling all revs on empty pulls
Durham Goode <durham@fb.com>
parents:
21547
diff
changeset
|
154 $ hg -R other pull -r 24b6387c8c8c |
4dca1a06e7ee
bundle2: fix bundle2 pulling all revs on empty pulls
Durham Goode <durham@fb.com>
parents:
21547
diff
changeset
|
155 pulling from $TESTTMP/main (glob) |
4dca1a06e7ee
bundle2: fix bundle2 pulling all revs on empty pulls
Durham Goode <durham@fb.com>
parents:
21547
diff
changeset
|
156 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
|
157 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
|
158 postclose-tip:24b6387c8c8c public |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
159 txnclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
160 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
|
161 $ 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
|
162 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
|
163 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
164 | @ 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
|
165 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
166 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
|
167 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
168 $ 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
|
169 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
|
170 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
|
171 |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
172 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
|
173 |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
174 $ hg -R main bookmark --rev eea13746799a book_eea1 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
175 $ 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
|
176 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
|
177 postclose-tip:02de42196ebe draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
178 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22241
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 02de42196ebe book_02de |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
180 $ 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
|
181 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
|
182 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
183 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
184 $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
185 $ 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
|
186 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
|
187 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
188 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
189 $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
190 $ 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
|
191 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
|
192 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
193 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
194 $ hg -R main bookmark --rev 32af7686d403 book_32af |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
195 $ 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
|
196 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
|
197 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
198 txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
199 |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
200 $ hg -R other bookmark --rev cd010b8cd998 book_eea1 |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
201 $ hg -R other bookmark --rev cd010b8cd998 book_02de |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
202 $ hg -R other bookmark --rev cd010b8cd998 book_42cc |
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 other bookmark --rev cd010b8cd998 book_5fdd |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
204 $ hg -R other bookmark --rev cd010b8cd998 book_32af |
21061
62d35f251c60
bundle2: allow using bundle2 for push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21019
diff
changeset
|
205 |
21649
3bfadd70550b
bundle2: add more phase movement in the test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21648
diff
changeset
|
206 $ hg -R main phase --public eea13746799a |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
207 pre-close-tip:000000000000 public |
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
208 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
209 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
210 |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
211 push |
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
212 $ 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
|
213 pushing to other |
62d35f251c60
bundle2: allow using bundle2 for push
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21019
diff
changeset
|
214 searching for changes |
23361
936b0ff34346
phases: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23360
diff
changeset
|
215 pre-close-tip:eea13746799a public book_eea1 |
23648
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
216 pushkey: lock state after "phases" |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
217 lock: free |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
218 wlock: free |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
219 pushkey: lock state after "bookmarks" |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
220 lock: free |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
221 wlock: free |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
222 postclose-tip:eea13746799a public book_eea1 |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
223 txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) |
21131
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
224 remote: adding changesets |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
225 remote: adding manifests |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
226 remote: adding file changes |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
227 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
|
228 remote: 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
|
229 updating bookmark book_eea1 |
23437
94e2862dbcfb
push: elevate phase transaction to cover entire operation
Eric Sumner <ericsumner@fb.com>
parents:
23389
diff
changeset
|
230 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
|
231 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
232 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
233 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
|
234 $ 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
|
235 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
|
236 |\ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
237 | 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
|
238 | | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
239 @ | 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
|
240 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
241 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
|
242 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
243 $ 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
|
244 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
|
245 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
|
246 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
|
247 |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
248 pull over ssh |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
249 |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
250 $ hg -R other 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
|
251 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
|
252 searching for changes |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
253 adding changesets |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
254 adding manifests |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
255 adding file changes |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
256 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
|
257 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
|
258 updating bookmark book_02de |
23361
936b0ff34346
phases: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23360
diff
changeset
|
259 pre-close-tip:02de42196ebe draft book_02de |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
260 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
261 txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
262 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
|
263 (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
|
264 $ 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
|
265 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
|
266 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
|
267 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
|
268 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
|
269 |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
270 pull over http |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
271 |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
272 $ hg -R main serve -p $HGPORT -d --pid-file=main.pid -E main-error.log |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
273 $ 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
|
274 |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
275 $ 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
|
276 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
|
277 searching for changes |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
278 adding changesets |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
279 adding manifests |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
280 adding file changes |
0a9cae236738
bundle2: allow bundle2 for pulling over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21062
diff
changeset
|
281 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
|
282 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
|
283 updating bookmark book_42cc |
23361
936b0ff34346
phases: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23360
diff
changeset
|
284 pre-close-tip:42ccdea3bb16 draft book_42cc |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
285 postclose-tip:42ccdea3bb16 draft book_42cc |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
286 txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
287 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
|
288 (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
|
289 $ 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
|
290 $ 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
|
291 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
|
292 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
|
293 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
|
294 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
|
295 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
|
296 |
21075
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
297 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
|
298 |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
299 $ 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
|
300 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
|
301 searching for changes |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
302 remote: adding changesets |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
303 remote: adding manifests |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
304 remote: adding file changes |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
305 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
|
306 remote: 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
|
307 updating bookmark book_5fdd |
23360
e06daad65f85
bookmark: read pending data when appropriate
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23359
diff
changeset
|
308 remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
23648
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
309 remote: pushkey: lock state after "bookmarks" |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
310 remote: lock: free |
915ac9403e13
pushkey: run hook after the lock release
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23591
diff
changeset
|
311 remote: wlock: free |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
312 remote: postclose-tip:5fddd98957c8 draft book_5fdd |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
313 remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob) |
23437
94e2862dbcfb
push: elevate phase transaction to cover entire operation
Eric Sumner <ericsumner@fb.com>
parents:
23389
diff
changeset
|
314 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
|
315 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
316 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
317 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
|
318 $ 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
|
319 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
|
320 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
321 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
|
322 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
323 | 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
|
324 | | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
325 | | 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
|
326 | |/| |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
327 | 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
|
328 |/ / |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
329 | @ 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
|
330 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
331 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
|
332 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
333 $ 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
|
334 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
|
335 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
|
336 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
|
337 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
|
338 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
|
339 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
|
340 |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
341 push over http |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
342 |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
343 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
344 $ 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
|
345 |
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 main phase --public 32af7686d403 |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
347 pre-close-tip:000000000000 public |
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
348 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
349 txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
350 $ 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
|
351 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
|
352 searching for changes |
21131
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
353 remote: adding changesets |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
354 remote: adding manifests |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
355 remote: adding file changes |
b7435117d951
bundle2: capture remote stdout while unbundling
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21130
diff
changeset
|
356 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
|
357 remote: 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
|
358 updating bookmark book_32af |
23437
94e2862dbcfb
push: elevate phase transaction to cover entire operation
Eric Sumner <ericsumner@fb.com>
parents:
23389
diff
changeset
|
359 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
|
360 postclose-tip:02de42196ebe draft book_02de |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
361 txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
362 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
|
363 $ cat other-error.log |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
364 |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
365 Check final content. |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
366 |
438803e4bd97
bundle2: support for push over the wire
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21069
diff
changeset
|
367 $ 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
|
368 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
|
369 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
370 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
|
371 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
372 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
|
373 | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
374 | 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
|
375 | | |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
376 | | 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
|
377 | |/| |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
378 | 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
|
379 |/ / |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
380 | @ 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
|
381 |/ |
22241
3dc3cf8d0e73
test-bundle2: add bookmark movement to the push test
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22090
diff
changeset
|
382 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
|
383 |
22323
b31d29b2a7f2
test-bundle2: add obsolescence information to be exchanged
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22241
diff
changeset
|
384 $ 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
|
385 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
|
386 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
|
387 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
|
388 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
|
389 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
|
390 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
|
391 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
|
392 |
23358
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
393 (check that no 'pending' files remain) |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
394 |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
395 $ ls -1 other/.hg/bookmarks* |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
396 other/.hg/bookmarks |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
397 $ ls -1 other/.hg/store/phaseroots* |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
398 other/.hg/store/phaseroots |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
399 $ 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
|
400 other/.hg/store/00changelog.i |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
401 |
21177
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
402 Error Handling |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
403 ============== |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
404 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
405 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
|
406 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
407 Setting up |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
408 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
409 $ cat > failpush.py << EOF |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
410 > """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
|
411 > |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
412 > 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
|
413 > """ |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
414 > |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
415 > from mercurial import util |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
416 > from mercurial import bundle2 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
417 > from mercurial import exchange |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
418 > from mercurial import extensions |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
419 > |
21905
7923648ad915
bundle2-test: use the new way to extend push content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21649
diff
changeset
|
420 > def _pushbundle2failpart(pushop, bundler): |
21178
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
421 > reason = pushop.ui.config('failpush', 'reason', None) |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
422 > part = None |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
423 > if reason == 'abort': |
21600
5e08f3b65510
bundle2: update all ``addpart`` callers to ``newpart``
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21585
diff
changeset
|
424 > bundler.newpart('test:abort') |
21183
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
425 > if reason == 'unknown': |
23591
414374cfb531
bundle2: lowercase part types
Eric Sumner <ericsumner@fb.com>
parents:
23437
diff
changeset
|
426 > 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
|
427 > if reason == 'race': |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
428 > # 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
|
429 > 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
|
430 > |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
431 > @bundle2.parthandler("test:abort") |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
432 > def handleabort(op, part): |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
433 > raise util.Abort('Abandon ship!', hint="don't panic") |
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 > def uisetup(ui): |
22017
7986e99bb69a
push: rework the bundle2partsgenerators logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21964
diff
changeset
|
436 > exchange.b2partsgenmapping['failpart'] = _pushbundle2failpart |
7986e99bb69a
push: rework the bundle2partsgenerators logic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21964
diff
changeset
|
437 > 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
|
438 > |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
439 > EOF |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
440 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
441 $ cd main |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
442 $ hg up tip |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
443 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
|
444 $ echo 'I' > I |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
445 $ hg add I |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
446 $ 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
|
447 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
|
448 postclose-tip:e7ec4e813ba6 draft |
24740
d283517b260b
transaction: introduce a transaction ID, to be available to all hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24738
diff
changeset
|
449 txnclose hook: HG_TXNID=TXN:* HG_TXNNAME=commit (glob) |
21177
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
450 $ hg id |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
451 e7ec4e813ba6 tip |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
452 $ cd .. |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
453 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
454 $ cat << EOF >> $HGRCPATH |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
455 > [extensions] |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
456 > failpush=$TESTTMP/failpush.py |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
457 > EOF |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
458 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
459 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
460 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
461 $ cat other.pid >> $DAEMON_PIDS |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
462 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
463 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
|
464 |
21178
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
465 $ cat << EOF >> $HGRCPATH |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
466 > [failpush] |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
467 > reason = abort |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
468 > EOF |
9a813e703172
bundle2: make error testing more modular
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21177
diff
changeset
|
469 |
21177
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
470 $ 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
|
471 pushing to other |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
472 searching for changes |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
473 abort: Abandon ship! |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
474 (don't panic) |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
475 [255] |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
476 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
477 $ 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
|
478 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
|
479 searching for changes |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
480 abort: Abandon ship! |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
481 (don't panic) |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
482 [255] |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
483 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
484 $ 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
|
485 pushing to http://localhost:$HGPORT2/ |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
486 searching for changes |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
487 abort: Abandon ship! |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
488 (don't panic) |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
489 [255] |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
490 |
952af771bc17
bundle2: gracefully handle abort during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21147
diff
changeset
|
491 |
21183
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
492 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
|
493 |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
494 $ cat << EOF >> $HGRCPATH |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
495 > [failpush] |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
496 > reason = unknown |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
497 > EOF |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
498 |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
499 $ 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
|
500 pushing to other |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
501 searching for changes |
21617
0cfda08afd24
bundle2: rename UnknownPartError to BundleValueError
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21605
diff
changeset
|
502 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
|
503 [255] |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
504 |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
505 $ 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
|
506 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
|
507 searching for changes |
21617
0cfda08afd24
bundle2: rename UnknownPartError to BundleValueError
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21605
diff
changeset
|
508 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
|
509 [255] |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
510 |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
511 $ 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
|
512 pushing to http://localhost:$HGPORT2/ |
4345274adc4b
bundle2: gracefully handle UnknownPartError during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21178
diff
changeset
|
513 searching for changes |
21617
0cfda08afd24
bundle2: rename UnknownPartError to BundleValueError
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21605
diff
changeset
|
514 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
|
515 [255] |
21186
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
516 |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
517 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
|
518 |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
519 $ cat << EOF >> $HGRCPATH |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
520 > [failpush] |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
521 > reason = race |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
522 > EOF |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
523 |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
524 $ 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
|
525 pushing to other |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
526 searching for changes |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
527 abort: push failed: |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
528 '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
|
529 [255] |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
530 |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
531 $ 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
|
532 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
|
533 searching for changes |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
534 abort: push failed: |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
535 '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
|
536 [255] |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
537 |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
538 $ 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
|
539 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
|
540 searching for changes |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
541 abort: push failed: |
9f3652e851f8
bundle2: gracefully handle PushRaced error during unbundle
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21185
diff
changeset
|
542 '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
|
543 [255] |
21187
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
544 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
545 Doing the actual push: hook abort |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
546 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
547 $ cat << EOF >> $HGRCPATH |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
548 > [failpush] |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
549 > reason = |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
550 > [hooks] |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
551 > pretxnclose.failpush = false |
21187
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
552 > EOF |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
553 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
554 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
555 $ hg -R other serve -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
556 $ cat other.pid >> $DAEMON_PIDS |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
557 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
558 $ 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
|
559 pushing to other |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
560 searching for changes |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
561 pre-close-tip:e7ec4e813ba6 draft |
21187
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
562 transaction abort! |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
563 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
|
564 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
|
565 [255] |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
566 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
567 $ 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
|
568 pushing to ssh://user@dummy/other |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
569 searching for changes |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
570 abort: pretxnclose.failpush hook exited with status 1 |
23359
1b2957b27203
test-bundle2: check visible data in pre/post-transaction hooks
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23358
diff
changeset
|
571 remote: pre-close-tip:e7ec4e813ba6 draft |
21187
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
572 remote: transaction abort! |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
573 remote: rollback completed |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
574 [255] |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
575 |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
576 $ 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
|
577 pushing to http://localhost:$HGPORT2/ |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
578 searching for changes |
24285
8e13cc0825f1
bundle2: test hooking using the new transaction-level hook
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23759
diff
changeset
|
579 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
|
580 [255] |
bcfd44abad93
bundle2: gracefully handle hook abort
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21186
diff
changeset
|
581 |
23358
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
582 (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
|
583 |
23358
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
584 $ ls -1 other/.hg/bookmarks* |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
585 other/.hg/bookmarks |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
586 $ ls -1 other/.hg/store/phaseroots* |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
587 other/.hg/store/phaseroots |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
588 $ 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
|
589 other/.hg/store/00changelog.i |
1b51d1b05482
transaction: write pending generated files
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23222
diff
changeset
|
590 |