This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11867

upgrade: move the revlog selection code lower down the chain
ClosedPublic

Authored by marmoute on Dec 7 2021, 3:52 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6e045497b20b: upgrade: move the revlog selection code lower down the chain
Summary

We about about to make revlog section smarter. Moving the code around will make
the next changesets clearer.

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.Dec 7 2021, 3:52 AM
marmoute added a comment.Dec 7 2021, 3:58 AM

This series is based on D11867, targeted on stable. So it will need a merge on default once the stable part has landed.

marmoute retitled this revision from upgrade: move the revlog selection code longer down the chain to upgrade: move the revlog selection code lower down the chain.Dec 7 2021, 4:12 AM
Alphare accepted this revision.Dec 7 2021, 11:39 AM
Alphare added a subscriber: Alphare.
In D11867#182005, @marmoute wrote:

This series is based on D11867, targeted on stable. So it will need a merge on default once the stable part has landed.

You mean D11866 right?

This revision is now accepted and ready to land.Dec 7 2021, 11:39 AM
marmoute added a comment.Dec 7 2021, 11:55 AM
In D11867#182126, @Alphare wrote:
In D11867#182005, @marmoute wrote:

This series is based on D11867, targeted on stable. So it will need a merge on default once the stable part has landed.

You mean D11866 right?

I do

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (31 lines)

Diff 31417

mercurial/upgrade.py

changelog=None, changelog=None,
filelogs=None, filelogs=None,
): ):
"""Upgrade a repository in place.""" """Upgrade a repository in place."""
if optimize is None: if optimize is None:
optimize = {} optimize = {}
repo = repo.unfiltered() repo = repo.unfiltered()
revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS)
specentries = ( specentries = (
(upgrade_engine.UPGRADE_CHANGELOG, changelog), (upgrade_engine.UPGRADE_CHANGELOG, changelog),
(upgrade_engine.UPGRADE_MANIFEST, manifest), (upgrade_engine.UPGRADE_MANIFEST, manifest),
(upgrade_engine.UPGRADE_FILELOGS, filelogs), (upgrade_engine.UPGRADE_FILELOGS, filelogs),
) )
specified = [(y, x) for (y, x) in specentries if x is not None]
if specified:
# we have some limitation on revlogs to be recloned
if any(x for y, x in specified):
revlogs = set()
for upgrade, enabled in specified:
if enabled:
revlogs.add(upgrade)
else:
# none are enabled
for upgrade, __ in specified:
revlogs.discard(upgrade)
# Ensure the repository can be upgraded. # Ensure the repository can be upgraded.
upgrade_actions.check_source_requirements(repo) upgrade_actions.check_source_requirements(repo)
default_options = localrepo.defaultcreateopts(repo.ui) default_options = localrepo.defaultcreateopts(repo.ui)
newreqs = localrepo.newreporequirements(repo.ui, default_options) newreqs = localrepo.newreporequirements(repo.ui, default_options)
newreqs.update(upgrade_actions.preservedrequirements(repo)) newreqs.update(upgrade_actions.preservedrequirements(repo))
up_actions = upgrade_actions.determine_upgrade_actions( up_actions = upgrade_actions.determine_upgrade_actions(
repo, format_upgrades, optimizations, repo.requirements, newreqs repo, format_upgrades, optimizations, repo.requirements, newreqs
) )
removed_actions = upgrade_actions.find_format_downgrades(repo) removed_actions = upgrade_actions.find_format_downgrades(repo)
removedreqs = repo.requirements - newreqs removedreqs = repo.requirements - newreqs
addedreqs = newreqs - repo.requirements addedreqs = newreqs - repo.requirements
# check if we need to touch revlog and if so, which ones
revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS)
specified = [(y, x) for (y, x) in specentries if x is not None]
if specified:
# we have some limitation on revlogs to be recloned
if any(x for y, x in specified):
revlogs = set()
for upgrade, enabled in specified:
if enabled:
revlogs.add(upgrade)
else:
# none are enabled
for upgrade, __ in specified:
revlogs.discard(upgrade)
# check the consistency of the revlog selection with the planned action
if revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS: if revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS:
incompatible = upgrade_actions.RECLONES_REQUIREMENTS & ( incompatible = upgrade_actions.RECLONES_REQUIREMENTS & (
removedreqs | addedreqs removedreqs | addedreqs
) )
if incompatible: if incompatible:
msg = _( msg = _(
b'ignoring revlogs selection flags, format requirements ' b'ignoring revlogs selection flags, format requirements '
b'change: %s\n' b'change: %s\n'