[Updated] D11869: upgrade: explicitly warn when a `--no-xxx` flag is overwritten
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Dec 10 15:47:26 UTC 2021
Closed by commit rHG1d0978cfe968: upgrade: explicitly warn when a `--no-xxx` flag is overwritten (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Revision".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11869?vs=31339&id=31420
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11869/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11869
AFFECTED FILES
mercurial/upgrade.py
tests/test-upgrade-repo.t
CHANGE DETAILS
diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t
--- a/tests/test-upgrade-repo.t
+++ b/tests/test-upgrade-repo.t
@@ -944,6 +944,22 @@
$ echo "[format]" > .hg/hgrc
$ echo "sparse-revlog=no" >> .hg/hgrc
+ $ hg debugupgrade --optimize re-delta-parent --no-manifest --no-backup --quiet
+ warning: ignoring --no-manifest, as upgrade is changing: sparserevlog
+
+ ignoring revlogs selection flags, format requirements change: sparserevlog
+ requirements
+ preserved: dotencode, fncache, generaldelta, revlogv1, store (no-rust !)
+ preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, store (rust !)
+ removed: sparserevlog
+
+ optimisations: re-delta-parent
+
+ processed revlogs:
+ - all-filelogs
+ - changelog
+ - manifest
+
$ hg debugupgrade --optimize re-delta-parent --run --manifest --no-backup --debug --traceback
ignoring revlogs selection flags, format requirements change: sparserevlog
upgrade will perform the following actions:
diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py
--- a/mercurial/upgrade.py
+++ b/mercurial/upgrade.py
@@ -90,6 +90,43 @@
# check if we need to touch revlog and if so, which ones
+ touched_revlogs = set()
+ overwrite_msg = _(b'warning: ignoring %14s, as upgrade is changing: %s\n')
+ msg_issued = False
+
+ FL = upgrade_engine.UPGRADE_FILELOGS
+ MN = upgrade_engine.UPGRADE_MANIFEST
+ CL = upgrade_engine.UPGRADE_CHANGELOG
+
+ for action in sorted(up_actions + removed_actions, key=lambda a: a.name):
+ # optimisation does not "requires anything, they just needs it.
+ if action.type != upgrade_actions.FORMAT_VARIANT:
+ continue
+
+ if action.touches_filelogs and FL not in touched_revlogs:
+ if FL in specified_revlogs:
+ if not specified_revlogs[FL]:
+ msg = overwrite_msg % (b'--no-filelogs', action.name)
+ ui.warn(msg)
+ msg_issued = True
+ touched_revlogs.add(FL)
+ if action.touches_manifests and MN not in touched_revlogs:
+ if MN in specified_revlogs:
+ if not specified_revlogs[MN]:
+ msg = overwrite_msg % (b'--no-manifest', action.name)
+ ui.warn(msg)
+ msg_issued = True
+ touched_revlogs.add(MN)
+ if action.touches_changelog and CL not in touched_revlogs:
+ if CL in specified_revlogs:
+ if not specified_revlogs[CL]:
+ msg = overwrite_msg % (b'--no-changelog', action.name)
+ ui.warn(msg)
+ msg_issued = True
+ touched_revlogs.add(CL)
+ if msg_issued:
+ ui.warn((b"\n"))
+
revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS)
if specified_revlogs:
# we have some limitation on revlogs to be recloned
To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211210/607ebae5/attachment-0002.html>
More information about the Mercurial-patches
mailing list