This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9614

upgrade: drop support for old style optimization names
ClosedPublic

Authored by pulkit on Dec 16 2020, 5:14 AM.

Details

Reviewers
marmoute
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG083438d6f403: upgrade: drop support for old style optimization names
Summary

Old style optimization names like redeltaparent were converted into
re-delta-parent more than two years ago. The old names were kept around for
sometime because of BC reasons.

Refer 5608b5a6c3231c4ec771171cc3079142c7672be6. The commit states the map is
there for a while and we can drop them as the underlying command is a debug
command.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Dec 16 2020, 5:14 AM
marmoute accepted this revision.Dec 22 2020, 3:41 AM
marmoute added a subscriber: marmoute.

Why not

pulkit updated this revision to Diff 24543.Dec 30 2020, 5:31 AM
mharbison72 accepted this revision.Jan 12 2021, 6:45 PM
This revision is now accepted and ready to land.Jan 12 2021, 6:45 PM
pulkit added a commit: rHG083438d6f403: upgrade: drop support for old style optimization names.Jan 12 2021, 6:53 PM
Closed by commit rHG083438d6f403: upgrade: drop support for old style optimization names (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 24543

mercurial/debugcommands.py

* `--manifest`: only optimize the manifest * `--manifest`: only optimize the manifest
* `--no-manifest`: optimize all revlog but the manifest * `--no-manifest`: optimize all revlog but the manifest
* `--changelog`: optimize the changelog only * `--changelog`: optimize the changelog only
* `--no-changelog --no-manifest`: optimize filelogs only * `--no-changelog --no-manifest`: optimize filelogs only
* `--filelogs`: optimize the filelogs only * `--filelogs`: optimize the filelogs only
* `--no-changelog --no-manifest --no-filelogs`: skip all filelog optimisation * `--no-changelog --no-manifest --no-filelogs`: skip all filelog optimisation
""" """
return upgrade.upgraderepo( return upgrade.upgraderepo(
ui, repo, run=run, optimize=optimize, backup=backup, **opts ui, repo, run=run, optimize=set(optimize), backup=backup, **opts
) )
@command( @command(
b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True b'debugwalk', cmdutil.walkopts, _(b'[OPTION]... [FILE]...'), inferrepo=True
) )
def debugwalk(ui, repo, *pats, **opts): def debugwalk(ui, repo, *pats, **opts):
"""show how files match on given patterns""" """show how files match on given patterns"""

mercurial/upgrade.py

from .upgrade_utils import ( from .upgrade_utils import (
actions as upgrade_actions, actions as upgrade_actions,
engine as upgrade_engine, engine as upgrade_engine,
) )
allformatvariant = upgrade_actions.allformatvariant allformatvariant = upgrade_actions.allformatvariant
# search without '-' to support older form on newer client.
#
# We don't enforce backward compatibility for debug command so this
# might eventually be dropped. However, having to use two different
# forms in script when comparing result is anoying enough to add
# backward compatibility for a while.
legacy_opts_map = {
b'redeltaparent': b're-delta-parent',
b'redeltamultibase': b're-delta-multibase',
b'redeltaall': b're-delta-all',
b'redeltafulladd': b're-delta-fulladd',
}
def upgraderepo( def upgraderepo(
ui, ui,
repo, repo,
run=False, run=False,
optimize=None, optimize=None,
backup=True, backup=True,
manifest=None, manifest=None,
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 = {}
optimize = {legacy_opts_map.get(o, o) for o in optimize}
repo = repo.unfiltered() repo = repo.unfiltered()
revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS) revlogs = set(upgrade_engine.UPGRADE_ALL_REVLOGS)
specentries = ( specentries = (
(upgrade_engine.UPGRADE_CHANGELOG, changelog), (upgrade_engine.UPGRADE_CHANGELOG, changelog),
(upgrade_engine.UPGRADE_MANIFEST, manifest), (upgrade_engine.UPGRADE_MANIFEST, manifest),
(upgrade_engine.UPGRADE_FILELOGS, filelogs), (upgrade_engine.UPGRADE_FILELOGS, filelogs),
) )

tests/test-upgrade-repo.t

processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
--optimize can be used to add optimizations --optimize can be used to add optimizations
$ hg debugupgrade --optimize redeltaparent $ hg debugupgrade --optimize 're-delta-parent'
(no format upgrades found in existing repository) (no format upgrades found in existing repository)
performing an upgrade with "--run" will make the following changes: performing an upgrade with "--run" will make the following changes:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-parent optimisations: re-delta-parent
starting in-place swap of repository data starting in-place swap of repository data
replaced files will be backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob) replaced files will be backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob)
replacing store... replacing store...
store replacement complete; repository was inconsistent for *s (glob) store replacement complete; repository was inconsistent for *s (glob)
finalizing requirements file and making repository readable again finalizing requirements file and making repository readable again
removing temporary repository $TESTTMP/store-filenames/.hg/upgrade.* (glob) removing temporary repository $TESTTMP/store-filenames/.hg/upgrade.* (glob)
copy of old repository backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob) copy of old repository backed up at $TESTTMP/store-filenames/.hg/upgradebackup.* (glob)
the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified the old repository will not be deleted; remove it to free up disk space once the upgraded repository is verified
$ hg debugupgraderepo --run --optimize redeltafulladd $ hg debugupgraderepo --run --optimize 're-delta-fulladd'
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-fulladd optimisations: re-delta-fulladd
re-delta-fulladd re-delta-fulladd
$ hg config format $ hg config format
format.maxchainlen=9001 format.maxchainlen=9001
$ hg debugdeltachain file $ hg debugdeltachain file
rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio readsize largestblk rddensity srchunks rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio readsize largestblk rddensity srchunks
0 1 1 -1 base 77 182 77 0.42308 77 0 0.00000 77 77 1.00000 1 0 1 1 -1 base 77 182 77 0.42308 77 0 0.00000 77 77 1.00000 1
1 1 2 0 p1 21 191 98 0.51309 98 0 0.00000 98 98 1.00000 1 1 1 2 0 p1 21 191 98 0.51309 98 0 0.00000 98 98 1.00000 1
2 1 2 0 other 30 200 107 0.53500 128 21 0.19626 128 128 0.83594 1 2 1 2 0 other 30 200 107 0.53500 128 21 0.19626 128 128 0.83594 1
$ hg debugupgraderepo --run --optimize redeltaall $ hg debugupgraderepo --run --optimize 're-delta-all'
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
optimisations: re-delta-all optimisations: re-delta-all
re-delta-all re-delta-all