Mercurial > public > mercurial-scm > hg
comparison mercurial/upgrade.py @ 46209:a51d345f1404
upgrade: move optimization addition to determineactions()
The documentation of `determineactions()` mention that it is given a list
returned from `findoptimizations()` however it was not true before this patch.
The code extending actions with optimizations also mentioned about it that this
should be in determineactions.
So let's do what comments at couple of places say.
Differential Revision: https://phab.mercurial-scm.org/D9615
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 16 Dec 2020 14:06:24 +0530 |
| parents | 083438d6f403 |
| children | 6b40aac4da8e |
comparison
equal
deleted
inserted
replaced
| 46208:083438d6f403 | 46209:a51d345f1404 |
|---|---|
| 83 hint=_(b'run without arguments to see valid optimizations'), | 83 hint=_(b'run without arguments to see valid optimizations'), |
| 84 ) | 84 ) |
| 85 | 85 |
| 86 format_upgrades = upgrade_actions.find_format_upgrades(repo) | 86 format_upgrades = upgrade_actions.find_format_upgrades(repo) |
| 87 actions = upgrade_actions.determineactions( | 87 actions = upgrade_actions.determineactions( |
| 88 repo, format_upgrades, repo.requirements, newreqs | 88 repo, format_upgrades, optimizations, repo.requirements, newreqs |
| 89 ) | |
| 90 actions.extend( | |
| 91 o | |
| 92 for o in sorted(optimizations) | |
| 93 # determineactions could have added optimisation | |
| 94 if o not in actions | |
| 95 ) | 89 ) |
| 96 | 90 |
| 97 removedreqs = repo.requirements - newreqs | 91 removedreqs = repo.requirements - newreqs |
| 98 addedreqs = newreqs - repo.requirements | 92 addedreqs = newreqs - repo.requirements |
| 99 | 93 |