This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6943

upgrade: allow for `sidedata` removal
ClosedPublic

Authored by marmoute on Oct 1 2019, 12:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6e3dc1eff5c7: upgrade: allow for `sidedata` removal
rHG1b4fd93cd79a: upgrade: allow for `sidedata` removal
Summary

If the side-date feature is removed, we need to drop them.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Oct 1 2019, 12:07 PM
marmoute updated this revision to Diff 16774.Oct 2 2019, 12:08 AM
marmoute updated this revision to Diff 16775.Oct 2 2019, 3:14 PM
martinvonz added a subscriber: martinvonz.Oct 8 2019, 6:19 PM
martinvonz added inline comments.
tests/test-sidedata.t
74–76

Looks like this change should be in the parent

marmoute marked an inline comment as done.Oct 9 2019, 12:02 PM
marmoute updated this revision to Diff 16989.
marmoute updated this revision to Diff 16992.Oct 9 2019, 12:23 PM
marmoute added a commit: rHG1b4fd93cd79a: upgrade: allow for `sidedata` removal.Oct 9 2019, 12:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1b4fd93cd79a: upgrade: allow for `sidedata` removal (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute added inline comments.Oct 9 2019, 6:19 PM
tests/test-sidedata.t
74–76

Actually, the text should says "downgrade from", on my way to fix that

Revision Contents
Changeset List

PathPackages
Mmercurial/upgrade.py (15 lines)
Mtests/test-sidedata.t (8 lines)
Mtests/test-upgrade-repo.t (50 lines)

Diff 16997

mercurial/upgrade.py

"""Obtain requirements that can be removed during an upgrade. """Obtain requirements that can be removed during an upgrade.
If an upgrade were to create a repository that dropped a requirement, If an upgrade were to create a repository that dropped a requirement,
the dropped requirement must appear in the returned set for the upgrade the dropped requirement must appear in the returned set for the upgrade
to be allowed. to be allowed.
""" """
supported = { supported = {
localrepo.SPARSEREVLOG_REQUIREMENT, localrepo.SPARSEREVLOG_REQUIREMENT,
localrepo.SIDEDATA_REQUIREMENT,
} }
for name in compression.compengines: for name in compression.compengines:
engine = compression.compengines[name] engine = compression.compengines[name]
if engine.available() and engine.revlogheader(): if engine.available() and engine.revlogheader():
supported.add(b'exp-compression-%s' % name) supported.add(b'exp-compression-%s' % name)
if engine.name() == b'zstd': if engine.name() == b'zstd':
supported.add(b'revlog-compression-zstd') supported.add(b'revlog-compression-zstd')
return supported return supported
UPGRADE_MANIFEST = object() UPGRADE_MANIFEST = object()
UPGRADE_FILELOG = object() UPGRADE_FILELOG = object()
UPGRADE_ALL_REVLOGS = frozenset( UPGRADE_ALL_REVLOGS = frozenset(
[UPGRADE_CHANGELOG, UPGRADE_MANIFEST, UPGRADE_FILELOG] [UPGRADE_CHANGELOG, UPGRADE_MANIFEST, UPGRADE_FILELOG]
) )
def getsidedatacompanion(srcrepo, destrepo): def getsidedatacompanion(srcrepo, dstrepo):
return None sidedatacompanion = None
removedreqs = srcrepo.requirements - dstrepo.requirements
if localrepo.SIDEDATA_REQUIREMENT in removedreqs:
def sidedatacompanion(rl, rev):
rl = getattr(rl, '_revlog', rl)
if rl.flags(rev) & revlog.REVIDX_SIDEDATA:
return True, (), {}
return False, (), {}
return sidedatacompanion
def matchrevlog(revlogfilter, entry): def matchrevlog(revlogfilter, entry):
"""check is a revlog is selected for cloning """check is a revlog is selected for cloning
The store entry is checked against the passed filter""" The store entry is checked against the passed filter"""
if entry.endswith(b'00changelog.i'): if entry.endswith(b'00changelog.i'):
return UPGRADE_CHANGELOG in revlogfilter return UPGRADE_CHANGELOG in revlogfilter

tests/test-sidedata.t

generaldelta: yes yes yes generaldelta: yes yes yes
sparserevlog: yes yes yes sparserevlog: yes yes yes
sidedata: no yes no sidedata: no yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib compression: zlib zlib zlib
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo -R up-no-side-data --config format.use-side-data=yes > /dev/null $ hg debugupgraderepo -R up-no-side-data --config format.use-side-data=yes > /dev/null
Check that we cannot upgrade to sidedata Check that we can downgrade to sidedata
---------------------------------------- -------------------------------------
martinvonzUnsubmitted
Done

Looks like this change should be in the parent

martinvonz: Looks like this change should be in the parent
marmouteAuthorUnsubmitted
Done

Actually, the text should says "downgrade from", on my way to fix that

marmoute: Actually, the text should says "downgrade from", on my way to fix that
$ hg init up-side-data --config format.use-side-data=yes $ hg init up-side-data --config format.use-side-data=yes
$ hg debugformat -v -R up-side-data $ hg debugformat -v -R up-side-data
format-variant repo config default format-variant repo config default
fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
sparserevlog: yes yes yes sparserevlog: yes yes yes
sidedata: yes no no sidedata: yes no no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib compression: zlib zlib zlib
compression-level: default default default compression-level: default default default
$ hg debugformat -v -R up-side-data --config format.use-side-data=no $ hg debugformat -v -R up-side-data --config format.use-side-data=no
format-variant repo config default format-variant repo config default
fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
sparserevlog: yes yes yes sparserevlog: yes yes yes
sidedata: yes no no sidedata: yes no no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib compression: zlib zlib zlib
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo -R up-side-data --config format.use-side-data=no $ hg debugupgraderepo -R up-side-data --config format.use-side-data=no > /dev/null
abort: cannot upgrade repository; requirement would be removed: exp-sidedata-flag
[255]

tests/test-upgrade-repo.t

revlogv1 revlogv1
sparserevlog sparserevlog
store store
$ hg debugsidedata -c 0 $ hg debugsidedata -c 0
2 sidedata entries 2 sidedata entries
entry-0001 size 4 entry-0001 size 4
entry-0002 size 32 entry-0002 size 32
downgrade
$ hg debugupgraderepo --config format.use-side-data=no --run --no-backup > /dev/null
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
dotencode: yes yes yes
generaldelta: yes yes yes
sparserevlog: yes yes yes
sidedata: no no no
plain-cl-delta: yes yes yes
compression: zstd zstd zlib
compression-level: default default default
$ cat .hg/requires
dotencode
fncache
generaldelta
revlog-compression-zstd
revlogv1
sparserevlog
store
$ hg debugsidedata -c 0
upgrade from hgrc
$ cat >> .hg/hgrc << EOF
> [format]
> use-side-data=yes
> EOF
$ hg debugupgraderepo --run --no-backup > /dev/null
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
dotencode: yes yes yes
generaldelta: yes yes yes
sparserevlog: yes yes yes
sidedata: yes yes no
plain-cl-delta: yes yes yes
compression: zstd zstd zlib
compression-level: default default default
$ cat .hg/requires
dotencode
exp-sidedata-flag
fncache
generaldelta
revlog-compression-zstd
revlogv1
sparserevlog
store
$ hg debugsidedata -c 0