diff -r fe5e30b58934 -r 49011f1cedd4 mercurial/upgrade.py --- a/mercurial/upgrade.py Mon Apr 10 18:03:11 2017 +0200 +++ b/mercurial/upgrade.py Mon Apr 10 18:04:50 2017 +0200 @@ -62,7 +62,7 @@ """ return set() -def upgradesupporteddestrequirements(repo): +def supporteddestrequirements(repo): """Obtain requirements that upgrade supports in the destination. If the result of the upgrade would create requirements not in this set, @@ -280,7 +280,7 @@ """ newactions = [] - knownreqs = upgradesupporteddestrequirements(repo) + knownreqs = supporteddestrequirements(repo) for i in improvements: name = i.name @@ -619,7 +619,7 @@ 'requirement: %s') % _(', ').join(sorted(noaddreqs))) - unsupportedreqs = newreqs - upgradesupporteddestrequirements(repo) + unsupportedreqs = newreqs - supporteddestrequirements(repo) if unsupportedreqs: raise error.Abort(_('cannot upgrade repository; do not support ' 'destination requirement: %s') %