diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py index 36c05ab022329639977b4a8764931150186bca68_bWVyY3VyaWFsL3VwZ3JhZGUucHk=..53d083fa1f8389ad1ccdbd9e9cf8eda77bbe070f_bWVyY3VyaWFsL3VwZ3JhZGUucHk= 100644 --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -97,5 +97,5 @@ 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( @@ -101,5 +101,5 @@ actions = upgrade_actions.determineactions( - repo, deficiencies, repo.requirements, newreqs + repo, format_upgrades, repo.requirements, newreqs ) actions.extend( o @@ -135,7 +135,7 @@ fromconfig = [] onlydefault = [] - for d in deficiencies: + for d in format_upgrades: if d.fromconfig(repo): fromconfig.append(d) elif d.default: @@ -165,12 +165,7 @@ ui.status(b'\n') else: - ui.status( - _( - b'(no feature deficiencies found in existing ' - b'repository)\n' - ) - ) + ui.status(_(b'(no format upgrades found in existing repository)\n')) ui.status( _( diff --git a/mercurial/upgrade_utils/actions.py b/mercurial/upgrade_utils/actions.py index 36c05ab022329639977b4a8764931150186bca68_bWVyY3VyaWFsL3VwZ3JhZGVfdXRpbHMvYWN0aW9ucy5weQ==..53d083fa1f8389ad1ccdbd9e9cf8eda77bbe070f_bWVyY3VyaWFsL3VwZ3JhZGVfdXRpbHMvYWN0aW9ucy5weQ== 100644 --- a/mercurial/upgrade_utils/actions.py +++ b/mercurial/upgrade_utils/actions.py @@ -410,9 +410,9 @@ return bytes(level) -def finddeficiencies(repo): - """returns a list of deficiencies that the repo suffer from""" - deficiencies = [] +def find_format_upgrades(repo): + """returns a list of format upgrades which can be perform on the repo""" + upgrades = [] # 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 @@ -420,5 +420,5 @@ for fv in allformatvariant: if not fv.fromrepo(repo): - deficiencies.append(fv) + upgrades.append(fv) @@ -424,5 +424,5 @@ - return deficiencies + return upgrades ALL_OPTIMISATIONS = [] @@ -523,6 +523,6 @@ return list(ALL_OPTIMISATIONS) -def determineactions(repo, deficiencies, sourcereqs, destreqs): +def determineactions(repo, format_upgrades, sourcereqs, destreqs): """Determine upgrade actions that will be performed. @@ -527,6 +527,6 @@ """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 will be performed. @@ -538,7 +538,7 @@ """ newactions = [] - for d in deficiencies: + for d in format_upgrades: name = d._requirement # If the action is a requirement that doesn't show up in the diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t index 36c05ab022329639977b4a8764931150186bca68_dGVzdHMvdGVzdC11cGdyYWRlLXJlcG8udA==..53d083fa1f8389ad1ccdbd9e9cf8eda77bbe070f_dGVzdHMvdGVzdC11cGdyYWRlLXJlcG8udA== 100644 --- a/tests/test-upgrade-repo.t +++ b/tests/test-upgrade-repo.t @@ -173,7 +173,7 @@ } ] $ 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: requirements @@ -212,7 +212,7 @@ --optimize can be used to add optimizations $ 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: requirements @@ -243,7 +243,7 @@ modern form of the option $ 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: requirements