Show More
@@ -22,13 +22,22 b' See also: test-obsolete-checkheads.t' | |||||
22 | > [experimental] |
|
22 | > [experimental] | |
23 | > branch-cache-v3=yes |
|
23 | > branch-cache-v3=yes | |
24 | > EOF |
|
24 | > EOF | |
|
25 | $ CACHE_PREFIX=branch3 | |||
25 | #else |
|
26 | #else | |
26 | $ cat <<EOF >> $HGRCPATH |
|
27 | $ cat <<EOF >> $HGRCPATH | |
27 | > [experimental] |
|
28 | > [experimental] | |
28 | > branch-cache-v3=no |
|
29 | > branch-cache-v3=no | |
29 | > EOF |
|
30 | > EOF | |
|
31 | $ CACHE_PREFIX=branch2 | |||
30 | #endif |
|
32 | #endif | |
31 |
|
33 | |||
|
34 | $ show_cache() { | |||
|
35 | > for cache_file in .hg/cache/$CACHE_PREFIX*; do | |||
|
36 | > echo "##### $cache_file" | |||
|
37 | > cat $cache_file | |||
|
38 | > done | |||
|
39 | > } | |||
|
40 | ||||
32 | Setup graph |
|
41 | Setup graph | |
33 | ############# |
|
42 | ############# | |
34 |
|
43 | |||
@@ -139,6 +148,19 b' Absolete a couple of changes' | |||||
139 | $ hg heads -T '{desc}\n' |
|
148 | $ hg heads -T '{desc}\n' | |
140 | A_3 |
|
149 | A_3 | |
141 | B_1 |
|
150 | B_1 | |
|
151 | #if v2 | |||
|
152 | $ show_cache | |||
|
153 | ##### .hg/cache/branch2-served | |||
|
154 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
155 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
156 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
157 | #else | |||
|
158 | $ show_cache | |||
|
159 | ##### .hg/cache/branch3-served | |||
|
160 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
161 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
162 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
163 | #endif | |||
142 | $ cd .. |
|
164 | $ cd .. | |
143 |
|
165 | |||
144 |
|
166 | |||
@@ -175,6 +197,27 b' Revealing tipmost changeset' | |||||
175 | $ hg heads -T '{desc}\n' |
|
197 | $ hg heads -T '{desc}\n' | |
176 | A_3 |
|
198 | A_3 | |
177 | B_1 |
|
199 | B_1 | |
|
200 | #if v2 | |||
|
201 | $ show_cache | |||
|
202 | ##### .hg/cache/branch2 | |||
|
203 | 3d808bbc94408ea19da905596d4079357a1f28be 8 a943c3355ad9e93654d58b1c934c7c4329a5d1d4 | |||
|
204 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
205 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
206 | ##### .hg/cache/branch2-served | |||
|
207 | 3d808bbc94408ea19da905596d4079357a1f28be 8 a943c3355ad9e93654d58b1c934c7c4329a5d1d4 | |||
|
208 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
209 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
210 | #else | |||
|
211 | $ show_cache | |||
|
212 | ##### .hg/cache/branch3 | |||
|
213 | filtered-hash=a943c3355ad9e93654d58b1c934c7c4329a5d1d4 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
214 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
215 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
216 | ##### .hg/cache/branch3-served | |||
|
217 | filtered-hash=a943c3355ad9e93654d58b1c934c7c4329a5d1d4 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
218 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
219 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
220 | #endif | |||
178 |
|
221 | |||
179 | Even when computing branches from scratch |
|
222 | Even when computing branches from scratch | |
180 |
|
223 | |||
@@ -183,6 +226,19 b' Even when computing branches from scratc' | |||||
183 | $ hg heads -T '{desc}\n' |
|
226 | $ hg heads -T '{desc}\n' | |
184 | A_3 |
|
227 | A_3 | |
185 | B_1 |
|
228 | B_1 | |
|
229 | #if v2 | |||
|
230 | $ show_cache | |||
|
231 | ##### .hg/cache/branch2-served | |||
|
232 | 3d808bbc94408ea19da905596d4079357a1f28be 8 a943c3355ad9e93654d58b1c934c7c4329a5d1d4 | |||
|
233 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
234 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
235 | #else | |||
|
236 | $ show_cache | |||
|
237 | ##### .hg/cache/branch3-served | |||
|
238 | filtered-hash=a943c3355ad9e93654d58b1c934c7c4329a5d1d4 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
239 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
240 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
241 | #endif | |||
186 |
|
242 | |||
187 | And we can get back to normal |
|
243 | And we can get back to normal | |
188 |
|
244 | |||
@@ -190,6 +246,19 b' And we can get back to normal' | |||||
190 | $ hg heads -T '{desc}\n' |
|
246 | $ hg heads -T '{desc}\n' | |
191 | A_3 |
|
247 | A_3 | |
192 | B_1 |
|
248 | B_1 | |
|
249 | #if v2 | |||
|
250 | $ show_cache | |||
|
251 | ##### .hg/cache/branch2-served | |||
|
252 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
253 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
254 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
255 | #else | |||
|
256 | $ show_cache | |||
|
257 | ##### .hg/cache/branch3-served | |||
|
258 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
259 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
260 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
261 | #endif | |||
193 |
|
262 | |||
194 | $ cd .. |
|
263 | $ cd .. | |
195 | $ rm -rf tmp-repo |
|
264 | $ rm -rf tmp-repo | |
@@ -222,6 +291,27 b' Check that revealing an obsolete changes' | |||||
222 | $ hg heads -T '{desc}\n' |
|
291 | $ hg heads -T '{desc}\n' | |
223 | A_3 |
|
292 | A_3 | |
224 | B_1 |
|
293 | B_1 | |
|
294 | #if v2 | |||
|
295 | $ show_cache | |||
|
296 | ##### .hg/cache/branch2 | |||
|
297 | 3d808bbc94408ea19da905596d4079357a1f28be 8 a943c3355ad9e93654d58b1c934c7c4329a5d1d4 | |||
|
298 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
299 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
300 | ##### .hg/cache/branch2-served | |||
|
301 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
302 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
303 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
304 | #else | |||
|
305 | $ show_cache | |||
|
306 | ##### .hg/cache/branch3 | |||
|
307 | filtered-hash=a943c3355ad9e93654d58b1c934c7c4329a5d1d4 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
308 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
309 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
310 | ##### .hg/cache/branch3-served | |||
|
311 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
312 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
313 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
314 | #endif | |||
225 |
|
315 | |||
226 | Even when computing branches from scratch |
|
316 | Even when computing branches from scratch | |
227 |
|
317 | |||
@@ -230,6 +320,19 b' Even when computing branches from scratc' | |||||
230 | $ hg heads -T '{desc}\n' |
|
320 | $ hg heads -T '{desc}\n' | |
231 | A_3 |
|
321 | A_3 | |
232 | B_1 |
|
322 | B_1 | |
|
323 | #if v2 | |||
|
324 | $ show_cache | |||
|
325 | ##### .hg/cache/branch2-served | |||
|
326 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
327 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
328 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
329 | #else | |||
|
330 | $ show_cache | |||
|
331 | ##### .hg/cache/branch3-served | |||
|
332 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
333 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
334 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
335 | #endif | |||
233 |
|
336 | |||
234 | And we can get back to normal |
|
337 | And we can get back to normal | |
235 |
|
338 | |||
@@ -237,6 +340,19 b' And we can get back to normal' | |||||
237 | $ hg heads -T '{desc}\n' |
|
340 | $ hg heads -T '{desc}\n' | |
238 | A_3 |
|
341 | A_3 | |
239 | B_1 |
|
342 | B_1 | |
|
343 | #if v2 | |||
|
344 | $ show_cache | |||
|
345 | ##### .hg/cache/branch2-served | |||
|
346 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
347 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
348 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
349 | #else | |||
|
350 | $ show_cache | |||
|
351 | ##### .hg/cache/branch3-served | |||
|
352 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
353 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
354 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
355 | #endif | |||
240 |
|
356 | |||
241 | $ cd .. |
|
357 | $ cd .. | |
242 | $ rm -rf tmp-repo |
|
358 | $ rm -rf tmp-repo | |
@@ -280,6 +396,19 b' branch head are okay' | |||||
280 | $ hg heads -T '{desc}\n' |
|
396 | $ hg heads -T '{desc}\n' | |
281 | A_3 |
|
397 | A_3 | |
282 | B_4 |
|
398 | B_4 | |
|
399 | #if v2 | |||
|
400 | $ show_cache | |||
|
401 | ##### .hg/cache/branch2-served | |||
|
402 | 3d808bbc94408ea19da905596d4079357a1f28be 8 ac5282439f301518f362f37547fcd52bcc670373 | |||
|
403 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
404 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
405 | #else | |||
|
406 | $ show_cache | |||
|
407 | ##### .hg/cache/branch3-served | |||
|
408 | filtered-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
409 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
410 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
411 | #endif | |||
283 |
|
412 | |||
284 | Even when computing branches from scratch |
|
413 | Even when computing branches from scratch | |
285 |
|
414 | |||
@@ -288,6 +417,19 b' Even when computing branches from scratc' | |||||
288 | $ hg heads -T '{desc}\n' |
|
417 | $ hg heads -T '{desc}\n' | |
289 | A_3 |
|
418 | A_3 | |
290 | B_4 |
|
419 | B_4 | |
|
420 | #if v2 | |||
|
421 | $ show_cache | |||
|
422 | ##### .hg/cache/branch2-served | |||
|
423 | 3d808bbc94408ea19da905596d4079357a1f28be 8 ac5282439f301518f362f37547fcd52bcc670373 | |||
|
424 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
425 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
426 | #else | |||
|
427 | $ show_cache | |||
|
428 | ##### .hg/cache/branch3-served | |||
|
429 | filtered-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
430 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
431 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
432 | #endif | |||
291 |
|
433 | |||
292 | And we can get back to normal |
|
434 | And we can get back to normal | |
293 |
|
435 | |||
@@ -295,6 +437,19 b' And we can get back to normal' | |||||
295 | $ hg heads -T '{desc}\n' |
|
437 | $ hg heads -T '{desc}\n' | |
296 | A_3 |
|
438 | A_3 | |
297 | B_4 |
|
439 | B_4 | |
|
440 | #if v2 | |||
|
441 | $ show_cache | |||
|
442 | ##### .hg/cache/branch2-served | |||
|
443 | 7c29ff2453bf38c75ee8982935739103c38a9284 7 | |||
|
444 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
445 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
446 | #else | |||
|
447 | $ show_cache | |||
|
448 | ##### .hg/cache/branch3-served | |||
|
449 | tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7 | |||
|
450 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
451 | 7c29ff2453bf38c75ee8982935739103c38a9284 o default | |||
|
452 | #endif | |||
298 |
|
453 | |||
299 | $ cd .. |
|
454 | $ cd .. | |
300 | $ rm -rf tmp-repo |
|
455 | $ rm -rf tmp-repo | |
@@ -327,6 +482,20 b' Getting the obsolescence marker after th' | |||||
327 | $ hg heads -T '{desc}\n' |
|
482 | $ hg heads -T '{desc}\n' | |
328 | A_4 |
|
483 | A_4 | |
329 | B_4 |
|
484 | B_4 | |
|
485 | #if v2 | |||
|
486 | $ show_cache | |||
|
487 | ##### .hg/cache/branch2-served | |||
|
488 | 3d808bbc94408ea19da905596d4079357a1f28be 8 | |||
|
489 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
490 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
491 | #else | |||
|
492 | $ show_cache | |||
|
493 | ##### .hg/cache/branch3-served | |||
|
494 | tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
495 | 63ba7cd843d1e95aac1a24435befeb1909c53619 o default | |||
|
496 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
497 | #endif | |||
|
498 | ||||
330 | $ hg pull --rev `cat ../main-single-branch-node_B4` --remote-hidden |
|
499 | $ hg pull --rev `cat ../main-single-branch-node_B4` --remote-hidden | |
331 | pulling from $TESTTMP/main-single-branch |
|
500 | pulling from $TESTTMP/main-single-branch | |
332 | no changes found |
|
501 | no changes found | |
@@ -338,6 +507,19 b' branch head are okay' | |||||
338 | $ hg heads -T '{desc}\n' |
|
507 | $ hg heads -T '{desc}\n' | |
339 | A_4 |
|
508 | A_4 | |
340 | B_1 |
|
509 | B_1 | |
|
510 | #if v2 | |||
|
511 | $ show_cache | |||
|
512 | ##### .hg/cache/branch2-served | |||
|
513 | 3d808bbc94408ea19da905596d4079357a1f28be 8 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
514 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
515 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
516 | #else | |||
|
517 | $ show_cache | |||
|
518 | ##### .hg/cache/branch3-served | |||
|
519 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
520 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
521 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
522 | #endif | |||
341 |
|
523 | |||
342 | Even when computing branches from scratch |
|
524 | Even when computing branches from scratch | |
343 |
|
525 | |||
@@ -346,6 +528,19 b' Even when computing branches from scratc' | |||||
346 | $ hg heads -T '{desc}\n' |
|
528 | $ hg heads -T '{desc}\n' | |
347 | A_4 |
|
529 | A_4 | |
348 | B_1 |
|
530 | B_1 | |
|
531 | #if v2 | |||
|
532 | $ show_cache | |||
|
533 | ##### .hg/cache/branch2-served | |||
|
534 | 3d808bbc94408ea19da905596d4079357a1f28be 8 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
535 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
536 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
537 | #else | |||
|
538 | $ show_cache | |||
|
539 | ##### .hg/cache/branch3-served | |||
|
540 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
541 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
542 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
543 | #endif | |||
349 |
|
544 | |||
350 | And we can get back to normal |
|
545 | And we can get back to normal | |
351 |
|
546 | |||
@@ -353,6 +548,19 b' And we can get back to normal' | |||||
353 | $ hg heads -T '{desc}\n' |
|
548 | $ hg heads -T '{desc}\n' | |
354 | A_4 |
|
549 | A_4 | |
355 | B_1 |
|
550 | B_1 | |
|
551 | #if v2 | |||
|
552 | $ show_cache | |||
|
553 | ##### .hg/cache/branch2-served | |||
|
554 | 3d808bbc94408ea19da905596d4079357a1f28be 8 f8006d64a10d35c011a5c5fa88be1e25c5929514 | |||
|
555 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
556 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
557 | #else | |||
|
558 | $ show_cache | |||
|
559 | ##### .hg/cache/branch3-served | |||
|
560 | filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8 | |||
|
561 | 550bb31f072912453ccbb503de1d554616911e88 o default | |||
|
562 | 3d808bbc94408ea19da905596d4079357a1f28be o default | |||
|
563 | #endif | |||
356 |
|
564 | |||
357 | $ cd .. |
|
565 | $ cd .. | |
358 | $ rm -rf tmp-repo |
|
566 | $ rm -rf tmp-repo |
General Comments 0
You need to be logged in to leave comments.
Login now