This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9467

upgrade: directly use the upgrade action constant
ClosedPublic

Authored by marmoute on Nov 30 2020, 10:43 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG53bde3ad0270: upgrade: directly use the upgrade action constant
Summary

This make the code simpler and will make it simpler to add more case in the
future.

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.Nov 30 2020, 10:43 AM
pulkit accepted this revision.Nov 30 2020, 11:35 AM
This revision is now accepted and ready to land.Nov 30 2020, 11:35 AM
marmoute added a commit: rHG53bde3ad0270: upgrade: directly use the upgrade action constant.Nov 30 2020, 12:24 PM
Closed by commit rHG53bde3ad0270: upgrade: directly use the upgrade action constant (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (19 lines)

Diff 23885

mercurial/upgrade.py

): ):
"""Upgrade a repository in place.""" """Upgrade a repository in place."""
if optimize is None: if optimize is None:
optimize = [] optimize = []
optimize = {legacy_opts_map.get(o, o) for o in optimize} optimize = {legacy_opts_map.get(o, o) for o in optimize}
repo = repo.unfiltered() repo = repo.unfiltered()
revlogs = set(UPGRADE_ALL_REVLOGS) revlogs = set(UPGRADE_ALL_REVLOGS)
specentries = ((b'c', changelog), (b'm', manifest)) specentries = (
(UPGRADE_CHANGELOG, changelog),
(UPGRADE_MANIFEST, manifest)
)
specified = [(y, x) for (y, x) in specentries if x is not None] specified = [(y, x) for (y, x) in specentries if x is not None]
if specified: if specified:
# we have some limitation on revlogs to be recloned # we have some limitation on revlogs to be recloned
if any(x for y, x in specified): if any(x for y, x in specified):
revlogs = set() revlogs = set()
for r, enabled in specified: for upgrade, enabled in specified:
if enabled: if enabled:
if r == b'c': revlogs.add(upgrade)
revlogs.add(UPGRADE_CHANGELOG)
elif r == b'm':
revlogs.add(UPGRADE_MANIFEST)
else: else:
# none are enabled # none are enabled
for r, __ in specified: for upgrade, __ in specified:
if r == b'c': revlogs.discard(upgrade)
revlogs.discard(UPGRADE_CHANGELOG)
elif r == b'm':
revlogs.discard(UPGRADE_MANIFEST)
# Ensure the repository can be upgraded. # Ensure the repository can be upgraded.
missingreqs = requiredsourcerequirements(repo) - repo.requirements missingreqs = requiredsourcerequirements(repo) - repo.requirements
if missingreqs: if missingreqs:
raise error.Abort( raise error.Abort(
_(b'cannot upgrade repository; requirement missing: %s') _(b'cannot upgrade repository; requirement missing: %s')
% _(b', ').join(sorted(missingreqs)) % _(b', ').join(sorted(missingreqs))
) )