Show More
@@ -1,1381 +1,1559 b'' | |||
|
1 | 1 | $ cat >> $HGRCPATH << EOF |
|
2 | 2 | > [extensions] |
|
3 | > drawdag=$TESTDIR/drawdag.py | |
|
3 | 4 | > phasereport=$TESTDIR/testlib/ext-phase-report.py |
|
4 | 5 | > EOF |
|
5 | 6 | |
|
6 | 7 | $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } |
|
7 | 8 | |
|
8 | 9 | $ mkcommit() { |
|
9 | 10 | > echo "$1" > "$1" |
|
10 | 11 | > hg add "$1" |
|
11 | 12 | > message="$1" |
|
12 | 13 | > shift |
|
13 | 14 | > hg ci -m "$message" $* |
|
14 | 15 | > } |
|
15 | 16 | |
|
16 | 17 | $ hg init alpha |
|
17 | 18 | $ cd alpha |
|
18 | 19 | $ mkcommit a-A |
|
19 | 20 | test-debug-phase: new rev 0: x -> 1 |
|
20 | 21 | $ mkcommit a-B |
|
21 | 22 | test-debug-phase: new rev 1: x -> 1 |
|
22 | 23 | $ mkcommit a-C |
|
23 | 24 | test-debug-phase: new rev 2: x -> 1 |
|
24 | 25 | $ mkcommit a-D |
|
25 | 26 | test-debug-phase: new rev 3: x -> 1 |
|
26 | 27 | $ hgph |
|
27 | 28 | @ 3 draft a-D - b555f63b6063 |
|
28 | 29 | | |
|
29 | 30 | o 2 draft a-C - 54acac6f23ab |
|
30 | 31 | | |
|
31 | 32 | o 1 draft a-B - 548a3d25dbf0 |
|
32 | 33 | | |
|
33 | 34 | o 0 draft a-A - 054250a37db4 |
|
34 | 35 | |
|
35 | 36 | |
|
36 | 37 | $ hg init ../beta |
|
37 | 38 | $ hg push -r 1 ../beta |
|
38 | 39 | pushing to ../beta |
|
39 | 40 | searching for changes |
|
40 | 41 | adding changesets |
|
41 | 42 | adding manifests |
|
42 | 43 | adding file changes |
|
43 | 44 | added 2 changesets with 2 changes to 2 files |
|
44 | 45 | test-debug-phase: new rev 0: x -> 0 |
|
45 | 46 | test-debug-phase: new rev 1: x -> 0 |
|
46 | 47 | test-debug-phase: move rev 0: 1 -> 0 |
|
47 | 48 | test-debug-phase: move rev 1: 1 -> 0 |
|
48 | 49 | $ hgph |
|
49 | 50 | @ 3 draft a-D - b555f63b6063 |
|
50 | 51 | | |
|
51 | 52 | o 2 draft a-C - 54acac6f23ab |
|
52 | 53 | | |
|
53 | 54 | o 1 public a-B - 548a3d25dbf0 |
|
54 | 55 | | |
|
55 | 56 | o 0 public a-A - 054250a37db4 |
|
56 | 57 | |
|
57 | 58 | |
|
58 | 59 | $ cd ../beta |
|
59 | 60 | $ hgph |
|
60 | 61 | o 1 public a-B - 548a3d25dbf0 |
|
61 | 62 | | |
|
62 | 63 | o 0 public a-A - 054250a37db4 |
|
63 | 64 | |
|
64 | 65 | $ hg up -q |
|
65 | 66 | $ mkcommit b-A |
|
66 | 67 | test-debug-phase: new rev 2: x -> 1 |
|
67 | 68 | $ hgph |
|
68 | 69 | @ 2 draft b-A - f54f1bb90ff3 |
|
69 | 70 | | |
|
70 | 71 | o 1 public a-B - 548a3d25dbf0 |
|
71 | 72 | | |
|
72 | 73 | o 0 public a-A - 054250a37db4 |
|
73 | 74 | |
|
74 | 75 | $ hg pull ../alpha |
|
75 | 76 | pulling from ../alpha |
|
76 | 77 | searching for changes |
|
77 | 78 | adding changesets |
|
78 | 79 | adding manifests |
|
79 | 80 | adding file changes |
|
80 | 81 | added 2 changesets with 2 changes to 2 files (+1 heads) |
|
81 | 82 | new changesets 54acac6f23ab:b555f63b6063 |
|
82 | 83 | test-debug-phase: new rev 3: x -> 0 |
|
83 | 84 | test-debug-phase: new rev 4: x -> 0 |
|
84 | 85 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
85 | 86 | $ hgph |
|
86 | 87 | o 4 public a-D - b555f63b6063 |
|
87 | 88 | | |
|
88 | 89 | o 3 public a-C - 54acac6f23ab |
|
89 | 90 | | |
|
90 | 91 | | @ 2 draft b-A - f54f1bb90ff3 |
|
91 | 92 | |/ |
|
92 | 93 | o 1 public a-B - 548a3d25dbf0 |
|
93 | 94 | | |
|
94 | 95 | o 0 public a-A - 054250a37db4 |
|
95 | 96 | |
|
96 | 97 | |
|
97 | 98 | pull did not updated ../alpha state. |
|
98 | 99 | push from alpha to beta should update phase even if nothing is transferred |
|
99 | 100 | |
|
100 | 101 | $ cd ../alpha |
|
101 | 102 | $ hgph # not updated by remote pull |
|
102 | 103 | @ 3 draft a-D - b555f63b6063 |
|
103 | 104 | | |
|
104 | 105 | o 2 draft a-C - 54acac6f23ab |
|
105 | 106 | | |
|
106 | 107 | o 1 public a-B - 548a3d25dbf0 |
|
107 | 108 | | |
|
108 | 109 | o 0 public a-A - 054250a37db4 |
|
109 | 110 | |
|
110 | 111 | $ hg push -r 2 ../beta |
|
111 | 112 | pushing to ../beta |
|
112 | 113 | searching for changes |
|
113 | 114 | no changes found |
|
114 | 115 | test-debug-phase: move rev 2: 1 -> 0 |
|
115 | 116 | [1] |
|
116 | 117 | $ hgph |
|
117 | 118 | @ 3 draft a-D - b555f63b6063 |
|
118 | 119 | | |
|
119 | 120 | o 2 public a-C - 54acac6f23ab |
|
120 | 121 | | |
|
121 | 122 | o 1 public a-B - 548a3d25dbf0 |
|
122 | 123 | | |
|
123 | 124 | o 0 public a-A - 054250a37db4 |
|
124 | 125 | |
|
125 | 126 | $ hg push ../beta |
|
126 | 127 | pushing to ../beta |
|
127 | 128 | searching for changes |
|
128 | 129 | no changes found |
|
129 | 130 | test-debug-phase: move rev 3: 1 -> 0 |
|
130 | 131 | [1] |
|
131 | 132 | $ hgph |
|
132 | 133 | @ 3 public a-D - b555f63b6063 |
|
133 | 134 | | |
|
134 | 135 | o 2 public a-C - 54acac6f23ab |
|
135 | 136 | | |
|
136 | 137 | o 1 public a-B - 548a3d25dbf0 |
|
137 | 138 | | |
|
138 | 139 | o 0 public a-A - 054250a37db4 |
|
139 | 140 | |
|
140 | 141 | |
|
141 | 142 | update must update phase of common changeset too |
|
142 | 143 | |
|
143 | 144 | $ hg pull ../beta # getting b-A |
|
144 | 145 | pulling from ../beta |
|
145 | 146 | searching for changes |
|
146 | 147 | adding changesets |
|
147 | 148 | adding manifests |
|
148 | 149 | adding file changes |
|
149 | 150 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
150 | 151 | new changesets f54f1bb90ff3 |
|
151 | 152 | test-debug-phase: new rev 4: x -> 0 |
|
152 | 153 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
153 | 154 | |
|
154 | 155 | $ cd ../beta |
|
155 | 156 | $ hgph # not updated by remote pull |
|
156 | 157 | o 4 public a-D - b555f63b6063 |
|
157 | 158 | | |
|
158 | 159 | o 3 public a-C - 54acac6f23ab |
|
159 | 160 | | |
|
160 | 161 | | @ 2 draft b-A - f54f1bb90ff3 |
|
161 | 162 | |/ |
|
162 | 163 | o 1 public a-B - 548a3d25dbf0 |
|
163 | 164 | | |
|
164 | 165 | o 0 public a-A - 054250a37db4 |
|
165 | 166 | |
|
166 | 167 | $ hg pull ../alpha |
|
167 | 168 | pulling from ../alpha |
|
168 | 169 | searching for changes |
|
169 | 170 | no changes found |
|
170 | 171 | 1 local changesets published |
|
171 | 172 | test-debug-phase: move rev 2: 1 -> 0 |
|
172 | 173 | $ hgph |
|
173 | 174 | o 4 public a-D - b555f63b6063 |
|
174 | 175 | | |
|
175 | 176 | o 3 public a-C - 54acac6f23ab |
|
176 | 177 | | |
|
177 | 178 | | @ 2 public b-A - f54f1bb90ff3 |
|
178 | 179 | |/ |
|
179 | 180 | o 1 public a-B - 548a3d25dbf0 |
|
180 | 181 | | |
|
181 | 182 | o 0 public a-A - 054250a37db4 |
|
182 | 183 | |
|
183 | 184 | |
|
184 | 185 | Publish configuration option |
|
185 | 186 | ---------------------------- |
|
186 | 187 | |
|
187 | 188 | Pull |
|
188 | 189 | ```` |
|
189 | 190 | |
|
190 | 191 | changegroup are added without phase movement |
|
191 | 192 | |
|
192 | 193 | $ hg bundle -a ../base.bundle |
|
193 | 194 | 5 changesets found |
|
194 | 195 | $ cd .. |
|
195 | 196 | $ hg init mu |
|
196 | 197 | $ cd mu |
|
197 | 198 | $ cat > .hg/hgrc << EOF |
|
198 | 199 | > [phases] |
|
199 | 200 | > publish=0 |
|
200 | 201 | > EOF |
|
201 | 202 | $ hg unbundle ../base.bundle |
|
202 | 203 | adding changesets |
|
203 | 204 | adding manifests |
|
204 | 205 | adding file changes |
|
205 | 206 | added 5 changesets with 5 changes to 5 files (+1 heads) |
|
206 | 207 | new changesets 054250a37db4:b555f63b6063 |
|
207 | 208 | test-debug-phase: new rev 0: x -> 1 |
|
208 | 209 | test-debug-phase: new rev 1: x -> 1 |
|
209 | 210 | test-debug-phase: new rev 2: x -> 1 |
|
210 | 211 | test-debug-phase: new rev 3: x -> 1 |
|
211 | 212 | test-debug-phase: new rev 4: x -> 1 |
|
212 | 213 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
213 | 214 | $ hgph |
|
214 | 215 | o 4 draft a-D - b555f63b6063 |
|
215 | 216 | | |
|
216 | 217 | o 3 draft a-C - 54acac6f23ab |
|
217 | 218 | | |
|
218 | 219 | | o 2 draft b-A - f54f1bb90ff3 |
|
219 | 220 | |/ |
|
220 | 221 | o 1 draft a-B - 548a3d25dbf0 |
|
221 | 222 | | |
|
222 | 223 | o 0 draft a-A - 054250a37db4 |
|
223 | 224 | |
|
224 | 225 | $ cd .. |
|
225 | 226 | |
|
226 | 227 | Pulling from publish=False to publish=False does not move boundary. |
|
227 | 228 | |
|
228 | 229 | $ hg init nu |
|
229 | 230 | $ cd nu |
|
230 | 231 | $ cat > .hg/hgrc << EOF |
|
231 | 232 | > [phases] |
|
232 | 233 | > publish=0 |
|
233 | 234 | > EOF |
|
234 | 235 | $ hg pull ../mu -r 54acac6f23ab |
|
235 | 236 | pulling from ../mu |
|
236 | 237 | adding changesets |
|
237 | 238 | adding manifests |
|
238 | 239 | adding file changes |
|
239 | 240 | added 3 changesets with 3 changes to 3 files |
|
240 | 241 | new changesets 054250a37db4:54acac6f23ab |
|
241 | 242 | test-debug-phase: new rev 0: x -> 1 |
|
242 | 243 | test-debug-phase: new rev 1: x -> 1 |
|
243 | 244 | test-debug-phase: new rev 2: x -> 1 |
|
244 | 245 | (run 'hg update' to get a working copy) |
|
245 | 246 | $ hgph |
|
246 | 247 | o 2 draft a-C - 54acac6f23ab |
|
247 | 248 | | |
|
248 | 249 | o 1 draft a-B - 548a3d25dbf0 |
|
249 | 250 | | |
|
250 | 251 | o 0 draft a-A - 054250a37db4 |
|
251 | 252 | |
|
252 | 253 | |
|
253 | 254 | Even for common |
|
254 | 255 | |
|
255 | 256 | $ hg pull ../mu -r f54f1bb90ff3 |
|
256 | 257 | pulling from ../mu |
|
257 | 258 | searching for changes |
|
258 | 259 | adding changesets |
|
259 | 260 | adding manifests |
|
260 | 261 | adding file changes |
|
261 | 262 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
262 | 263 | new changesets f54f1bb90ff3 |
|
263 | 264 | test-debug-phase: new rev 3: x -> 1 |
|
264 | 265 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
265 | 266 | $ hgph |
|
266 | 267 | o 3 draft b-A - f54f1bb90ff3 |
|
267 | 268 | | |
|
268 | 269 | | o 2 draft a-C - 54acac6f23ab |
|
269 | 270 | |/ |
|
270 | 271 | o 1 draft a-B - 548a3d25dbf0 |
|
271 | 272 | | |
|
272 | 273 | o 0 draft a-A - 054250a37db4 |
|
273 | 274 | |
|
274 | 275 | |
|
275 | 276 | |
|
276 | 277 | Pulling from Publish=True to Publish=False move boundary in common set. |
|
277 | 278 | we are in nu |
|
278 | 279 | |
|
279 | 280 | $ hg pull ../alpha -r b555f63b6063 |
|
280 | 281 | pulling from ../alpha |
|
281 | 282 | searching for changes |
|
282 | 283 | adding changesets |
|
283 | 284 | adding manifests |
|
284 | 285 | adding file changes |
|
285 | 286 | added 1 changesets with 1 changes to 1 files |
|
286 | 287 | new changesets b555f63b6063 |
|
287 | 288 | 3 local changesets published |
|
288 | 289 | test-debug-phase: move rev 0: 1 -> 0 |
|
289 | 290 | test-debug-phase: move rev 1: 1 -> 0 |
|
290 | 291 | test-debug-phase: move rev 2: 1 -> 0 |
|
291 | 292 | test-debug-phase: new rev 4: x -> 0 |
|
292 | 293 | (run 'hg update' to get a working copy) |
|
293 | 294 | $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r |
|
294 | 295 | o 4 public a-D - b555f63b6063 |
|
295 | 296 | | |
|
296 | 297 | | o 3 draft b-A - f54f1bb90ff3 |
|
297 | 298 | | | |
|
298 | 299 | o | 2 public a-C - 54acac6f23ab |
|
299 | 300 | |/ |
|
300 | 301 | o 1 public a-B - 548a3d25dbf0 |
|
301 | 302 | | |
|
302 | 303 | o 0 public a-A - 054250a37db4 |
|
303 | 304 | |
|
304 | 305 | |
|
305 | 306 | pulling from Publish=False to publish=False with some public |
|
306 | 307 | |
|
307 | 308 | $ hg up -q f54f1bb90ff3 |
|
308 | 309 | $ mkcommit n-A |
|
309 | 310 | test-debug-phase: new rev 5: x -> 1 |
|
310 | 311 | $ mkcommit n-B |
|
311 | 312 | test-debug-phase: new rev 6: x -> 1 |
|
312 | 313 | $ hgph |
|
313 | 314 | @ 6 draft n-B - 145e75495359 |
|
314 | 315 | | |
|
315 | 316 | o 5 draft n-A - d6bcb4f74035 |
|
316 | 317 | | |
|
317 | 318 | | o 4 public a-D - b555f63b6063 |
|
318 | 319 | | | |
|
319 | 320 | o | 3 draft b-A - f54f1bb90ff3 |
|
320 | 321 | | | |
|
321 | 322 | | o 2 public a-C - 54acac6f23ab |
|
322 | 323 | |/ |
|
323 | 324 | o 1 public a-B - 548a3d25dbf0 |
|
324 | 325 | | |
|
325 | 326 | o 0 public a-A - 054250a37db4 |
|
326 | 327 | |
|
327 | 328 | $ cd ../mu |
|
328 | 329 | $ hg pull ../nu |
|
329 | 330 | pulling from ../nu |
|
330 | 331 | searching for changes |
|
331 | 332 | adding changesets |
|
332 | 333 | adding manifests |
|
333 | 334 | adding file changes |
|
334 | 335 | added 2 changesets with 2 changes to 2 files |
|
335 | 336 | new changesets d6bcb4f74035:145e75495359 |
|
336 | 337 | 4 local changesets published |
|
337 | 338 | test-debug-phase: move rev 0: 1 -> 0 |
|
338 | 339 | test-debug-phase: move rev 1: 1 -> 0 |
|
339 | 340 | test-debug-phase: move rev 3: 1 -> 0 |
|
340 | 341 | test-debug-phase: move rev 4: 1 -> 0 |
|
341 | 342 | test-debug-phase: new rev 5: x -> 1 |
|
342 | 343 | test-debug-phase: new rev 6: x -> 1 |
|
343 | 344 | (run 'hg update' to get a working copy) |
|
344 | 345 | $ hgph |
|
345 | 346 | o 6 draft n-B - 145e75495359 |
|
346 | 347 | | |
|
347 | 348 | o 5 draft n-A - d6bcb4f74035 |
|
348 | 349 | | |
|
349 | 350 | | o 4 public a-D - b555f63b6063 |
|
350 | 351 | | | |
|
351 | 352 | | o 3 public a-C - 54acac6f23ab |
|
352 | 353 | | | |
|
353 | 354 | o | 2 draft b-A - f54f1bb90ff3 |
|
354 | 355 | |/ |
|
355 | 356 | o 1 public a-B - 548a3d25dbf0 |
|
356 | 357 | | |
|
357 | 358 | o 0 public a-A - 054250a37db4 |
|
358 | 359 | |
|
359 | 360 | $ cd .. |
|
360 | 361 | |
|
361 | 362 | pulling into publish=True |
|
362 | 363 | |
|
363 | 364 | $ cd alpha |
|
364 | 365 | $ hgph |
|
365 | 366 | o 4 public b-A - f54f1bb90ff3 |
|
366 | 367 | | |
|
367 | 368 | | @ 3 public a-D - b555f63b6063 |
|
368 | 369 | | | |
|
369 | 370 | | o 2 public a-C - 54acac6f23ab |
|
370 | 371 | |/ |
|
371 | 372 | o 1 public a-B - 548a3d25dbf0 |
|
372 | 373 | | |
|
373 | 374 | o 0 public a-A - 054250a37db4 |
|
374 | 375 | |
|
375 | 376 | $ hg pull ../mu |
|
376 | 377 | pulling from ../mu |
|
377 | 378 | searching for changes |
|
378 | 379 | adding changesets |
|
379 | 380 | adding manifests |
|
380 | 381 | adding file changes |
|
381 | 382 | added 2 changesets with 2 changes to 2 files |
|
382 | 383 | new changesets d6bcb4f74035:145e75495359 |
|
383 | 384 | test-debug-phase: new rev 5: x -> 1 |
|
384 | 385 | test-debug-phase: new rev 6: x -> 1 |
|
385 | 386 | (run 'hg update' to get a working copy) |
|
386 | 387 | $ hgph |
|
387 | 388 | o 6 draft n-B - 145e75495359 |
|
388 | 389 | | |
|
389 | 390 | o 5 draft n-A - d6bcb4f74035 |
|
390 | 391 | | |
|
391 | 392 | o 4 public b-A - f54f1bb90ff3 |
|
392 | 393 | | |
|
393 | 394 | | @ 3 public a-D - b555f63b6063 |
|
394 | 395 | | | |
|
395 | 396 | | o 2 public a-C - 54acac6f23ab |
|
396 | 397 | |/ |
|
397 | 398 | o 1 public a-B - 548a3d25dbf0 |
|
398 | 399 | | |
|
399 | 400 | o 0 public a-A - 054250a37db4 |
|
400 | 401 | |
|
401 | 402 | $ cd .. |
|
402 | 403 | |
|
403 | 404 | pulling back into original repo |
|
404 | 405 | |
|
405 | 406 | $ cd nu |
|
406 | 407 | $ hg pull ../alpha |
|
407 | 408 | pulling from ../alpha |
|
408 | 409 | searching for changes |
|
409 | 410 | no changes found |
|
410 | 411 | 3 local changesets published |
|
411 | 412 | test-debug-phase: move rev 3: 1 -> 0 |
|
412 | 413 | test-debug-phase: move rev 5: 1 -> 0 |
|
413 | 414 | test-debug-phase: move rev 6: 1 -> 0 |
|
414 | 415 | $ hgph |
|
415 | 416 | @ 6 public n-B - 145e75495359 |
|
416 | 417 | | |
|
417 | 418 | o 5 public n-A - d6bcb4f74035 |
|
418 | 419 | | |
|
419 | 420 | | o 4 public a-D - b555f63b6063 |
|
420 | 421 | | | |
|
421 | 422 | o | 3 public b-A - f54f1bb90ff3 |
|
422 | 423 | | | |
|
423 | 424 | | o 2 public a-C - 54acac6f23ab |
|
424 | 425 | |/ |
|
425 | 426 | o 1 public a-B - 548a3d25dbf0 |
|
426 | 427 | | |
|
427 | 428 | o 0 public a-A - 054250a37db4 |
|
428 | 429 | |
|
429 | 430 | |
|
430 | 431 | Push |
|
431 | 432 | ```` |
|
432 | 433 | |
|
433 | 434 | (inserted) |
|
434 | 435 | |
|
435 | 436 | Test that phase are pushed even when they are nothing to pus |
|
436 | 437 | (this might be tested later bu are very convenient to not alter too much test) |
|
437 | 438 | |
|
438 | 439 | Push back to alpha |
|
439 | 440 | |
|
440 | 441 | $ hg push ../alpha # from nu |
|
441 | 442 | pushing to ../alpha |
|
442 | 443 | searching for changes |
|
443 | 444 | no changes found |
|
444 | 445 | test-debug-phase: move rev 5: 1 -> 0 |
|
445 | 446 | test-debug-phase: move rev 6: 1 -> 0 |
|
446 | 447 | [1] |
|
447 | 448 | $ cd .. |
|
448 | 449 | $ cd alpha |
|
449 | 450 | $ hgph |
|
450 | 451 | o 6 public n-B - 145e75495359 |
|
451 | 452 | | |
|
452 | 453 | o 5 public n-A - d6bcb4f74035 |
|
453 | 454 | | |
|
454 | 455 | o 4 public b-A - f54f1bb90ff3 |
|
455 | 456 | | |
|
456 | 457 | | @ 3 public a-D - b555f63b6063 |
|
457 | 458 | | | |
|
458 | 459 | | o 2 public a-C - 54acac6f23ab |
|
459 | 460 | |/ |
|
460 | 461 | o 1 public a-B - 548a3d25dbf0 |
|
461 | 462 | | |
|
462 | 463 | o 0 public a-A - 054250a37db4 |
|
463 | 464 | |
|
464 | 465 | |
|
465 | 466 | (end insertion) |
|
466 | 467 | |
|
467 | 468 | |
|
468 | 469 | initial setup |
|
469 | 470 | |
|
470 | 471 | $ hg log -G # of alpha |
|
471 | 472 | o changeset: 6:145e75495359 |
|
472 | 473 | | tag: tip |
|
473 | 474 | | user: test |
|
474 | 475 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
475 | 476 | | summary: n-B |
|
476 | 477 | | |
|
477 | 478 | o changeset: 5:d6bcb4f74035 |
|
478 | 479 | | user: test |
|
479 | 480 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
480 | 481 | | summary: n-A |
|
481 | 482 | | |
|
482 | 483 | o changeset: 4:f54f1bb90ff3 |
|
483 | 484 | | parent: 1:548a3d25dbf0 |
|
484 | 485 | | user: test |
|
485 | 486 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
486 | 487 | | summary: b-A |
|
487 | 488 | | |
|
488 | 489 | | @ changeset: 3:b555f63b6063 |
|
489 | 490 | | | user: test |
|
490 | 491 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
491 | 492 | | | summary: a-D |
|
492 | 493 | | | |
|
493 | 494 | | o changeset: 2:54acac6f23ab |
|
494 | 495 | |/ user: test |
|
495 | 496 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
496 | 497 | | summary: a-C |
|
497 | 498 | | |
|
498 | 499 | o changeset: 1:548a3d25dbf0 |
|
499 | 500 | | user: test |
|
500 | 501 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
501 | 502 | | summary: a-B |
|
502 | 503 | | |
|
503 | 504 | o changeset: 0:054250a37db4 |
|
504 | 505 | user: test |
|
505 | 506 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
506 | 507 | summary: a-A |
|
507 | 508 | |
|
508 | 509 | $ mkcommit a-E |
|
509 | 510 | test-debug-phase: new rev 7: x -> 1 |
|
510 | 511 | $ mkcommit a-F |
|
511 | 512 | test-debug-phase: new rev 8: x -> 1 |
|
512 | 513 | $ mkcommit a-G |
|
513 | 514 | test-debug-phase: new rev 9: x -> 1 |
|
514 | 515 | $ hg up d6bcb4f74035 -q |
|
515 | 516 | $ mkcommit a-H |
|
516 | 517 | test-debug-phase: new rev 10: x -> 1 |
|
517 | 518 | created new head |
|
518 | 519 | $ hgph |
|
519 | 520 | @ 10 draft a-H - 967b449fbc94 |
|
520 | 521 | | |
|
521 | 522 | | o 9 draft a-G - 3e27b6f1eee1 |
|
522 | 523 | | | |
|
523 | 524 | | o 8 draft a-F - b740e3e5c05d |
|
524 | 525 | | | |
|
525 | 526 | | o 7 draft a-E - e9f537e46dea |
|
526 | 527 | | | |
|
527 | 528 | +---o 6 public n-B - 145e75495359 |
|
528 | 529 | | | |
|
529 | 530 | o | 5 public n-A - d6bcb4f74035 |
|
530 | 531 | | | |
|
531 | 532 | o | 4 public b-A - f54f1bb90ff3 |
|
532 | 533 | | | |
|
533 | 534 | | o 3 public a-D - b555f63b6063 |
|
534 | 535 | | | |
|
535 | 536 | | o 2 public a-C - 54acac6f23ab |
|
536 | 537 | |/ |
|
537 | 538 | o 1 public a-B - 548a3d25dbf0 |
|
538 | 539 | | |
|
539 | 540 | o 0 public a-A - 054250a37db4 |
|
540 | 541 | |
|
541 | 542 | |
|
542 | 543 | Pulling from bundle does not alter phases of changeset not present in the bundle |
|
543 | 544 | |
|
544 | 545 | #if repobundlerepo |
|
545 | 546 | $ hg bundle --base 1 -r 6 -r 3 ../partial-bundle.hg |
|
546 | 547 | 5 changesets found |
|
547 | 548 | $ hg pull ../partial-bundle.hg |
|
548 | 549 | pulling from ../partial-bundle.hg |
|
549 | 550 | searching for changes |
|
550 | 551 | no changes found |
|
551 | 552 | $ hgph |
|
552 | 553 | @ 10 draft a-H - 967b449fbc94 |
|
553 | 554 | | |
|
554 | 555 | | o 9 draft a-G - 3e27b6f1eee1 |
|
555 | 556 | | | |
|
556 | 557 | | o 8 draft a-F - b740e3e5c05d |
|
557 | 558 | | | |
|
558 | 559 | | o 7 draft a-E - e9f537e46dea |
|
559 | 560 | | | |
|
560 | 561 | +---o 6 public n-B - 145e75495359 |
|
561 | 562 | | | |
|
562 | 563 | o | 5 public n-A - d6bcb4f74035 |
|
563 | 564 | | | |
|
564 | 565 | o | 4 public b-A - f54f1bb90ff3 |
|
565 | 566 | | | |
|
566 | 567 | | o 3 public a-D - b555f63b6063 |
|
567 | 568 | | | |
|
568 | 569 | | o 2 public a-C - 54acac6f23ab |
|
569 | 570 | |/ |
|
570 | 571 | o 1 public a-B - 548a3d25dbf0 |
|
571 | 572 | | |
|
572 | 573 | o 0 public a-A - 054250a37db4 |
|
573 | 574 | |
|
574 | 575 | #endif |
|
575 | 576 | |
|
576 | 577 | Pushing to Publish=False (unknown changeset) |
|
577 | 578 | |
|
578 | 579 | $ hg push ../mu -r b740e3e5c05d # a-F |
|
579 | 580 | pushing to ../mu |
|
580 | 581 | searching for changes |
|
581 | 582 | adding changesets |
|
582 | 583 | adding manifests |
|
583 | 584 | adding file changes |
|
584 | 585 | added 2 changesets with 2 changes to 2 files |
|
585 | 586 | test-debug-phase: new rev 7: x -> 1 |
|
586 | 587 | test-debug-phase: new rev 8: x -> 1 |
|
587 | 588 | $ hgph |
|
588 | 589 | @ 10 draft a-H - 967b449fbc94 |
|
589 | 590 | | |
|
590 | 591 | | o 9 draft a-G - 3e27b6f1eee1 |
|
591 | 592 | | | |
|
592 | 593 | | o 8 draft a-F - b740e3e5c05d |
|
593 | 594 | | | |
|
594 | 595 | | o 7 draft a-E - e9f537e46dea |
|
595 | 596 | | | |
|
596 | 597 | +---o 6 public n-B - 145e75495359 |
|
597 | 598 | | | |
|
598 | 599 | o | 5 public n-A - d6bcb4f74035 |
|
599 | 600 | | | |
|
600 | 601 | o | 4 public b-A - f54f1bb90ff3 |
|
601 | 602 | | | |
|
602 | 603 | | o 3 public a-D - b555f63b6063 |
|
603 | 604 | | | |
|
604 | 605 | | o 2 public a-C - 54acac6f23ab |
|
605 | 606 | |/ |
|
606 | 607 | o 1 public a-B - 548a3d25dbf0 |
|
607 | 608 | | |
|
608 | 609 | o 0 public a-A - 054250a37db4 |
|
609 | 610 | |
|
610 | 611 | |
|
611 | 612 | $ cd ../mu |
|
612 | 613 | $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft, |
|
613 | 614 | > # not ancestor of -r |
|
614 | 615 | o 8 draft a-F - b740e3e5c05d |
|
615 | 616 | | |
|
616 | 617 | o 7 draft a-E - e9f537e46dea |
|
617 | 618 | | |
|
618 | 619 | | o 6 draft n-B - 145e75495359 |
|
619 | 620 | | | |
|
620 | 621 | | o 5 draft n-A - d6bcb4f74035 |
|
621 | 622 | | | |
|
622 | 623 | o | 4 public a-D - b555f63b6063 |
|
623 | 624 | | | |
|
624 | 625 | o | 3 public a-C - 54acac6f23ab |
|
625 | 626 | | | |
|
626 | 627 | | o 2 draft b-A - f54f1bb90ff3 |
|
627 | 628 | |/ |
|
628 | 629 | o 1 public a-B - 548a3d25dbf0 |
|
629 | 630 | | |
|
630 | 631 | o 0 public a-A - 054250a37db4 |
|
631 | 632 | |
|
632 | 633 | |
|
633 | 634 | Pushing to Publish=True (unknown changeset) |
|
634 | 635 | |
|
635 | 636 | $ hg push ../beta -r b740e3e5c05d |
|
636 | 637 | pushing to ../beta |
|
637 | 638 | searching for changes |
|
638 | 639 | adding changesets |
|
639 | 640 | adding manifests |
|
640 | 641 | adding file changes |
|
641 | 642 | added 2 changesets with 2 changes to 2 files |
|
642 | 643 | test-debug-phase: new rev 5: x -> 0 |
|
643 | 644 | test-debug-phase: new rev 6: x -> 0 |
|
644 | 645 | test-debug-phase: move rev 7: 1 -> 0 |
|
645 | 646 | test-debug-phase: move rev 8: 1 -> 0 |
|
646 | 647 | $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft, |
|
647 | 648 | > # not ancestor of -r |
|
648 | 649 | o 8 public a-F - b740e3e5c05d |
|
649 | 650 | | |
|
650 | 651 | o 7 public a-E - e9f537e46dea |
|
651 | 652 | | |
|
652 | 653 | | o 6 draft n-B - 145e75495359 |
|
653 | 654 | | | |
|
654 | 655 | | o 5 draft n-A - d6bcb4f74035 |
|
655 | 656 | | | |
|
656 | 657 | o | 4 public a-D - b555f63b6063 |
|
657 | 658 | | | |
|
658 | 659 | o | 3 public a-C - 54acac6f23ab |
|
659 | 660 | | | |
|
660 | 661 | | o 2 draft b-A - f54f1bb90ff3 |
|
661 | 662 | |/ |
|
662 | 663 | o 1 public a-B - 548a3d25dbf0 |
|
663 | 664 | | |
|
664 | 665 | o 0 public a-A - 054250a37db4 |
|
665 | 666 | |
|
666 | 667 | |
|
667 | 668 | Pushing to Publish=True (common changeset) |
|
668 | 669 | |
|
669 | 670 | $ cd ../beta |
|
670 | 671 | $ hg push ../alpha |
|
671 | 672 | pushing to ../alpha |
|
672 | 673 | searching for changes |
|
673 | 674 | no changes found |
|
674 | 675 | test-debug-phase: move rev 7: 1 -> 0 |
|
675 | 676 | test-debug-phase: move rev 8: 1 -> 0 |
|
676 | 677 | [1] |
|
677 | 678 | $ hgph |
|
678 | 679 | o 6 public a-F - b740e3e5c05d |
|
679 | 680 | | |
|
680 | 681 | o 5 public a-E - e9f537e46dea |
|
681 | 682 | | |
|
682 | 683 | o 4 public a-D - b555f63b6063 |
|
683 | 684 | | |
|
684 | 685 | o 3 public a-C - 54acac6f23ab |
|
685 | 686 | | |
|
686 | 687 | | @ 2 public b-A - f54f1bb90ff3 |
|
687 | 688 | |/ |
|
688 | 689 | o 1 public a-B - 548a3d25dbf0 |
|
689 | 690 | | |
|
690 | 691 | o 0 public a-A - 054250a37db4 |
|
691 | 692 | |
|
692 | 693 | $ cd ../alpha |
|
693 | 694 | $ hgph |
|
694 | 695 | @ 10 draft a-H - 967b449fbc94 |
|
695 | 696 | | |
|
696 | 697 | | o 9 draft a-G - 3e27b6f1eee1 |
|
697 | 698 | | | |
|
698 | 699 | | o 8 public a-F - b740e3e5c05d |
|
699 | 700 | | | |
|
700 | 701 | | o 7 public a-E - e9f537e46dea |
|
701 | 702 | | | |
|
702 | 703 | +---o 6 public n-B - 145e75495359 |
|
703 | 704 | | | |
|
704 | 705 | o | 5 public n-A - d6bcb4f74035 |
|
705 | 706 | | | |
|
706 | 707 | o | 4 public b-A - f54f1bb90ff3 |
|
707 | 708 | | | |
|
708 | 709 | | o 3 public a-D - b555f63b6063 |
|
709 | 710 | | | |
|
710 | 711 | | o 2 public a-C - 54acac6f23ab |
|
711 | 712 | |/ |
|
712 | 713 | o 1 public a-B - 548a3d25dbf0 |
|
713 | 714 | | |
|
714 | 715 | o 0 public a-A - 054250a37db4 |
|
715 | 716 | |
|
716 | 717 | |
|
717 | 718 | Pushing to Publish=False (common changeset that change phase + unknown one) |
|
718 | 719 | |
|
719 | 720 | $ hg push ../mu -r 967b449fbc94 -f |
|
720 | 721 | pushing to ../mu |
|
721 | 722 | searching for changes |
|
722 | 723 | adding changesets |
|
723 | 724 | adding manifests |
|
724 | 725 | adding file changes |
|
725 | 726 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
726 | 727 | test-debug-phase: move rev 2: 1 -> 0 |
|
727 | 728 | test-debug-phase: move rev 5: 1 -> 0 |
|
728 | 729 | test-debug-phase: new rev 9: x -> 1 |
|
729 | 730 | $ hgph |
|
730 | 731 | @ 10 draft a-H - 967b449fbc94 |
|
731 | 732 | | |
|
732 | 733 | | o 9 draft a-G - 3e27b6f1eee1 |
|
733 | 734 | | | |
|
734 | 735 | | o 8 public a-F - b740e3e5c05d |
|
735 | 736 | | | |
|
736 | 737 | | o 7 public a-E - e9f537e46dea |
|
737 | 738 | | | |
|
738 | 739 | +---o 6 public n-B - 145e75495359 |
|
739 | 740 | | | |
|
740 | 741 | o | 5 public n-A - d6bcb4f74035 |
|
741 | 742 | | | |
|
742 | 743 | o | 4 public b-A - f54f1bb90ff3 |
|
743 | 744 | | | |
|
744 | 745 | | o 3 public a-D - b555f63b6063 |
|
745 | 746 | | | |
|
746 | 747 | | o 2 public a-C - 54acac6f23ab |
|
747 | 748 | |/ |
|
748 | 749 | o 1 public a-B - 548a3d25dbf0 |
|
749 | 750 | | |
|
750 | 751 | o 0 public a-A - 054250a37db4 |
|
751 | 752 | |
|
752 | 753 | $ cd ../mu |
|
753 | 754 | $ hgph # d6bcb4f74035 should have changed phase |
|
754 | 755 | > # 145e75495359 is still draft. not ancestor of -r |
|
755 | 756 | o 9 draft a-H - 967b449fbc94 |
|
756 | 757 | | |
|
757 | 758 | | o 8 public a-F - b740e3e5c05d |
|
758 | 759 | | | |
|
759 | 760 | | o 7 public a-E - e9f537e46dea |
|
760 | 761 | | | |
|
761 | 762 | +---o 6 draft n-B - 145e75495359 |
|
762 | 763 | | | |
|
763 | 764 | o | 5 public n-A - d6bcb4f74035 |
|
764 | 765 | | | |
|
765 | 766 | | o 4 public a-D - b555f63b6063 |
|
766 | 767 | | | |
|
767 | 768 | | o 3 public a-C - 54acac6f23ab |
|
768 | 769 | | | |
|
769 | 770 | o | 2 public b-A - f54f1bb90ff3 |
|
770 | 771 | |/ |
|
771 | 772 | o 1 public a-B - 548a3d25dbf0 |
|
772 | 773 | | |
|
773 | 774 | o 0 public a-A - 054250a37db4 |
|
774 | 775 | |
|
775 | 776 | |
|
776 | 777 | |
|
777 | 778 | Pushing to Publish=True (common changeset from publish=False) |
|
778 | 779 | |
|
779 | 780 | (in mu) |
|
780 | 781 | $ hg push ../alpha |
|
781 | 782 | pushing to ../alpha |
|
782 | 783 | searching for changes |
|
783 | 784 | no changes found |
|
784 | 785 | test-debug-phase: move rev 10: 1 -> 0 |
|
785 | 786 | test-debug-phase: move rev 6: 1 -> 0 |
|
786 | 787 | test-debug-phase: move rev 9: 1 -> 0 |
|
787 | 788 | [1] |
|
788 | 789 | $ hgph |
|
789 | 790 | o 9 public a-H - 967b449fbc94 |
|
790 | 791 | | |
|
791 | 792 | | o 8 public a-F - b740e3e5c05d |
|
792 | 793 | | | |
|
793 | 794 | | o 7 public a-E - e9f537e46dea |
|
794 | 795 | | | |
|
795 | 796 | +---o 6 public n-B - 145e75495359 |
|
796 | 797 | | | |
|
797 | 798 | o | 5 public n-A - d6bcb4f74035 |
|
798 | 799 | | | |
|
799 | 800 | | o 4 public a-D - b555f63b6063 |
|
800 | 801 | | | |
|
801 | 802 | | o 3 public a-C - 54acac6f23ab |
|
802 | 803 | | | |
|
803 | 804 | o | 2 public b-A - f54f1bb90ff3 |
|
804 | 805 | |/ |
|
805 | 806 | o 1 public a-B - 548a3d25dbf0 |
|
806 | 807 | | |
|
807 | 808 | o 0 public a-A - 054250a37db4 |
|
808 | 809 | |
|
809 | 810 | $ hgph -R ../alpha # a-H should have been synced to 0 |
|
810 | 811 | @ 10 public a-H - 967b449fbc94 |
|
811 | 812 | | |
|
812 | 813 | | o 9 draft a-G - 3e27b6f1eee1 |
|
813 | 814 | | | |
|
814 | 815 | | o 8 public a-F - b740e3e5c05d |
|
815 | 816 | | | |
|
816 | 817 | | o 7 public a-E - e9f537e46dea |
|
817 | 818 | | | |
|
818 | 819 | +---o 6 public n-B - 145e75495359 |
|
819 | 820 | | | |
|
820 | 821 | o | 5 public n-A - d6bcb4f74035 |
|
821 | 822 | | | |
|
822 | 823 | o | 4 public b-A - f54f1bb90ff3 |
|
823 | 824 | | | |
|
824 | 825 | | o 3 public a-D - b555f63b6063 |
|
825 | 826 | | | |
|
826 | 827 | | o 2 public a-C - 54acac6f23ab |
|
827 | 828 | |/ |
|
828 | 829 | o 1 public a-B - 548a3d25dbf0 |
|
829 | 830 | | |
|
830 | 831 | o 0 public a-A - 054250a37db4 |
|
831 | 832 | |
|
832 | 833 | |
|
833 | 834 | |
|
834 | 835 | Bare push with next changeset and common changeset needing sync (issue3575) |
|
835 | 836 | |
|
836 | 837 | (reset some stat on remote repo to avoid confusing other tests) |
|
837 | 838 | |
|
838 | 839 | $ hg -R ../alpha --config extensions.strip= strip --no-backup 967b449fbc94 |
|
839 | 840 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
840 | 841 | $ hg phase --force --draft b740e3e5c05d 967b449fbc94 |
|
841 | 842 | test-debug-phase: move rev 8: 0 -> 1 |
|
842 | 843 | test-debug-phase: move rev 9: 0 -> 1 |
|
843 | 844 | $ hg push -fv ../alpha |
|
844 | 845 | pushing to ../alpha |
|
845 | 846 | searching for changes |
|
846 | 847 | 1 changesets found |
|
847 | 848 | uncompressed size of bundle content: |
|
848 | 849 | 178 (changelog) |
|
849 | 850 | 165 (manifests) |
|
850 | 851 | 131 a-H |
|
851 | 852 | adding changesets |
|
852 | 853 | adding manifests |
|
853 | 854 | adding file changes |
|
854 | 855 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
855 | 856 | test-debug-phase: new rev 10: x -> 0 |
|
856 | 857 | test-debug-phase: move rev 8: 1 -> 0 |
|
857 | 858 | test-debug-phase: move rev 9: 1 -> 0 |
|
858 | 859 | $ hgph |
|
859 | 860 | o 9 public a-H - 967b449fbc94 |
|
860 | 861 | | |
|
861 | 862 | | o 8 public a-F - b740e3e5c05d |
|
862 | 863 | | | |
|
863 | 864 | | o 7 public a-E - e9f537e46dea |
|
864 | 865 | | | |
|
865 | 866 | +---o 6 public n-B - 145e75495359 |
|
866 | 867 | | | |
|
867 | 868 | o | 5 public n-A - d6bcb4f74035 |
|
868 | 869 | | | |
|
869 | 870 | | o 4 public a-D - b555f63b6063 |
|
870 | 871 | | | |
|
871 | 872 | | o 3 public a-C - 54acac6f23ab |
|
872 | 873 | | | |
|
873 | 874 | o | 2 public b-A - f54f1bb90ff3 |
|
874 | 875 | |/ |
|
875 | 876 | o 1 public a-B - 548a3d25dbf0 |
|
876 | 877 | | |
|
877 | 878 | o 0 public a-A - 054250a37db4 |
|
878 | 879 | |
|
879 | 880 | |
|
880 | 881 | $ hg -R ../alpha update 967b449fbc94 #for latter test consistency |
|
881 | 882 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
882 | 883 | $ hgph -R ../alpha |
|
883 | 884 | @ 10 public a-H - 967b449fbc94 |
|
884 | 885 | | |
|
885 | 886 | | o 9 draft a-G - 3e27b6f1eee1 |
|
886 | 887 | | | |
|
887 | 888 | | o 8 public a-F - b740e3e5c05d |
|
888 | 889 | | | |
|
889 | 890 | | o 7 public a-E - e9f537e46dea |
|
890 | 891 | | | |
|
891 | 892 | +---o 6 public n-B - 145e75495359 |
|
892 | 893 | | | |
|
893 | 894 | o | 5 public n-A - d6bcb4f74035 |
|
894 | 895 | | | |
|
895 | 896 | o | 4 public b-A - f54f1bb90ff3 |
|
896 | 897 | | | |
|
897 | 898 | | o 3 public a-D - b555f63b6063 |
|
898 | 899 | | | |
|
899 | 900 | | o 2 public a-C - 54acac6f23ab |
|
900 | 901 | |/ |
|
901 | 902 | o 1 public a-B - 548a3d25dbf0 |
|
902 | 903 | | |
|
903 | 904 | o 0 public a-A - 054250a37db4 |
|
904 | 905 | |
|
905 | 906 | |
|
906 | 907 | Discovery locally secret changeset on a remote repository: |
|
907 | 908 | |
|
908 | 909 | - should make it non-secret |
|
909 | 910 | |
|
910 | 911 | $ cd ../alpha |
|
911 | 912 | $ mkcommit A-secret --config phases.new-commit=2 |
|
912 | 913 | test-debug-phase: new rev 11: x -> 2 |
|
913 | 914 | $ hgph |
|
914 | 915 | @ 11 secret A-secret - 435b5d83910c |
|
915 | 916 | | |
|
916 | 917 | o 10 public a-H - 967b449fbc94 |
|
917 | 918 | | |
|
918 | 919 | | o 9 draft a-G - 3e27b6f1eee1 |
|
919 | 920 | | | |
|
920 | 921 | | o 8 public a-F - b740e3e5c05d |
|
921 | 922 | | | |
|
922 | 923 | | o 7 public a-E - e9f537e46dea |
|
923 | 924 | | | |
|
924 | 925 | +---o 6 public n-B - 145e75495359 |
|
925 | 926 | | | |
|
926 | 927 | o | 5 public n-A - d6bcb4f74035 |
|
927 | 928 | | | |
|
928 | 929 | o | 4 public b-A - f54f1bb90ff3 |
|
929 | 930 | | | |
|
930 | 931 | | o 3 public a-D - b555f63b6063 |
|
931 | 932 | | | |
|
932 | 933 | | o 2 public a-C - 54acac6f23ab |
|
933 | 934 | |/ |
|
934 | 935 | o 1 public a-B - 548a3d25dbf0 |
|
935 | 936 | | |
|
936 | 937 | o 0 public a-A - 054250a37db4 |
|
937 | 938 | |
|
938 | 939 | $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg |
|
939 | 940 | 1 changesets found |
|
940 | 941 | $ hg -R ../mu unbundle ../secret-bundle.hg |
|
941 | 942 | adding changesets |
|
942 | 943 | adding manifests |
|
943 | 944 | adding file changes |
|
944 | 945 | added 1 changesets with 1 changes to 1 files |
|
945 | 946 | new changesets 435b5d83910c |
|
946 | 947 | test-debug-phase: new rev 10: x -> 1 |
|
947 | 948 | (run 'hg update' to get a working copy) |
|
948 | 949 | $ hgph -R ../mu |
|
949 | 950 | o 10 draft A-secret - 435b5d83910c |
|
950 | 951 | | |
|
951 | 952 | o 9 public a-H - 967b449fbc94 |
|
952 | 953 | | |
|
953 | 954 | | o 8 public a-F - b740e3e5c05d |
|
954 | 955 | | | |
|
955 | 956 | | o 7 public a-E - e9f537e46dea |
|
956 | 957 | | | |
|
957 | 958 | +---o 6 public n-B - 145e75495359 |
|
958 | 959 | | | |
|
959 | 960 | o | 5 public n-A - d6bcb4f74035 |
|
960 | 961 | | | |
|
961 | 962 | | o 4 public a-D - b555f63b6063 |
|
962 | 963 | | | |
|
963 | 964 | | o 3 public a-C - 54acac6f23ab |
|
964 | 965 | | | |
|
965 | 966 | o | 2 public b-A - f54f1bb90ff3 |
|
966 | 967 | |/ |
|
967 | 968 | o 1 public a-B - 548a3d25dbf0 |
|
968 | 969 | | |
|
969 | 970 | o 0 public a-A - 054250a37db4 |
|
970 | 971 | |
|
971 | 972 | $ hg pull ../mu |
|
972 | 973 | pulling from ../mu |
|
973 | 974 | searching for changes |
|
974 | 975 | no changes found |
|
975 | 976 | test-debug-phase: move rev 11: 2 -> 1 |
|
976 | 977 | $ hgph |
|
977 | 978 | @ 11 draft A-secret - 435b5d83910c |
|
978 | 979 | | |
|
979 | 980 | o 10 public a-H - 967b449fbc94 |
|
980 | 981 | | |
|
981 | 982 | | o 9 draft a-G - 3e27b6f1eee1 |
|
982 | 983 | | | |
|
983 | 984 | | o 8 public a-F - b740e3e5c05d |
|
984 | 985 | | | |
|
985 | 986 | | o 7 public a-E - e9f537e46dea |
|
986 | 987 | | | |
|
987 | 988 | +---o 6 public n-B - 145e75495359 |
|
988 | 989 | | | |
|
989 | 990 | o | 5 public n-A - d6bcb4f74035 |
|
990 | 991 | | | |
|
991 | 992 | o | 4 public b-A - f54f1bb90ff3 |
|
992 | 993 | | | |
|
993 | 994 | | o 3 public a-D - b555f63b6063 |
|
994 | 995 | | | |
|
995 | 996 | | o 2 public a-C - 54acac6f23ab |
|
996 | 997 | |/ |
|
997 | 998 | o 1 public a-B - 548a3d25dbf0 |
|
998 | 999 | | |
|
999 | 1000 | o 0 public a-A - 054250a37db4 |
|
1000 | 1001 | |
|
1001 | 1002 | |
|
1002 | 1003 | pushing a locally public and draft changesets remotely secret should make them |
|
1003 | 1004 | appear on the remote side. |
|
1004 | 1005 | |
|
1005 | 1006 | $ hg -R ../mu phase --secret --force 967b449fbc94 |
|
1006 | 1007 | test-debug-phase: move rev 9: 0 -> 2 |
|
1007 | 1008 | test-debug-phase: move rev 10: 1 -> 2 |
|
1008 | 1009 | $ hg push -r 435b5d83910c ../mu |
|
1009 | 1010 | pushing to ../mu |
|
1010 | 1011 | searching for changes |
|
1011 | 1012 | abort: push creates new remote head 435b5d83910c! |
|
1012 | 1013 | (merge or see 'hg help push' for details about pushing new heads) |
|
1013 | 1014 | [255] |
|
1014 | 1015 | $ hg push -fr 435b5d83910c ../mu # because the push will create new visible head |
|
1015 | 1016 | pushing to ../mu |
|
1016 | 1017 | searching for changes |
|
1017 | 1018 | adding changesets |
|
1018 | 1019 | adding manifests |
|
1019 | 1020 | adding file changes |
|
1020 | 1021 | added 0 changesets with 0 changes to 2 files |
|
1021 | 1022 | test-debug-phase: move rev 9: 2 -> 0 |
|
1022 | 1023 | test-debug-phase: move rev 10: 2 -> 1 |
|
1023 | 1024 | $ hgph -R ../mu |
|
1024 | 1025 | o 10 draft A-secret - 435b5d83910c |
|
1025 | 1026 | | |
|
1026 | 1027 | o 9 public a-H - 967b449fbc94 |
|
1027 | 1028 | | |
|
1028 | 1029 | | o 8 public a-F - b740e3e5c05d |
|
1029 | 1030 | | | |
|
1030 | 1031 | | o 7 public a-E - e9f537e46dea |
|
1031 | 1032 | | | |
|
1032 | 1033 | +---o 6 public n-B - 145e75495359 |
|
1033 | 1034 | | | |
|
1034 | 1035 | o | 5 public n-A - d6bcb4f74035 |
|
1035 | 1036 | | | |
|
1036 | 1037 | | o 4 public a-D - b555f63b6063 |
|
1037 | 1038 | | | |
|
1038 | 1039 | | o 3 public a-C - 54acac6f23ab |
|
1039 | 1040 | | | |
|
1040 | 1041 | o | 2 public b-A - f54f1bb90ff3 |
|
1041 | 1042 | |/ |
|
1042 | 1043 | o 1 public a-B - 548a3d25dbf0 |
|
1043 | 1044 | | |
|
1044 | 1045 | o 0 public a-A - 054250a37db4 |
|
1045 | 1046 | |
|
1046 | 1047 | |
|
1047 | 1048 | pull new changeset with common draft locally |
|
1048 | 1049 | |
|
1049 | 1050 | $ hg up -q 967b449fbc94 # create a new root for draft |
|
1050 | 1051 | $ mkcommit 'alpha-more' |
|
1051 | 1052 | test-debug-phase: new rev 12: x -> 1 |
|
1052 | 1053 | created new head |
|
1053 | 1054 | $ hg push -fr . ../mu |
|
1054 | 1055 | pushing to ../mu |
|
1055 | 1056 | searching for changes |
|
1056 | 1057 | adding changesets |
|
1057 | 1058 | adding manifests |
|
1058 | 1059 | adding file changes |
|
1059 | 1060 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
1060 | 1061 | test-debug-phase: new rev 11: x -> 1 |
|
1061 | 1062 | $ cd ../mu |
|
1062 | 1063 | $ hg phase --secret --force 1c5cfd894796 |
|
1063 | 1064 | test-debug-phase: move rev 11: 1 -> 2 |
|
1064 | 1065 | $ hg up -q 435b5d83910c |
|
1065 | 1066 | $ mkcommit 'mu-more' |
|
1066 | 1067 | test-debug-phase: new rev 12: x -> 1 |
|
1067 | 1068 | $ cd ../alpha |
|
1068 | 1069 | $ hg pull ../mu |
|
1069 | 1070 | pulling from ../mu |
|
1070 | 1071 | searching for changes |
|
1071 | 1072 | adding changesets |
|
1072 | 1073 | adding manifests |
|
1073 | 1074 | adding file changes |
|
1074 | 1075 | added 1 changesets with 1 changes to 1 files |
|
1075 | 1076 | new changesets 5237fb433fc8 |
|
1076 | 1077 | test-debug-phase: new rev 13: x -> 1 |
|
1077 | 1078 | (run 'hg update' to get a working copy) |
|
1078 | 1079 | $ hgph |
|
1079 | 1080 | o 13 draft mu-more - 5237fb433fc8 |
|
1080 | 1081 | | |
|
1081 | 1082 | | @ 12 draft alpha-more - 1c5cfd894796 |
|
1082 | 1083 | | | |
|
1083 | 1084 | o | 11 draft A-secret - 435b5d83910c |
|
1084 | 1085 | |/ |
|
1085 | 1086 | o 10 public a-H - 967b449fbc94 |
|
1086 | 1087 | | |
|
1087 | 1088 | | o 9 draft a-G - 3e27b6f1eee1 |
|
1088 | 1089 | | | |
|
1089 | 1090 | | o 8 public a-F - b740e3e5c05d |
|
1090 | 1091 | | | |
|
1091 | 1092 | | o 7 public a-E - e9f537e46dea |
|
1092 | 1093 | | | |
|
1093 | 1094 | +---o 6 public n-B - 145e75495359 |
|
1094 | 1095 | | | |
|
1095 | 1096 | o | 5 public n-A - d6bcb4f74035 |
|
1096 | 1097 | | | |
|
1097 | 1098 | o | 4 public b-A - f54f1bb90ff3 |
|
1098 | 1099 | | | |
|
1099 | 1100 | | o 3 public a-D - b555f63b6063 |
|
1100 | 1101 | | | |
|
1101 | 1102 | | o 2 public a-C - 54acac6f23ab |
|
1102 | 1103 | |/ |
|
1103 | 1104 | o 1 public a-B - 548a3d25dbf0 |
|
1104 | 1105 | | |
|
1105 | 1106 | o 0 public a-A - 054250a37db4 |
|
1106 | 1107 | |
|
1107 | 1108 | |
|
1108 | 1109 | Test that test are properly ignored on remote event when existing locally |
|
1109 | 1110 | |
|
1110 | 1111 | $ cd .. |
|
1111 | 1112 | $ hg clone -qU -r b555f63b6063 -r f54f1bb90ff3 beta gamma |
|
1112 | 1113 | test-debug-phase: new rev 0: x -> 0 |
|
1113 | 1114 | test-debug-phase: new rev 1: x -> 0 |
|
1114 | 1115 | test-debug-phase: new rev 2: x -> 0 |
|
1115 | 1116 | test-debug-phase: new rev 3: x -> 0 |
|
1116 | 1117 | test-debug-phase: new rev 4: x -> 0 |
|
1117 | 1118 | |
|
1118 | 1119 | # pathological case are |
|
1119 | 1120 | # |
|
1120 | 1121 | # * secret remotely |
|
1121 | 1122 | # * known locally |
|
1122 | 1123 | # * repo have uncommon changeset |
|
1123 | 1124 | |
|
1124 | 1125 | $ hg -R beta phase --secret --force f54f1bb90ff3 |
|
1125 | 1126 | test-debug-phase: move rev 2: 0 -> 2 |
|
1126 | 1127 | $ hg -R gamma phase --draft --force f54f1bb90ff3 |
|
1127 | 1128 | test-debug-phase: move rev 2: 0 -> 1 |
|
1128 | 1129 | |
|
1129 | 1130 | $ cd gamma |
|
1130 | 1131 | $ hg pull ../beta |
|
1131 | 1132 | pulling from ../beta |
|
1132 | 1133 | searching for changes |
|
1133 | 1134 | adding changesets |
|
1134 | 1135 | adding manifests |
|
1135 | 1136 | adding file changes |
|
1136 | 1137 | added 2 changesets with 2 changes to 2 files |
|
1137 | 1138 | new changesets e9f537e46dea:b740e3e5c05d |
|
1138 | 1139 | test-debug-phase: new rev 5: x -> 0 |
|
1139 | 1140 | test-debug-phase: new rev 6: x -> 0 |
|
1140 | 1141 | (run 'hg update' to get a working copy) |
|
1141 | 1142 | $ hg phase f54f1bb90ff3 |
|
1142 | 1143 | 2: draft |
|
1143 | 1144 | |
|
1144 | 1145 | same over the wire |
|
1145 | 1146 | |
|
1146 | 1147 | $ cd ../beta |
|
1147 | 1148 | $ hg serve -p $HGPORT -d --pid-file=../beta.pid -E ../beta-error.log |
|
1148 | 1149 | $ cat ../beta.pid >> $DAEMON_PIDS |
|
1149 | 1150 | $ cd ../gamma |
|
1150 | 1151 | |
|
1151 | 1152 | $ hg pull http://localhost:$HGPORT/ # bundle2+ |
|
1152 | 1153 | pulling from http://localhost:$HGPORT/ |
|
1153 | 1154 | searching for changes |
|
1154 | 1155 | no changes found |
|
1155 | 1156 | $ hg phase f54f1bb90ff3 |
|
1156 | 1157 | 2: draft |
|
1157 | 1158 | |
|
1158 | 1159 | enforce bundle1 |
|
1159 | 1160 | |
|
1160 | 1161 | $ hg pull http://localhost:$HGPORT/ --config devel.legacy.exchange=bundle1 |
|
1161 | 1162 | pulling from http://localhost:$HGPORT/ |
|
1162 | 1163 | searching for changes |
|
1163 | 1164 | no changes found |
|
1164 | 1165 | $ hg phase f54f1bb90ff3 |
|
1165 | 1166 | 2: draft |
|
1166 | 1167 | |
|
1167 | 1168 | check that secret local on both side are not synced to public |
|
1168 | 1169 | |
|
1169 | 1170 | $ hg push -r b555f63b6063 http://localhost:$HGPORT/ |
|
1170 | 1171 | pushing to http://localhost:$HGPORT/ |
|
1171 | 1172 | searching for changes |
|
1172 | 1173 | no changes found |
|
1173 | 1174 | [1] |
|
1174 | 1175 | $ hg phase f54f1bb90ff3 |
|
1175 | 1176 | 2: draft |
|
1176 | 1177 | |
|
1178 | $ killdaemons.py | |
|
1179 | ||
|
1177 | 1180 | put the changeset in the draft state again |
|
1178 | 1181 | (first test after this one expect to be able to copy) |
|
1179 | 1182 | |
|
1180 | 1183 | $ cd .. |
|
1181 | 1184 | |
|
1182 | 1185 | |
|
1183 | 1186 | Test Clone behavior |
|
1184 | 1187 | |
|
1185 | 1188 | A. Clone without secret changeset |
|
1186 | 1189 | |
|
1187 | 1190 | 1. cloning non-publishing repository |
|
1188 | 1191 | (Phase should be preserved) |
|
1189 | 1192 | |
|
1190 | 1193 | # make sure there is no secret so we can use a copy clone |
|
1191 | 1194 | |
|
1192 | 1195 | $ hg -R mu phase --draft 'secret()' |
|
1193 | 1196 | test-debug-phase: move rev 11: 2 -> 1 |
|
1194 | 1197 | |
|
1195 | 1198 | $ hg clone -U mu Tau |
|
1196 | 1199 | $ hgph -R Tau |
|
1197 | 1200 | o 12 draft mu-more - 5237fb433fc8 |
|
1198 | 1201 | | |
|
1199 | 1202 | | o 11 draft alpha-more - 1c5cfd894796 |
|
1200 | 1203 | | | |
|
1201 | 1204 | o | 10 draft A-secret - 435b5d83910c |
|
1202 | 1205 | |/ |
|
1203 | 1206 | o 9 public a-H - 967b449fbc94 |
|
1204 | 1207 | | |
|
1205 | 1208 | | o 8 public a-F - b740e3e5c05d |
|
1206 | 1209 | | | |
|
1207 | 1210 | | o 7 public a-E - e9f537e46dea |
|
1208 | 1211 | | | |
|
1209 | 1212 | +---o 6 public n-B - 145e75495359 |
|
1210 | 1213 | | | |
|
1211 | 1214 | o | 5 public n-A - d6bcb4f74035 |
|
1212 | 1215 | | | |
|
1213 | 1216 | | o 4 public a-D - b555f63b6063 |
|
1214 | 1217 | | | |
|
1215 | 1218 | | o 3 public a-C - 54acac6f23ab |
|
1216 | 1219 | | | |
|
1217 | 1220 | o | 2 public b-A - f54f1bb90ff3 |
|
1218 | 1221 | |/ |
|
1219 | 1222 | o 1 public a-B - 548a3d25dbf0 |
|
1220 | 1223 | | |
|
1221 | 1224 | o 0 public a-A - 054250a37db4 |
|
1222 | 1225 | |
|
1223 | 1226 | |
|
1224 | 1227 | 2. cloning publishing repository |
|
1225 | 1228 | |
|
1226 | 1229 | (everything should be public) |
|
1227 | 1230 | |
|
1228 | 1231 | $ hg clone -U alpha Upsilon |
|
1229 | 1232 | $ hgph -R Upsilon |
|
1230 | 1233 | o 13 public mu-more - 5237fb433fc8 |
|
1231 | 1234 | | |
|
1232 | 1235 | | o 12 public alpha-more - 1c5cfd894796 |
|
1233 | 1236 | | | |
|
1234 | 1237 | o | 11 public A-secret - 435b5d83910c |
|
1235 | 1238 | |/ |
|
1236 | 1239 | o 10 public a-H - 967b449fbc94 |
|
1237 | 1240 | | |
|
1238 | 1241 | | o 9 public a-G - 3e27b6f1eee1 |
|
1239 | 1242 | | | |
|
1240 | 1243 | | o 8 public a-F - b740e3e5c05d |
|
1241 | 1244 | | | |
|
1242 | 1245 | | o 7 public a-E - e9f537e46dea |
|
1243 | 1246 | | | |
|
1244 | 1247 | +---o 6 public n-B - 145e75495359 |
|
1245 | 1248 | | | |
|
1246 | 1249 | o | 5 public n-A - d6bcb4f74035 |
|
1247 | 1250 | | | |
|
1248 | 1251 | o | 4 public b-A - f54f1bb90ff3 |
|
1249 | 1252 | | | |
|
1250 | 1253 | | o 3 public a-D - b555f63b6063 |
|
1251 | 1254 | | | |
|
1252 | 1255 | | o 2 public a-C - 54acac6f23ab |
|
1253 | 1256 | |/ |
|
1254 | 1257 | o 1 public a-B - 548a3d25dbf0 |
|
1255 | 1258 | | |
|
1256 | 1259 | o 0 public a-A - 054250a37db4 |
|
1257 | 1260 | |
|
1258 | 1261 | #if unix-permissions no-root |
|
1259 | 1262 | |
|
1260 | 1263 | Pushing From an unlockable repo |
|
1261 | 1264 | -------------------------------- |
|
1262 | 1265 | (issue3684) |
|
1263 | 1266 | |
|
1264 | 1267 | Unability to lock the source repo should not prevent the push. It will prevent |
|
1265 | 1268 | the retrieval of remote phase during push. For example, pushing to a publishing |
|
1266 | 1269 | server won't turn changeset public. |
|
1267 | 1270 | |
|
1268 | 1271 | 1. Test that push is not prevented |
|
1269 | 1272 | |
|
1270 | 1273 | $ hg init Phi |
|
1271 | 1274 | $ cd Upsilon |
|
1272 | 1275 | $ chmod -R -w .hg |
|
1273 | 1276 | $ hg push ../Phi |
|
1274 | 1277 | pushing to ../Phi |
|
1275 | 1278 | searching for changes |
|
1276 | 1279 | adding changesets |
|
1277 | 1280 | adding manifests |
|
1278 | 1281 | adding file changes |
|
1279 | 1282 | added 14 changesets with 14 changes to 14 files (+3 heads) |
|
1280 | 1283 | test-debug-phase: new rev 0: x -> 0 |
|
1281 | 1284 | test-debug-phase: new rev 1: x -> 0 |
|
1282 | 1285 | test-debug-phase: new rev 2: x -> 0 |
|
1283 | 1286 | test-debug-phase: new rev 3: x -> 0 |
|
1284 | 1287 | test-debug-phase: new rev 4: x -> 0 |
|
1285 | 1288 | test-debug-phase: new rev 5: x -> 0 |
|
1286 | 1289 | test-debug-phase: new rev 6: x -> 0 |
|
1287 | 1290 | test-debug-phase: new rev 7: x -> 0 |
|
1288 | 1291 | test-debug-phase: new rev 8: x -> 0 |
|
1289 | 1292 | test-debug-phase: new rev 9: x -> 0 |
|
1290 | 1293 | test-debug-phase: new rev 10: x -> 0 |
|
1291 | 1294 | test-debug-phase: new rev 11: x -> 0 |
|
1292 | 1295 | test-debug-phase: new rev 12: x -> 0 |
|
1293 | 1296 | test-debug-phase: new rev 13: x -> 0 |
|
1294 | 1297 | $ chmod -R +w .hg |
|
1295 | 1298 | |
|
1296 | 1299 | 2. Test that failed phases movement are reported |
|
1297 | 1300 | |
|
1298 | 1301 | $ hg phase --force --draft 3 |
|
1299 | 1302 | test-debug-phase: move rev 3: 0 -> 1 |
|
1300 | 1303 | test-debug-phase: move rev 7: 0 -> 1 |
|
1301 | 1304 | test-debug-phase: move rev 8: 0 -> 1 |
|
1302 | 1305 | test-debug-phase: move rev 9: 0 -> 1 |
|
1303 | 1306 | $ chmod -R -w .hg |
|
1304 | 1307 | $ hg push ../Phi |
|
1305 | 1308 | pushing to ../Phi |
|
1306 | 1309 | searching for changes |
|
1307 | 1310 | no changes found |
|
1308 | 1311 | cannot lock source repo, skipping local public phase update |
|
1309 | 1312 | [1] |
|
1310 | 1313 | $ chmod -R +w .hg |
|
1311 | 1314 | |
|
1312 | 1315 | 3. Test that push is prevented if lock was already acquired (not a permission |
|
1313 | 1316 | error, but EEXIST) |
|
1314 | 1317 | |
|
1315 | 1318 | $ touch .hg/store/lock |
|
1316 | 1319 | $ hg push ../Phi --config ui.timeout=1 |
|
1317 | 1320 | pushing to ../Phi |
|
1318 | 1321 | waiting for lock on repository $TESTTMP/Upsilon held by '' |
|
1319 | 1322 | abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by '' |
|
1320 | 1323 | (lock might be very busy) |
|
1321 | 1324 | [255] |
|
1322 | 1325 | $ rm .hg/store/lock |
|
1323 | 1326 | |
|
1324 | 1327 | $ cd .. |
|
1325 | 1328 | |
|
1326 | 1329 | #endif |
|
1327 | 1330 | |
|
1328 | 1331 | Test that clone behaves like pull and doesn't publish changesets as plain push |
|
1329 | 1332 | does. The conditional output accounts for changes in the conditional block |
|
1330 | 1333 | above. |
|
1331 | 1334 | |
|
1332 | 1335 | #if unix-permissions no-root |
|
1333 | 1336 | $ hg -R Upsilon phase -q --force --draft 2 |
|
1334 | 1337 | test-debug-phase: move rev 2: 0 -> 1 |
|
1335 | 1338 | #else |
|
1336 | 1339 | $ hg -R Upsilon phase -q --force --draft 2 |
|
1337 | 1340 | test-debug-phase: move rev 2: 0 -> 1 |
|
1338 | 1341 | test-debug-phase: move rev 3: 0 -> 1 |
|
1339 | 1342 | test-debug-phase: move rev 7: 0 -> 1 |
|
1340 | 1343 | test-debug-phase: move rev 8: 0 -> 1 |
|
1341 | 1344 | test-debug-phase: move rev 9: 0 -> 1 |
|
1342 | 1345 | #endif |
|
1343 | 1346 | |
|
1344 | 1347 | $ hg clone -q Upsilon Pi -r 7 |
|
1345 | 1348 | test-debug-phase: new rev 0: x -> 0 |
|
1346 | 1349 | test-debug-phase: new rev 1: x -> 0 |
|
1347 | 1350 | test-debug-phase: new rev 2: x -> 0 |
|
1348 | 1351 | test-debug-phase: new rev 3: x -> 0 |
|
1349 | 1352 | test-debug-phase: new rev 4: x -> 0 |
|
1350 | 1353 | $ hgph Upsilon -r 'min(draft())' |
|
1351 | 1354 | o 2 draft a-C - 54acac6f23ab |
|
1352 | 1355 | | |
|
1353 | 1356 | ~ |
|
1354 | 1357 | |
|
1355 | 1358 | $ hg -R Upsilon push Pi -r 7 |
|
1356 | 1359 | pushing to Pi |
|
1357 | 1360 | searching for changes |
|
1358 | 1361 | no changes found |
|
1359 | 1362 | test-debug-phase: move rev 2: 1 -> 0 |
|
1360 | 1363 | test-debug-phase: move rev 3: 1 -> 0 |
|
1361 | 1364 | test-debug-phase: move rev 7: 1 -> 0 |
|
1362 | 1365 | [1] |
|
1363 | 1366 | $ hgph Upsilon -r 'min(draft())' |
|
1364 | 1367 | o 8 draft a-F - b740e3e5c05d |
|
1365 | 1368 | | |
|
1366 | 1369 | ~ |
|
1367 | 1370 | |
|
1368 | 1371 | $ hg -R Upsilon push Pi -r 8 |
|
1369 | 1372 | pushing to Pi |
|
1370 | 1373 | searching for changes |
|
1371 | 1374 | adding changesets |
|
1372 | 1375 | adding manifests |
|
1373 | 1376 | adding file changes |
|
1374 | 1377 | added 1 changesets with 1 changes to 1 files |
|
1375 | 1378 | test-debug-phase: new rev 5: x -> 0 |
|
1376 | 1379 | test-debug-phase: move rev 8: 1 -> 0 |
|
1377 | 1380 | |
|
1378 | 1381 | $ hgph Upsilon -r 'min(draft())' |
|
1379 | 1382 | o 9 draft a-G - 3e27b6f1eee1 |
|
1380 | 1383 | | |
|
1381 | 1384 | ~ |
|
1385 | ||
|
1386 | Test phases exchange when a phaseroot is on a merge | |
|
1387 | ||
|
1388 | $ hg init mergetest | |
|
1389 | $ cd mergetest | |
|
1390 | > cat > .hg/hgrc << EOF | |
|
1391 | > [phases] | |
|
1392 | > publish = false | |
|
1393 | > EOF | |
|
1394 | ||
|
1395 | $ hg debugdrawdag << EOF | |
|
1396 | > E Z | |
|
1397 | > |\| | |
|
1398 | > D Y | |
|
1399 | > | | | |
|
1400 | > C X | |
|
1401 | > |/ | |
|
1402 | > B | |
|
1403 | > | | |
|
1404 | > A | |
|
1405 | > EOF | |
|
1406 | test-debug-phase: new rev 0: x -> 1 | |
|
1407 | test-debug-phase: new rev 1: x -> 1 | |
|
1408 | test-debug-phase: new rev 2: x -> 1 | |
|
1409 | test-debug-phase: new rev 3: x -> 1 | |
|
1410 | test-debug-phase: new rev 4: x -> 1 | |
|
1411 | test-debug-phase: new rev 5: x -> 1 | |
|
1412 | test-debug-phase: new rev 6: x -> 1 | |
|
1413 | test-debug-phase: new rev 7: x -> 1 | |
|
1414 | ||
|
1415 | $ hg phase --public -r D | |
|
1416 | test-debug-phase: move rev 0: 1 -> 0 | |
|
1417 | test-debug-phase: move rev 1: 1 -> 0 | |
|
1418 | test-debug-phase: move rev 2: 1 -> 0 | |
|
1419 | test-debug-phase: move rev 4: 1 -> 0 | |
|
1420 | ||
|
1421 | $ hg log -G -T '{shortest(node, 5)} {phase}' | |
|
1422 | o bb947 draft | |
|
1423 | | | |
|
1424 | | o 5ac28 draft | |
|
1425 | |/| | |
|
1426 | o | 13b7b draft | |
|
1427 | | | | |
|
1428 | | o f5853 public | |
|
1429 | | | | |
|
1430 | o | c67c4 draft | |
|
1431 | | | | |
|
1432 | | o 26805 public | |
|
1433 | |/ | |
|
1434 | o 11247 public | |
|
1435 | | | |
|
1436 | o 426ba public | |
|
1437 | ||
|
1438 | $ cd .. | |
|
1439 | ||
|
1440 | Works with default settings | |
|
1441 | ||
|
1442 | $ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid | |
|
1443 | $ cat hg.pid >> $DAEMON_PIDS | |
|
1444 | ||
|
1445 | $ hg clone -U http://localhost:$HGPORT mergetest-normal | |
|
1446 | requesting all changes | |
|
1447 | adding changesets | |
|
1448 | adding manifests | |
|
1449 | adding file changes | |
|
1450 | added 8 changesets with 7 changes to 7 files (+1 heads) | |
|
1451 | new changesets 426bada5c675:bb94757e651a | |
|
1452 | test-debug-phase: new rev 0: x -> 0 | |
|
1453 | test-debug-phase: new rev 1: x -> 0 | |
|
1454 | test-debug-phase: new rev 2: x -> 0 | |
|
1455 | test-debug-phase: new rev 3: x -> 1 | |
|
1456 | test-debug-phase: new rev 4: x -> 0 | |
|
1457 | test-debug-phase: new rev 5: x -> 1 | |
|
1458 | test-debug-phase: new rev 6: x -> 1 | |
|
1459 | test-debug-phase: new rev 7: x -> 1 | |
|
1460 | ||
|
1461 | $ hg -R mergetest-normal log -G -T '{shortest(node, 5)} {phase}' | |
|
1462 | o bb947 draft | |
|
1463 | | | |
|
1464 | | o 5ac28 draft | |
|
1465 | |/| | |
|
1466 | o | 13b7b draft | |
|
1467 | | | | |
|
1468 | | o f5853 public | |
|
1469 | | | | |
|
1470 | o | c67c4 draft | |
|
1471 | | | | |
|
1472 | | o 26805 public | |
|
1473 | |/ | |
|
1474 | o 11247 public | |
|
1475 | | | |
|
1476 | o 426ba public | |
|
1477 | ||
|
1478 | $ killdaemons.py | |
|
1479 | ||
|
1480 | With legacy listkeys over bundle2 | |
|
1481 | TODO issue 5939: public phase lost on 26805 and f5853 | |
|
1482 | ||
|
1483 | $ hg -R mergetest --config devel.legacy.exchange=phases serve -p $HGPORT -d --pid-file=hg.pid | |
|
1484 | $ cat hg.pid >> $DAEMON_PIDS | |
|
1485 | ||
|
1486 | $ hg clone -U http://localhost:$HGPORT mergetest-nobinarypart | |
|
1487 | requesting all changes | |
|
1488 | adding changesets | |
|
1489 | adding manifests | |
|
1490 | adding file changes | |
|
1491 | added 8 changesets with 7 changes to 7 files (+1 heads) | |
|
1492 | new changesets 426bada5c675:bb94757e651a | |
|
1493 | test-debug-phase: new rev 0: x -> 0 | |
|
1494 | test-debug-phase: new rev 1: x -> 0 | |
|
1495 | test-debug-phase: new rev 2: x -> 1 | |
|
1496 | test-debug-phase: new rev 3: x -> 1 | |
|
1497 | test-debug-phase: new rev 4: x -> 1 | |
|
1498 | test-debug-phase: new rev 5: x -> 1 | |
|
1499 | test-debug-phase: new rev 6: x -> 1 | |
|
1500 | test-debug-phase: new rev 7: x -> 1 | |
|
1501 | ||
|
1502 | $ hg -R mergetest-nobinarypart log -G -T '{shortest(node, 5)} {phase}' | |
|
1503 | o bb947 draft | |
|
1504 | | | |
|
1505 | | o 5ac28 draft | |
|
1506 | |/| | |
|
1507 | o | 13b7b draft | |
|
1508 | | | | |
|
1509 | | o f5853 draft | |
|
1510 | | | | |
|
1511 | o | c67c4 draft | |
|
1512 | | | | |
|
1513 | | o 26805 draft | |
|
1514 | |/ | |
|
1515 | o 11247 public | |
|
1516 | | | |
|
1517 | o 426ba public | |
|
1518 | ||
|
1519 | $ killdaemons.py | |
|
1520 | ||
|
1521 | Without bundle2 | |
|
1522 | TODO issue 5939: public phase lost on 26805 and f5853 | |
|
1523 | ||
|
1524 | $ hg -R mergetest serve -p $HGPORT -d --pid-file=hg.pid | |
|
1525 | $ cat hg.pid >> $DAEMON_PIDS | |
|
1526 | ||
|
1527 | $ hg --config devel.legacy.exchange=bundle1 clone -U http://localhost:$HGPORT mergetest-bundle1 | |
|
1528 | requesting all changes | |
|
1529 | adding changesets | |
|
1530 | adding manifests | |
|
1531 | adding file changes | |
|
1532 | added 8 changesets with 7 changes to 7 files (+1 heads) | |
|
1533 | new changesets 426bada5c675:bb94757e651a | |
|
1534 | test-debug-phase: new rev 0: x -> 0 | |
|
1535 | test-debug-phase: new rev 1: x -> 0 | |
|
1536 | test-debug-phase: new rev 2: x -> 1 | |
|
1537 | test-debug-phase: new rev 3: x -> 1 | |
|
1538 | test-debug-phase: new rev 4: x -> 1 | |
|
1539 | test-debug-phase: new rev 5: x -> 1 | |
|
1540 | test-debug-phase: new rev 6: x -> 1 | |
|
1541 | test-debug-phase: new rev 7: x -> 1 | |
|
1542 | ||
|
1543 | $ hg -R mergetest-bundle1 log -G -T '{shortest(node, 5)} {phase}' | |
|
1544 | o bb947 draft | |
|
1545 | | | |
|
1546 | | o 5ac28 draft | |
|
1547 | |/| | |
|
1548 | o | 13b7b draft | |
|
1549 | | | | |
|
1550 | | o f5853 draft | |
|
1551 | | | | |
|
1552 | o | c67c4 draft | |
|
1553 | | | | |
|
1554 | | o 26805 draft | |
|
1555 | |/ | |
|
1556 | o 11247 public | |
|
1557 | | | |
|
1558 | o 426ba public | |
|
1559 |
General Comments 0
You need to be logged in to leave comments.
Login now