This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9575

upgrade: move `printupgradeactions()` to UpgradeOperation class
ClosedPublic

Authored by pulkit on Dec 14 2020, 4:55 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGdfddcbb0c244: upgrade: move `printupgradeactions()` to UpgradeOperation class
Summary

Part of refactor where we make things more arranged and integrated into single
UpgradeOperation class.

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.

Revision Contents
Changeset List

Diff 24603

mercurial/upgrade.py

if optimisations: if optimisations:
ui.write(_(b'optimisations: ')) ui.write(_(b'optimisations: '))
write_labeled( write_labeled(
[a.name for a in optimisations], [a.name for a in optimisations],
"upgrade-repo.optimisation.performed", "upgrade-repo.optimisation.performed",
) )
ui.write(b'\n\n') ui.write(b'\n\n')
def printupgradeactions():
for a in actions:
ui.status(b'%s\n %s\n\n' % (a.name, a.upgrademessage))
upgrade_op = upgrade_actions.UpgradeOperation( upgrade_op = upgrade_actions.UpgradeOperation(
ui, ui,
newreqs, newreqs,
[a.name for a in actions], actions,
revlogs, revlogs,
) )
if not run: if not run:
fromconfig = [] fromconfig = []
onlydefault = [] onlydefault = []
for d in deficiencies: for d in deficiencies:
_( _(
b'performing an upgrade with "--run" will make the following ' b'performing an upgrade with "--run" will make the following '
b'changes:\n\n' b'changes:\n\n'
) )
) )
printrequirements() printrequirements()
printoptimisations() printoptimisations()
printupgradeactions() upgrade_op.print_upgrade_actions()
upgrade_op.print_affected_revlogs() upgrade_op.print_affected_revlogs()
unusedoptimize = [i for i in alloptimizations if i not in actions] unusedoptimize = [i for i in alloptimizations if i not in actions]
if unusedoptimize: if unusedoptimize:
ui.status( ui.status(
_( _(
b'additional optimizations are available by specifying ' b'additional optimizations are available by specifying '
b'"--optimize <name>":\n\n' b'"--optimize <name>":\n\n'
) )
) )
for i in unusedoptimize: for i in unusedoptimize:
ui.status(_(b'%s\n %s\n\n') % (i.name, i.description)) ui.status(_(b'%s\n %s\n\n') % (i.name, i.description))
return return
# Else we're in the run=true case. # Else we're in the run=true case.
ui.write(_(b'upgrade will perform the following actions:\n\n')) ui.write(_(b'upgrade will perform the following actions:\n\n'))
printrequirements() printrequirements()
printoptimisations() printoptimisations()
printupgradeactions() upgrade_op.print_upgrade_actions()
upgrade_op.print_affected_revlogs() upgrade_op.print_affected_revlogs()
ui.status(_(b'beginning upgrade...\n')) ui.status(_(b'beginning upgrade...\n'))
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
ui.status(_(b'repository locked and read-only\n')) ui.status(_(b'repository locked and read-only\n'))
# Our strategy for upgrading the repository is to create a new, # Our strategy for upgrading the repository is to create a new,
# temporary repository, write data to it, then do a swap of the # temporary repository, write data to it, then do a swap of the
# data. There are less heavyweight ways to do this, but it is easier # data. There are less heavyweight ways to do this, but it is easier

mercurial/upgrade_utils/actions.py

class UpgradeOperation(object): class UpgradeOperation(object):
"""represent the work to be done during an upgrade""" """represent the work to be done during an upgrade"""
def __init__(self, ui, requirements, actions, revlogs_to_process): def __init__(self, ui, requirements, actions, revlogs_to_process):
self.ui = ui self.ui = ui
self.requirements = requirements self.requirements = requirements
self.actions = actions self.actions = actions
self._actions_names = set([a.name for a in actions])
self.revlogs_to_process = revlogs_to_process self.revlogs_to_process = revlogs_to_process
def print_upgrade_actions(self):
for a in self.actions:
self.ui.status(b'%s\n %s\n\n' % (a.name, a.upgrademessage))
def print_affected_revlogs(self): def print_affected_revlogs(self):
if not self.revlogs_to_process: if not self.revlogs_to_process:
self.ui.write((b'no revlogs to process\n')) self.ui.write((b'no revlogs to process\n'))
else: else:
self.ui.write((b'processed revlogs:\n')) self.ui.write((b'processed revlogs:\n'))
for r in sorted(self.revlogs_to_process): for r in sorted(self.revlogs_to_process):
self.ui.write((b' - %s\n' % r)) self.ui.write((b' - %s\n' % r))
self.ui.write((b'\n')) self.ui.write((b'\n'))
def has_action(self, name):
""" Check whether the upgrade operation will perform this action """
return name in self._actions_names
### Code checking if a repository can got through the upgrade process at all. # ### Code checking if a repository can got through the upgrade process at all. #
def requiredsourcerequirements(repo): def requiredsourcerequirements(repo):
"""Obtain requirements required to be present to upgrade a repo. """Obtain requirements required to be present to upgrade a repo.
An upgrade will not be allowed if the repository doesn't have the An upgrade will not be allowed if the repository doesn't have the

mercurial/upgrade_utils/engine.py

ui.status( ui.status(
_( _(
b'(it is safe to interrupt this process any time before ' b'(it is safe to interrupt this process any time before '
b'data migration completes)\n' b'data migration completes)\n'
) )
) )
if b're-delta-all' in upgrade_op.actions: if upgrade_op.has_action(b're-delta-all'):
deltareuse = revlog.revlog.DELTAREUSENEVER deltareuse = revlog.revlog.DELTAREUSENEVER
elif b're-delta-parent' in upgrade_op.actions: elif upgrade_op.has_action(b're-delta-parent'):
deltareuse = revlog.revlog.DELTAREUSESAMEREVS deltareuse = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-multibase' in upgrade_op.actions: elif upgrade_op.has_action(b're-delta-multibase'):
deltareuse = revlog.revlog.DELTAREUSESAMEREVS deltareuse = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-fulladd' in upgrade_op.actions: elif upgrade_op.has_action(b're-delta-fulladd'):
deltareuse = revlog.revlog.DELTAREUSEFULLADD deltareuse = revlog.revlog.DELTAREUSEFULLADD
else: else:
deltareuse = revlog.revlog.DELTAREUSEALWAYS deltareuse = revlog.revlog.DELTAREUSEALWAYS
with dstrepo.transaction(b'upgrade') as tr: with dstrepo.transaction(b'upgrade') as tr:
_clonerevlogs( _clonerevlogs(
ui, ui,
srcrepo, srcrepo,
dstrepo, dstrepo,
tr, tr,
deltareuse, deltareuse,
b're-delta-multibase' in upgrade_op.actions, upgrade_op.has_action(b're-delta-multibase'),
revlogs=upgrade_op.revlogs_to_process, revlogs=upgrade_op.revlogs_to_process,
) )
# Now copy other files in the store directory. # Now copy other files in the store directory.
# The sorted() makes execution deterministic. # The sorted() makes execution deterministic.
for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)): for p, kind, st in sorted(srcrepo.store.vfs.readdir(b'', stat=True)):
if not _filterstorefile( if not _filterstorefile(
srcrepo, dstrepo, upgrade_op.requirements, p, kind, st srcrepo, dstrepo, upgrade_op.requirements, p, kind, st