This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9582

upgrade: rename finddeficiences() to find_format_upgrades()
ClosedPublic

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

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG53d083fa1f83: upgrade: rename finddeficiences() to find_format_upgrades()
Summary

It was not obvious what does deficieny means and every format upgrade can't be a
deficiency. There are some format upgrades like compression levels, share-safe
which can't be understood at deficiencies.

A change can be an upgrade or downgrade, however this finddeficiences() only
used to find upgrades.

This patch renames the function and related variables to make things more
clearer. The ui message also got improved which is a good thing.

Next patch will rename deficiency in general across the upgrade code.

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 14 2020, 5:52 AM
pulkit updated this revision to Diff 24298.Dec 16 2020, 5:14 AM
marmoute added a subscriber: marmoute.Dec 22 2020, 3:40 AM

I don't know if `"format upgrade" is the right pick. Because the command can more things in both direction. What about "format variant" ?

pulkit added a comment.Dec 28 2020, 3:38 AM
In D9582#145557, @marmoute wrote:

I don't know if `"format upgrade" is the right pick. Because the command can more things in both direction. What about "format variant" ?

Agreed, will update.

pulkit retitled this revision from upgrade: rename deficiences to format_upgrades to upgrade: rename finddeficiences() to find_format_upgrades().Dec 30 2020, 5:31 AM
pulkit edited the summary of this revision. (Show Details)
pulkit added a child revision: D9664: actions: rename DEFICIENCY constant to FORMAT_VARIANT.
pulkit removed a child revision: D9583: upgrade: add a missing space in status message.
pulkit updated this revision to Diff 24541.
pulkit added a comment.Jan 6 2021, 4:48 AM
In D9582#145557, @marmoute wrote:

I don't know if `"format upgrade" is the right pick. Because the command can more things in both direction. What about "format variant" ?

Deficiency was used in replacement for two things: format upgrades and format variants. I have split the old patch and to replace each of both separately.

marmoute accepted this revision.Jan 7 2021, 6:29 PM
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

Revision Contents
Changeset List

Diff 24749

mercurial/upgrade.py

if optimize: # anything left is unknown if optimize: # anything left is unknown
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'),
) )
deficiencies = upgrade_actions.finddeficiencies(repo) format_upgrades = upgrade_actions.find_format_upgrades(repo)
actions = upgrade_actions.determineactions( actions = upgrade_actions.determineactions(
repo, deficiencies, repo.requirements, newreqs repo, format_upgrades, repo.requirements, newreqs
) )
actions.extend( actions.extend(
o o
for o in sorted(optimizations) for o in sorted(optimizations)
# determineactions could have added optimisation # determineactions could have added optimisation
if o not in actions if o not in actions
) )
actions, actions,
revlogs, revlogs,
) )
if not run: if not run:
fromconfig = [] fromconfig = []
onlydefault = [] onlydefault = []
for d in deficiencies: for d in format_upgrades:
if d.fromconfig(repo): if d.fromconfig(repo):
fromconfig.append(d) fromconfig.append(d)
elif d.default: elif d.default:
onlydefault.append(d) onlydefault.append(d)
if fromconfig or onlydefault: if fromconfig or onlydefault:
if fromconfig: if fromconfig:
b'config options:\n\n' b'config options:\n\n'
) )
) )
for i in onlydefault: for i in onlydefault:
ui.status(b'%s\n %s\n\n' % (i.name, i.description)) ui.status(b'%s\n %s\n\n' % (i.name, i.description))
ui.status(b'\n') ui.status(b'\n')
else: else:
ui.status( ui.status(_(b'(no format upgrades found in existing repository)\n'))
_(
b'(no feature deficiencies found in existing '
b'repository)\n'
)
)
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'
) )
) )

mercurial/upgrade_utils/actions.py

level = repo.ui.configint(b'storage', b'revlog.zlib.level') level = repo.ui.configint(b'storage', b'revlog.zlib.level')
elif comp == b'zstd': elif comp == b'zstd':
level = repo.ui.configint(b'storage', b'revlog.zstd.level') level = repo.ui.configint(b'storage', b'revlog.zstd.level')
if level is None: if level is None:
return b'default' return b'default'
return bytes(level) return bytes(level)
def finddeficiencies(repo): def find_format_upgrades(repo):
"""returns a list of deficiencies that the repo suffer from""" """returns a list of format upgrades which can be perform on the repo"""
deficiencies = [] upgrades = []
# We could detect lack of revlogv1 and store here, but they were added # We could detect lack of revlogv1 and store here, but they were added
# in 0.9.2 and we don't support upgrading repos without these # in 0.9.2 and we don't support upgrading repos without these
# requirements, so let's not bother. # requirements, so let's not bother.
for fv in allformatvariant: for fv in allformatvariant:
if not fv.fromrepo(repo): if not fv.fromrepo(repo):
deficiencies.append(fv) upgrades.append(fv)
return deficiencies return upgrades
ALL_OPTIMISATIONS = [] ALL_OPTIMISATIONS = []
def register_optimization(obj): def register_optimization(obj):
ALL_OPTIMISATIONS.append(obj) ALL_OPTIMISATIONS.append(obj)
return obj return obj
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, deficiencies, sourcereqs, destreqs): def determineactions(repo, format_upgrades, sourcereqs, destreqs):
"""Determine upgrade actions that will be performed. """Determine upgrade actions that will be performed.
Given a list of improvements as returned by ``finddeficiencies`` 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 deficiencies: 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)

tests/test-upgrade-repo.t

{ {
"config": "default", "config": "default",
"default": "default", "default": "default",
"name": "compression-level", "name": "compression-level",
"repo": "default" "repo": "default"
} }
] ]
$ hg debugupgraderepo $ hg debugupgraderepo
(no feature deficiencies found in existing repository) (no format upgrades found in existing repository)
performing an upgrade with "--run" will make the following changes: performing an upgrade with "--run" will make the following changes:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
--optimize can be used to add optimizations --optimize can be used to add optimizations
$ hg debugupgrade --optimize redeltaparent $ hg debugupgrade --optimize redeltaparent
(no feature deficiencies found in existing repository) (no format upgrades found in existing repository)
performing an upgrade with "--run" will make the following changes: performing an upgrade with "--run" will make the following changes:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-parent optimisations: re-delta-parent
re-delta-parent re-delta-parent
re-delta-fulladd re-delta-fulladd
every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved. every revision will be re-added as if it was new content. It will go through the full storage mechanism giving extensions a chance to process it (eg. lfs). This is similar to "re-delta-all" but even slower since more logic is involved.
modern form of the option modern form of the option
$ hg debugupgrade --optimize re-delta-parent $ hg debugupgrade --optimize re-delta-parent
(no feature deficiencies found in existing repository) (no format upgrades found in existing repository)
performing an upgrade with "--run" will make the following changes: performing an upgrade with "--run" will make the following changes:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-parent optimisations: re-delta-parent
re-delta-parent re-delta-parent