# HG changeset patch # User Pierre-Yves David # Date 2017-04-10 16:00:27 # Node ID cc60b6c36637749598375ba57a24bb573b378d39 # Parent 1454726b6d7c411d57e61b2ce6a32f7d5797940f upgrade: drop the prefix to the 'supportremovedrequirements' function Now that we are in the 'upgrade' module we can simplify the name. diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -53,7 +53,7 @@ def blocksourcerequirements(repo): 'shared', ]) -def upgradesupportremovedrequirements(repo): +def supportremovedrequirements(repo): """Obtain requirements that can be removed during an upgrade. If an upgrade were to create a repository that dropped a requirement, @@ -607,7 +607,7 @@ def upgraderepo(ui, repo, run=False, opt newreqs = localrepo.newreporequirements(repo) noremovereqs = (repo.requirements - newreqs - - upgradesupportremovedrequirements(repo)) + supportremovedrequirements(repo)) if noremovereqs: raise error.Abort(_('cannot upgrade repository; requirement would be ' 'removed: %s') % _(', ').join(sorted(noremovereqs)))