Show More
@@ -1370,12 +1370,6 b' coreconfigitem(' | |||||
1370 | ) |
|
1370 | ) | |
1371 | coreconfigitem( |
|
1371 | coreconfigitem( | |
1372 | b'format', |
|
1372 | b'format', | |
1373 | b'exp-use-side-data', |
|
|||
1374 | default=False, |
|
|||
1375 | experimental=True, |
|
|||
1376 | ) |
|
|||
1377 | coreconfigitem( |
|
|||
1378 | b'format', |
|
|||
1379 | b'use-share-safe', |
|
1373 | b'use-share-safe', | |
1380 | default=False, |
|
1374 | default=False, | |
1381 | ) |
|
1375 | ) |
@@ -1066,9 +1066,6 b' def resolverevlogstorevfsoptions(ui, req' | |||||
1066 | if sparserevlog: |
|
1066 | if sparserevlog: | |
1067 | options[b'generaldelta'] = True |
|
1067 | options[b'generaldelta'] = True | |
1068 |
|
1068 | |||
1069 | sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements |
|
|||
1070 | options[b'side-data'] = sidedata |
|
|||
1071 |
|
||||
1072 | maxchainlen = None |
|
1069 | maxchainlen = None | |
1073 | if sparserevlog: |
|
1070 | if sparserevlog: | |
1074 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH |
|
1071 | maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH | |
@@ -1221,7 +1218,6 b' class localrepository(object):' | |||||
1221 | requirementsmod.TREEMANIFEST_REQUIREMENT, |
|
1218 | requirementsmod.TREEMANIFEST_REQUIREMENT, | |
1222 | requirementsmod.COPIESSDC_REQUIREMENT, |
|
1219 | requirementsmod.COPIESSDC_REQUIREMENT, | |
1223 | requirementsmod.REVLOGV2_REQUIREMENT, |
|
1220 | requirementsmod.REVLOGV2_REQUIREMENT, | |
1224 | requirementsmod.SIDEDATA_REQUIREMENT, |
|
|||
1225 | requirementsmod.SPARSEREVLOG_REQUIREMENT, |
|
1221 | requirementsmod.SPARSEREVLOG_REQUIREMENT, | |
1226 | requirementsmod.NODEMAP_REQUIREMENT, |
|
1222 | requirementsmod.NODEMAP_REQUIREMENT, | |
1227 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, |
|
1223 | bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, | |
@@ -3517,16 +3513,10 b' def newreporequirements(ui, createopts):' | |||||
3517 | if ui.configbool(b'format', b'sparse-revlog'): |
|
3513 | if ui.configbool(b'format', b'sparse-revlog'): | |
3518 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) |
|
3514 | requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) | |
3519 |
|
3515 | |||
3520 | # experimental config: format.exp-use-side-data |
|
|||
3521 | if ui.configbool(b'format', b'exp-use-side-data'): |
|
|||
3522 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) |
|
|||
3523 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
|||
3524 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
|||
3525 | # experimental config: format.exp-use-copies-side-data-changeset |
|
3516 | # experimental config: format.exp-use-copies-side-data-changeset | |
3526 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): |
|
3517 | if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): | |
3527 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) |
|
3518 | requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) | |
3528 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) |
|
3519 | requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) | |
3529 | requirements.add(requirementsmod.SIDEDATA_REQUIREMENT) |
|
|||
3530 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) |
|
3520 | requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) | |
3531 | if ui.configbool(b'experimental', b'treemanifest'): |
|
3521 | if ui.configbool(b'experimental', b'treemanifest'): | |
3532 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
|
3522 | requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) |
@@ -41,10 +41,6 b" REVLOGV2_REQUIREMENT = b'exp-revlogv2.2'" | |||||
41 | # This is why once a repository has enabled sparse-read, it becomes required. |
|
41 | # This is why once a repository has enabled sparse-read, it becomes required. | |
42 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' |
|
42 | SPARSEREVLOG_REQUIREMENT = b'sparserevlog' | |
43 |
|
43 | |||
44 | # A repository with the sidedataflag requirement will allow to store extra |
|
|||
45 | # information for revision without altering their original hashes. |
|
|||
46 | SIDEDATA_REQUIREMENT = b'exp-sidedata-flag' |
|
|||
47 |
|
||||
48 | # A repository with the the copies-sidedata-changeset requirement will store |
|
44 | # A repository with the the copies-sidedata-changeset requirement will store | |
49 | # copies related information in changeset's sidedata. |
|
45 | # copies related information in changeset's sidedata. | |
50 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' |
|
46 | COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' |
@@ -935,7 +935,6 b' def supportremovedrequirements(repo):' | |||||
935 | """ |
|
935 | """ | |
936 | supported = { |
|
936 | supported = { | |
937 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
937 | requirements.SPARSEREVLOG_REQUIREMENT, | |
938 | requirements.SIDEDATA_REQUIREMENT, |
|
|||
939 | requirements.COPIESSDC_REQUIREMENT, |
|
938 | requirements.COPIESSDC_REQUIREMENT, | |
940 | requirements.NODEMAP_REQUIREMENT, |
|
939 | requirements.NODEMAP_REQUIREMENT, | |
941 | requirements.SHARESAFE_REQUIREMENT, |
|
940 | requirements.SHARESAFE_REQUIREMENT, | |
@@ -966,7 +965,6 b' def supporteddestrequirements(repo):' | |||||
966 | requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade |
|
965 | requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade | |
967 | requirements.STORE_REQUIREMENT, |
|
966 | requirements.STORE_REQUIREMENT, | |
968 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
967 | requirements.SPARSEREVLOG_REQUIREMENT, | |
969 | requirements.SIDEDATA_REQUIREMENT, |
|
|||
970 | requirements.COPIESSDC_REQUIREMENT, |
|
968 | requirements.COPIESSDC_REQUIREMENT, | |
971 | requirements.NODEMAP_REQUIREMENT, |
|
969 | requirements.NODEMAP_REQUIREMENT, | |
972 | requirements.SHARESAFE_REQUIREMENT, |
|
970 | requirements.SHARESAFE_REQUIREMENT, | |
@@ -996,7 +994,6 b' def allowednewrequirements(repo):' | |||||
996 | requirements.FNCACHE_REQUIREMENT, |
|
994 | requirements.FNCACHE_REQUIREMENT, | |
997 | requirements.GENERALDELTA_REQUIREMENT, |
|
995 | requirements.GENERALDELTA_REQUIREMENT, | |
998 | requirements.SPARSEREVLOG_REQUIREMENT, |
|
996 | requirements.SPARSEREVLOG_REQUIREMENT, | |
999 | requirements.SIDEDATA_REQUIREMENT, |
|
|||
1000 | requirements.COPIESSDC_REQUIREMENT, |
|
997 | requirements.COPIESSDC_REQUIREMENT, | |
1001 | requirements.NODEMAP_REQUIREMENT, |
|
998 | requirements.NODEMAP_REQUIREMENT, | |
1002 | requirements.SHARESAFE_REQUIREMENT, |
|
999 | requirements.SHARESAFE_REQUIREMENT, |
@@ -124,11 +124,6 b' pub(crate) const REVLOGV2_REQUIREMENT: &' | |||||
124 | #[allow(unused)] |
|
124 | #[allow(unused)] | |
125 | pub(crate) const SPARSEREVLOG_REQUIREMENT: &str = "sparserevlog"; |
|
125 | pub(crate) const SPARSEREVLOG_REQUIREMENT: &str = "sparserevlog"; | |
126 |
|
126 | |||
127 | /// A repository with the sidedataflag requirement will allow to store extra |
|
|||
128 | /// information for revision without altering their original hashes. |
|
|||
129 | #[allow(unused)] |
|
|||
130 | pub(crate) const SIDEDATA_REQUIREMENT: &str = "exp-sidedata-flag"; |
|
|||
131 |
|
||||
132 | /// A repository with the the copies-sidedata-changeset requirement will store |
|
127 | /// A repository with the the copies-sidedata-changeset requirement will store | |
133 | /// copies related information in changeset's sidedata. |
|
128 | /// copies related information in changeset's sidedata. | |
134 | #[allow(unused)] |
|
129 | #[allow(unused)] |
@@ -1669,7 +1669,7 b' We upgrade a repository that is not usin' | |||||
1669 | requirements |
|
1669 | requirements | |
1670 | preserved: * (glob) |
|
1670 | preserved: * (glob) | |
1671 | removed: revlogv1 |
|
1671 | removed: revlogv1 | |
1672 |
added: exp-copies-sidedata-changeset, exp-revlogv2.2 |
|
1672 | added: exp-copies-sidedata-changeset, exp-revlogv2.2 | |
1673 |
|
1673 | |||
1674 | processed revlogs: |
|
1674 | processed revlogs: | |
1675 | - all-filelogs |
|
1675 | - all-filelogs | |
@@ -1708,7 +1708,7 b' We upgrade a repository that is not usin' | |||||
1708 | requirements |
|
1708 | requirements | |
1709 | preserved: * (glob) |
|
1709 | preserved: * (glob) | |
1710 | removed: revlogv1 |
|
1710 | removed: revlogv1 | |
1711 |
added: exp-copies-sidedata-changeset, exp-revlogv2.2 |
|
1711 | added: exp-copies-sidedata-changeset, exp-revlogv2.2 | |
1712 |
|
1712 | |||
1713 | processed revlogs: |
|
1713 | processed revlogs: | |
1714 | - all-filelogs |
|
1714 | - all-filelogs |
General Comments 0
You need to be logged in to leave comments.
Login now