This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9485

upgrade: extract the checking of target requirements change
ClosedPublic

Authored by marmoute on Dec 1 2020, 5:12 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG72b7b4bf3e65: upgrade: extract the checking of target requirements change
Summary

This logic is fairly independant, lets move it out of the main function.

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 1 2020, 5:12 PM
baymax updated this revision to Diff 24036.Dec 4 2020, 6:48 PM
pulkit accepted this revision.Dec 6 2020, 6:22 AM
This revision is now accepted and ready to land.Dec 6 2020, 6:22 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (43 lines)
Mmercurial/upgrade_utils/actions.py (31 lines)

Diff 24061

mercurial/upgrade.py

else: else:
# none are enabled # none are enabled
for upgrade, __ in specified: for upgrade, __ in specified:
revlogs.discard(upgrade) 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)
newreqs = localrepo.newreporequirements( default_options = localrepo.defaultcreateopts(repo.ui)
repo.ui, localrepo.defaultcreateopts(repo.ui) newreqs = localrepo.newreporequirements(repo.ui, default_options)
)
newreqs.update(upgrade_actions.preservedrequirements(repo)) newreqs.update(upgrade_actions.preservedrequirements(repo))
noremovereqs = ( upgrade_actions.check_requirements_changes(repo, newreqs)
repo.requirements
- newreqs
- upgrade_actions.supportremovedrequirements(repo)
)
if noremovereqs:
raise error.Abort(
_(
b'cannot upgrade repository; requirement would be '
b'removed: %s'
)
% _(b', ').join(sorted(noremovereqs))
)
noaddreqs = (
newreqs
- repo.requirements
- upgrade_actions.allowednewrequirements(repo)
)
if noaddreqs:
raise error.Abort(
_(
b'cannot upgrade repository; do not support adding '
b'requirement: %s'
)
% _(b', ').join(sorted(noaddreqs))
)
unsupportedreqs = newreqs - upgrade_actions.supporteddestrequirements(repo)
if unsupportedreqs:
raise error.Abort(
_(
b'cannot upgrade repository; do not support '
b'destination requirement: %s'
)
% _(b', ').join(sorted(unsupportedreqs))
)
# Find and validate all improvements that can be made. # Find and validate all improvements that can be made.
alloptimizations = upgrade_actions.findoptimizations(repo) alloptimizations = upgrade_actions.findoptimizations(repo)
# Apply and Validate arguments. # Apply and Validate arguments.
optimizations = [] optimizations = []
for o in alloptimizations: for o in alloptimizations:
if o.name in optimize: if o.name in optimize:

mercurial/upgrade_utils/actions.py

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)
### Verify the validity of the planned requirement changes ####################
def check_requirements_changes(repo, new_reqs):
old_reqs = repo.requirements
support_removal = supportremovedrequirements(repo)
no_remove_reqs = old_reqs - new_reqs - support_removal
if no_remove_reqs:
msg = _(b'cannot upgrade repository; requirement would be removed: %s')
no_remove_reqs = b', '.join(sorted(no_remove_reqs))
raise error.Abort(msg % no_remove_reqs)
support_addition = allowednewrequirements(repo)
no_add_reqs = new_reqs - old_reqs - support_addition
if no_add_reqs:
m = _(b'cannot upgrade repository; do not support adding requirement: ')
no_add_reqs = b', '.join(sorted(no_add_reqs))
raise error.Abort(m + no_add_reqs)
supported = supporteddestrequirements(repo)
unsupported_reqs = new_reqs - supported
if unsupported_reqs:
msg = _(
b'cannot upgrade repository; do not support destination '
b'requirement: %s'
)
unsupported_reqs = b', '.join(sorted(unsupported_reqs))
raise error.Abort(msg % unsupported_reqs)