This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9666

actions: store deltareuse mode of whole operation in UpgradeOperation
ClosedPublic

Authored by pulkit on Dec 30 2020, 6:53 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG82f3ee1a505f: actions: store deltareuse mode of whole operation in UpgradeOperation
Summary

UpgradeOperation should provide easy access to all the things related to the
current operation. Clients should not need to compute them.

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 24759

mercurial/upgrade_utils/actions.py

# upgrade.py - functions for in place upgrade of Mercurial repository # upgrade.py - functions for in place upgrade of Mercurial repository
# #
# Copyright (c) 2016-present, Gregory Szorc # Copyright (c) 2016-present, Gregory Szorc
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from ..i18n import _ from ..i18n import _
from .. import ( from .. import (
error, error,
localrepo, localrepo,
requirements, requirements,
revlog,
util, util,
) )
from ..utils import compression from ..utils import compression
# list of requirements that request a clone of all revlog if added/removed # list of requirements that request a clone of all revlog if added/removed
RECLONES_REQUIREMENTS = { RECLONES_REQUIREMENTS = {
b'generaldelta', b'generaldelta',
) )
# optimizations which are not used and it's recommended that they # optimizations which are not used and it's recommended that they
# should use them # should use them
all_optimizations = findoptimizations(None) all_optimizations = findoptimizations(None)
self.unused_optimizations = [ self.unused_optimizations = [
i for i in all_optimizations if i not in self.upgrade_actions i for i in all_optimizations if i not in self.upgrade_actions
] ]
# delta reuse mode of this upgrade operation
self.delta_reuse_mode = revlog.revlog.DELTAREUSEALWAYS
if b're-delta-all' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSENEVER
elif b're-delta-parent' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-multibase' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSESAMEREVS
elif b're-delta-fulladd' in self._upgrade_actions_names:
self.delta_reuse_mode = revlog.revlog.DELTAREUSEFULLADD
def _write_labeled(self, l, label): def _write_labeled(self, l, label):
""" """
Utility function to aid writing of a list under one label Utility function to aid writing of a list under one label
""" """
first = True first = True
for r in sorted(l): for r in sorted(l):
if not first: if not first:
self.ui.write(b', ') self.ui.write(b', ')

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 upgrade_op.has_upgrade_action(b're-delta-all'):
deltareuse = revlog.revlog.DELTAREUSENEVER
elif upgrade_op.has_upgrade_action(b're-delta-parent'):
deltareuse = revlog.revlog.DELTAREUSESAMEREVS
elif upgrade_op.has_upgrade_action(b're-delta-multibase'):
deltareuse = revlog.revlog.DELTAREUSESAMEREVS
elif upgrade_op.has_upgrade_action(b're-delta-fulladd'):
deltareuse = revlog.revlog.DELTAREUSEFULLADD
else:
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, upgrade_op.delta_reuse_mode,
upgrade_op.has_upgrade_action(b're-delta-multibase'), upgrade_op.has_upgrade_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(