changeset 48488:dc2ef4b4d9a9

upgrade: drop some dead code Everything done by this block is now done by earlier code. So we don't need it anymore. Differential Revision: https://phab.mercurial-scm.org/D11872
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 06 Dec 2021 21:30:32 +0100
parents 62e6222cc5b6
children b5f8d9e55d42
files mercurial/upgrade.py
diffstat 1 files changed, 0 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/upgrade.py	Mon Dec 06 17:54:39 2021 +0100
+++ b/mercurial/upgrade.py	Mon Dec 06 21:30:32 2021 +0100
@@ -85,9 +85,6 @@
     )
     removed_actions = upgrade_actions.find_format_downgrades(repo)
 
-    removedreqs = repo.requirements - newreqs
-    addedreqs = newreqs - repo.requirements
-
     # check if we need to touch revlog and if so, which ones
 
     touched_revlogs = set()
@@ -159,20 +156,6 @@
     elif msg_issued >= 1:
         ui.status((b"\n"))
 
-    # check the consistency of the revlog selection with the planned action
-
-    if touched_revlogs != upgrade_engine.UPGRADE_ALL_REVLOGS:
-        incompatible = upgrade_actions.RECLONES_REQUIREMENTS & (
-            removedreqs | addedreqs
-        )
-        if incompatible:
-            msg = _(
-                b'ignoring revlogs selection flags, format requirements '
-                b'change: %s\n'
-            )
-            ui.warn(msg % b', '.join(sorted(incompatible)))
-            touched_revlogs = upgrade_engine.UPGRADE_ALL_REVLOGS
-
     upgrade_op = upgrade_actions.UpgradeOperation(
         ui,
         newreqs,