Show More
@@ -85,9 +85,6 b' def upgraderepo(' | |||||
85 | ) |
|
85 | ) | |
86 | removed_actions = upgrade_actions.find_format_downgrades(repo) |
|
86 | removed_actions = upgrade_actions.find_format_downgrades(repo) | |
87 |
|
87 | |||
88 | removedreqs = repo.requirements - newreqs |
|
|||
89 | addedreqs = newreqs - repo.requirements |
|
|||
90 |
|
||||
91 | # check if we need to touch revlog and if so, which ones |
|
88 | # check if we need to touch revlog and if so, which ones | |
92 |
|
89 | |||
93 | touched_revlogs = set() |
|
90 | touched_revlogs = set() | |
@@ -159,20 +156,6 b' def upgraderepo(' | |||||
159 | elif msg_issued >= 1: |
|
156 | elif msg_issued >= 1: | |
160 | ui.status((b"\n")) |
|
157 | ui.status((b"\n")) | |
161 |
|
158 | |||
162 | # check the consistency of the revlog selection with the planned action |
|
|||
163 |
|
||||
164 | if touched_revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS: |
|
|||
165 | incompatible = upgrade_actions.RECLONES_REQUIREMENTS & ( |
|
|||
166 | removedreqs | addedreqs |
|
|||
167 | ) |
|
|||
168 | if incompatible: |
|
|||
169 | msg = _( |
|
|||
170 | b'ignoring revlogs selection flags, format requirements ' |
|
|||
171 | b'change: %s\n' |
|
|||
172 | ) |
|
|||
173 | ui.warn(msg % b', '.join(sorted(incompatible))) |
|
|||
174 | touched_revlogs = upgrade_engine.UPGRADE_ALL_REVLOGS |
|
|||
175 |
|
||||
176 | upgrade_op = upgrade_actions.UpgradeOperation( |
|
159 | upgrade_op = upgrade_actions.UpgradeOperation( | |
177 | ui, |
|
160 | ui, | |
178 | newreqs, |
|
161 | newreqs, |
General Comments 0
You need to be logged in to leave comments.
Login now