This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12196

upgrade: prepare code (and output) for the idea of upgrading share
ClosedPublic

Authored by marmoute on Feb 16 2022, 4:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG17eaeb06562c: upgrade: prepare code (and output) for the idea of upgrading share
Summary

This would work for a subset of action only. Our first target is dirstate-v2.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Feb 16 2022, 4:37 AM
Alphare accepted this revision.Feb 16 2022, 4:42 AM
Alphare added a subscriber: Alphare.

I'll amend the error message

mercurial/upgrade.py
121

s/theses action/these actions

This revision is now accepted and ready to land.Feb 16 2022, 4:42 AM
KennyThomas added a subscriber: KennyThomas.Tue, Mar 22, 1:51 PM

Preparing this code isn't all that easy to be honest. Even the best essay writer service couldn't crack this code. It just doesn't seem all that easy to be honest.

Revision Contents
Changeset List

Diff 32241

mercurial/upgrade.py

if enabled: if enabled:
touched_revlogs.add(rl) touched_revlogs.add(rl)
else: else:
touched_revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) touched_revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS)
for rl, enabled in specified_revlogs.items(): for rl, enabled in specified_revlogs.items():
if not enabled: if not enabled:
touched_revlogs.discard(rl) touched_revlogs.discard(rl)
if repo.shared():
unsafe_actions = set()
unsafe_actions.update(up_actions)
unsafe_actions.update(removed_actions)
unsafe_actions.update(optimizations)
unsafe_actions = [
a for a in unsafe_actions if not a.compatible_with_share
]
unsafe_actions.sort(key=lambda a: a.name)
if unsafe_actions:
m = _(b'cannot use these actions on a share repository: %s')
AlphareUnsubmitted
Not Done

s/theses action/these actions

Alphare: s/theses action/these actions
h = _(b'upgrade the main repository directly')
actions = b', '.join(a.name for a in unsafe_actions)
m %= actions
raise error.Abort(m, hint=h)
for action in sorted(up_actions + removed_actions, key=lambda a: a.name): for action in sorted(up_actions + removed_actions, key=lambda a: a.name):
# optimisation does not "requires anything, they just needs it. # optimisation does not "requires anything, they just needs it.
if action.type != upgrade_actions.FORMAT_VARIANT: if action.type != upgrade_actions.FORMAT_VARIANT:
continue continue
if action.touches_filelogs and FL not in touched_revlogs: if action.touches_filelogs and FL not in touched_revlogs:
if FL in specified_revlogs: if FL in specified_revlogs:
if not specified_revlogs[FL]: if not specified_revlogs[FL]:

mercurial/upgrade_utils/actions.py

requirements.GENERALDELTA_REQUIREMENT, requirements.GENERALDELTA_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT, requirements.SPARSEREVLOG_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
requirements.CHANGELOGV2_REQUIREMENT, requirements.CHANGELOGV2_REQUIREMENT,
} }
def preservedrequirements(repo): def preservedrequirements(repo):
return set() preserved = {
requirements.SHARED_REQUIREMENT,
}
return preserved & repo.requirements
FORMAT_VARIANT = b'deficiency' FORMAT_VARIANT = b'deficiency'
OPTIMISATION = b'optimization' OPTIMISATION = b'optimization'
class improvement(object): class improvement(object):
"""Represents an improvement that can be made as part of an upgrade.""" """Represents an improvement that can be made as part of an upgrade."""
touches_changelog = True touches_changelog = True
# Whether this improvement changes repository requirements # Whether this improvement changes repository requirements
touches_requirements = True touches_requirements = True
# Whether this improvement touches the dirstate # Whether this improvement touches the dirstate
touches_dirstate = False touches_dirstate = False
# Can this action be run on a share instead of its mains repository
compatible_with_share = False
allformatvariant = [] # type: List[Type['formatvariant']] allformatvariant = [] # type: List[Type['formatvariant']]
def registerformatvariant(cls): def registerformatvariant(cls):
allformatvariant.append(cls) allformatvariant.append(cls)
return cls return cls
""" """
return { return {
# The upgrade code does not yet support these experimental features. # The upgrade code does not yet support these experimental features.
# This is an artificial limitation. # This is an artificial limitation.
requirements.TREEMANIFEST_REQUIREMENT, requirements.TREEMANIFEST_REQUIREMENT,
# This was a precursor to generaldelta and was never enabled by default. # This was a precursor to generaldelta and was never enabled by default.
# It should (hopefully) not exist in the wild. # It should (hopefully) not exist in the wild.
b'parentdelta', b'parentdelta',
# Upgrade should operate on the actual store, not the shared link.
requirements.SHARED_REQUIREMENT,
} }
def check_revlog_version(reqs): def check_revlog_version(reqs):
"""Check that the requirements contain at least one Revlog version""" """Check that the requirements contain at least one Revlog version"""
all_revlogs = { all_revlogs = {
requirements.REVLOGV1_REQUIREMENT, requirements.REVLOGV1_REQUIREMENT,
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
raise error.Abort(msg % missingreqs) raise error.Abort(msg % missingreqs)
blocking = blocksourcerequirements(repo) blocking = blocksourcerequirements(repo)
blockingreqs = blocking & repo.requirements blockingreqs = blocking & repo.requirements
if blockingreqs: if blockingreqs:
m = _(b'cannot upgrade repository; unsupported source requirement: %s') m = _(b'cannot upgrade repository; unsupported source requirement: %s')
blockingreqs = b', '.join(sorted(blockingreqs)) blockingreqs = b', '.join(sorted(blockingreqs))
raise error.Abort(m % blockingreqs) raise error.Abort(m % blockingreqs)
# Upgrade should operate on the actual store, not the shared link.
bad_share = (
requirements.SHARED_REQUIREMENT in repo.requirements
and requirements.SHARESAFE_REQUIREMENT not in repo.requirements
)
if bad_share:
m = _(b'cannot upgrade repository; share repository without share-safe')
h = _(b'check :hg:`help config.format.use-share-safe`')
raise error.Abort(m, hint=h)
### Verify the validity of the planned requirement changes #################### ### Verify the validity of the planned requirement changes ####################
def supportremovedrequirements(repo): def supportremovedrequirements(repo):
"""Obtain requirements that can be removed during an upgrade. """Obtain requirements that can be removed during an upgrade.
"""Obtain requirements that upgrade supports in the destination. """Obtain requirements that upgrade supports in the destination.
If the result of the upgrade would create requirements not in this set, If the result of the upgrade would create requirements not in this set,
the upgrade is disallowed. the upgrade is disallowed.
Extensions should monkeypatch this to add their custom requirements. Extensions should monkeypatch this to add their custom requirements.
""" """
supported = { supported = {
requirements.CHANGELOGV2_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT,
requirements.DIRSTATE_V2_REQUIREMENT,
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.STORE_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT,
requirements.COPIESSDC_REQUIREMENT,
requirements.NODEMAP_REQUIREMENT, requirements.NODEMAP_REQUIREMENT,
requirements.SHARESAFE_REQUIREMENT, requirements.REVLOGV1_REQUIREMENT, # allowed in case of downgrade
requirements.REVLOGV2_REQUIREMENT, requirements.REVLOGV2_REQUIREMENT,
requirements.CHANGELOGV2_REQUIREMENT, requirements.SHARED_REQUIREMENT,
requirements.DIRSTATE_V2_REQUIREMENT, requirements.SHARESAFE_REQUIREMENT,
requirements.SPARSEREVLOG_REQUIREMENT,
requirements.STORE_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():
supported.add(b'exp-compression-%s' % name) supported.add(b'exp-compression-%s' % name)
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported

tests/test-share-safe.t

date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: added b summary: added b
#endif #endif
$ echo "[format]" >> .hg/hgrc $ echo "[format]" >> .hg/hgrc
$ echo "use-persistent-nodemap=True" >> .hg/hgrc $ echo "use-persistent-nodemap=True" >> .hg/hgrc
$ hg debugupgraderepo --run -q -R ../shared1 $ hg debugupgraderepo --run -q -R ../shared1
abort: cannot upgrade repository; unsupported source requirement: shared abort: cannot use these actions on a share repository: persistent-nodemap
(upgrade the main repository directly)
[255] [255]
$ hg debugupgraderepo --run -q $ hg debugupgraderepo --run -q
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !) preserved: dotencode, fncache, generaldelta, revlogv1, share-safe, sparserevlog, store (no-zstd no-dirstate-v2 !)
preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !) preserved: dotencode, fncache, generaldelta, revlog-compression-zstd, revlogv1, share-safe, sparserevlog, store (zstd no-dirstate-v2 !)

tests/test-upgrade-repo.t

abort: cannot upgrade repository; missing a revlog version abort: cannot upgrade repository; missing a revlog version
[255] [255]
Cannot upgrade shared repositories Cannot upgrade shared repositories
$ hg init share-parent $ hg init share-parent
$ hg -q share share-parent share-child $ hg -q share share-parent share-child
$ hg -R share-child debugupgraderepo $ hg -R share-child debugupgraderepo --config format.sparse-revlog=no
abort: cannot upgrade repository; unsupported source requirement: shared abort: cannot use these actions on a share repository: sparserevlog
(upgrade the main repository directly)
[255] [255]
Do not yet support upgrading treemanifest repos Do not yet support upgrading treemanifest repos
$ hg --config experimental.treemanifest=true init treemanifest $ hg --config experimental.treemanifest=true init treemanifest
$ hg -R treemanifest debugupgraderepo $ hg -R treemanifest debugupgraderepo
abort: cannot upgrade repository; unsupported source requirement: treemanifest abort: cannot upgrade repository; unsupported source requirement: treemanifest
[255] [255]
Cannot add treemanifest requirement during upgrade Cannot add treemanifest requirement during upgrade