Show More
@@ -76,6 +76,7 b' def supportremovedrequirements(repo):' | |||||
76 | """ |
|
76 | """ | |
77 | supported = { |
|
77 | supported = { | |
78 | localrepo.SPARSEREVLOG_REQUIREMENT, |
|
78 | localrepo.SPARSEREVLOG_REQUIREMENT, | |
|
79 | localrepo.SIDEDATA_REQUIREMENT, | |||
79 | } |
|
80 | } | |
80 | for name in compression.compengines: |
|
81 | for name in compression.compengines: | |
81 | engine = compression.compengines[name] |
|
82 | engine = compression.compengines[name] | |
@@ -679,8 +680,18 b' UPGRADE_ALL_REVLOGS = frozenset(' | |||||
679 | ) |
|
680 | ) | |
680 |
|
681 | |||
681 |
|
682 | |||
682 |
def getsidedatacompanion(srcrepo, d |
|
683 | def getsidedatacompanion(srcrepo, dstrepo): | |
683 | return None |
|
684 | sidedatacompanion = None | |
|
685 | removedreqs = srcrepo.requirements - dstrepo.requirements | |||
|
686 | if localrepo.SIDEDATA_REQUIREMENT in removedreqs: | |||
|
687 | ||||
|
688 | def sidedatacompanion(rl, rev): | |||
|
689 | rl = getattr(rl, '_revlog', rl) | |||
|
690 | if rl.flags(rev) & revlog.REVIDX_SIDEDATA: | |||
|
691 | return True, (), {} | |||
|
692 | return False, (), {} | |||
|
693 | ||||
|
694 | return sidedatacompanion | |||
684 |
|
695 | |||
685 |
|
696 | |||
686 | def matchrevlog(revlogfilter, entry): |
|
697 | def matchrevlog(revlogfilter, entry): |
@@ -71,8 +71,8 b' Check that we can upgrade to sidedata' | |||||
71 | compression-level: default default default |
|
71 | compression-level: default default default | |
72 | $ hg debugupgraderepo -R up-no-side-data --config format.use-side-data=yes > /dev/null |
|
72 | $ hg debugupgraderepo -R up-no-side-data --config format.use-side-data=yes > /dev/null | |
73 |
|
73 | |||
74 |
Check that we can |
|
74 | Check that we can downgrade from sidedata | |
75 | ---------------------------------------- |
|
75 | ----------------------------------------- | |
76 |
|
76 | |||
77 | $ hg init up-side-data --config format.use-side-data=yes |
|
77 | $ hg init up-side-data --config format.use-side-data=yes | |
78 | $ hg debugformat -v -R up-side-data |
|
78 | $ hg debugformat -v -R up-side-data | |
@@ -95,6 +95,4 b' Check that we cannot upgrade to sidedata' | |||||
95 | plain-cl-delta: yes yes yes |
|
95 | plain-cl-delta: yes yes yes | |
96 | compression: zlib zlib zlib |
|
96 | compression: zlib zlib zlib | |
97 | compression-level: default default default |
|
97 | compression-level: default default default | |
98 | $ hg debugupgraderepo -R up-side-data --config format.use-side-data=no |
|
98 | $ hg debugupgraderepo -R up-side-data --config format.use-side-data=no > /dev/null | |
99 | abort: cannot upgrade repository; requirement would be removed: exp-sidedata-flag |
|
|||
100 | [255] |
|
@@ -1361,3 +1361,53 b' upgrade' | |||||
1361 | entry-0001 size 4 |
|
1361 | entry-0001 size 4 | |
1362 | entry-0002 size 32 |
|
1362 | entry-0002 size 32 | |
1363 |
|
1363 | |||
|
1364 | downgrade | |||
|
1365 | ||||
|
1366 | $ hg debugupgraderepo --config format.use-side-data=no --run --no-backup > /dev/null | |||
|
1367 | $ hg debugformat -v | |||
|
1368 | format-variant repo config default | |||
|
1369 | fncache: yes yes yes | |||
|
1370 | dotencode: yes yes yes | |||
|
1371 | generaldelta: yes yes yes | |||
|
1372 | sparserevlog: yes yes yes | |||
|
1373 | sidedata: no no no | |||
|
1374 | plain-cl-delta: yes yes yes | |||
|
1375 | compression: zstd zstd zlib | |||
|
1376 | compression-level: default default default | |||
|
1377 | $ cat .hg/requires | |||
|
1378 | dotencode | |||
|
1379 | fncache | |||
|
1380 | generaldelta | |||
|
1381 | revlog-compression-zstd | |||
|
1382 | revlogv1 | |||
|
1383 | sparserevlog | |||
|
1384 | store | |||
|
1385 | $ hg debugsidedata -c 0 | |||
|
1386 | ||||
|
1387 | upgrade from hgrc | |||
|
1388 | ||||
|
1389 | $ cat >> .hg/hgrc << EOF | |||
|
1390 | > [format] | |||
|
1391 | > use-side-data=yes | |||
|
1392 | > EOF | |||
|
1393 | $ hg debugupgraderepo --run --no-backup > /dev/null | |||
|
1394 | $ hg debugformat -v | |||
|
1395 | format-variant repo config default | |||
|
1396 | fncache: yes yes yes | |||
|
1397 | dotencode: yes yes yes | |||
|
1398 | generaldelta: yes yes yes | |||
|
1399 | sparserevlog: yes yes yes | |||
|
1400 | sidedata: yes yes no | |||
|
1401 | plain-cl-delta: yes yes yes | |||
|
1402 | compression: zstd zstd zlib | |||
|
1403 | compression-level: default default default | |||
|
1404 | $ cat .hg/requires | |||
|
1405 | dotencode | |||
|
1406 | exp-sidedata-flag | |||
|
1407 | fncache | |||
|
1408 | generaldelta | |||
|
1409 | revlog-compression-zstd | |||
|
1410 | revlogv1 | |||
|
1411 | sparserevlog | |||
|
1412 | store | |||
|
1413 | $ hg debugsidedata -c 0 |
General Comments 0
You need to be logged in to leave comments.
Login now