This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9615

upgrade: move optimization addition to determineactions()
ClosedPublic

Authored by pulkit on Dec 16 2020, 5:14 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGa51d345f1404: upgrade: move optimization addition to determineactions()
Summary

The documentation of determineactions() mention that it is given a list
returned from findoptimizations() however it was not true before this patch.

The code extending actions with optimizations also mentioned about it that this
should be in determineactions.

So let's do what comments at couple of places say.

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

pulkit created this revision.Dec 16 2020, 5:14 AM
marmoute accepted this revision.Dec 22 2020, 3:42 AM
pulkit updated this revision to Diff 24544.Dec 30 2020, 5:31 AM
mharbison72 accepted this revision.Jan 12 2021, 6:45 PM
This revision is now accepted and ready to land.Jan 12 2021, 6:45 PM
pulkit added a commit: rHGa51d345f1404: upgrade: move optimization addition to determineactions().Jan 12 2021, 6:53 PM
Closed by commit rHGa51d345f1404: upgrade: move optimization addition to determineactions() (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24753

mercurial/upgrade.py

raise error.Abort( raise error.Abort(
_(b'unknown optimization action requested: %s') _(b'unknown optimization action requested: %s')
% b', '.join(sorted(optimize)), % b', '.join(sorted(optimize)),
hint=_(b'run without arguments to see valid optimizations'), hint=_(b'run without arguments to see valid optimizations'),
) )
format_upgrades = upgrade_actions.find_format_upgrades(repo) format_upgrades = upgrade_actions.find_format_upgrades(repo)
actions = upgrade_actions.determineactions( actions = upgrade_actions.determineactions(
repo, format_upgrades, repo.requirements, newreqs repo, format_upgrades, optimizations, repo.requirements, newreqs
)
actions.extend(
o
for o in sorted(optimizations)
# determineactions could have added optimisation
if o not in actions
) )
removedreqs = repo.requirements - newreqs removedreqs = repo.requirements - newreqs
addedreqs = newreqs - repo.requirements addedreqs = newreqs - repo.requirements
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

mercurial/upgrade_utils/actions.py

def findoptimizations(repo): def findoptimizations(repo):
"""Determine optimisation that could be used during upgrade""" """Determine optimisation that could be used during upgrade"""
# These are unconditionally added. There is logic later that figures out # These are unconditionally added. There is logic later that figures out
# which ones to apply. # which ones to apply.
return list(ALL_OPTIMISATIONS) return list(ALL_OPTIMISATIONS)
def determineactions(repo, format_upgrades, sourcereqs, destreqs): def determineactions(
repo, format_upgrades, optimizations, sourcereqs, destreqs
):
"""Determine upgrade actions that will be performed. """Determine upgrade actions that will be performed.
Given a list of improvements as returned by ``find_format_upgrades`` and Given a list of improvements as returned by ``find_format_upgrades`` and
``findoptimizations``, determine the list of upgrade actions that ``findoptimizations``, determine the list of upgrade actions that
will be performed. will be performed.
The role of this function is to filter improvements if needed, apply The role of this function is to filter improvements if needed, apply
recommended optimizations from the improvements list that make sense, recommended optimizations from the improvements list that make sense,
etc. etc.
Returns a list of action names. Returns a list of action names.
""" """
newactions = [] newactions = []
for d in format_upgrades: for d in format_upgrades:
name = d._requirement name = d._requirement
# If the action is a requirement that doesn't show up in the # If the action is a requirement that doesn't show up in the
# destination requirements, prune the action. # destination requirements, prune the action.
if name is not None and name not in destreqs: if name is not None and name not in destreqs:
continue continue
newactions.append(d) newactions.append(d)
newactions.extend(o for o in sorted(optimizations) if o not in newactions)
# FUTURE consider adding some optimizations here for certain transitions. # FUTURE consider adding some optimizations here for certain transitions.
# e.g. adding generaldelta could schedule parent redeltas. # e.g. adding generaldelta could schedule parent redeltas.
return newactions return newactions
class UpgradeOperation(object): class UpgradeOperation(object):
"""represent the work to be done during an upgrade""" """represent the work to be done during an upgrade"""