equal
deleted
inserted
replaced
121 b'change: %s\n' |
121 b'change: %s\n' |
122 ) |
122 ) |
123 ui.warn(msg % b', '.join(sorted(incompatible))) |
123 ui.warn(msg % b', '.join(sorted(incompatible))) |
124 revlogs = upgrade_engine.UPGRADE_ALL_REVLOGS |
124 revlogs = upgrade_engine.UPGRADE_ALL_REVLOGS |
125 |
125 |
126 def write_labeled(l, label): |
|
127 first = True |
|
128 for r in sorted(l): |
|
129 if not first: |
|
130 ui.write(b', ') |
|
131 ui.write(r, label=label) |
|
132 first = False |
|
133 |
|
134 def printrequirements(): |
|
135 ui.write(_(b'requirements\n')) |
|
136 ui.write(_(b' preserved: ')) |
|
137 write_labeled( |
|
138 newreqs & repo.requirements, "upgrade-repo.requirement.preserved" |
|
139 ) |
|
140 ui.write((b'\n')) |
|
141 removed = repo.requirements - newreqs |
|
142 if repo.requirements - newreqs: |
|
143 ui.write(_(b' removed: ')) |
|
144 write_labeled(removed, "upgrade-repo.requirement.removed") |
|
145 ui.write((b'\n')) |
|
146 added = newreqs - repo.requirements |
|
147 if added: |
|
148 ui.write(_(b' added: ')) |
|
149 write_labeled(added, "upgrade-repo.requirement.added") |
|
150 ui.write((b'\n')) |
|
151 ui.write(b'\n') |
|
152 |
|
153 upgrade_op = upgrade_actions.UpgradeOperation( |
126 upgrade_op = upgrade_actions.UpgradeOperation( |
154 ui, |
127 ui, |
155 newreqs, |
128 newreqs, |
|
129 repo.requirements, |
156 actions, |
130 actions, |
157 revlogs, |
131 revlogs, |
158 ) |
132 ) |
159 |
133 |
160 if not run: |
134 if not run: |
203 b'performing an upgrade with "--run" will make the following ' |
177 b'performing an upgrade with "--run" will make the following ' |
204 b'changes:\n\n' |
178 b'changes:\n\n' |
205 ) |
179 ) |
206 ) |
180 ) |
207 |
181 |
208 printrequirements() |
182 upgrade_op.print_requirements() |
209 upgrade_op.print_optimisations() |
183 upgrade_op.print_optimisations() |
210 upgrade_op.print_upgrade_actions() |
184 upgrade_op.print_upgrade_actions() |
211 upgrade_op.print_affected_revlogs() |
185 upgrade_op.print_affected_revlogs() |
212 |
186 |
213 unusedoptimize = [i for i in alloptimizations if i not in actions] |
187 unusedoptimize = [i for i in alloptimizations if i not in actions] |
223 ui.status(_(b'%s\n %s\n\n') % (i.name, i.description)) |
197 ui.status(_(b'%s\n %s\n\n') % (i.name, i.description)) |
224 return |
198 return |
225 |
199 |
226 # Else we're in the run=true case. |
200 # Else we're in the run=true case. |
227 ui.write(_(b'upgrade will perform the following actions:\n\n')) |
201 ui.write(_(b'upgrade will perform the following actions:\n\n')) |
228 printrequirements() |
202 upgrade_op.print_requirements() |
229 upgrade_op.print_optimisations() |
203 upgrade_op.print_optimisations() |
230 upgrade_op.print_upgrade_actions() |
204 upgrade_op.print_upgrade_actions() |
231 upgrade_op.print_affected_revlogs() |
205 upgrade_op.print_affected_revlogs() |
232 |
206 |
233 ui.status(_(b'beginning upgrade...\n')) |
207 ui.status(_(b'beginning upgrade...\n')) |