This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12612

upgrade: split some logic from UpgradeOperation
ClosedPublic

Authored by marmoute on Fri, May 6, 4:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG566066826e7c: upgrade: split some logic from UpgradeOperation
Summary

The logic for automatic-upgrade and the upgrade-repo should be able to use the
same code. However that code often need an UpgradeOperation object to function.
So we start spliting the Operation into a minimal component that we will be
able to reuse outside of the "classic" upgrade path.

We will put the base-class to use in the next changeset.

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.Fri, May 6, 4:37 AM
Alphare accepted this revision.Tue, May 17, 11:59 AM
This revision is now accepted and ready to land.Tue, May 17, 11:59 AM
baymax edited the summary of this revision. (Show Details)Thu, May 19, 6:36 AM
baymax updated this revision to Diff 33410.

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 33425.Tue, May 24, 10:33 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG566066826e7c: upgrade: split some logic from UpgradeOperation.Tue, May 24, 10:50 AM
Closed by commit rHG566066826e7c: upgrade: split some logic from UpgradeOperation (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade_utils/actions.py (27 lines)

Diff 33435

mercurial/upgrade_utils/actions.py

newactions.extend(o for o in sorted(optimizations) if o not in newactions) 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: class BaseOperation:
"""base class that contains the minimum for an upgrade to work
(this might need to be extended as the usage for subclass alternative to
UpgradeOperation extends)
"""
def __init__(
self,
new_requirements,
backup_store,
):
self.new_requirements = new_requirements
# should this operation create a backup of the store
self.backup_store = backup_store
class UpgradeOperation(BaseOperation):
"""represent the work to be done during an upgrade""" """represent the work to be done during an upgrade"""
def __init__( def __init__(
self, self,
ui, ui,
new_requirements, new_requirements,
current_requirements, current_requirements,
upgrade_actions, upgrade_actions,
removed_actions, removed_actions,
revlogs_to_process, revlogs_to_process,
backup_store, backup_store,
): ):
super().__init__(
new_requirements,
backup_store,
)
self.ui = ui self.ui = ui
self.new_requirements = new_requirements
self.current_requirements = current_requirements self.current_requirements = current_requirements
# list of upgrade actions the operation will perform # list of upgrade actions the operation will perform
self.upgrade_actions = upgrade_actions self.upgrade_actions = upgrade_actions
self.removed_actions = removed_actions self.removed_actions = removed_actions
self.revlogs_to_process = revlogs_to_process self.revlogs_to_process = revlogs_to_process
# requirements which will be added by the operation # requirements which will be added by the operation
self._added_requirements = ( self._added_requirements = (
self.new_requirements - self.current_requirements self.new_requirements - self.current_requirements
elif b're-delta-fulladd' in upgrade_actions_names: elif b're-delta-fulladd' in upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD
# should this operation force re-delta of both parents # should this operation force re-delta of both parents
self.force_re_delta_both_parents = ( self.force_re_delta_both_parents = (
b're-delta-multibase' in upgrade_actions_names b're-delta-multibase' in upgrade_actions_names
) )
# should this operation create a backup of the store
self.backup_store = backup_store
@property @property
def upgrade_actions_names(self): def upgrade_actions_names(self):
return set([a.name for a in self.upgrade_actions]) return set([a.name for a in self.upgrade_actions])
@property @property
def requirements_only(self): def requirements_only(self):
# does the operation only touches repository requirement # does the operation only touches repository requirement
return ( return (