This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9576

upgrade: move `printoptimisations() to UpgradeOperation class
ClosedPublic

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

Details

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

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

Diff Detail

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

Event Timeline

pulkit created this revision.Dec 14 2020, 4:55 AM
marmoute accepted this revision.Dec 22 2020, 3:32 AM
mharbison72 accepted this revision.Jan 5 2021, 10:34 AM
This revision is now accepted and ready to land.Jan 5 2021, 10:34 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (17 lines)
Mmercurial/upgrade_utils/actions.py (22 lines)

Diff 24200

mercurial/upgrade.py

ui.write((b'\n')) ui.write((b'\n'))
added = newreqs - repo.requirements added = newreqs - repo.requirements
if added: if added:
ui.write(_(b' added: ')) ui.write(_(b' added: '))
write_labeled(added, "upgrade-repo.requirement.added") write_labeled(added, "upgrade-repo.requirement.added")
ui.write((b'\n')) ui.write((b'\n'))
ui.write(b'\n') ui.write(b'\n')
def printoptimisations():
optimisations = [
a for a in actions if a.type == upgrade_actions.OPTIMISATION
]
optimisations.sort(key=lambda a: a.name)
if optimisations:
ui.write(_(b'optimisations: '))
write_labeled(
[a.name for a in optimisations],
"upgrade-repo.optimisation.performed",
)
ui.write(b'\n\n')
upgrade_op = upgrade_actions.UpgradeOperation( upgrade_op = upgrade_actions.UpgradeOperation(
ui, ui,
newreqs, newreqs,
actions, actions,
revlogs, revlogs,
) )
if not run: if not run:
ui.status( ui.status(
_( _(
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() upgrade_op.print_optimisations()
upgrade_op.print_upgrade_actions() 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() upgrade_op.print_optimisations()
upgrade_op.print_upgrade_actions() 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

mercurial/upgrade_utils/actions.py

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._actions_names = set([a.name for a in actions])
self.revlogs_to_process = revlogs_to_process self.revlogs_to_process = revlogs_to_process
def _write_labeled(self, l, label):
"""
Utility function to aid writing of a list under one label
"""
first = True
for r in sorted(l):
if not first:
self.ui.write(b', ')
self.ui.write(r, label=label)
first = False
def print_optimisations(self):
optimisations = [a for a in self.actions if a.type == OPTIMISATION]
optimisations.sort(key=lambda a: a.name)
if optimisations:
self.ui.write(_(b'optimisations: '))
self._write_labeled(
[a.name for a in optimisations],
"upgrade-repo.optimisation.performed",
)
self.ui.write(b'\n\n')
def print_upgrade_actions(self): def print_upgrade_actions(self):
for a in self.actions: for a in self.actions:
self.ui.status(b'%s\n %s\n\n' % (a.name, a.upgrademessage)) 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: