Show More
@@ -53,7 +53,7 b' def blocksourcerequirements(repo):' | |||||
53 | 'shared', |
|
53 | 'shared', | |
54 | ]) |
|
54 | ]) | |
55 |
|
55 | |||
56 |
def |
|
56 | def supportremovedrequirements(repo): | |
57 | """Obtain requirements that can be removed during an upgrade. |
|
57 | """Obtain requirements that can be removed during an upgrade. | |
58 |
|
58 | |||
59 | If an upgrade were to create a repository that dropped a requirement, |
|
59 | If an upgrade were to create a repository that dropped a requirement, | |
@@ -607,7 +607,7 b' def upgraderepo(ui, repo, run=False, opt' | |||||
607 | newreqs = localrepo.newreporequirements(repo) |
|
607 | newreqs = localrepo.newreporequirements(repo) | |
608 |
|
608 | |||
609 | noremovereqs = (repo.requirements - newreqs - |
|
609 | noremovereqs = (repo.requirements - newreqs - | |
610 |
|
|
610 | supportremovedrequirements(repo)) | |
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))) |
General Comments 0
You need to be logged in to leave comments.
Login now