This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11872

upgrade: drop some dead code
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGdc2ef4b4d9a9: upgrade: drop some dead code
Summary

Everything done by this block is now done by earlier code. So we don't need it anymore.

Diff Detail

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

Event Timeline

marmoute created this revision.Dec 7 2021, 3:53 AM
Alphare accepted this revision.Dec 10 2021, 4:55 AM
This revision is now accepted and ready to land.Dec 10 2021, 4:55 AM
marmoute updated this revision to Diff 31411.Dec 10 2021, 6:24 AM
marmoute added a commit: rHGdc2ef4b4d9a9: upgrade: drop some dead code.Dec 10 2021, 10:47 AM
Closed by commit rHGdc2ef4b4d9a9: upgrade: drop some dead code (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (17 lines)

Diff 31411

mercurial/upgrade.py

) )
format_upgrades = upgrade_actions.find_format_upgrades(repo) format_upgrades = upgrade_actions.find_format_upgrades(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
addedreqs = newreqs - repo.requirements
# check if we need to touch revlog and if so, which ones # check if we need to touch revlog and if so, which ones
touched_revlogs = set() touched_revlogs = set()
overwrite_msg = _(b'warning: ignoring %14s, as upgrade is changing: %s\n') overwrite_msg = _(b'warning: ignoring %14s, as upgrade is changing: %s\n')
select_msg = _(b'note: selecting %s for processing to change: %s\n') select_msg = _(b'note: selecting %s for processing to change: %s\n')
msg_issued = 0 msg_issued = 0
FL = upgrade_engine.UPGRADE_FILELOGS FL = upgrade_engine.UPGRADE_FILELOGS
if not ui.quiet: if not ui.quiet:
msg_issued = 1 msg_issued = 1
touched_revlogs.add(CL) touched_revlogs.add(CL)
if msg_issued >= 2: if msg_issued >= 2:
ui.warn((b"\n")) ui.warn((b"\n"))
elif msg_issued >= 1: elif msg_issued >= 1:
ui.status((b"\n")) ui.status((b"\n"))
# check the consistency of the revlog selection with the planned action
if touched_revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS:
incompatible = upgrade_actions.RECLONES_REQUIREMENTS & (
removedreqs | addedreqs
)
if incompatible:
msg = _(
b'ignoring revlogs selection flags, format requirements '
b'change: %s\n'
)
ui.warn(msg % b', '.join(sorted(incompatible)))
touched_revlogs = upgrade_engine.UPGRADE_ALL_REVLOGS
upgrade_op = upgrade_actions.UpgradeOperation( upgrade_op = upgrade_actions.UpgradeOperation(
ui, ui,
newreqs, newreqs,
repo.requirements, repo.requirements,
up_actions, up_actions,
removed_actions, removed_actions,
touched_revlogs, touched_revlogs,
backup, backup,