comparison tests/test-share-safe.t @ 47279:40b51c28b242

dirstate-v2: Update the expected output of some tests for new requirement Fix most test failures (except in test-narrow-debugrebuilddirstate.t and test-upgrade-repo.t) caused by the new entry in config or in .hg/requires when running `run-tests.py --extra-config-opt format.exp-dirstate-v2=1` There is no CI so far for this configuration. Differential Revision: https://phab.mercurial-scm.org/D10718
author Simon Sapin <simon.sapin@octobus.net>
date Wed, 19 May 2021 13:15:00 +0200
parents f8f738c24d2f
children bf11ff22a9af
comparison
equal deleted inserted replaced
47278:6a60f03d2241 47279:40b51c28b242
17 prepare source repo 17 prepare source repo
18 18
19 $ hg init source 19 $ hg init source
20 $ cd source 20 $ cd source
21 $ cat .hg/requires 21 $ cat .hg/requires
22 exp-dirstate-v2 (dirstate-v2 !)
22 share-safe 23 share-safe
23 $ cat .hg/store/requires 24 $ cat .hg/store/requires
24 dotencode 25 dotencode
25 fncache 26 fncache
26 generaldelta 27 generaldelta
27 revlogv1 28 revlogv1
28 sparserevlog 29 sparserevlog
29 store 30 store
30 $ hg debugrequirements 31 $ hg debugrequirements
31 dotencode 32 dotencode
33 exp-dirstate-v2 (dirstate-v2 !)
32 fncache 34 fncache
33 generaldelta 35 generaldelta
34 revlogv1 36 revlogv1
35 share-safe 37 share-safe
36 sparserevlog 38 sparserevlog
50 $ hg share source shared1 52 $ hg share source shared1
51 updating working directory 53 updating working directory
52 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 54 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
53 $ cd shared1 55 $ cd shared1
54 $ cat .hg/requires 56 $ cat .hg/requires
57 exp-dirstate-v2 (dirstate-v2 !)
55 share-safe 58 share-safe
56 shared 59 shared
57 60
58 $ hg debugrequirements -R ../source 61 $ hg debugrequirements -R ../source
59 dotencode 62 dotencode
63 exp-dirstate-v2 (dirstate-v2 !)
60 fncache 64 fncache
61 generaldelta 65 generaldelta
62 revlogv1 66 revlogv1
63 share-safe 67 share-safe
64 sparserevlog 68 sparserevlog
65 store 69 store
66 70
67 $ hg debugrequirements 71 $ hg debugrequirements
68 dotencode 72 dotencode
73 exp-dirstate-v2 (dirstate-v2 !)
69 fncache 74 fncache
70 generaldelta 75 generaldelta
71 revlogv1 76 revlogv1
72 share-safe 77 share-safe
73 shared 78 shared
217 222
218 $ hg debugupgraderepo --run -q 223 $ hg debugupgraderepo --run -q
219 upgrade will perform the following actions: 224 upgrade will perform the following actions:
220 225
221 requirements 226 requirements
222 preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store 227 preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-dirstate-v2 !)
228 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (dirstate-v2 !)
223 added: revlog-compression-zstd 229 added: revlog-compression-zstd
224 230
225 processed revlogs: 231 processed revlogs:
226 - all-filelogs 232 - all-filelogs
227 - changelog 233 - changelog
243 249
244 $ hg debugupgraderepo --run -q 250 $ hg debugupgraderepo --run -q
245 upgrade will perform the following actions: 251 upgrade will perform the following actions:
246 252
247 requirements 253 requirements
248 preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd !) 254 preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
249 preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd !) 255 preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !)
256 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd dirstate-v2 !)
257 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd dirstate-v2 !)
250 added: persistent-nodemap 258 added: persistent-nodemap
251 259
252 processed revlogs: 260 processed revlogs:
253 - all-filelogs 261 - all-filelogs
254 - changelog 262 - changelog
317 325
318 $ hg init non-share-safe --config format.use-share-safe=false 326 $ hg init non-share-safe --config format.use-share-safe=false
319 $ cd non-share-safe 327 $ cd non-share-safe
320 $ hg debugrequirements 328 $ hg debugrequirements
321 dotencode 329 dotencode
330 exp-dirstate-v2 (dirstate-v2 !)
322 fncache 331 fncache
323 generaldelta 332 generaldelta
324 revlogv1 333 revlogv1
325 sparserevlog 334 sparserevlog
326 store 335 store
335 $ hg share non-share-safe nss-share 344 $ hg share non-share-safe nss-share
336 updating working directory 345 updating working directory
337 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 346 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
338 $ hg debugrequirements -R nss-share 347 $ hg debugrequirements -R nss-share
339 dotencode 348 dotencode
349 exp-dirstate-v2 (dirstate-v2 !)
340 fncache 350 fncache
341 generaldelta 351 generaldelta
342 revlogv1 352 revlogv1
343 shared 353 shared
344 sparserevlog 354 sparserevlog
347 357
348 Upgrade 358 Upgrade
349 359
350 $ hg debugupgraderepo -q 360 $ hg debugupgraderepo -q
351 requirements 361 requirements
352 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store 362 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-dirstate-v2 !)
363 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, sparserevlog, store (dirstate-v2 !)
353 added: share-safe 364 added: share-safe
354 365
355 processed revlogs: 366 processed revlogs:
356 - all-filelogs 367 - all-filelogs
357 - changelog 368 - changelog
359 370
360 $ hg debugupgraderepo --run 371 $ hg debugupgraderepo --run
361 upgrade will perform the following actions: 372 upgrade will perform the following actions:
362 373
363 requirements 374 requirements
364 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store 375 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-dirstate-v2 !)
376 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, sparserevlog, store (dirstate-v2 !)
365 added: share-safe 377 added: share-safe
366 378
367 share-safe 379 share-safe
368 Upgrades a repository to share-safe format so that future shares of this repository share its requirements and configs. 380 Upgrades a repository to share-safe format so that future shares of this repository share its requirements and configs.
369 381
380 removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob) 392 removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
381 repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode. 393 repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode.
382 394
383 $ hg debugrequirements 395 $ hg debugrequirements
384 dotencode 396 dotencode
397 exp-dirstate-v2 (dirstate-v2 !)
385 fncache 398 fncache
386 generaldelta 399 generaldelta
387 revlogv1 400 revlogv1
388 share-safe 401 share-safe
389 sparserevlog 402 sparserevlog
390 store 403 store
391 404
392 $ cat .hg/requires 405 $ cat .hg/requires
406 exp-dirstate-v2 (dirstate-v2 !)
393 share-safe 407 share-safe
394 408
395 $ cat .hg/store/requires 409 $ cat .hg/store/requires
396 dotencode 410 dotencode
397 fncache 411 fncache
437 > use-share-safe = False 451 > use-share-safe = False
438 > EOF 452 > EOF
439 453
440 $ hg debugupgraderepo -q 454 $ hg debugupgraderepo -q
441 requirements 455 requirements
442 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store 456 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-dirstate-v2 !)
457 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, sparserevlog, store (dirstate-v2 !)
443 removed: share-safe 458 removed: share-safe
444 459
445 processed revlogs: 460 processed revlogs:
446 - all-filelogs 461 - all-filelogs
447 - changelog 462 - changelog
449 464
450 $ hg debugupgraderepo --run 465 $ hg debugupgraderepo --run
451 upgrade will perform the following actions: 466 upgrade will perform the following actions:
452 467
453 requirements 468 requirements
454 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store 469 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-dirstate-v2 !)
470 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, sparserevlog, store (dirstate-v2 !)
455 removed: share-safe 471 removed: share-safe
456 472
457 processed revlogs: 473 processed revlogs:
458 - all-filelogs 474 - all-filelogs
459 - changelog 475 - changelog
467 removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob) 483 removing temporary repository $TESTTMP/non-share-safe/.hg/upgrade.* (glob)
468 repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared. 484 repository downgraded to not use share safe mode, existing shares will not work and needs to be reshared.
469 485
470 $ hg debugrequirements 486 $ hg debugrequirements
471 dotencode 487 dotencode
488 exp-dirstate-v2 (dirstate-v2 !)
472 fncache 489 fncache
473 generaldelta 490 generaldelta
474 revlogv1 491 revlogv1
475 sparserevlog 492 sparserevlog
476 store 493 store
477 494
478 $ cat .hg/requires 495 $ cat .hg/requires
479 dotencode 496 dotencode
497 exp-dirstate-v2 (dirstate-v2 !)
480 fncache 498 fncache
481 generaldelta 499 generaldelta
482 revlogv1 500 revlogv1
483 sparserevlog 501 sparserevlog
484 store 502 store
532 550
533 $ hg debugupgraderepo -q --run --config format.use-share-safe=True 551 $ hg debugupgraderepo -q --run --config format.use-share-safe=True
534 upgrade will perform the following actions: 552 upgrade will perform the following actions:
535 553
536 requirements 554 requirements
537 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store 555 preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store (no-dirstate-v2 !)
556 preserved: dotencode, exp-dirstate-v2, fncache, generaldelta, revlogv1, sparserevlog, store (dirstate-v2 !)
538 added: share-safe 557 added: share-safe
539 558
540 processed revlogs: 559 processed revlogs:
541 - all-filelogs 560 - all-filelogs
542 - changelog 561 - changelog
543 - manifest 562 - manifest
544 563
545 repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode. 564 repository upgraded to share safe mode, existing shares will still work in old non-safe mode. Re-share existing shares to use them in safe mode New shares will be created in safe mode.
546 $ hg debugrequirements 565 $ hg debugrequirements
547 dotencode 566 dotencode
567 exp-dirstate-v2 (dirstate-v2 !)
548 fncache 568 fncache
549 generaldelta 569 generaldelta
550 revlogv1 570 revlogv1
551 share-safe 571 share-safe
552 sparserevlog 572 sparserevlog