Show More
@@ -78,7 +78,7 def upgradesupporteddestrequirements(rep | |||||
78 | 'store', |
|
78 | 'store', | |
79 | ]) |
|
79 | ]) | |
80 |
|
80 | |||
81 |
def |
|
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 | |
@@ -613,7 +613,7 def upgraderepo(ui, repo, run=False, opt | |||||
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 |
|
|
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') % |
General Comments 0
You need to be logged in to leave comments.
Login now