( )⚙ D10620 side-data: drop the associated config and requirements

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10620

side-data: drop the associated config and requirements
ClosedPublic

Authored by marmoute on May 3 2021, 7:53 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG21b3e6116bd1: side-data: drop the associated config and requirements
Summary

This is no longer and extensions of revlog v1, but a part of revlog v2. We no
longer needs independent config and requirement management for that.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.May 3 2021, 7:53 AM
baymax updated this revision to Diff 27535.May 3 2021, 9:45 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27866.May 11 2021, 1:43 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 27992.May 17 2021, 7:02 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG21b3e6116bd1: side-data: drop the associated config and requirements.May 17 2021, 8:58 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG21b3e6116bd1: side-data: drop the associated config and requirements (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27992

mercurial/configitems.py

coreconfigitem( coreconfigitem(
b'format', b'format',
b'exp-use-copies-side-data-changeset', b'exp-use-copies-side-data-changeset',
default=False, default=False,
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'format', b'format',
b'exp-use-side-data',
default=False,
experimental=True,
)
coreconfigitem(
b'format',
b'use-share-safe', b'use-share-safe',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'format', b'format',
b'internal-phase', b'internal-phase',
default=False, default=False,
experimental=True, experimental=True,

mercurial/localrepo.py

options[b'sparse-read-density-threshold'] = srdensitythres options[b'sparse-read-density-threshold'] = srdensitythres
options[b'sparse-read-min-gap-size'] = srmingapsize options[b'sparse-read-min-gap-size'] = srmingapsize
sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
options[b'sparse-revlog'] = sparserevlog options[b'sparse-revlog'] = sparserevlog
if sparserevlog: if sparserevlog:
options[b'generaldelta'] = True options[b'generaldelta'] = True
sidedata = requirementsmod.SIDEDATA_REQUIREMENT in requirements
options[b'side-data'] = sidedata
maxchainlen = None maxchainlen = None
if sparserevlog: if sparserevlog:
maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
# experimental config: format.maxchainlen # experimental config: format.maxchainlen
maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen) maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
if maxchainlen is not None: if maxchainlen is not None:
options[b'maxchainlen'] = maxchainlen options[b'maxchainlen'] = maxchainlen
# being successful (repository sizes went up due to worse delta # being successful (repository sizes went up due to worse delta
# chains), and the code was deleted in 4.6. # chains), and the code was deleted in 4.6.
supportedformats = { supportedformats = {
requirementsmod.REVLOGV1_REQUIREMENT, requirementsmod.REVLOGV1_REQUIREMENT,
requirementsmod.GENERALDELTA_REQUIREMENT, requirementsmod.GENERALDELTA_REQUIREMENT,
requirementsmod.TREEMANIFEST_REQUIREMENT, requirementsmod.TREEMANIFEST_REQUIREMENT,
requirementsmod.COPIESSDC_REQUIREMENT, requirementsmod.COPIESSDC_REQUIREMENT,
requirementsmod.REVLOGV2_REQUIREMENT, requirementsmod.REVLOGV2_REQUIREMENT,
requirementsmod.SIDEDATA_REQUIREMENT,
requirementsmod.SPARSEREVLOG_REQUIREMENT, requirementsmod.SPARSEREVLOG_REQUIREMENT,
requirementsmod.NODEMAP_REQUIREMENT, requirementsmod.NODEMAP_REQUIREMENT,
bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT, bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT,
requirementsmod.SHARESAFE_REQUIREMENT, requirementsmod.SHARESAFE_REQUIREMENT,
} }
_basesupported = supportedformats | { _basesupported = supportedformats | {
requirementsmod.STORE_REQUIREMENT, requirementsmod.STORE_REQUIREMENT,
requirementsmod.FNCACHE_REQUIREMENT, requirementsmod.FNCACHE_REQUIREMENT,
elif compengine != b'zlib': elif compengine != b'zlib':
requirements.add(b'exp-compression-%s' % compengine) requirements.add(b'exp-compression-%s' % compengine)
if scmutil.gdinitconfig(ui): if scmutil.gdinitconfig(ui):
requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
if ui.configbool(b'format', b'sparse-revlog'): if ui.configbool(b'format', b'sparse-revlog'):
requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
# experimental config: format.exp-use-side-data
if ui.configbool(b'format', b'exp-use-side-data'):
requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
# experimental config: format.exp-use-copies-side-data-changeset # experimental config: format.exp-use-copies-side-data-changeset
if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
requirements.add(requirementsmod.SIDEDATA_REQUIREMENT)
requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
if ui.configbool(b'experimental', b'treemanifest'): if ui.configbool(b'experimental', b'treemanifest'):
requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
revlogv2 = ui.config(b'experimental', b'revlogv2') revlogv2 = ui.config(b'experimental', b'revlogv2')
if revlogv2 == b'enable-unstable-format-and-corrupt-my-data': if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT) requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT) requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)

mercurial/requirements.py

# can spread over a larger span. Sparse reading cuts these large spans into # can spread over a larger span. Sparse reading cuts these large spans into
# pieces, so that each piece isn't too big. # pieces, so that each piece isn't too big.
# Without the sparserevlog capability, reading from the repository could use # Without the sparserevlog capability, reading from the repository could use
# huge amounts of memory, because the whole span would be read at once, # huge amounts of memory, because the whole span would be read at once,
# including all the intermediate revisions that aren't pertinent for the chain. # including all the intermediate revisions that aren't pertinent for the chain.
# This is why once a repository has enabled sparse-read, it becomes required. # This is why once a repository has enabled sparse-read, it becomes required.
SPARSEREVLOG_REQUIREMENT = b'sparserevlog' SPARSEREVLOG_REQUIREMENT = b'sparserevlog'
# A repository with the sidedataflag requirement will allow to store extra
# information for revision without altering their original hashes.
SIDEDATA_REQUIREMENT = b'exp-sidedata-flag'
# A repository with the the copies-sidedata-changeset requirement will store # A repository with the the copies-sidedata-changeset requirement will store
# copies related information in changeset's sidedata. # copies related information in changeset's sidedata.
COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset' COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset'
# The repository use persistent nodemap for the changelog and the manifest. # The repository use persistent nodemap for the changelog and the manifest.
NODEMAP_REQUIREMENT = b'persistent-nodemap' NODEMAP_REQUIREMENT = b'persistent-nodemap'
# Denotes that the current repository is a share # Denotes that the current repository is a share

mercurial/upgrade_utils/actions.py

"""Obtain requirements that can be removed during an upgrade. """Obtain requirements that can be removed during an upgrade.
If an upgrade were to create a repository that dropped a requirement, If an upgrade were to create a repository that dropped a requirement,
the dropped requirement must appear in the returned set for the upgrade the dropped requirement must appear in the returned set for the upgrade
to be allowed. to be allowed.
""" """
supported = { supported = {
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.SIDEDATA_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
requirements.REVLOGV1_REQUIREMENT, requirements.REVLOGV1_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
""" """
supported = { supported = {
requirements.DOTENCODE_REQUIREMENT, requirements.DOTENCODE_REQUIREMENT,
requirements.FNCACHE_REQUIREMENT, requirements.FNCACHE_REQUIREMENT,
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade
requirements.STORE_REQUIREMENT, requirements.STORE_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.SIDEDATA_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
if engine.available() and engine.revlogheader(): if engine.available() and engine.revlogheader():
bad additions because the whitelist approach is safer and will prevent bad additions because the whitelist approach is safer and will prevent
future, unknown requirements from accidentally being added. future, unknown requirements from accidentally being added.
""" """
supported = { supported = {
requirements.DOTENCODE_REQUIREMENT, requirements.DOTENCODE_REQUIREMENT,
requirements.FNCACHE_REQUIREMENT, requirements.FNCACHE_REQUIREMENT,
requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.SIDEDATA_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT, requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
requirements.REVLOGV1_REQUIREMENT, requirements.REVLOGV1_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]

rust/hg-core/src/requirements.rs

/// Without the sparserevlog capability, reading from the repository could use /// Without the sparserevlog capability, reading from the repository could use
/// huge amounts of memory, because the whole span would be read at once, /// huge amounts of memory, because the whole span would be read at once,
/// including all the intermediate revisions that aren't pertinent for the /// including all the intermediate revisions that aren't pertinent for the
/// chain. This is why once a repository has enabled sparse-read, it becomes /// chain. This is why once a repository has enabled sparse-read, it becomes
/// required. /// required.
#[allow(unused)] #[allow(unused)]
pub(crate) const SPARSEREVLOG_REQUIREMENT: &str = "sparserevlog"; pub(crate) const SPARSEREVLOG_REQUIREMENT: &str = "sparserevlog";
/// A repository with the sidedataflag requirement will allow to store extra
/// information for revision without altering their original hashes.
#[allow(unused)]
pub(crate) const SIDEDATA_REQUIREMENT: &str = "exp-sidedata-flag";
/// A repository with the the copies-sidedata-changeset requirement will store /// A repository with the the copies-sidedata-changeset requirement will store
/// copies related information in changeset's sidedata. /// copies related information in changeset's sidedata.
#[allow(unused)] #[allow(unused)]
pub(crate) const COPIESSDC_REQUIREMENT: &str = "exp-copies-sidedata-changeset"; pub(crate) const COPIESSDC_REQUIREMENT: &str = "exp-copies-sidedata-changeset";
/// The repository use persistent nodemap for the changelog and the manifest. /// The repository use persistent nodemap for the changelog and the manifest.
#[allow(unused)] #[allow(unused)]
pub(crate) const NODEMAP_REQUIREMENT: &str = "persistent-nodemap"; pub(crate) const NODEMAP_REQUIREMENT: &str = "persistent-nodemap";

tests/test-copies-chain-merge.t

compression: * (glob) compression: * (glob)
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo --run --quiet $ hg debugupgraderepo --run --quiet
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: * (glob) preserved: * (glob)
removed: revlogv1 removed: revlogv1
added: exp-copies-sidedata-changeset, exp-revlogv2.2, exp-sidedata-flag added: exp-copies-sidedata-changeset, exp-revlogv2.2
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
#endif #endif
compression: * (glob) compression: * (glob)
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo --run --quiet $ hg debugupgraderepo --run --quiet
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: * (glob) preserved: * (glob)
removed: revlogv1 removed: revlogv1
added: exp-copies-sidedata-changeset, exp-revlogv2.2, exp-sidedata-flag added: exp-copies-sidedata-changeset, exp-revlogv2.2
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
#endif #endif