Mercurial > hg

comparison mercurial/upgrade.py @ 31869:fe5e30b58934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade: drop the prefix to the 'allowednewrequirements' function Now that we are in the 'upgrade' module we can simplify the name.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 10 Apr 2017 18:03:11 +0200
parents 9f84ccb1b282
children 49011f1cedd4
comparison
equal deleted inserted replaced
31868:9f84ccb1b282 31869:fe5e30b58934
76 'generaldelta', 76 'generaldelta',
77 'revlogv1', 77 'revlogv1',
78 'store', 78 'store',
79 ]) 79 ])
80 80
81 def upgradeallowednewrequirements(repo): 81 def allowednewrequirements(repo):
82 """Obtain requirements that can be added to a repository during upgrade. 82 """Obtain requirements that can be added to a repository during upgrade.
83 83
84 This is used to disallow proposed requirements from being added when 84 This is used to disallow proposed requirements from being added when
85 they weren't present before. 85 they weren't present before.
86 86
611 if noremovereqs: 611 if noremovereqs:
612 raise error.Abort(_('cannot upgrade repository; requirement would be ' 612 raise error.Abort(_('cannot upgrade repository; requirement would be '
613 'removed: %s') % _(', ').join(sorted(noremovereqs))) 613 'removed: %s') % _(', ').join(sorted(noremovereqs)))
614 614
615 noaddreqs = (newreqs - repo.requirements - 615 noaddreqs = (newreqs - repo.requirements -
616 upgradeallowednewrequirements(repo)) 616 allowednewrequirements(repo))
617 if noaddreqs: 617 if noaddreqs:
618 raise error.Abort(_('cannot upgrade repository; do not support adding ' 618 raise error.Abort(_('cannot upgrade repository; do not support adding '
619 'requirement: %s') % 619 'requirement: %s') %
620 _(', ').join(sorted(noaddreqs))) 620 _(', ').join(sorted(noaddreqs)))
621 621