| Alphare |
| hg-reviewers |
This makes various logic simpler and will help making future patch clearer.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/upgrade.py (21 lines) |
| changelog=None, | changelog=None, | ||||
| filelogs=None, | filelogs=None, | ||||
| ): | ): | ||||
| """Upgrade a repository in place.""" | """Upgrade a repository in place.""" | ||||
| if optimize is None: | if optimize is None: | ||||
| optimize = {} | optimize = {} | ||||
| repo = repo.unfiltered() | repo = repo.unfiltered() | ||||
| specentries = ( | specified_revlogs = {} | ||||
| (upgrade_engine.UPGRADE_CHANGELOG, changelog), | if changelog is not None: | ||||
| (upgrade_engine.UPGRADE_MANIFEST, manifest), | specified_revlogs[upgrade_engine.UPGRADE_CHANGELOG] = changelog | ||||
| (upgrade_engine.UPGRADE_FILELOGS, filelogs), | if manifest is not None: | ||||
| ) | specified_revlogs[upgrade_engine.UPGRADE_MANIFEST] = manifest | ||||
| if filelogs is not None: | |||||
| specified_revlogs[upgrade_engine.UPGRADE_FILELOGS] = filelogs | |||||
| # Ensure the repository can be upgraded. | # Ensure the repository can be upgraded. | ||||
| upgrade_actions.check_source_requirements(repo) | upgrade_actions.check_source_requirements(repo) | ||||
| default_options = localrepo.defaultcreateopts(repo.ui) | default_options = localrepo.defaultcreateopts(repo.ui) | ||||
| newreqs = localrepo.newreporequirements(repo.ui, default_options) | newreqs = localrepo.newreporequirements(repo.ui, default_options) | ||||
| newreqs.update(upgrade_actions.preservedrequirements(repo)) | newreqs.update(upgrade_actions.preservedrequirements(repo)) | ||||
| removed_actions = upgrade_actions.find_format_downgrades(repo) | removed_actions = upgrade_actions.find_format_downgrades(repo) | ||||
| removedreqs = repo.requirements - newreqs | removedreqs = repo.requirements - newreqs | ||||
| addedreqs = newreqs - repo.requirements | addedreqs = newreqs - repo.requirements | ||||
| # check if we need to touch revlog and if so, which ones | # check if we need to touch revlog and if so, which ones | ||||
| revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) | revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) | ||||
| specified = [(y, x) for (y, x) in specentries if x is not None] | if specified_revlogs: | ||||
| if specified: | |||||
| # we have some limitation on revlogs to be recloned | # we have some limitation on revlogs to be recloned | ||||
| if any(x for y, x in specified): | if any(specified_revlogs.values()): | ||||
| revlogs = set() | revlogs = set() | ||||
| for upgrade, enabled in specified: | for upgrade, enabled in specified_revlogs.items(): | ||||
| if enabled: | if enabled: | ||||
| revlogs.add(upgrade) | revlogs.add(upgrade) | ||||
| else: | else: | ||||
| # none are enabled | # none are enabled | ||||
| for upgrade, __ in specified: | for upgrade in specified_revlogs.keys(): | ||||
| revlogs.discard(upgrade) | revlogs.discard(upgrade) | ||||
| # check the consistency of the revlog selection with the planned action | # check the consistency of the revlog selection with the planned action | ||||
| if revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS: | if revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS: | ||||
| incompatible = upgrade_actions.RECLONES_REQUIREMENTS & ( | incompatible = upgrade_actions.RECLONES_REQUIREMENTS & ( | ||||
| removedreqs | addedreqs | removedreqs | addedreqs | ||||
| ) | ) | ||||