Show More
@@ -1,1116 +1,1116 b'' | |||||
1 | Test exchange of common information using bundle2 |
|
1 | Test exchange of common information using bundle2 | |
2 |
|
2 | |||
3 |
|
3 | |||
4 | $ getmainid() { |
|
4 | $ getmainid() { | |
5 | > hg -R main log --template '{node}\n' --rev "$1" |
|
5 | > hg -R main log --template '{node}\n' --rev "$1" | |
6 | > } |
|
6 | > } | |
7 |
|
7 | |||
8 | enable obsolescence |
|
8 | enable obsolescence | |
9 |
|
9 | |||
10 | $ cp $HGRCPATH $TESTTMP/hgrc.orig |
|
10 | $ cp $HGRCPATH $TESTTMP/hgrc.orig | |
11 | $ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF |
|
11 | $ cat > $TESTTMP/bundle2-pushkey-hook.sh << EOF | |
12 | > echo pushkey: lock state after \"\$HG_NAMESPACE\" |
|
12 | > echo pushkey: lock state after \"\$HG_NAMESPACE\" | |
13 | > hg debuglock |
|
13 | > hg debuglock | |
14 | > EOF |
|
14 | > EOF | |
15 |
|
15 | |||
16 | $ cat >> $HGRCPATH << EOF |
|
16 | $ cat >> $HGRCPATH << EOF | |
17 | > [experimental] |
|
17 | > [experimental] | |
18 | > evolution=createmarkers,exchange |
|
18 | > evolution=createmarkers,exchange | |
19 | > bundle2-output-capture=True |
|
19 | > bundle2-output-capture=True | |
20 | > [ui] |
|
20 | > [ui] | |
21 | > ssh=python "$TESTDIR/dummyssh" |
|
21 | > ssh=python "$TESTDIR/dummyssh" | |
22 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
22 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
23 | > [web] |
|
23 | > [web] | |
24 | > push_ssl = false |
|
24 | > push_ssl = false | |
25 | > allow_push = * |
|
25 | > allow_push = * | |
26 | > [phases] |
|
26 | > [phases] | |
27 | > publish=False |
|
27 | > publish=False | |
28 | > [hooks] |
|
28 | > [hooks] | |
29 | > pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node|short} {phase} {bookmarks}\n" |
|
29 | > pretxnclose.tip = hg log -r tip -T "pre-close-tip:{node|short} {phase} {bookmarks}\n" | |
30 | > txnclose.tip = hg log -r tip -T "postclose-tip:{node|short} {phase} {bookmarks}\n" |
|
30 | > txnclose.tip = hg log -r tip -T "postclose-tip:{node|short} {phase} {bookmarks}\n" | |
31 | > txnclose.env = sh -c "HG_LOCAL= printenv.py txnclose" |
|
31 | > txnclose.env = sh -c "HG_LOCAL= printenv.py txnclose" | |
32 | > pushkey= sh "$TESTTMP/bundle2-pushkey-hook.sh" |
|
32 | > pushkey= sh "$TESTTMP/bundle2-pushkey-hook.sh" | |
33 | > EOF |
|
33 | > EOF | |
34 |
|
34 | |||
35 | The extension requires a repo (currently unused) |
|
35 | The extension requires a repo (currently unused) | |
36 |
|
36 | |||
37 | $ hg init main |
|
37 | $ hg init main | |
38 | $ cd main |
|
38 | $ cd main | |
39 | $ touch a |
|
39 | $ touch a | |
40 | $ hg add a |
|
40 | $ hg add a | |
41 | $ hg commit -m 'a' |
|
41 | $ hg commit -m 'a' | |
42 | pre-close-tip:3903775176ed draft |
|
42 | pre-close-tip:3903775176ed draft | |
43 | postclose-tip:3903775176ed draft |
|
43 | postclose-tip:3903775176ed draft | |
44 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob) |
|
44 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=commit (glob) | |
45 |
|
45 | |||
46 | $ hg unbundle $TESTDIR/bundles/rebase.hg |
|
46 | $ hg unbundle $TESTDIR/bundles/rebase.hg | |
47 | adding changesets |
|
47 | adding changesets | |
48 | adding manifests |
|
48 | adding manifests | |
49 | adding file changes |
|
49 | adding file changes | |
50 | added 8 changesets with 7 changes to 7 files (+3 heads) |
|
50 | added 8 changesets with 7 changes to 7 files (+3 heads) | |
51 | pre-close-tip:02de42196ebe draft |
|
51 | pre-close-tip:02de42196ebe draft | |
52 | postclose-tip:02de42196ebe draft |
|
52 | postclose-tip:02de42196ebe draft | |
53 | txnclose hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:* HG_TXNNAME=unbundle (glob) |
|
53 | txnclose hook: HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=unbundle HG_TXNID=TXN:* HG_TXNNAME=unbundle (glob) | |
54 | bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) |
|
54 | bundle:*/tests/bundles/rebase.hg HG_URL=bundle:*/tests/bundles/rebase.hg (glob) | |
55 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
55 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
56 |
|
56 | |||
57 | $ cd .. |
|
57 | $ cd .. | |
58 |
|
58 | |||
59 | Real world exchange |
|
59 | Real world exchange | |
60 | ===================== |
|
60 | ===================== | |
61 |
|
61 | |||
62 | Add more obsolescence information |
|
62 | Add more obsolescence information | |
63 |
|
63 | |||
64 | $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` |
|
64 | $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc` | |
65 | pre-close-tip:02de42196ebe draft |
|
65 | pre-close-tip:02de42196ebe draft | |
66 | postclose-tip:02de42196ebe draft |
|
66 | postclose-tip:02de42196ebe draft | |
67 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
67 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
68 | $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` |
|
68 | $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c` | |
69 | pre-close-tip:02de42196ebe draft |
|
69 | pre-close-tip:02de42196ebe draft | |
70 | postclose-tip:02de42196ebe draft |
|
70 | postclose-tip:02de42196ebe draft | |
71 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
71 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
72 |
|
72 | |||
73 | clone --pull |
|
73 | clone --pull | |
74 |
|
74 | |||
75 | $ hg -R main phase --public cd010b8cd998 |
|
75 | $ hg -R main phase --public cd010b8cd998 | |
76 | pre-close-tip:02de42196ebe draft |
|
76 | pre-close-tip:02de42196ebe draft | |
77 | postclose-tip:02de42196ebe draft |
|
77 | postclose-tip:02de42196ebe draft | |
78 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
78 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
79 | $ hg clone main other --pull --rev 9520eea781bc |
|
79 | $ hg clone main other --pull --rev 9520eea781bc | |
80 | adding changesets |
|
80 | adding changesets | |
81 | adding manifests |
|
81 | adding manifests | |
82 | adding file changes |
|
82 | adding file changes | |
83 | added 2 changesets with 2 changes to 2 files |
|
83 | added 2 changesets with 2 changes to 2 files | |
84 | 1 new obsolescence markers |
|
84 | 1 new obsolescence markers | |
85 | pre-close-tip:9520eea781bc draft |
|
85 | pre-close-tip:9520eea781bc draft | |
86 | postclose-tip:9520eea781bc draft |
|
86 | postclose-tip:9520eea781bc draft | |
87 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
87 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=cd010b8cd998f3981a5a8115f94f8da4ab506089 HG_NODE_LAST=9520eea781bcca16c1e15acc0ba14335a0e8e5ba HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
88 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
88 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
89 | updating to branch default |
|
89 | updating to branch default | |
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
91 | $ hg -R other log -G |
|
91 | $ hg -R other log -G | |
92 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
92 | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
93 | | |
|
93 | | | |
94 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
|
94 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
95 |
|
95 | |||
96 | $ hg -R other debugobsolete |
|
96 | $ hg -R other debugobsolete | |
97 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
97 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
98 |
|
98 | |||
99 | pull |
|
99 | pull | |
100 |
|
100 | |||
101 | $ hg -R main phase --public 9520eea781bc |
|
101 | $ hg -R main phase --public 9520eea781bc | |
102 | pre-close-tip:02de42196ebe draft |
|
102 | pre-close-tip:02de42196ebe draft | |
103 | postclose-tip:02de42196ebe draft |
|
103 | postclose-tip:02de42196ebe draft | |
104 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
104 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
105 | $ hg -R other pull -r 24b6387c8c8c |
|
105 | $ hg -R other pull -r 24b6387c8c8c | |
106 | pulling from $TESTTMP/main (glob) |
|
106 | pulling from $TESTTMP/main (glob) | |
107 | searching for changes |
|
107 | searching for changes | |
108 | adding changesets |
|
108 | adding changesets | |
109 | adding manifests |
|
109 | adding manifests | |
110 | adding file changes |
|
110 | adding file changes | |
111 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
111 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
112 | 1 new obsolescence markers |
|
112 | 1 new obsolescence markers | |
113 | pre-close-tip:24b6387c8c8c draft |
|
113 | pre-close-tip:24b6387c8c8c draft | |
114 | postclose-tip:24b6387c8c8c draft |
|
114 | postclose-tip:24b6387c8c8c draft | |
115 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
115 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_NODE=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_NODE_LAST=24b6387c8c8cae37178880f3fa95ded3cb1cf785 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
116 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
116 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
117 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
117 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
118 | $ hg -R other log -G |
|
118 | $ hg -R other log -G | |
119 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
119 | o 2:24b6387c8c8c draft Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
120 | | |
|
120 | | | |
121 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
121 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
122 | |/ |
|
122 | |/ | |
123 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
|
123 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
124 |
|
124 | |||
125 | $ hg -R other debugobsolete |
|
125 | $ hg -R other debugobsolete | |
126 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
126 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
127 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
127 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
128 |
|
128 | |||
129 | pull empty (with phase movement) |
|
129 | pull empty (with phase movement) | |
130 |
|
130 | |||
131 | $ hg -R main phase --public 24b6387c8c8c |
|
131 | $ hg -R main phase --public 24b6387c8c8c | |
132 | pre-close-tip:02de42196ebe draft |
|
132 | pre-close-tip:02de42196ebe draft | |
133 | postclose-tip:02de42196ebe draft |
|
133 | postclose-tip:02de42196ebe draft | |
134 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
134 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
135 | $ hg -R other pull -r 24b6387c8c8c |
|
135 | $ hg -R other pull -r 24b6387c8c8c | |
136 | pulling from $TESTTMP/main (glob) |
|
136 | pulling from $TESTTMP/main (glob) | |
137 | no changes found |
|
137 | no changes found | |
138 | pre-close-tip:24b6387c8c8c public |
|
138 | pre-close-tip:24b6387c8c8c public | |
139 | postclose-tip:24b6387c8c8c public |
|
139 | postclose-tip:24b6387c8c8c public | |
140 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
140 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
141 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
141 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
142 | $ hg -R other log -G |
|
142 | $ hg -R other log -G | |
143 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
143 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
144 | | |
|
144 | | | |
145 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
145 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
146 | |/ |
|
146 | |/ | |
147 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
|
147 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
148 |
|
148 | |||
149 | $ hg -R other debugobsolete |
|
149 | $ hg -R other debugobsolete | |
150 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
150 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
151 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
151 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
152 |
|
152 | |||
153 | pull empty |
|
153 | pull empty | |
154 |
|
154 | |||
155 | $ hg -R other pull -r 24b6387c8c8c |
|
155 | $ hg -R other pull -r 24b6387c8c8c | |
156 | pulling from $TESTTMP/main (glob) |
|
156 | pulling from $TESTTMP/main (glob) | |
157 | no changes found |
|
157 | no changes found | |
158 | pre-close-tip:24b6387c8c8c public |
|
158 | pre-close-tip:24b6387c8c8c public | |
159 | postclose-tip:24b6387c8c8c public |
|
159 | postclose-tip:24b6387c8c8c public | |
160 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
160 | txnclose hook: HG_NEW_OBSMARKERS=0 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
161 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) |
|
161 | file:/*/$TESTTMP/main HG_URL=file:$TESTTMP/main (glob) | |
162 | $ hg -R other log -G |
|
162 | $ hg -R other log -G | |
163 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
163 | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
164 | | |
|
164 | | | |
165 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
165 | | @ 1:9520eea781bc draft Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
166 | |/ |
|
166 | |/ | |
167 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
|
167 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
168 |
|
168 | |||
169 | $ hg -R other debugobsolete |
|
169 | $ hg -R other debugobsolete | |
170 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
170 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
171 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
171 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
172 |
|
172 | |||
173 | add extra data to test their exchange during push |
|
173 | add extra data to test their exchange during push | |
174 |
|
174 | |||
175 | $ hg -R main bookmark --rev eea13746799a book_eea1 |
|
175 | $ hg -R main bookmark --rev eea13746799a book_eea1 | |
176 | pre-close-tip:02de42196ebe draft |
|
176 | pre-close-tip:02de42196ebe draft | |
177 | postclose-tip:02de42196ebe draft |
|
177 | postclose-tip:02de42196ebe draft | |
178 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
178 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
179 | $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` |
|
179 | $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a` | |
180 | pre-close-tip:02de42196ebe draft |
|
180 | pre-close-tip:02de42196ebe draft | |
181 | postclose-tip:02de42196ebe draft |
|
181 | postclose-tip:02de42196ebe draft | |
182 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
182 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
183 | $ hg -R main bookmark --rev 02de42196ebe book_02de |
|
183 | $ hg -R main bookmark --rev 02de42196ebe book_02de | |
184 | pre-close-tip:02de42196ebe draft book_02de |
|
184 | pre-close-tip:02de42196ebe draft book_02de | |
185 | postclose-tip:02de42196ebe draft book_02de |
|
185 | postclose-tip:02de42196ebe draft book_02de | |
186 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
186 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
187 | $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` |
|
187 | $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe` | |
188 | pre-close-tip:02de42196ebe draft book_02de |
|
188 | pre-close-tip:02de42196ebe draft book_02de | |
189 | postclose-tip:02de42196ebe draft book_02de |
|
189 | postclose-tip:02de42196ebe draft book_02de | |
190 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
190 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
191 | $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc |
|
191 | $ hg -R main bookmark --rev 42ccdea3bb16 book_42cc | |
192 | pre-close-tip:02de42196ebe draft book_02de |
|
192 | pre-close-tip:02de42196ebe draft book_02de | |
193 | postclose-tip:02de42196ebe draft book_02de |
|
193 | postclose-tip:02de42196ebe draft book_02de | |
194 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
194 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
195 | $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16` |
|
195 | $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16` | |
196 | pre-close-tip:02de42196ebe draft book_02de |
|
196 | pre-close-tip:02de42196ebe draft book_02de | |
197 | postclose-tip:02de42196ebe draft book_02de |
|
197 | postclose-tip:02de42196ebe draft book_02de | |
198 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
198 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
199 | $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd |
|
199 | $ hg -R main bookmark --rev 5fddd98957c8 book_5fdd | |
200 | pre-close-tip:02de42196ebe draft book_02de |
|
200 | pre-close-tip:02de42196ebe draft book_02de | |
201 | postclose-tip:02de42196ebe draft book_02de |
|
201 | postclose-tip:02de42196ebe draft book_02de | |
202 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
202 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
203 | $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8` |
|
203 | $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8` | |
204 | pre-close-tip:02de42196ebe draft book_02de |
|
204 | pre-close-tip:02de42196ebe draft book_02de | |
205 | postclose-tip:02de42196ebe draft book_02de |
|
205 | postclose-tip:02de42196ebe draft book_02de | |
206 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
206 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
207 | $ hg -R main bookmark --rev 32af7686d403 book_32af |
|
207 | $ hg -R main bookmark --rev 32af7686d403 book_32af | |
208 | pre-close-tip:02de42196ebe draft book_02de |
|
208 | pre-close-tip:02de42196ebe draft book_02de | |
209 | postclose-tip:02de42196ebe draft book_02de |
|
209 | postclose-tip:02de42196ebe draft book_02de | |
210 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
210 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
211 | $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` |
|
211 | $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403` | |
212 | pre-close-tip:02de42196ebe draft book_02de |
|
212 | pre-close-tip:02de42196ebe draft book_02de | |
213 | postclose-tip:02de42196ebe draft book_02de |
|
213 | postclose-tip:02de42196ebe draft book_02de | |
214 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) |
|
214 | txnclose hook: HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:* HG_TXNNAME=debugobsolete (glob) | |
215 |
|
215 | |||
216 | $ hg -R other bookmark --rev cd010b8cd998 book_eea1 |
|
216 | $ hg -R other bookmark --rev cd010b8cd998 book_eea1 | |
217 | pre-close-tip:24b6387c8c8c public |
|
217 | pre-close-tip:24b6387c8c8c public | |
218 | postclose-tip:24b6387c8c8c public |
|
218 | postclose-tip:24b6387c8c8c public | |
219 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
219 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
220 | $ hg -R other bookmark --rev cd010b8cd998 book_02de |
|
220 | $ hg -R other bookmark --rev cd010b8cd998 book_02de | |
221 | pre-close-tip:24b6387c8c8c public |
|
221 | pre-close-tip:24b6387c8c8c public | |
222 | postclose-tip:24b6387c8c8c public |
|
222 | postclose-tip:24b6387c8c8c public | |
223 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
223 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
224 | $ hg -R other bookmark --rev cd010b8cd998 book_42cc |
|
224 | $ hg -R other bookmark --rev cd010b8cd998 book_42cc | |
225 | pre-close-tip:24b6387c8c8c public |
|
225 | pre-close-tip:24b6387c8c8c public | |
226 | postclose-tip:24b6387c8c8c public |
|
226 | postclose-tip:24b6387c8c8c public | |
227 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
227 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
228 | $ hg -R other bookmark --rev cd010b8cd998 book_5fdd |
|
228 | $ hg -R other bookmark --rev cd010b8cd998 book_5fdd | |
229 | pre-close-tip:24b6387c8c8c public |
|
229 | pre-close-tip:24b6387c8c8c public | |
230 | postclose-tip:24b6387c8c8c public |
|
230 | postclose-tip:24b6387c8c8c public | |
231 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
231 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
232 | $ hg -R other bookmark --rev cd010b8cd998 book_32af |
|
232 | $ hg -R other bookmark --rev cd010b8cd998 book_32af | |
233 | pre-close-tip:24b6387c8c8c public |
|
233 | pre-close-tip:24b6387c8c8c public | |
234 | postclose-tip:24b6387c8c8c public |
|
234 | postclose-tip:24b6387c8c8c public | |
235 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) |
|
235 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=bookmark (glob) | |
236 |
|
236 | |||
237 | $ hg -R main phase --public eea13746799a |
|
237 | $ hg -R main phase --public eea13746799a | |
238 | pre-close-tip:02de42196ebe draft book_02de |
|
238 | pre-close-tip:02de42196ebe draft book_02de | |
239 | postclose-tip:02de42196ebe draft book_02de |
|
239 | postclose-tip:02de42196ebe draft book_02de | |
240 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
240 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
241 |
|
241 | |||
242 | push |
|
242 | push | |
243 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 |
|
243 | $ hg -R main push other --rev eea13746799a --bookmark book_eea1 | |
244 | pushing to other |
|
244 | pushing to other | |
245 | searching for changes |
|
245 | searching for changes | |
246 | remote: adding changesets |
|
246 | remote: adding changesets | |
247 | remote: adding manifests |
|
247 | remote: adding manifests | |
248 | remote: adding file changes |
|
248 | remote: adding file changes | |
249 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) |
|
249 | remote: added 1 changesets with 0 changes to 0 files (-1 heads) | |
250 | remote: 1 new obsolescence markers |
|
250 | remote: 1 new obsolescence markers | |
251 | remote: pre-close-tip:eea13746799a public book_eea1 |
|
251 | remote: pre-close-tip:eea13746799a public book_eea1 | |
252 | remote: pushkey: lock state after "phases" |
|
252 | remote: pushkey: lock state after "phases" | |
253 | remote: lock: free |
|
253 | remote: lock: free | |
254 | remote: wlock: free |
|
254 | remote: wlock: free | |
255 | remote: pushkey: lock state after "bookmarks" |
|
255 | remote: pushkey: lock state after "bookmarks" | |
256 | remote: lock: free |
|
256 | remote: lock: free | |
257 | remote: wlock: free |
|
257 | remote: wlock: free | |
258 | remote: postclose-tip:eea13746799a public book_eea1 |
|
258 | remote: postclose-tip:eea13746799a public book_eea1 | |
259 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) |
|
259 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_NODE_LAST=eea13746799a9e0bfd88f29d3c2e9dc9389f524f HG_PHASES_MOVED=1 HG_SOURCE=push HG_TXNID=TXN:* HG_TXNNAME=push HG_URL=push (glob) | |
260 | updating bookmark book_eea1 |
|
260 | updating bookmark book_eea1 | |
261 | pre-close-tip:02de42196ebe draft book_02de |
|
261 | pre-close-tip:02de42196ebe draft book_02de | |
262 | postclose-tip:02de42196ebe draft book_02de |
|
262 | postclose-tip:02de42196ebe draft book_02de | |
263 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
|
263 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | |
264 | file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob) |
|
264 | file:/*/$TESTTMP/other HG_URL=file:$TESTTMP/other (glob) | |
265 | $ hg -R other log -G |
|
265 | $ hg -R other log -G | |
266 | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G |
|
266 | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
267 | |\ |
|
267 | |\ | |
268 | | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
268 | | o 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
269 | | | |
|
269 | | | | |
270 | @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
270 | @ | 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
271 | |/ |
|
271 | |/ | |
272 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A |
|
272 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de book_32af book_42cc book_5fdd A | |
273 |
|
273 | |||
274 | $ hg -R other debugobsolete |
|
274 | $ hg -R other debugobsolete | |
275 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
275 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
276 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
276 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
277 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
277 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
278 |
|
278 | |||
279 | pull over ssh |
|
279 | pull over ssh | |
280 |
|
280 | |||
281 | $ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de |
|
281 | $ hg -R other pull ssh://user@dummy/main -r 02de42196ebe --bookmark book_02de | |
282 | pulling from ssh://user@dummy/main |
|
282 | pulling from ssh://user@dummy/main | |
283 | searching for changes |
|
283 | searching for changes | |
284 | adding changesets |
|
284 | adding changesets | |
285 | adding manifests |
|
285 | adding manifests | |
286 | adding file changes |
|
286 | adding file changes | |
287 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
287 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
288 | 1 new obsolescence markers |
|
288 | 1 new obsolescence markers | |
289 | updating bookmark book_02de |
|
289 | updating bookmark book_02de | |
290 | pre-close-tip:02de42196ebe draft book_02de |
|
290 | pre-close-tip:02de42196ebe draft book_02de | |
291 | postclose-tip:02de42196ebe draft book_02de |
|
291 | postclose-tip:02de42196ebe draft book_02de | |
292 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
292 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_NODE_LAST=02de42196ebee42ef284b6780a87cdc96e8eaab6 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
293 | ssh://user@dummy/main HG_URL=ssh://user@dummy/main |
|
293 | ssh://user@dummy/main HG_URL=ssh://user@dummy/main | |
294 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
294 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
295 | $ hg -R other debugobsolete |
|
295 | $ hg -R other debugobsolete | |
296 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
296 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
297 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
297 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
298 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
298 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
299 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
299 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
300 |
|
300 | |||
301 | pull over http |
|
301 | pull over http | |
302 |
|
302 | |||
303 | $ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log |
|
303 | $ hg serve -R main -p $HGPORT -d --pid-file=main.pid -E main-error.log | |
304 | $ cat main.pid >> $DAEMON_PIDS |
|
304 | $ cat main.pid >> $DAEMON_PIDS | |
305 |
|
305 | |||
306 | $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc |
|
306 | $ hg -R other pull http://localhost:$HGPORT/ -r 42ccdea3bb16 --bookmark book_42cc | |
307 | pulling from http://localhost:$HGPORT/ |
|
307 | pulling from http://localhost:$HGPORT/ | |
308 | searching for changes |
|
308 | searching for changes | |
309 | adding changesets |
|
309 | adding changesets | |
310 | adding manifests |
|
310 | adding manifests | |
311 | adding file changes |
|
311 | adding file changes | |
312 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
312 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
313 | 1 new obsolescence markers |
|
313 | 1 new obsolescence markers | |
314 | updating bookmark book_42cc |
|
314 | updating bookmark book_42cc | |
315 | pre-close-tip:42ccdea3bb16 draft book_42cc |
|
315 | pre-close-tip:42ccdea3bb16 draft book_42cc | |
316 | postclose-tip:42ccdea3bb16 draft book_42cc |
|
316 | postclose-tip:42ccdea3bb16 draft book_42cc | |
317 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) |
|
317 | txnclose hook: HG_BOOKMARK_MOVED=1 HG_NEW_OBSMARKERS=1 HG_NODE=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_NODE_LAST=42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 HG_PHASES_MOVED=1 HG_SOURCE=pull HG_TXNID=TXN:* HG_TXNNAME=pull (glob) | |
318 | http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/ |
|
318 | http://localhost:$HGPORT/ HG_URL=http://localhost:$HGPORT/ | |
319 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
319 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
320 | $ cat main-error.log |
|
320 | $ cat main-error.log | |
321 | $ hg -R other debugobsolete |
|
321 | $ hg -R other debugobsolete | |
322 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
322 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
323 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
323 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
324 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
324 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
325 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
325 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
326 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
326 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
327 |
|
327 | |||
328 | push over ssh |
|
328 | push over ssh | |
329 |
|
329 | |||
330 | $ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 --bookmark book_5fdd |
|
330 | $ hg -R main push ssh://user@dummy/other -r 5fddd98957c8 --bookmark book_5fdd | |
331 | pushing to ssh://user@dummy/other |
|
331 | pushing to ssh://user@dummy/other | |
332 | searching for changes |
|
332 | searching for changes | |
333 | remote: adding changesets |
|
333 | remote: adding changesets | |
334 | remote: adding manifests |
|
334 | remote: adding manifests | |
335 | remote: adding file changes |
|
335 | remote: adding file changes | |
336 | remote: added 1 changesets with 1 changes to 1 files |
|
336 | remote: added 1 changesets with 1 changes to 1 files | |
337 | remote: 1 new obsolescence markers |
|
337 | remote: 1 new obsolescence markers | |
338 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd |
|
338 | remote: pre-close-tip:5fddd98957c8 draft book_5fdd | |
339 | remote: pushkey: lock state after "bookmarks" |
|
339 | remote: pushkey: lock state after "bookmarks" | |
340 | remote: lock: free |
|
340 | remote: lock: free | |
341 | remote: wlock: free |
|
341 | remote: wlock: free | |
342 | remote: postclose-tip:5fddd98957c8 draft book_5fdd |
|
342 | remote: postclose-tip:5fddd98957c8 draft book_5fdd | |
343 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob) |
|
343 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_NODE_LAST=5fddd98957c8a54a4d436dfe1da9d87f21a1b97b HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:ssh:127.0.0.1 (glob) | |
344 | updating bookmark book_5fdd |
|
344 | updating bookmark book_5fdd | |
345 | pre-close-tip:02de42196ebe draft book_02de |
|
345 | pre-close-tip:02de42196ebe draft book_02de | |
346 | postclose-tip:02de42196ebe draft book_02de |
|
346 | postclose-tip:02de42196ebe draft book_02de | |
347 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
|
347 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | |
348 | ssh://user@dummy/other HG_URL=ssh://user@dummy/other |
|
348 | ssh://user@dummy/other HG_URL=ssh://user@dummy/other | |
349 | $ hg -R other log -G |
|
349 | $ hg -R other log -G | |
350 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
|
350 | o 6:5fddd98957c8 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
351 | | |
|
351 | | | |
352 | o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B |
|
352 | o 5:42ccdea3bb16 draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | |
353 | | |
|
353 | | | |
354 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H |
|
354 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | |
355 | | | |
|
355 | | | | |
356 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G |
|
356 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
357 | | |/| |
|
357 | | |/| | |
358 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
358 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
359 | |/ / |
|
359 | |/ / | |
360 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
360 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
361 | |/ |
|
361 | |/ | |
362 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A |
|
362 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af A | |
363 |
|
363 | |||
364 | $ hg -R other debugobsolete |
|
364 | $ hg -R other debugobsolete | |
365 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
365 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
366 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
366 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
367 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
367 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
368 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
368 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
369 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
369 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
370 | 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
370 | 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
371 |
|
371 | |||
372 | push over http |
|
372 | push over http | |
373 |
|
373 | |||
374 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
374 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
375 | $ cat other.pid >> $DAEMON_PIDS |
|
375 | $ cat other.pid >> $DAEMON_PIDS | |
376 |
|
376 | |||
377 | $ hg -R main phase --public 32af7686d403 |
|
377 | $ hg -R main phase --public 32af7686d403 | |
378 | pre-close-tip:02de42196ebe draft book_02de |
|
378 | pre-close-tip:02de42196ebe draft book_02de | |
379 | postclose-tip:02de42196ebe draft book_02de |
|
379 | postclose-tip:02de42196ebe draft book_02de | |
380 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) |
|
380 | txnclose hook: HG_PHASES_MOVED=1 HG_TXNID=TXN:* HG_TXNNAME=phase (glob) | |
381 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af |
|
381 | $ hg -R main push http://localhost:$HGPORT2/ -r 32af7686d403 --bookmark book_32af | |
382 | pushing to http://localhost:$HGPORT2/ |
|
382 | pushing to http://localhost:$HGPORT2/ | |
383 | searching for changes |
|
383 | searching for changes | |
384 | remote: adding changesets |
|
384 | remote: adding changesets | |
385 | remote: adding manifests |
|
385 | remote: adding manifests | |
386 | remote: adding file changes |
|
386 | remote: adding file changes | |
387 | remote: added 1 changesets with 1 changes to 1 files |
|
387 | remote: added 1 changesets with 1 changes to 1 files | |
388 | remote: 1 new obsolescence markers |
|
388 | remote: 1 new obsolescence markers | |
389 | remote: pre-close-tip:32af7686d403 public book_32af |
|
389 | remote: pre-close-tip:32af7686d403 public book_32af | |
390 | remote: pushkey: lock state after "phases" |
|
390 | remote: pushkey: lock state after "phases" | |
391 | remote: lock: free |
|
391 | remote: lock: free | |
392 | remote: wlock: free |
|
392 | remote: wlock: free | |
393 | remote: pushkey: lock state after "bookmarks" |
|
393 | remote: pushkey: lock state after "bookmarks" | |
394 | remote: lock: free |
|
394 | remote: lock: free | |
395 | remote: wlock: free |
|
395 | remote: wlock: free | |
396 | remote: postclose-tip:32af7686d403 public book_32af |
|
396 | remote: postclose-tip:32af7686d403 public book_32af | |
397 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:127.0.0.1: (glob) |
|
397 | remote: txnclose hook: HG_BOOKMARK_MOVED=1 HG_BUNDLE2=1 HG_NEW_OBSMARKERS=1 HG_NODE=32af7686d403cf45b5d95f2d70cebea587ac806a HG_NODE_LAST=32af7686d403cf45b5d95f2d70cebea587ac806a HG_PHASES_MOVED=1 HG_SOURCE=serve HG_TXNID=TXN:* HG_TXNNAME=serve HG_URL=remote:http:127.0.0.1: (glob) | |
398 | updating bookmark book_32af |
|
398 | updating bookmark book_32af | |
399 | pre-close-tip:02de42196ebe draft book_02de |
|
399 | pre-close-tip:02de42196ebe draft book_02de | |
400 | postclose-tip:02de42196ebe draft book_02de |
|
400 | postclose-tip:02de42196ebe draft book_02de | |
401 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) |
|
401 | txnclose hook: HG_SOURCE=push-response HG_TXNID=TXN:* HG_TXNNAME=push-response (glob) | |
402 | http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/ |
|
402 | http://localhost:$HGPORT2/ HG_URL=http://localhost:$HGPORT2/ | |
403 | $ cat other-error.log |
|
403 | $ cat other-error.log | |
404 |
|
404 | |||
405 | Check final content. |
|
405 | Check final content. | |
406 |
|
406 | |||
407 | $ hg -R other log -G |
|
407 | $ hg -R other log -G | |
408 | o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af D |
|
408 | o 7:32af7686d403 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_32af D | |
409 | | |
|
409 | | | |
410 | o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C |
|
410 | o 6:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_5fdd C | |
411 | | |
|
411 | | | |
412 | o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B |
|
412 | o 5:42ccdea3bb16 public Nicolas Dumazet <nicdumz.commits@gmail.com> book_42cc B | |
413 | | |
|
413 | | | |
414 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H |
|
414 | | o 4:02de42196ebe draft Nicolas Dumazet <nicdumz.commits@gmail.com> book_02de H | |
415 | | | |
|
415 | | | | |
416 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G |
|
416 | | | o 3:eea13746799a public Nicolas Dumazet <nicdumz.commits@gmail.com> book_eea1 G | |
417 | | |/| |
|
417 | | |/| | |
418 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F |
|
418 | | o | 2:24b6387c8c8c public Nicolas Dumazet <nicdumz.commits@gmail.com> F | |
419 | |/ / |
|
419 | |/ / | |
420 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E |
|
420 | | @ 1:9520eea781bc public Nicolas Dumazet <nicdumz.commits@gmail.com> E | |
421 | |/ |
|
421 | |/ | |
422 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A |
|
422 | o 0:cd010b8cd998 public Nicolas Dumazet <nicdumz.commits@gmail.com> A | |
423 |
|
423 | |||
424 | $ hg -R other debugobsolete |
|
424 | $ hg -R other debugobsolete | |
425 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
425 | 1111111111111111111111111111111111111111 9520eea781bcca16c1e15acc0ba14335a0e8e5ba 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
426 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
426 | 2222222222222222222222222222222222222222 24b6387c8c8cae37178880f3fa95ded3cb1cf785 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
427 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
427 | 3333333333333333333333333333333333333333 eea13746799a9e0bfd88f29d3c2e9dc9389f524f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
428 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
428 | 4444444444444444444444444444444444444444 02de42196ebee42ef284b6780a87cdc96e8eaab6 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
429 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
429 | 5555555555555555555555555555555555555555 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
430 | 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
430 | 6666666666666666666666666666666666666666 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
431 | 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
431 | 7777777777777777777777777777777777777777 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
432 |
|
432 | |||
433 | (check that no 'pending' files remain) |
|
433 | (check that no 'pending' files remain) | |
434 |
|
434 | |||
435 | $ ls -1 other/.hg/bookmarks* |
|
435 | $ ls -1 other/.hg/bookmarks* | |
436 | other/.hg/bookmarks |
|
436 | other/.hg/bookmarks | |
437 | $ ls -1 other/.hg/store/phaseroots* |
|
437 | $ ls -1 other/.hg/store/phaseroots* | |
438 | other/.hg/store/phaseroots |
|
438 | other/.hg/store/phaseroots | |
439 | $ ls -1 other/.hg/store/00changelog.i* |
|
439 | $ ls -1 other/.hg/store/00changelog.i* | |
440 | other/.hg/store/00changelog.i |
|
440 | other/.hg/store/00changelog.i | |
441 |
|
441 | |||
442 | Error Handling |
|
442 | Error Handling | |
443 | ============== |
|
443 | ============== | |
444 |
|
444 | |||
445 | Check that errors are properly returned to the client during push. |
|
445 | Check that errors are properly returned to the client during push. | |
446 |
|
446 | |||
447 | Setting up |
|
447 | Setting up | |
448 |
|
448 | |||
449 | $ cat > failpush.py << EOF |
|
449 | $ cat > failpush.py << EOF | |
450 | > """A small extension that makes push fails when using bundle2 |
|
450 | > """A small extension that makes push fails when using bundle2 | |
451 | > |
|
451 | > | |
452 | > used to test error handling in bundle2 |
|
452 | > used to test error handling in bundle2 | |
453 | > """ |
|
453 | > """ | |
454 | > |
|
454 | > | |
455 | > from mercurial import error |
|
455 | > from mercurial import error | |
456 | > from mercurial import bundle2 |
|
456 | > from mercurial import bundle2 | |
457 | > from mercurial import exchange |
|
457 | > from mercurial import exchange | |
458 | > from mercurial import extensions |
|
458 | > from mercurial import extensions | |
459 | > |
|
459 | > | |
460 | > def _pushbundle2failpart(pushop, bundler): |
|
460 | > def _pushbundle2failpart(pushop, bundler): | |
461 | > reason = pushop.ui.config('failpush', 'reason', None) |
|
461 | > reason = pushop.ui.config('failpush', 'reason', None) | |
462 | > part = None |
|
462 | > part = None | |
463 | > if reason == 'abort': |
|
463 | > if reason == 'abort': | |
464 | > bundler.newpart('test:abort') |
|
464 | > bundler.newpart('test:abort') | |
465 | > if reason == 'unknown': |
|
465 | > if reason == 'unknown': | |
466 | > bundler.newpart('test:unknown') |
|
466 | > bundler.newpart('test:unknown') | |
467 | > if reason == 'race': |
|
467 | > if reason == 'race': | |
468 | > # 20 Bytes of crap |
|
468 | > # 20 Bytes of crap | |
469 | > bundler.newpart('check:heads', data='01234567890123456789') |
|
469 | > bundler.newpart('check:heads', data='01234567890123456789') | |
470 | > |
|
470 | > | |
471 | > @bundle2.parthandler("test:abort") |
|
471 | > @bundle2.parthandler("test:abort") | |
472 | > def handleabort(op, part): |
|
472 | > def handleabort(op, part): | |
473 | > raise error.Abort('Abandon ship!', hint="don't panic") |
|
473 | > raise error.Abort('Abandon ship!', hint="don't panic") | |
474 | > |
|
474 | > | |
475 | > def uisetup(ui): |
|
475 | > def uisetup(ui): | |
476 | > exchange.b2partsgenmapping['failpart'] = _pushbundle2failpart |
|
476 | > exchange.b2partsgenmapping['failpart'] = _pushbundle2failpart | |
477 | > exchange.b2partsgenorder.insert(0, 'failpart') |
|
477 | > exchange.b2partsgenorder.insert(0, 'failpart') | |
478 | > |
|
478 | > | |
479 | > EOF |
|
479 | > EOF | |
480 |
|
480 | |||
481 | $ cd main |
|
481 | $ cd main | |
482 | $ hg up tip |
|
482 | $ hg up tip | |
483 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
483 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
484 | $ echo 'I' > I |
|
484 | $ echo 'I' > I | |
485 | $ hg add I |
|
485 | $ hg add I | |
486 | $ hg ci -m 'I' |
|
486 | $ hg ci -m 'I' | |
487 | pre-close-tip:e7ec4e813ba6 draft |
|
487 | pre-close-tip:e7ec4e813ba6 draft | |
488 | postclose-tip:e7ec4e813ba6 draft |
|
488 | postclose-tip:e7ec4e813ba6 draft | |
489 | txnclose hook: HG_TXNID=TXN:* HG_TXNNAME=commit (glob) |
|
489 | txnclose hook: HG_TXNID=TXN:* HG_TXNNAME=commit (glob) | |
490 | $ hg id |
|
490 | $ hg id | |
491 | e7ec4e813ba6 tip |
|
491 | e7ec4e813ba6 tip | |
492 | $ cd .. |
|
492 | $ cd .. | |
493 |
|
493 | |||
494 | $ cat << EOF >> $HGRCPATH |
|
494 | $ cat << EOF >> $HGRCPATH | |
495 | > [extensions] |
|
495 | > [extensions] | |
496 | > failpush=$TESTTMP/failpush.py |
|
496 | > failpush=$TESTTMP/failpush.py | |
497 | > EOF |
|
497 | > EOF | |
498 |
|
498 | |||
499 | $ killdaemons.py |
|
499 | $ killdaemons.py | |
500 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
500 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
501 | $ cat other.pid >> $DAEMON_PIDS |
|
501 | $ cat other.pid >> $DAEMON_PIDS | |
502 |
|
502 | |||
503 | Doing the actual push: Abort error |
|
503 | Doing the actual push: Abort error | |
504 |
|
504 | |||
505 | $ cat << EOF >> $HGRCPATH |
|
505 | $ cat << EOF >> $HGRCPATH | |
506 | > [failpush] |
|
506 | > [failpush] | |
507 | > reason = abort |
|
507 | > reason = abort | |
508 | > EOF |
|
508 | > EOF | |
509 |
|
509 | |||
510 | $ hg -R main push other -r e7ec4e813ba6 |
|
510 | $ hg -R main push other -r e7ec4e813ba6 | |
511 | pushing to other |
|
511 | pushing to other | |
512 | searching for changes |
|
512 | searching for changes | |
513 | abort: Abandon ship! |
|
513 | abort: Abandon ship! | |
514 | (don't panic) |
|
514 | (don't panic) | |
515 | [255] |
|
515 | [255] | |
516 |
|
516 | |||
517 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
517 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
518 | pushing to ssh://user@dummy/other |
|
518 | pushing to ssh://user@dummy/other | |
519 | searching for changes |
|
519 | searching for changes | |
520 | remote: Abandon ship! |
|
520 | remote: Abandon ship! | |
521 | abort: push failed on remote |
|
521 | abort: push failed on remote | |
522 | (don't panic) |
|
522 | (don't panic) | |
523 | [255] |
|
523 | [255] | |
524 |
|
524 | |||
525 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
525 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
526 | pushing to http://localhost:$HGPORT2/ |
|
526 | pushing to http://localhost:$HGPORT2/ | |
527 | searching for changes |
|
527 | searching for changes | |
528 | remote: Abandon ship! |
|
528 | remote: Abandon ship! | |
529 | abort: push failed on remote |
|
529 | abort: push failed on remote | |
530 | (don't panic) |
|
530 | (don't panic) | |
531 | [255] |
|
531 | [255] | |
532 |
|
532 | |||
533 |
|
533 | |||
534 | Doing the actual push: unknown mandatory parts |
|
534 | Doing the actual push: unknown mandatory parts | |
535 |
|
535 | |||
536 | $ cat << EOF >> $HGRCPATH |
|
536 | $ cat << EOF >> $HGRCPATH | |
537 | > [failpush] |
|
537 | > [failpush] | |
538 | > reason = unknown |
|
538 | > reason = unknown | |
539 | > EOF |
|
539 | > EOF | |
540 |
|
540 | |||
541 | $ hg -R main push other -r e7ec4e813ba6 |
|
541 | $ hg -R main push other -r e7ec4e813ba6 | |
542 | pushing to other |
|
542 | pushing to other | |
543 | searching for changes |
|
543 | searching for changes | |
544 | abort: missing support for test:unknown |
|
544 | abort: missing support for test:unknown | |
545 | [255] |
|
545 | [255] | |
546 |
|
546 | |||
547 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
547 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
548 | pushing to ssh://user@dummy/other |
|
548 | pushing to ssh://user@dummy/other | |
549 | searching for changes |
|
549 | searching for changes | |
550 | abort: missing support for test:unknown |
|
550 | abort: missing support for test:unknown | |
551 | [255] |
|
551 | [255] | |
552 |
|
552 | |||
553 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
553 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
554 | pushing to http://localhost:$HGPORT2/ |
|
554 | pushing to http://localhost:$HGPORT2/ | |
555 | searching for changes |
|
555 | searching for changes | |
556 | abort: missing support for test:unknown |
|
556 | abort: missing support for test:unknown | |
557 | [255] |
|
557 | [255] | |
558 |
|
558 | |||
559 | Doing the actual push: race |
|
559 | Doing the actual push: race | |
560 |
|
560 | |||
561 | $ cat << EOF >> $HGRCPATH |
|
561 | $ cat << EOF >> $HGRCPATH | |
562 | > [failpush] |
|
562 | > [failpush] | |
563 | > reason = race |
|
563 | > reason = race | |
564 | > EOF |
|
564 | > EOF | |
565 |
|
565 | |||
566 | $ hg -R main push other -r e7ec4e813ba6 |
|
566 | $ hg -R main push other -r e7ec4e813ba6 | |
567 | pushing to other |
|
567 | pushing to other | |
568 | searching for changes |
|
568 | searching for changes | |
569 | abort: push failed: |
|
569 | abort: push failed: | |
570 | 'repository changed while pushing - please try again' |
|
570 | 'repository changed while pushing - please try again' | |
571 | [255] |
|
571 | [255] | |
572 |
|
572 | |||
573 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
573 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
574 | pushing to ssh://user@dummy/other |
|
574 | pushing to ssh://user@dummy/other | |
575 | searching for changes |
|
575 | searching for changes | |
576 | abort: push failed: |
|
576 | abort: push failed: | |
577 | 'repository changed while pushing - please try again' |
|
577 | 'repository changed while pushing - please try again' | |
578 | [255] |
|
578 | [255] | |
579 |
|
579 | |||
580 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
580 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
581 | pushing to http://localhost:$HGPORT2/ |
|
581 | pushing to http://localhost:$HGPORT2/ | |
582 | searching for changes |
|
582 | searching for changes | |
583 | abort: push failed: |
|
583 | abort: push failed: | |
584 | 'repository changed while pushing - please try again' |
|
584 | 'repository changed while pushing - please try again' | |
585 | [255] |
|
585 | [255] | |
586 |
|
586 | |||
587 | Doing the actual push: hook abort |
|
587 | Doing the actual push: hook abort | |
588 |
|
588 | |||
589 | $ cat << EOF >> $HGRCPATH |
|
589 | $ cat << EOF >> $HGRCPATH | |
590 | > [failpush] |
|
590 | > [failpush] | |
591 | > reason = |
|
591 | > reason = | |
592 | > [hooks] |
|
592 | > [hooks] | |
593 | > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" |
|
593 | > pretxnclose.failpush = sh -c "echo 'You shall not pass!'; false" | |
594 | > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" |
|
594 | > txnabort.failpush = sh -c "echo 'Cleaning up the mess...'" | |
595 | > EOF |
|
595 | > EOF | |
596 |
|
596 | |||
597 | $ killdaemons.py |
|
597 | $ killdaemons.py | |
598 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
598 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
599 | $ cat other.pid >> $DAEMON_PIDS |
|
599 | $ cat other.pid >> $DAEMON_PIDS | |
600 |
|
600 | |||
601 | $ hg -R main push other -r e7ec4e813ba6 |
|
601 | $ hg -R main push other -r e7ec4e813ba6 | |
602 | pushing to other |
|
602 | pushing to other | |
603 | searching for changes |
|
603 | searching for changes | |
604 | remote: adding changesets |
|
604 | remote: adding changesets | |
605 | remote: adding manifests |
|
605 | remote: adding manifests | |
606 | remote: adding file changes |
|
606 | remote: adding file changes | |
607 | remote: added 1 changesets with 1 changes to 1 files |
|
607 | remote: added 1 changesets with 1 changes to 1 files | |
608 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
608 | remote: pre-close-tip:e7ec4e813ba6 draft | |
609 | remote: You shall not pass! |
|
609 | remote: You shall not pass! | |
610 | remote: transaction abort! |
|
610 | remote: transaction abort! | |
611 | remote: Cleaning up the mess... |
|
611 | remote: Cleaning up the mess... | |
612 | remote: rollback completed |
|
612 | remote: rollback completed | |
613 | abort: pretxnclose.failpush hook exited with status 1 |
|
613 | abort: pretxnclose.failpush hook exited with status 1 | |
614 | [255] |
|
614 | [255] | |
615 |
|
615 | |||
616 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
616 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
617 | pushing to ssh://user@dummy/other |
|
617 | pushing to ssh://user@dummy/other | |
618 | searching for changes |
|
618 | searching for changes | |
619 | remote: adding changesets |
|
619 | remote: adding changesets | |
620 | remote: adding manifests |
|
620 | remote: adding manifests | |
621 | remote: adding file changes |
|
621 | remote: adding file changes | |
622 | remote: added 1 changesets with 1 changes to 1 files |
|
622 | remote: added 1 changesets with 1 changes to 1 files | |
623 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
623 | remote: pre-close-tip:e7ec4e813ba6 draft | |
624 | remote: You shall not pass! |
|
624 | remote: You shall not pass! | |
625 | remote: transaction abort! |
|
625 | remote: transaction abort! | |
626 | remote: Cleaning up the mess... |
|
626 | remote: Cleaning up the mess... | |
627 | remote: rollback completed |
|
627 | remote: rollback completed | |
628 | remote: pretxnclose.failpush hook exited with status 1 |
|
628 | remote: pretxnclose.failpush hook exited with status 1 | |
629 | abort: push failed on remote |
|
629 | abort: push failed on remote | |
630 | [255] |
|
630 | [255] | |
631 |
|
631 | |||
632 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
632 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
633 | pushing to http://localhost:$HGPORT2/ |
|
633 | pushing to http://localhost:$HGPORT2/ | |
634 | searching for changes |
|
634 | searching for changes | |
635 | remote: adding changesets |
|
635 | remote: adding changesets | |
636 | remote: adding manifests |
|
636 | remote: adding manifests | |
637 | remote: adding file changes |
|
637 | remote: adding file changes | |
638 | remote: added 1 changesets with 1 changes to 1 files |
|
638 | remote: added 1 changesets with 1 changes to 1 files | |
639 | remote: pre-close-tip:e7ec4e813ba6 draft |
|
639 | remote: pre-close-tip:e7ec4e813ba6 draft | |
640 | remote: You shall not pass! |
|
640 | remote: You shall not pass! | |
641 | remote: transaction abort! |
|
641 | remote: transaction abort! | |
642 | remote: Cleaning up the mess... |
|
642 | remote: Cleaning up the mess... | |
643 | remote: rollback completed |
|
643 | remote: rollback completed | |
644 | remote: pretxnclose.failpush hook exited with status 1 |
|
644 | remote: pretxnclose.failpush hook exited with status 1 | |
645 | abort: push failed on remote |
|
645 | abort: push failed on remote | |
646 | [255] |
|
646 | [255] | |
647 |
|
647 | |||
648 | (check that no 'pending' files remain) |
|
648 | (check that no 'pending' files remain) | |
649 |
|
649 | |||
650 | $ ls -1 other/.hg/bookmarks* |
|
650 | $ ls -1 other/.hg/bookmarks* | |
651 | other/.hg/bookmarks |
|
651 | other/.hg/bookmarks | |
652 | $ ls -1 other/.hg/store/phaseroots* |
|
652 | $ ls -1 other/.hg/store/phaseroots* | |
653 | other/.hg/store/phaseroots |
|
653 | other/.hg/store/phaseroots | |
654 | $ ls -1 other/.hg/store/00changelog.i* |
|
654 | $ ls -1 other/.hg/store/00changelog.i* | |
655 | other/.hg/store/00changelog.i |
|
655 | other/.hg/store/00changelog.i | |
656 |
|
656 | |||
657 | Check error from hook during the unbundling process itself |
|
657 | Check error from hook during the unbundling process itself | |
658 |
|
658 | |||
659 | $ cat << EOF >> $HGRCPATH |
|
659 | $ cat << EOF >> $HGRCPATH | |
660 | > pretxnchangegroup = sh -c "echo 'Fail early!'; false" |
|
660 | > pretxnchangegroup = sh -c "echo 'Fail early!'; false" | |
661 | > EOF |
|
661 | > EOF | |
662 | $ killdaemons.py # reload http config |
|
662 | $ killdaemons.py # reload http config | |
663 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
663 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
664 | $ cat other.pid >> $DAEMON_PIDS |
|
664 | $ cat other.pid >> $DAEMON_PIDS | |
665 |
|
665 | |||
666 | $ hg -R main push other -r e7ec4e813ba6 |
|
666 | $ hg -R main push other -r e7ec4e813ba6 | |
667 | pushing to other |
|
667 | pushing to other | |
668 | searching for changes |
|
668 | searching for changes | |
669 | remote: adding changesets |
|
669 | remote: adding changesets | |
670 | remote: adding manifests |
|
670 | remote: adding manifests | |
671 | remote: adding file changes |
|
671 | remote: adding file changes | |
672 | remote: added 1 changesets with 1 changes to 1 files |
|
672 | remote: added 1 changesets with 1 changes to 1 files | |
673 | remote: Fail early! |
|
673 | remote: Fail early! | |
674 | remote: transaction abort! |
|
674 | remote: transaction abort! | |
675 | remote: Cleaning up the mess... |
|
675 | remote: Cleaning up the mess... | |
676 | remote: rollback completed |
|
676 | remote: rollback completed | |
677 | abort: pretxnchangegroup hook exited with status 1 |
|
677 | abort: pretxnchangegroup hook exited with status 1 | |
678 | [255] |
|
678 | [255] | |
679 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
679 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
680 | pushing to ssh://user@dummy/other |
|
680 | pushing to ssh://user@dummy/other | |
681 | searching for changes |
|
681 | searching for changes | |
682 | remote: adding changesets |
|
682 | remote: adding changesets | |
683 | remote: adding manifests |
|
683 | remote: adding manifests | |
684 | remote: adding file changes |
|
684 | remote: adding file changes | |
685 | remote: added 1 changesets with 1 changes to 1 files |
|
685 | remote: added 1 changesets with 1 changes to 1 files | |
686 | remote: Fail early! |
|
686 | remote: Fail early! | |
687 | remote: transaction abort! |
|
687 | remote: transaction abort! | |
688 | remote: Cleaning up the mess... |
|
688 | remote: Cleaning up the mess... | |
689 | remote: rollback completed |
|
689 | remote: rollback completed | |
690 | remote: pretxnchangegroup hook exited with status 1 |
|
690 | remote: pretxnchangegroup hook exited with status 1 | |
691 | abort: push failed on remote |
|
691 | abort: push failed on remote | |
692 | [255] |
|
692 | [255] | |
693 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
693 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
694 | pushing to http://localhost:$HGPORT2/ |
|
694 | pushing to http://localhost:$HGPORT2/ | |
695 | searching for changes |
|
695 | searching for changes | |
696 | remote: adding changesets |
|
696 | remote: adding changesets | |
697 | remote: adding manifests |
|
697 | remote: adding manifests | |
698 | remote: adding file changes |
|
698 | remote: adding file changes | |
699 | remote: added 1 changesets with 1 changes to 1 files |
|
699 | remote: added 1 changesets with 1 changes to 1 files | |
700 | remote: Fail early! |
|
700 | remote: Fail early! | |
701 | remote: transaction abort! |
|
701 | remote: transaction abort! | |
702 | remote: Cleaning up the mess... |
|
702 | remote: Cleaning up the mess... | |
703 | remote: rollback completed |
|
703 | remote: rollback completed | |
704 | remote: pretxnchangegroup hook exited with status 1 |
|
704 | remote: pretxnchangegroup hook exited with status 1 | |
705 | abort: push failed on remote |
|
705 | abort: push failed on remote | |
706 | [255] |
|
706 | [255] | |
707 |
|
707 | |||
708 | Check output capture control. |
|
708 | Check output capture control. | |
709 |
|
709 | |||
710 | (should be still forced for http, disabled for local and ssh) |
|
710 | (should be still forced for http, disabled for local and ssh) | |
711 |
|
711 | |||
712 | $ cat >> $HGRCPATH << EOF |
|
712 | $ cat >> $HGRCPATH << EOF | |
713 | > [experimental] |
|
713 | > [experimental] | |
714 | > bundle2-output-capture=False |
|
714 | > bundle2-output-capture=False | |
715 | > EOF |
|
715 | > EOF | |
716 |
|
716 | |||
717 | $ hg -R main push other -r e7ec4e813ba6 |
|
717 | $ hg -R main push other -r e7ec4e813ba6 | |
718 | pushing to other |
|
718 | pushing to other | |
719 | searching for changes |
|
719 | searching for changes | |
720 | adding changesets |
|
720 | adding changesets | |
721 | adding manifests |
|
721 | adding manifests | |
722 | adding file changes |
|
722 | adding file changes | |
723 | added 1 changesets with 1 changes to 1 files |
|
723 | added 1 changesets with 1 changes to 1 files | |
724 | Fail early! |
|
724 | Fail early! | |
725 | transaction abort! |
|
725 | transaction abort! | |
726 | Cleaning up the mess... |
|
726 | Cleaning up the mess... | |
727 | rollback completed |
|
727 | rollback completed | |
728 | abort: pretxnchangegroup hook exited with status 1 |
|
728 | abort: pretxnchangegroup hook exited with status 1 | |
729 | [255] |
|
729 | [255] | |
730 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
730 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
731 | pushing to ssh://user@dummy/other |
|
731 | pushing to ssh://user@dummy/other | |
732 | searching for changes |
|
732 | searching for changes | |
733 | remote: adding changesets |
|
733 | remote: adding changesets | |
734 | remote: adding manifests |
|
734 | remote: adding manifests | |
735 | remote: adding file changes |
|
735 | remote: adding file changes | |
736 | remote: added 1 changesets with 1 changes to 1 files |
|
736 | remote: added 1 changesets with 1 changes to 1 files | |
737 | remote: Fail early! |
|
737 | remote: Fail early! | |
738 | remote: transaction abort! |
|
738 | remote: transaction abort! | |
739 | remote: Cleaning up the mess... |
|
739 | remote: Cleaning up the mess... | |
740 | remote: rollback completed |
|
740 | remote: rollback completed | |
741 | remote: pretxnchangegroup hook exited with status 1 |
|
741 | remote: pretxnchangegroup hook exited with status 1 | |
742 | abort: push failed on remote |
|
742 | abort: push failed on remote | |
743 | [255] |
|
743 | [255] | |
744 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
744 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
745 | pushing to http://localhost:$HGPORT2/ |
|
745 | pushing to http://localhost:$HGPORT2/ | |
746 | searching for changes |
|
746 | searching for changes | |
747 | remote: adding changesets |
|
747 | remote: adding changesets | |
748 | remote: adding manifests |
|
748 | remote: adding manifests | |
749 | remote: adding file changes |
|
749 | remote: adding file changes | |
750 | remote: added 1 changesets with 1 changes to 1 files |
|
750 | remote: added 1 changesets with 1 changes to 1 files | |
751 | remote: Fail early! |
|
751 | remote: Fail early! | |
752 | remote: transaction abort! |
|
752 | remote: transaction abort! | |
753 | remote: Cleaning up the mess... |
|
753 | remote: Cleaning up the mess... | |
754 | remote: rollback completed |
|
754 | remote: rollback completed | |
755 | remote: pretxnchangegroup hook exited with status 1 |
|
755 | remote: pretxnchangegroup hook exited with status 1 | |
756 | abort: push failed on remote |
|
756 | abort: push failed on remote | |
757 | [255] |
|
757 | [255] | |
758 |
|
758 | |||
759 | Check abort from mandatory pushkey |
|
759 | Check abort from mandatory pushkey | |
760 |
|
760 | |||
761 | $ cat > mandatorypart.py << EOF |
|
761 | $ cat > mandatorypart.py << EOF | |
762 | > from mercurial import exchange |
|
762 | > from mercurial import exchange | |
763 | > from mercurial import pushkey |
|
763 | > from mercurial import pushkey | |
764 | > from mercurial import node |
|
764 | > from mercurial import node | |
765 | > from mercurial import error |
|
765 | > from mercurial import error | |
766 | > @exchange.b2partsgenerator('failingpuskey') |
|
766 | > @exchange.b2partsgenerator('failingpuskey') | |
767 | > def addfailingpushey(pushop, bundler): |
|
767 | > def addfailingpushey(pushop, bundler): | |
768 | > enc = pushkey.encode |
|
768 | > enc = pushkey.encode | |
769 | > part = bundler.newpart('pushkey') |
|
769 | > part = bundler.newpart('pushkey') | |
770 | > part.addparam('namespace', enc('phases')) |
|
770 | > part.addparam('namespace', enc('phases')) | |
771 | > part.addparam('key', enc(pushop.repo['cd010b8cd998'].hex())) |
|
771 | > part.addparam('key', enc(pushop.repo['cd010b8cd998'].hex())) | |
772 | > part.addparam('old', enc(str(0))) # successful update |
|
772 | > part.addparam('old', enc(str(0))) # successful update | |
773 | > part.addparam('new', enc(str(0))) |
|
773 | > part.addparam('new', enc(str(0))) | |
774 | > def fail(pushop, exc): |
|
774 | > def fail(pushop, exc): | |
775 | > raise error.Abort('Correct phase push failed (because hooks)') |
|
775 | > raise error.Abort('Correct phase push failed (because hooks)') | |
776 | > pushop.pkfailcb[part.id] = fail |
|
776 | > pushop.pkfailcb[part.id] = fail | |
777 | > EOF |
|
777 | > EOF | |
778 | $ cat >> $HGRCPATH << EOF |
|
778 | $ cat >> $HGRCPATH << EOF | |
779 | > [hooks] |
|
779 | > [hooks] | |
780 | > pretxnchangegroup= |
|
780 | > pretxnchangegroup= | |
781 | > pretxnclose.failpush= |
|
781 | > pretxnclose.failpush= | |
782 | > prepushkey.failpush = sh -c "echo 'do not push the key !'; false" |
|
782 | > prepushkey.failpush = sh -c "echo 'do not push the key !'; false" | |
783 | > [extensions] |
|
783 | > [extensions] | |
784 | > mandatorypart=$TESTTMP/mandatorypart.py |
|
784 | > mandatorypart=$TESTTMP/mandatorypart.py | |
785 | > EOF |
|
785 | > EOF | |
786 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config |
|
786 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config | |
787 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
787 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
788 | $ cat other.pid >> $DAEMON_PIDS |
|
788 | $ cat other.pid >> $DAEMON_PIDS | |
789 |
|
789 | |||
790 | (Failure from a hook) |
|
790 | (Failure from a hook) | |
791 |
|
791 | |||
792 | $ hg -R main push other -r e7ec4e813ba6 |
|
792 | $ hg -R main push other -r e7ec4e813ba6 | |
793 | pushing to other |
|
793 | pushing to other | |
794 | searching for changes |
|
794 | searching for changes | |
795 | adding changesets |
|
795 | adding changesets | |
796 | adding manifests |
|
796 | adding manifests | |
797 | adding file changes |
|
797 | adding file changes | |
798 | added 1 changesets with 1 changes to 1 files |
|
798 | added 1 changesets with 1 changes to 1 files | |
799 | do not push the key ! |
|
799 | do not push the key ! | |
800 | pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
800 | pushkey-abort: prepushkey.failpush hook exited with status 1 | |
801 | transaction abort! |
|
801 | transaction abort! | |
802 | Cleaning up the mess... |
|
802 | Cleaning up the mess... | |
803 | rollback completed |
|
803 | rollback completed | |
804 | abort: Correct phase push failed (because hooks) |
|
804 | abort: Correct phase push failed (because hooks) | |
805 | [255] |
|
805 | [255] | |
806 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
806 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
807 | pushing to ssh://user@dummy/other |
|
807 | pushing to ssh://user@dummy/other | |
808 | searching for changes |
|
808 | searching for changes | |
809 | remote: adding changesets |
|
809 | remote: adding changesets | |
810 | remote: adding manifests |
|
810 | remote: adding manifests | |
811 | remote: adding file changes |
|
811 | remote: adding file changes | |
812 | remote: added 1 changesets with 1 changes to 1 files |
|
812 | remote: added 1 changesets with 1 changes to 1 files | |
813 | remote: do not push the key ! |
|
813 | remote: do not push the key ! | |
814 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
814 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | |
815 | remote: transaction abort! |
|
815 | remote: transaction abort! | |
816 | remote: Cleaning up the mess... |
|
816 | remote: Cleaning up the mess... | |
817 | remote: rollback completed |
|
817 | remote: rollback completed | |
818 | abort: Correct phase push failed (because hooks) |
|
818 | abort: Correct phase push failed (because hooks) | |
819 | [255] |
|
819 | [255] | |
820 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
820 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
821 | pushing to http://localhost:$HGPORT2/ |
|
821 | pushing to http://localhost:$HGPORT2/ | |
822 | searching for changes |
|
822 | searching for changes | |
823 | remote: adding changesets |
|
823 | remote: adding changesets | |
824 | remote: adding manifests |
|
824 | remote: adding manifests | |
825 | remote: adding file changes |
|
825 | remote: adding file changes | |
826 | remote: added 1 changesets with 1 changes to 1 files |
|
826 | remote: added 1 changesets with 1 changes to 1 files | |
827 | remote: do not push the key ! |
|
827 | remote: do not push the key ! | |
828 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 |
|
828 | remote: pushkey-abort: prepushkey.failpush hook exited with status 1 | |
829 | remote: transaction abort! |
|
829 | remote: transaction abort! | |
830 | remote: Cleaning up the mess... |
|
830 | remote: Cleaning up the mess... | |
831 | remote: rollback completed |
|
831 | remote: rollback completed | |
832 | abort: Correct phase push failed (because hooks) |
|
832 | abort: Correct phase push failed (because hooks) | |
833 | [255] |
|
833 | [255] | |
834 |
|
834 | |||
835 | (Failure from a the pushkey) |
|
835 | (Failure from a the pushkey) | |
836 |
|
836 | |||
837 | $ cat > mandatorypart.py << EOF |
|
837 | $ cat > mandatorypart.py << EOF | |
838 | > from mercurial import exchange |
|
838 | > from mercurial import exchange | |
839 | > from mercurial import pushkey |
|
839 | > from mercurial import pushkey | |
840 | > from mercurial import node |
|
840 | > from mercurial import node | |
841 | > from mercurial import error |
|
841 | > from mercurial import error | |
842 | > @exchange.b2partsgenerator('failingpuskey') |
|
842 | > @exchange.b2partsgenerator('failingpuskey') | |
843 | > def addfailingpushey(pushop, bundler): |
|
843 | > def addfailingpushey(pushop, bundler): | |
844 | > enc = pushkey.encode |
|
844 | > enc = pushkey.encode | |
845 | > part = bundler.newpart('pushkey') |
|
845 | > part = bundler.newpart('pushkey') | |
846 | > part.addparam('namespace', enc('phases')) |
|
846 | > part.addparam('namespace', enc('phases')) | |
847 | > part.addparam('key', enc(pushop.repo['cd010b8cd998'].hex())) |
|
847 | > part.addparam('key', enc(pushop.repo['cd010b8cd998'].hex())) | |
848 | > part.addparam('old', enc(str(4))) # will fail |
|
848 | > part.addparam('old', enc(str(4))) # will fail | |
849 | > part.addparam('new', enc(str(3))) |
|
849 | > part.addparam('new', enc(str(3))) | |
850 | > def fail(pushop, exc): |
|
850 | > def fail(pushop, exc): | |
851 | > raise error.Abort('Clown phase push failed') |
|
851 | > raise error.Abort('Clown phase push failed') | |
852 | > pushop.pkfailcb[part.id] = fail |
|
852 | > pushop.pkfailcb[part.id] = fail | |
853 | > EOF |
|
853 | > EOF | |
854 | $ cat >> $HGRCPATH << EOF |
|
854 | $ cat >> $HGRCPATH << EOF | |
855 | > [hooks] |
|
855 | > [hooks] | |
856 | > prepushkey.failpush = |
|
856 | > prepushkey.failpush = | |
857 | > EOF |
|
857 | > EOF | |
858 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config |
|
858 | $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS # reload http config | |
859 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log |
|
859 | $ hg serve -R other -p $HGPORT2 -d --pid-file=other.pid -E other-error.log | |
860 | $ cat other.pid >> $DAEMON_PIDS |
|
860 | $ cat other.pid >> $DAEMON_PIDS | |
861 |
|
861 | |||
862 | $ hg -R main push other -r e7ec4e813ba6 |
|
862 | $ hg -R main push other -r e7ec4e813ba6 | |
863 | pushing to other |
|
863 | pushing to other | |
864 | searching for changes |
|
864 | searching for changes | |
865 | adding changesets |
|
865 | adding changesets | |
866 | adding manifests |
|
866 | adding manifests | |
867 | adding file changes |
|
867 | adding file changes | |
868 | added 1 changesets with 1 changes to 1 files |
|
868 | added 1 changesets with 1 changes to 1 files | |
869 | transaction abort! |
|
869 | transaction abort! | |
870 | Cleaning up the mess... |
|
870 | Cleaning up the mess... | |
871 | rollback completed |
|
871 | rollback completed | |
872 | pushkey: lock state after "phases" |
|
872 | pushkey: lock state after "phases" | |
873 | lock: free |
|
873 | lock: free | |
874 | wlock: free |
|
874 | wlock: free | |
875 | abort: Clown phase push failed |
|
875 | abort: Clown phase push failed | |
876 | [255] |
|
876 | [255] | |
877 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 |
|
877 | $ hg -R main push ssh://user@dummy/other -r e7ec4e813ba6 | |
878 | pushing to ssh://user@dummy/other |
|
878 | pushing to ssh://user@dummy/other | |
879 | searching for changes |
|
879 | searching for changes | |
880 | remote: adding changesets |
|
880 | remote: adding changesets | |
881 | remote: adding manifests |
|
881 | remote: adding manifests | |
882 | remote: adding file changes |
|
882 | remote: adding file changes | |
883 | remote: added 1 changesets with 1 changes to 1 files |
|
883 | remote: added 1 changesets with 1 changes to 1 files | |
884 | remote: transaction abort! |
|
884 | remote: transaction abort! | |
885 | remote: Cleaning up the mess... |
|
885 | remote: Cleaning up the mess... | |
886 | remote: rollback completed |
|
886 | remote: rollback completed | |
887 | remote: pushkey: lock state after "phases" |
|
887 | remote: pushkey: lock state after "phases" | |
888 | remote: lock: free |
|
888 | remote: lock: free | |
889 | remote: wlock: free |
|
889 | remote: wlock: free | |
890 | abort: Clown phase push failed |
|
890 | abort: Clown phase push failed | |
891 | [255] |
|
891 | [255] | |
892 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 |
|
892 | $ hg -R main push http://localhost:$HGPORT2/ -r e7ec4e813ba6 | |
893 | pushing to http://localhost:$HGPORT2/ |
|
893 | pushing to http://localhost:$HGPORT2/ | |
894 | searching for changes |
|
894 | searching for changes | |
895 | remote: adding changesets |
|
895 | remote: adding changesets | |
896 | remote: adding manifests |
|
896 | remote: adding manifests | |
897 | remote: adding file changes |
|
897 | remote: adding file changes | |
898 | remote: added 1 changesets with 1 changes to 1 files |
|
898 | remote: added 1 changesets with 1 changes to 1 files | |
899 | remote: transaction abort! |
|
899 | remote: transaction abort! | |
900 | remote: Cleaning up the mess... |
|
900 | remote: Cleaning up the mess... | |
901 | remote: rollback completed |
|
901 | remote: rollback completed | |
902 | remote: pushkey: lock state after "phases" |
|
902 | remote: pushkey: lock state after "phases" | |
903 | remote: lock: free |
|
903 | remote: lock: free | |
904 | remote: wlock: free |
|
904 | remote: wlock: free | |
905 | abort: Clown phase push failed |
|
905 | abort: Clown phase push failed | |
906 | [255] |
|
906 | [255] | |
907 |
|
907 | |||
908 | Test lazily acquiring the lock during unbundle |
|
908 | Test lazily acquiring the lock during unbundle | |
909 | $ cp $TESTTMP/hgrc.orig $HGRCPATH |
|
909 | $ cp $TESTTMP/hgrc.orig $HGRCPATH | |
910 | $ cat >> $HGRCPATH <<EOF |
|
910 | $ cat >> $HGRCPATH <<EOF | |
911 | > [ui] |
|
911 | > [ui] | |
912 | > ssh=python "$TESTDIR/dummyssh" |
|
912 | > ssh=python "$TESTDIR/dummyssh" | |
913 | > EOF |
|
913 | > EOF | |
914 |
|
914 | |||
915 | $ cat >> $TESTTMP/locktester.py <<EOF |
|
915 | $ cat >> $TESTTMP/locktester.py <<EOF | |
916 | > import os |
|
916 | > import os | |
917 | > from mercurial import extensions, bundle2, util |
|
917 | > from mercurial import extensions, bundle2, util | |
918 | > def checklock(orig, repo, *args, **kwargs): |
|
918 | > def checklock(orig, repo, *args, **kwargs): | |
919 | > if repo.svfs.lexists("lock"): |
|
919 | > if repo.svfs.lexists("lock"): | |
920 | > raise util.Abort("Lock should not be taken") |
|
920 | > raise util.Abort("Lock should not be taken") | |
921 | > return orig(repo, *args, **kwargs) |
|
921 | > return orig(repo, *args, **kwargs) | |
922 | > def extsetup(ui): |
|
922 | > def extsetup(ui): | |
923 | > extensions.wrapfunction(bundle2, 'processbundle', checklock) |
|
923 | > extensions.wrapfunction(bundle2, 'processbundle', checklock) | |
924 | > EOF |
|
924 | > EOF | |
925 |
|
925 | |||
926 | $ hg init lazylock |
|
926 | $ hg init lazylock | |
927 | $ cat >> lazylock/.hg/hgrc <<EOF |
|
927 | $ cat >> lazylock/.hg/hgrc <<EOF | |
928 | > [extensions] |
|
928 | > [extensions] | |
929 | > locktester=$TESTTMP/locktester.py |
|
929 | > locktester=$TESTTMP/locktester.py | |
930 | > EOF |
|
930 | > EOF | |
931 |
|
931 | |||
932 | $ hg clone -q ssh://user@dummy/lazylock lazylockclient |
|
932 | $ hg clone -q ssh://user@dummy/lazylock lazylockclient | |
933 | $ cd lazylockclient |
|
933 | $ cd lazylockclient | |
934 | $ touch a && hg ci -Aqm a |
|
934 | $ touch a && hg ci -Aqm a | |
935 | $ hg push |
|
935 | $ hg push | |
936 | pushing to ssh://user@dummy/lazylock |
|
936 | pushing to ssh://user@dummy/lazylock | |
937 | searching for changes |
|
937 | searching for changes | |
938 | remote: Lock should not be taken |
|
938 | remote: Lock should not be taken | |
939 | abort: push failed on remote |
|
939 | abort: push failed on remote | |
940 | [255] |
|
940 | [255] | |
941 |
|
941 | |||
942 | $ cat >> ../lazylock/.hg/hgrc <<EOF |
|
942 | $ cat >> ../lazylock/.hg/hgrc <<EOF | |
943 | > [experimental] |
|
943 | > [experimental] | |
944 | > bundle2lazylocking=True |
|
944 | > bundle2lazylocking=True | |
945 | > EOF |
|
945 | > EOF | |
946 | $ hg push |
|
946 | $ hg push | |
947 | pushing to ssh://user@dummy/lazylock |
|
947 | pushing to ssh://user@dummy/lazylock | |
948 | searching for changes |
|
948 | searching for changes | |
949 | remote: adding changesets |
|
949 | remote: adding changesets | |
950 | remote: adding manifests |
|
950 | remote: adding manifests | |
951 | remote: adding file changes |
|
951 | remote: adding file changes | |
952 | remote: added 1 changesets with 1 changes to 1 files |
|
952 | remote: added 1 changesets with 1 changes to 1 files | |
953 |
|
953 | |||
954 | $ cd .. |
|
954 | $ cd .. | |
955 |
|
955 | |||
956 | Servers can disable bundle1 for clone/pull operations |
|
956 | Servers can disable bundle1 for clone/pull operations | |
957 |
|
957 | |||
958 | $ killdaemons.py |
|
958 | $ killdaemons.py | |
959 | $ hg init bundle2onlyserver |
|
959 | $ hg init bundle2onlyserver | |
960 | $ cd bundle2onlyserver |
|
960 | $ cd bundle2onlyserver | |
961 | $ cat > .hg/hgrc << EOF |
|
961 | $ cat > .hg/hgrc << EOF | |
962 | > [server] |
|
962 | > [server] | |
963 | > bundle1.pull = false |
|
963 | > bundle1.pull = false | |
964 | > EOF |
|
964 | > EOF | |
965 |
|
965 | |||
966 | $ touch foo |
|
966 | $ touch foo | |
967 | $ hg -q commit -A -m initial |
|
967 | $ hg -q commit -A -m initial | |
968 |
|
968 | |||
969 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
969 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
970 | $ cat hg.pid >> $DAEMON_PIDS |
|
970 | $ cat hg.pid >> $DAEMON_PIDS | |
971 |
|
971 | |||
972 |
$ hg --config |
|
972 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | |
973 | requesting all changes |
|
973 | requesting all changes | |
974 | abort: remote error: |
|
974 | abort: remote error: | |
975 | incompatible Mercurial client; bundle2 required |
|
975 | incompatible Mercurial client; bundle2 required | |
976 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
976 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |
977 | [255] |
|
977 | [255] | |
978 | $ killdaemons.py |
|
978 | $ killdaemons.py | |
979 | $ cd .. |
|
979 | $ cd .. | |
980 |
|
980 | |||
981 | bundle1 can still pull non-generaldelta repos when generaldelta bundle1 disabled |
|
981 | bundle1 can still pull non-generaldelta repos when generaldelta bundle1 disabled | |
982 |
|
982 | |||
983 | $ hg --config format.usegeneraldelta=false init notgdserver |
|
983 | $ hg --config format.usegeneraldelta=false init notgdserver | |
984 | $ cd notgdserver |
|
984 | $ cd notgdserver | |
985 | $ cat > .hg/hgrc << EOF |
|
985 | $ cat > .hg/hgrc << EOF | |
986 | > [server] |
|
986 | > [server] | |
987 | > bundle1gd.pull = false |
|
987 | > bundle1gd.pull = false | |
988 | > EOF |
|
988 | > EOF | |
989 |
|
989 | |||
990 | $ touch foo |
|
990 | $ touch foo | |
991 | $ hg -q commit -A -m initial |
|
991 | $ hg -q commit -A -m initial | |
992 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
992 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
993 | $ cat hg.pid >> $DAEMON_PIDS |
|
993 | $ cat hg.pid >> $DAEMON_PIDS | |
994 |
|
994 | |||
995 |
$ hg --config |
|
995 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-1 | |
996 | requesting all changes |
|
996 | requesting all changes | |
997 | adding changesets |
|
997 | adding changesets | |
998 | adding manifests |
|
998 | adding manifests | |
999 | adding file changes |
|
999 | adding file changes | |
1000 | added 1 changesets with 1 changes to 1 files |
|
1000 | added 1 changesets with 1 changes to 1 files | |
1001 | updating to branch default |
|
1001 | updating to branch default | |
1002 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1002 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1003 |
|
1003 | |||
1004 | $ killdaemons.py |
|
1004 | $ killdaemons.py | |
1005 | $ cd ../bundle2onlyserver |
|
1005 | $ cd ../bundle2onlyserver | |
1006 |
|
1006 | |||
1007 | bundle1 pull can be disabled for generaldelta repos only |
|
1007 | bundle1 pull can be disabled for generaldelta repos only | |
1008 |
|
1008 | |||
1009 | $ cat > .hg/hgrc << EOF |
|
1009 | $ cat > .hg/hgrc << EOF | |
1010 | > [server] |
|
1010 | > [server] | |
1011 | > bundle1gd.pull = false |
|
1011 | > bundle1gd.pull = false | |
1012 | > EOF |
|
1012 | > EOF | |
1013 |
|
1013 | |||
1014 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
1014 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
1015 | $ cat hg.pid >> $DAEMON_PIDS |
|
1015 | $ cat hg.pid >> $DAEMON_PIDS | |
1016 |
$ hg --config |
|
1016 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | |
1017 | requesting all changes |
|
1017 | requesting all changes | |
1018 | abort: remote error: |
|
1018 | abort: remote error: | |
1019 | incompatible Mercurial client; bundle2 required |
|
1019 | incompatible Mercurial client; bundle2 required | |
1020 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
1020 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |
1021 | [255] |
|
1021 | [255] | |
1022 |
|
1022 | |||
1023 | $ killdaemons.py |
|
1023 | $ killdaemons.py | |
1024 |
|
1024 | |||
1025 | Verify the global server.bundle1 option works |
|
1025 | Verify the global server.bundle1 option works | |
1026 |
|
1026 | |||
1027 | $ cat > .hg/hgrc << EOF |
|
1027 | $ cat > .hg/hgrc << EOF | |
1028 | > [server] |
|
1028 | > [server] | |
1029 | > bundle1 = false |
|
1029 | > bundle1 = false | |
1030 | > EOF |
|
1030 | > EOF | |
1031 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
1031 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
1032 | $ cat hg.pid >> $DAEMON_PIDS |
|
1032 | $ cat hg.pid >> $DAEMON_PIDS | |
1033 |
$ hg --config |
|
1033 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT not-bundle2 | |
1034 | requesting all changes |
|
1034 | requesting all changes | |
1035 | abort: remote error: |
|
1035 | abort: remote error: | |
1036 | incompatible Mercurial client; bundle2 required |
|
1036 | incompatible Mercurial client; bundle2 required | |
1037 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
1037 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |
1038 | [255] |
|
1038 | [255] | |
1039 | $ killdaemons.py |
|
1039 | $ killdaemons.py | |
1040 |
|
1040 | |||
1041 | $ cat > .hg/hgrc << EOF |
|
1041 | $ cat > .hg/hgrc << EOF | |
1042 | > [server] |
|
1042 | > [server] | |
1043 | > bundle1gd = false |
|
1043 | > bundle1gd = false | |
1044 | > EOF |
|
1044 | > EOF | |
1045 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
1045 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
1046 | $ cat hg.pid >> $DAEMON_PIDS |
|
1046 | $ cat hg.pid >> $DAEMON_PIDS | |
1047 |
|
1047 | |||
1048 |
$ hg --config |
|
1048 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2 | |
1049 | requesting all changes |
|
1049 | requesting all changes | |
1050 | abort: remote error: |
|
1050 | abort: remote error: | |
1051 | incompatible Mercurial client; bundle2 required |
|
1051 | incompatible Mercurial client; bundle2 required | |
1052 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
1052 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |
1053 | [255] |
|
1053 | [255] | |
1054 |
|
1054 | |||
1055 | $ killdaemons.py |
|
1055 | $ killdaemons.py | |
1056 |
|
1056 | |||
1057 | $ cd ../notgdserver |
|
1057 | $ cd ../notgdserver | |
1058 | $ cat > .hg/hgrc << EOF |
|
1058 | $ cat > .hg/hgrc << EOF | |
1059 | > [server] |
|
1059 | > [server] | |
1060 | > bundle1gd = false |
|
1060 | > bundle1gd = false | |
1061 | > EOF |
|
1061 | > EOF | |
1062 | $ hg serve -p $HGPORT -d --pid-file=hg.pid |
|
1062 | $ hg serve -p $HGPORT -d --pid-file=hg.pid | |
1063 | $ cat hg.pid >> $DAEMON_PIDS |
|
1063 | $ cat hg.pid >> $DAEMON_PIDS | |
1064 |
|
1064 | |||
1065 |
$ hg --config |
|
1065 | $ hg --config devel.legacy.exchange=bundle1 clone http://localhost:$HGPORT/ not-bundle2-2 | |
1066 | requesting all changes |
|
1066 | requesting all changes | |
1067 | adding changesets |
|
1067 | adding changesets | |
1068 | adding manifests |
|
1068 | adding manifests | |
1069 | adding file changes |
|
1069 | adding file changes | |
1070 | added 1 changesets with 1 changes to 1 files |
|
1070 | added 1 changesets with 1 changes to 1 files | |
1071 | updating to branch default |
|
1071 | updating to branch default | |
1072 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1072 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1073 |
|
1073 | |||
1074 | $ killdaemons.py |
|
1074 | $ killdaemons.py | |
1075 | $ cd ../bundle2onlyserver |
|
1075 | $ cd ../bundle2onlyserver | |
1076 |
|
1076 | |||
1077 | Verify bundle1 pushes can be disabled |
|
1077 | Verify bundle1 pushes can be disabled | |
1078 |
|
1078 | |||
1079 | $ cat > .hg/hgrc << EOF |
|
1079 | $ cat > .hg/hgrc << EOF | |
1080 | > [server] |
|
1080 | > [server] | |
1081 | > bundle1.push = false |
|
1081 | > bundle1.push = false | |
1082 | > [web] |
|
1082 | > [web] | |
1083 | > allow_push = * |
|
1083 | > allow_push = * | |
1084 | > push_ssl = false |
|
1084 | > push_ssl = false | |
1085 | > EOF |
|
1085 | > EOF | |
1086 |
|
1086 | |||
1087 | $ hg serve -p $HGPORT -d --pid-file=hg.pid -E error.log |
|
1087 | $ hg serve -p $HGPORT -d --pid-file=hg.pid -E error.log | |
1088 | $ cat hg.pid >> $DAEMON_PIDS |
|
1088 | $ cat hg.pid >> $DAEMON_PIDS | |
1089 | $ cd .. |
|
1089 | $ cd .. | |
1090 |
|
1090 | |||
1091 | $ hg clone http://localhost:$HGPORT bundle2-only |
|
1091 | $ hg clone http://localhost:$HGPORT bundle2-only | |
1092 | requesting all changes |
|
1092 | requesting all changes | |
1093 | adding changesets |
|
1093 | adding changesets | |
1094 | adding manifests |
|
1094 | adding manifests | |
1095 | adding file changes |
|
1095 | adding file changes | |
1096 | added 1 changesets with 1 changes to 1 files |
|
1096 | added 1 changesets with 1 changes to 1 files | |
1097 | updating to branch default |
|
1097 | updating to branch default | |
1098 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1098 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1099 | $ cd bundle2-only |
|
1099 | $ cd bundle2-only | |
1100 | $ echo commit > foo |
|
1100 | $ echo commit > foo | |
1101 | $ hg commit -m commit |
|
1101 | $ hg commit -m commit | |
1102 | $ hg --config experimental.bundle2-exp=false push |
|
1102 | $ hg --config devel.legacy.exchange=bundle1 push | |
1103 | pushing to http://localhost:$HGPORT/ |
|
1103 | pushing to http://localhost:$HGPORT/ | |
1104 | searching for changes |
|
1104 | searching for changes | |
1105 | abort: remote error: |
|
1105 | abort: remote error: | |
1106 | incompatible Mercurial client; bundle2 required |
|
1106 | incompatible Mercurial client; bundle2 required | |
1107 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) |
|
1107 | (see https://www.mercurial-scm.org/wiki/IncompatibleClient) | |
1108 | [255] |
|
1108 | [255] | |
1109 |
|
1109 | |||
1110 | $ hg push |
|
1110 | $ hg push | |
1111 | pushing to http://localhost:$HGPORT/ |
|
1111 | pushing to http://localhost:$HGPORT/ | |
1112 | searching for changes |
|
1112 | searching for changes | |
1113 | remote: adding changesets |
|
1113 | remote: adding changesets | |
1114 | remote: adding manifests |
|
1114 | remote: adding manifests | |
1115 | remote: adding file changes |
|
1115 | remote: adding file changes | |
1116 | remote: added 1 changesets with 1 changes to 1 files |
|
1116 | remote: added 1 changesets with 1 changes to 1 files |
General Comments 0
You need to be logged in to leave comments.
Login now