Show More
@@ -1,384 +1,443 b'' | |||||
1 | #require no-reposimplestore |
|
1 | #require no-reposimplestore | |
2 |
|
2 | |||
3 | Testing the case when there is no infinitepush extension present on the client |
|
3 | Testing the case when there is no infinitepush extension present on the client | |
4 | side and the server routes each push to bundlestore. This case is very much |
|
4 | side and the server routes each push to bundlestore. This case is very much | |
5 | similar to CI use case. |
|
5 | similar to CI use case. | |
6 |
|
6 | |||
7 | Setup |
|
7 | Setup | |
8 | ----- |
|
8 | ----- | |
9 |
|
9 | |||
10 | $ . "$TESTDIR/library-infinitepush.sh" |
|
10 | $ . "$TESTDIR/library-infinitepush.sh" | |
11 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
|
12 | > [ui] | |||
|
13 | > ssh = python "$TESTDIR/dummyssh" | |||
12 | > [alias] |
|
14 | > [alias] | |
13 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" |
|
15 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" | |
14 | > EOF |
|
16 | > EOF | |
15 | $ cp $HGRCPATH $TESTTMP/defaulthgrc |
|
17 | $ cp $HGRCPATH $TESTTMP/defaulthgrc | |
16 | $ hg init repo |
|
18 | $ hg init repo | |
17 | $ cd repo |
|
19 | $ cd repo | |
18 | $ setupserver |
|
20 | $ setupserver | |
19 | $ echo "pushtobundlestore = True" >> .hg/hgrc |
|
21 | $ echo "pushtobundlestore = True" >> .hg/hgrc | |
20 | $ echo "[extensions]" >> .hg/hgrc |
|
22 | $ echo "[extensions]" >> .hg/hgrc | |
21 | $ echo "infinitepush=" >> .hg/hgrc |
|
23 | $ echo "infinitepush=" >> .hg/hgrc | |
22 | $ echo initialcommit > initialcommit |
|
24 | $ echo initialcommit > initialcommit | |
23 | $ hg ci -Aqm "initialcommit" |
|
25 | $ hg ci -Aqm "initialcommit" | |
24 | $ hg phase --public . |
|
26 | $ hg phase --public . | |
25 |
|
27 | |||
26 | $ cd .. |
|
28 | $ cd .. | |
27 | $ hg clone repo client -q |
|
29 | $ hg clone repo client -q | |
28 | $ hg clone repo client2 -q |
|
30 | $ hg clone repo client2 -q | |
|
31 | $ hg clone ssh://user@dummy/repo client3 -q | |||
29 | $ cd client |
|
32 | $ cd client | |
30 |
|
33 | |||
31 | Pushing a new commit from the client to the server |
|
34 | Pushing a new commit from the client to the server | |
32 | ----------------------------------------------------- |
|
35 | ----------------------------------------------------- | |
33 |
|
36 | |||
34 | $ echo foobar > a |
|
37 | $ echo foobar > a | |
35 | $ hg ci -Aqm "added a" |
|
38 | $ hg ci -Aqm "added a" | |
36 | $ hg glog |
|
39 | $ hg glog | |
37 | @ 1:6cb0989601f1 added a |
|
40 | @ 1:6cb0989601f1 added a | |
38 | | draft |
|
41 | | draft | |
39 | o 0:67145f466344 initialcommit |
|
42 | o 0:67145f466344 initialcommit | |
40 | public |
|
43 | public | |
41 |
|
44 | |||
42 | $ hg push |
|
45 | $ hg push | |
43 | pushing to $TESTTMP/repo |
|
46 | pushing to $TESTTMP/repo | |
44 | searching for changes |
|
47 | searching for changes | |
45 | storing changesets on the bundlestore |
|
48 | storing changesets on the bundlestore | |
46 | pushing 1 commit: |
|
49 | pushing 1 commit: | |
47 | 6cb0989601f1 added a |
|
50 | 6cb0989601f1 added a | |
48 |
|
51 | |||
49 | $ scratchnodes |
|
52 | $ scratchnodes | |
50 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
53 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
51 |
|
54 | |||
52 | Understanding how data is stored on the bundlestore in server |
|
55 | Understanding how data is stored on the bundlestore in server | |
53 | ------------------------------------------------------------- |
|
56 | ------------------------------------------------------------- | |
54 |
|
57 | |||
55 | There are two things, filebundlestore and index |
|
58 | There are two things, filebundlestore and index | |
56 | $ ls ../repo/.hg/scratchbranches |
|
59 | $ ls ../repo/.hg/scratchbranches | |
57 | filebundlestore |
|
60 | filebundlestore | |
58 | index |
|
61 | index | |
59 |
|
62 | |||
60 | filebundlestore stores the bundles |
|
63 | filebundlestore stores the bundles | |
61 | $ ls ../repo/.hg/scratchbranches/filebundlestore/a4/c2/ |
|
64 | $ ls ../repo/.hg/scratchbranches/filebundlestore/a4/c2/ | |
62 | a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
65 | a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
63 |
|
66 | |||
64 | index/nodemap stores a map of node id and file in which bundle is stored in filebundlestore |
|
67 | index/nodemap stores a map of node id and file in which bundle is stored in filebundlestore | |
65 | $ ls ../repo/.hg/scratchbranches/index/ |
|
68 | $ ls ../repo/.hg/scratchbranches/index/ | |
66 | nodemap |
|
69 | nodemap | |
67 | $ ls ../repo/.hg/scratchbranches/index/nodemap/ |
|
70 | $ ls ../repo/.hg/scratchbranches/index/nodemap/ | |
68 | 6cb0989601f1fb5805238edfb16f3606713d9a0b |
|
71 | 6cb0989601f1fb5805238edfb16f3606713d9a0b | |
69 |
|
72 | |||
70 | $ cd ../repo |
|
73 | $ cd ../repo | |
71 |
|
74 | |||
72 | Checking that the commit was not applied to revlog on the server |
|
75 | Checking that the commit was not applied to revlog on the server | |
73 | ------------------------------------------------------------------ |
|
76 | ------------------------------------------------------------------ | |
74 |
|
77 | |||
75 | $ hg glog |
|
78 | $ hg glog | |
76 | @ 0:67145f466344 initialcommit |
|
79 | @ 0:67145f466344 initialcommit | |
77 | public |
|
80 | public | |
78 |
|
81 | |||
79 | Applying the changeset from the bundlestore |
|
82 | Applying the changeset from the bundlestore | |
80 | -------------------------------------------- |
|
83 | -------------------------------------------- | |
81 |
|
84 | |||
82 | $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
85 | $ hg unbundle .hg/scratchbranches/filebundlestore/a4/c2/a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
83 | adding changesets |
|
86 | adding changesets | |
84 | adding manifests |
|
87 | adding manifests | |
85 | adding file changes |
|
88 | adding file changes | |
86 | added 1 changesets with 1 changes to 1 files |
|
89 | added 1 changesets with 1 changes to 1 files | |
87 | new changesets 6cb0989601f1 |
|
90 | new changesets 6cb0989601f1 | |
88 | (run 'hg update' to get a working copy) |
|
91 | (run 'hg update' to get a working copy) | |
89 |
|
92 | |||
90 | $ hg glog |
|
93 | $ hg glog | |
91 | o 1:6cb0989601f1 added a |
|
94 | o 1:6cb0989601f1 added a | |
92 | | public |
|
95 | | public | |
93 | @ 0:67145f466344 initialcommit |
|
96 | @ 0:67145f466344 initialcommit | |
94 | public |
|
97 | public | |
95 |
|
98 | |||
96 | Pushing more changesets from the local repo |
|
99 | Pushing more changesets from the local repo | |
97 | -------------------------------------------- |
|
100 | -------------------------------------------- | |
98 |
|
101 | |||
99 | $ cd ../client |
|
102 | $ cd ../client | |
100 | $ echo b > b |
|
103 | $ echo b > b | |
101 | $ hg ci -Aqm "added b" |
|
104 | $ hg ci -Aqm "added b" | |
102 | $ echo c > c |
|
105 | $ echo c > c | |
103 | $ hg ci -Aqm "added c" |
|
106 | $ hg ci -Aqm "added c" | |
104 | $ hg glog |
|
107 | $ hg glog | |
105 | @ 3:bf8a6e3011b3 added c |
|
108 | @ 3:bf8a6e3011b3 added c | |
106 | | draft |
|
109 | | draft | |
107 | o 2:eaba929e866c added b |
|
110 | o 2:eaba929e866c added b | |
108 | | draft |
|
111 | | draft | |
109 | o 1:6cb0989601f1 added a |
|
112 | o 1:6cb0989601f1 added a | |
110 | | public |
|
113 | | public | |
111 | o 0:67145f466344 initialcommit |
|
114 | o 0:67145f466344 initialcommit | |
112 | public |
|
115 | public | |
113 |
|
116 | |||
114 | $ hg push |
|
117 | $ hg push | |
115 | pushing to $TESTTMP/repo |
|
118 | pushing to $TESTTMP/repo | |
116 | searching for changes |
|
119 | searching for changes | |
117 | storing changesets on the bundlestore |
|
120 | storing changesets on the bundlestore | |
118 | pushing 2 commits: |
|
121 | pushing 2 commits: | |
119 | eaba929e866c added b |
|
122 | eaba929e866c added b | |
120 | bf8a6e3011b3 added c |
|
123 | bf8a6e3011b3 added c | |
121 |
|
124 | |||
122 | Checking that changesets are not applied on the server |
|
125 | Checking that changesets are not applied on the server | |
123 | ------------------------------------------------------ |
|
126 | ------------------------------------------------------ | |
124 |
|
127 | |||
125 | $ hg glog -R ../repo |
|
128 | $ hg glog -R ../repo | |
126 | o 1:6cb0989601f1 added a |
|
129 | o 1:6cb0989601f1 added a | |
127 | | public |
|
130 | | public | |
128 | @ 0:67145f466344 initialcommit |
|
131 | @ 0:67145f466344 initialcommit | |
129 | public |
|
132 | public | |
130 |
|
133 | |||
131 | Both of the new changesets are stored in a single bundle-file |
|
134 | Both of the new changesets are stored in a single bundle-file | |
132 | $ scratchnodes |
|
135 | $ scratchnodes | |
133 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
136 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
134 | bf8a6e3011b345146bbbedbcb1ebd4837571492a ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f |
|
137 | bf8a6e3011b345146bbbedbcb1ebd4837571492a ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f | |
135 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f |
|
138 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 ee41a41cefb7817cbfb235b4f6e9f27dbad6ca1f | |
136 |
|
139 | |||
137 | Pushing more changesets to the server |
|
140 | Pushing more changesets to the server | |
138 | ------------------------------------- |
|
141 | ------------------------------------- | |
139 |
|
142 | |||
140 | $ echo d > d |
|
143 | $ echo d > d | |
141 | $ hg ci -Aqm "added d" |
|
144 | $ hg ci -Aqm "added d" | |
142 | $ echo e > e |
|
145 | $ echo e > e | |
143 | $ hg ci -Aqm "added e" |
|
146 | $ hg ci -Aqm "added e" | |
144 |
|
147 | |||
145 | XXX: we should have pushed only the parts which are not in bundlestore |
|
148 | XXX: we should have pushed only the parts which are not in bundlestore | |
146 | $ hg push |
|
149 | $ hg push | |
147 | pushing to $TESTTMP/repo |
|
150 | pushing to $TESTTMP/repo | |
148 | searching for changes |
|
151 | searching for changes | |
149 | storing changesets on the bundlestore |
|
152 | storing changesets on the bundlestore | |
150 | pushing 4 commits: |
|
153 | pushing 4 commits: | |
151 | eaba929e866c added b |
|
154 | eaba929e866c added b | |
152 | bf8a6e3011b3 added c |
|
155 | bf8a6e3011b3 added c | |
153 | 1bb96358eda2 added d |
|
156 | 1bb96358eda2 added d | |
154 | b4e4bce66051 added e |
|
157 | b4e4bce66051 added e | |
155 |
|
158 | |||
156 | Sneak peek into the bundlestore at the server |
|
159 | Sneak peek into the bundlestore at the server | |
157 | $ scratchnodes |
|
160 | $ scratchnodes | |
158 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 |
|
161 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 | |
159 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
162 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
160 | b4e4bce660512ad3e71189e14588a70ac8e31fef 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 |
|
163 | b4e4bce660512ad3e71189e14588a70ac8e31fef 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 | |
161 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 |
|
164 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 | |
162 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 |
|
165 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 57e00c0d4f26e2a2a72b751b63d9abc4f3eb28e7 | |
163 |
|
166 | |||
164 | Checking if `hg pull` pulls something or `hg incoming` shows something |
|
167 | Checking if `hg pull` pulls something or `hg incoming` shows something | |
165 | ----------------------------------------------------------------------- |
|
168 | ----------------------------------------------------------------------- | |
166 |
|
169 | |||
167 | $ hg incoming |
|
170 | $ hg incoming | |
168 | comparing with $TESTTMP/repo |
|
171 | comparing with $TESTTMP/repo | |
169 | searching for changes |
|
172 | searching for changes | |
170 | no changes found |
|
173 | no changes found | |
171 | [1] |
|
174 | [1] | |
172 |
|
175 | |||
173 | $ hg pull |
|
176 | $ hg pull | |
174 | pulling from $TESTTMP/repo |
|
177 | pulling from $TESTTMP/repo | |
175 | searching for changes |
|
178 | searching for changes | |
176 | no changes found |
|
179 | no changes found | |
177 |
|
180 | |||
178 | Pulling from second client to test `hg pull -r <rev>` |
|
181 | Pulling from second client which is a localpeer to test `hg pull -r <rev>` | |
179 | ------------------------------------------------------ |
|
182 | -------------------------------------------------------------------------- | |
180 |
|
183 | |||
181 | Pulling the revision which is applied |
|
184 | Pulling the revision which is applied | |
182 |
|
185 | |||
183 | $ cd ../client2 |
|
186 | $ cd ../client2 | |
184 | $ hg pull -r 6cb0989601f1 |
|
187 | $ hg pull -r 6cb0989601f1 | |
185 | pulling from $TESTTMP/repo |
|
188 | pulling from $TESTTMP/repo | |
186 | searching for changes |
|
189 | searching for changes | |
187 | adding changesets |
|
190 | adding changesets | |
188 | adding manifests |
|
191 | adding manifests | |
189 | adding file changes |
|
192 | adding file changes | |
190 | added 1 changesets with 1 changes to 1 files |
|
193 | added 1 changesets with 1 changes to 1 files | |
191 | new changesets 6cb0989601f1 |
|
194 | new changesets 6cb0989601f1 | |
192 | (run 'hg update' to get a working copy) |
|
195 | (run 'hg update' to get a working copy) | |
193 | $ hg glog |
|
196 | $ hg glog | |
194 | o 1:6cb0989601f1 added a |
|
197 | o 1:6cb0989601f1 added a | |
195 | | public |
|
198 | | public | |
196 | @ 0:67145f466344 initialcommit |
|
199 | @ 0:67145f466344 initialcommit | |
197 | public |
|
200 | public | |
198 |
|
201 | |||
199 | Pulling the revision which is in bundlestore |
|
202 | Pulling the revision which is in bundlestore | |
200 |
XXX: we should support pulling revisions from bundlestore without |
|
203 | XXX: we should support pulling revisions from a local peers bundlestore without | |
201 | wrapping |
|
204 | client side wrapping | |
202 |
|
205 | |||
203 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef |
|
206 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |
204 | pulling from $TESTTMP/repo |
|
207 | pulling from $TESTTMP/repo | |
205 | abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef'! |
|
208 | abort: unknown revision 'b4e4bce660512ad3e71189e14588a70ac8e31fef'! | |
206 | [255] |
|
209 | [255] | |
207 | $ hg glog |
|
210 | $ hg glog | |
208 | o 1:6cb0989601f1 added a |
|
211 | o 1:6cb0989601f1 added a | |
209 | | public |
|
212 | | public | |
210 | @ 0:67145f466344 initialcommit |
|
213 | @ 0:67145f466344 initialcommit | |
211 | public |
|
214 | public | |
212 |
|
215 | |||
213 | $ cd ../client |
|
216 | $ cd ../client | |
214 |
|
217 | |||
|
218 | Pulling from third client which is not a localpeer | |||
|
219 | --------------------------------------------------- | |||
|
220 | ||||
|
221 | Pulling the revision which is applied | |||
|
222 | ||||
|
223 | $ cd ../client3 | |||
|
224 | $ hg pull -r 6cb0989601f1 | |||
|
225 | pulling from ssh://user@dummy/repo | |||
|
226 | searching for changes | |||
|
227 | adding changesets | |||
|
228 | adding manifests | |||
|
229 | adding file changes | |||
|
230 | added 1 changesets with 1 changes to 1 files | |||
|
231 | new changesets 6cb0989601f1 | |||
|
232 | (run 'hg update' to get a working copy) | |||
|
233 | $ hg glog | |||
|
234 | o 1:6cb0989601f1 added a | |||
|
235 | | public | |||
|
236 | @ 0:67145f466344 initialcommit | |||
|
237 | public | |||
|
238 | ||||
|
239 | Pulling the revision which is in bundlestore | |||
|
240 | ||||
|
241 | Trying to specify short hash | |||
|
242 | XXX: we should support this | |||
|
243 | $ hg pull -r b4e4bce660512 | |||
|
244 | pulling from ssh://user@dummy/repo | |||
|
245 | abort: unknown revision 'b4e4bce660512'! | |||
|
246 | [255] | |||
|
247 | ||||
|
248 | XXX: we should show better message when the pull is happening from bundlestore | |||
|
249 | $ hg pull -r b4e4bce660512ad3e71189e14588a70ac8e31fef | |||
|
250 | pulling from ssh://user@dummy/repo | |||
|
251 | searching for changes | |||
|
252 | no changes found | |||
|
253 | adding changesets | |||
|
254 | adding manifests | |||
|
255 | adding file changes | |||
|
256 | added 4 changesets with 4 changes to 4 files | |||
|
257 | new changesets eaba929e866c:b4e4bce66051 | |||
|
258 | $ hg glog | |||
|
259 | o 5:b4e4bce66051 added e | |||
|
260 | | public | |||
|
261 | o 4:1bb96358eda2 added d | |||
|
262 | | public | |||
|
263 | o 3:bf8a6e3011b3 added c | |||
|
264 | | public | |||
|
265 | o 2:eaba929e866c added b | |||
|
266 | | public | |||
|
267 | o 1:6cb0989601f1 added a | |||
|
268 | | public | |||
|
269 | @ 0:67145f466344 initialcommit | |||
|
270 | public | |||
|
271 | ||||
|
272 | $ cd ../client | |||
|
273 | ||||
215 | Checking storage of phase information with the bundle on bundlestore |
|
274 | Checking storage of phase information with the bundle on bundlestore | |
216 | --------------------------------------------------------------------- |
|
275 | --------------------------------------------------------------------- | |
217 |
|
276 | |||
218 | creating a draft commit |
|
277 | creating a draft commit | |
219 | $ cat >> $HGRCPATH <<EOF |
|
278 | $ cat >> $HGRCPATH <<EOF | |
220 | > [phases] |
|
279 | > [phases] | |
221 | > publish = False |
|
280 | > publish = False | |
222 | > EOF |
|
281 | > EOF | |
223 | $ echo f > f |
|
282 | $ echo f > f | |
224 | $ hg ci -Aqm "added f" |
|
283 | $ hg ci -Aqm "added f" | |
225 | $ hg glog -r '.^::' |
|
284 | $ hg glog -r '.^::' | |
226 | @ 6:9b42578d4447 added f |
|
285 | @ 6:9b42578d4447 added f | |
227 | | draft |
|
286 | | draft | |
228 | o 5:b4e4bce66051 added e |
|
287 | o 5:b4e4bce66051 added e | |
229 | | public |
|
288 | | public | |
230 | ~ |
|
289 | ~ | |
231 |
|
290 | |||
232 | $ hg push |
|
291 | $ hg push | |
233 | pushing to $TESTTMP/repo |
|
292 | pushing to $TESTTMP/repo | |
234 | searching for changes |
|
293 | searching for changes | |
235 | storing changesets on the bundlestore |
|
294 | storing changesets on the bundlestore | |
236 | pushing 5 commits: |
|
295 | pushing 5 commits: | |
237 | eaba929e866c added b |
|
296 | eaba929e866c added b | |
238 | bf8a6e3011b3 added c |
|
297 | bf8a6e3011b3 added c | |
239 | 1bb96358eda2 added d |
|
298 | 1bb96358eda2 added d | |
240 | b4e4bce66051 added e |
|
299 | b4e4bce66051 added e | |
241 | 9b42578d4447 added f |
|
300 | 9b42578d4447 added f | |
242 |
|
301 | |||
243 | XXX: the phase of 9b42578d4447 should not be changed here |
|
302 | XXX: the phase of 9b42578d4447 should not be changed here | |
244 | $ hg glog -r . |
|
303 | $ hg glog -r . | |
245 | @ 6:9b42578d4447 added f |
|
304 | @ 6:9b42578d4447 added f | |
246 | | public |
|
305 | | public | |
247 | ~ |
|
306 | ~ | |
248 |
|
307 | |||
249 | applying the bundle on the server to check preservation of phase-information |
|
308 | applying the bundle on the server to check preservation of phase-information | |
250 |
|
309 | |||
251 | $ cd ../repo |
|
310 | $ cd ../repo | |
252 | $ scratchnodes |
|
311 | $ scratchnodes | |
253 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
312 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
254 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
313 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
255 | 9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
314 | 9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
256 | b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
315 | b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
257 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
316 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
258 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
317 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
259 |
|
318 | |||
260 | $ hg unbundle .hg/scratchbranches/filebundlestore/0a/6e/0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
319 | $ hg unbundle .hg/scratchbranches/filebundlestore/0a/6e/0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
261 | adding changesets |
|
320 | adding changesets | |
262 | adding manifests |
|
321 | adding manifests | |
263 | adding file changes |
|
322 | adding file changes | |
264 | added 5 changesets with 5 changes to 5 files |
|
323 | added 5 changesets with 5 changes to 5 files | |
265 | new changesets eaba929e866c:9b42578d4447 |
|
324 | new changesets eaba929e866c:9b42578d4447 | |
266 | (run 'hg update' to get a working copy) |
|
325 | (run 'hg update' to get a working copy) | |
267 |
|
326 | |||
268 | $ hg glog |
|
327 | $ hg glog | |
269 | o 6:9b42578d4447 added f |
|
328 | o 6:9b42578d4447 added f | |
270 | | draft |
|
329 | | draft | |
271 | o 5:b4e4bce66051 added e |
|
330 | o 5:b4e4bce66051 added e | |
272 | | public |
|
331 | | public | |
273 | o 4:1bb96358eda2 added d |
|
332 | o 4:1bb96358eda2 added d | |
274 | | public |
|
333 | | public | |
275 | o 3:bf8a6e3011b3 added c |
|
334 | o 3:bf8a6e3011b3 added c | |
276 | | public |
|
335 | | public | |
277 | o 2:eaba929e866c added b |
|
336 | o 2:eaba929e866c added b | |
278 | | public |
|
337 | | public | |
279 | o 1:6cb0989601f1 added a |
|
338 | o 1:6cb0989601f1 added a | |
280 | | public |
|
339 | | public | |
281 | @ 0:67145f466344 initialcommit |
|
340 | @ 0:67145f466344 initialcommit | |
282 | public |
|
341 | public | |
283 |
|
342 | |||
284 | Checking storage of obsmarkers in the bundlestore |
|
343 | Checking storage of obsmarkers in the bundlestore | |
285 | -------------------------------------------------- |
|
344 | -------------------------------------------------- | |
286 |
|
345 | |||
287 | enabling obsmarkers and rebase extension |
|
346 | enabling obsmarkers and rebase extension | |
288 |
|
347 | |||
289 | $ cat >> $HGRCPATH << EOF |
|
348 | $ cat >> $HGRCPATH << EOF | |
290 | > [experimental] |
|
349 | > [experimental] | |
291 | > evolution = all |
|
350 | > evolution = all | |
292 | > [extensions] |
|
351 | > [extensions] | |
293 | > rebase = |
|
352 | > rebase = | |
294 | > EOF |
|
353 | > EOF | |
295 |
|
354 | |||
296 | $ cd ../client |
|
355 | $ cd ../client | |
297 |
|
356 | |||
298 | $ hg phase -r . --draft --force |
|
357 | $ hg phase -r . --draft --force | |
299 | $ hg rebase -r 6 -d 3 |
|
358 | $ hg rebase -r 6 -d 3 | |
300 | rebasing 6:9b42578d4447 "added f" (tip) |
|
359 | rebasing 6:9b42578d4447 "added f" (tip) | |
301 |
|
360 | |||
302 | $ hg glog |
|
361 | $ hg glog | |
303 | @ 7:99949238d9ac added f |
|
362 | @ 7:99949238d9ac added f | |
304 | | draft |
|
363 | | draft | |
305 | | o 5:b4e4bce66051 added e |
|
364 | | o 5:b4e4bce66051 added e | |
306 | | | public |
|
365 | | | public | |
307 | | o 4:1bb96358eda2 added d |
|
366 | | o 4:1bb96358eda2 added d | |
308 | |/ public |
|
367 | |/ public | |
309 | o 3:bf8a6e3011b3 added c |
|
368 | o 3:bf8a6e3011b3 added c | |
310 | | public |
|
369 | | public | |
311 | o 2:eaba929e866c added b |
|
370 | o 2:eaba929e866c added b | |
312 | | public |
|
371 | | public | |
313 | o 1:6cb0989601f1 added a |
|
372 | o 1:6cb0989601f1 added a | |
314 | | public |
|
373 | | public | |
315 | o 0:67145f466344 initialcommit |
|
374 | o 0:67145f466344 initialcommit | |
316 | public |
|
375 | public | |
317 |
|
376 | |||
318 | $ hg push -f |
|
377 | $ hg push -f | |
319 | pushing to $TESTTMP/repo |
|
378 | pushing to $TESTTMP/repo | |
320 | searching for changes |
|
379 | searching for changes | |
321 | storing changesets on the bundlestore |
|
380 | storing changesets on the bundlestore | |
322 | pushing 1 commit: |
|
381 | pushing 1 commit: | |
323 | 99949238d9ac added f |
|
382 | 99949238d9ac added f | |
324 |
|
383 | |||
325 | XXX: the phase should not have changed here |
|
384 | XXX: the phase should not have changed here | |
326 | $ hg glog -r . |
|
385 | $ hg glog -r . | |
327 | @ 7:99949238d9ac added f |
|
386 | @ 7:99949238d9ac added f | |
328 | | public |
|
387 | | public | |
329 | ~ |
|
388 | ~ | |
330 |
|
389 | |||
331 | Unbundling on server to see obsmarkers being applied |
|
390 | Unbundling on server to see obsmarkers being applied | |
332 |
|
391 | |||
333 | $ cd ../repo |
|
392 | $ cd ../repo | |
334 |
|
393 | |||
335 | $ scratchnodes |
|
394 | $ scratchnodes | |
336 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
395 | 1bb96358eda285b536c6d1c66846a7cdb2336cea 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
337 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 |
|
396 | 6cb0989601f1fb5805238edfb16f3606713d9a0b a4c202c147a9c4bb91bbadb56321fc5f3950f7f2 | |
338 | 99949238d9ac7f2424a33a46dface6f866afd059 090a24fe63f31d3b4bee714447f835c8c362ff57 |
|
397 | 99949238d9ac7f2424a33a46dface6f866afd059 090a24fe63f31d3b4bee714447f835c8c362ff57 | |
339 | 9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
398 | 9b42578d44473575994109161430d65dd147d16d 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
340 | b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
399 | b4e4bce660512ad3e71189e14588a70ac8e31fef 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
341 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
400 | bf8a6e3011b345146bbbedbcb1ebd4837571492a 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
342 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927 |
|
401 | eaba929e866c59bc9a6aada5a9dd2f6990db83c0 0a6e70ecd5b98d22382f69b93909f557ac6a9927 | |
343 |
|
402 | |||
344 | $ hg glog |
|
403 | $ hg glog | |
345 | o 6:9b42578d4447 added f |
|
404 | o 6:9b42578d4447 added f | |
346 | | draft |
|
405 | | draft | |
347 | o 5:b4e4bce66051 added e |
|
406 | o 5:b4e4bce66051 added e | |
348 | | public |
|
407 | | public | |
349 | o 4:1bb96358eda2 added d |
|
408 | o 4:1bb96358eda2 added d | |
350 | | public |
|
409 | | public | |
351 | o 3:bf8a6e3011b3 added c |
|
410 | o 3:bf8a6e3011b3 added c | |
352 | | public |
|
411 | | public | |
353 | o 2:eaba929e866c added b |
|
412 | o 2:eaba929e866c added b | |
354 | | public |
|
413 | | public | |
355 | o 1:6cb0989601f1 added a |
|
414 | o 1:6cb0989601f1 added a | |
356 | | public |
|
415 | | public | |
357 | @ 0:67145f466344 initialcommit |
|
416 | @ 0:67145f466344 initialcommit | |
358 | public |
|
417 | public | |
359 |
|
418 | |||
360 | $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 |
|
419 | $ hg unbundle .hg/scratchbranches/filebundlestore/09/0a/090a24fe63f31d3b4bee714447f835c8c362ff57 | |
361 | adding changesets |
|
420 | adding changesets | |
362 | adding manifests |
|
421 | adding manifests | |
363 | adding file changes |
|
422 | adding file changes | |
364 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
423 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
365 | 1 new obsolescence markers |
|
424 | 1 new obsolescence markers | |
366 | obsoleted 1 changesets |
|
425 | obsoleted 1 changesets | |
367 | new changesets 99949238d9ac |
|
426 | new changesets 99949238d9ac | |
368 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
427 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
369 |
|
428 | |||
370 | $ hg glog |
|
429 | $ hg glog | |
371 | o 7:99949238d9ac added f |
|
430 | o 7:99949238d9ac added f | |
372 | | draft |
|
431 | | draft | |
373 | | o 5:b4e4bce66051 added e |
|
432 | | o 5:b4e4bce66051 added e | |
374 | | | public |
|
433 | | | public | |
375 | | o 4:1bb96358eda2 added d |
|
434 | | o 4:1bb96358eda2 added d | |
376 | |/ public |
|
435 | |/ public | |
377 | o 3:bf8a6e3011b3 added c |
|
436 | o 3:bf8a6e3011b3 added c | |
378 | | public |
|
437 | | public | |
379 | o 2:eaba929e866c added b |
|
438 | o 2:eaba929e866c added b | |
380 | | public |
|
439 | | public | |
381 | o 1:6cb0989601f1 added a |
|
440 | o 1:6cb0989601f1 added a | |
382 | | public |
|
441 | | public | |
383 | @ 0:67145f466344 initialcommit |
|
442 | @ 0:67145f466344 initialcommit | |
384 | public |
|
443 | public |
General Comments 0
You need to be logged in to leave comments.
Login now