This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7040

sidedata: rename the configuration option to `exp-use-side-data`
ClosedPublic

Authored by marmoute on Oct 10 2019, 10:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbca9d1a6c4c5: sidedata: rename the configuration option to `exp-use-side-data`
Summary

We don't want setup configured to use the final version that would end using the
experimental one while using and older version.

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 10 2019, 10:48 AM
marmoute added a commit: rHGbca9d1a6c4c5: sidedata: rename the configuration option to `exp-use-side-data`.Oct 11 2019, 12:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbca9d1a6c4c5: sidedata: rename the configuration option to `exp-use-side-data` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 17063

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'format', b'format',
b'exp-use-copies-side-data-changeset', b'exp-use-copies-side-data-changeset',
default=False, default=False,
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'format', b'use-side-data', default=False, experimental=True, b'format', b'exp-use-side-data', default=False, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'format', b'internal-phase', default=False, experimental=True, b'format', b'internal-phase', default=False, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'fsmonitor', b'warn_when_unused', default=True, b'fsmonitor', b'warn_when_unused', default=True,
) )
coreconfigitem( coreconfigitem(

mercurial/localrepo.py

elif compengine != b'zlib': elif compengine != b'zlib':
requirements.add(b'exp-compression-%s' % compengine) requirements.add(b'exp-compression-%s' % compengine)
if scmutil.gdinitconfig(ui): if scmutil.gdinitconfig(ui):
requirements.add(b'generaldelta') requirements.add(b'generaldelta')
if ui.configbool(b'format', b'sparse-revlog'): if ui.configbool(b'format', b'sparse-revlog'):
requirements.add(SPARSEREVLOG_REQUIREMENT) requirements.add(SPARSEREVLOG_REQUIREMENT)
# experimental config: format.use-side-data # experimental config: format.exp-use-side-data
if ui.configbool(b'format', b'use-side-data'): if ui.configbool(b'format', b'exp-use-side-data'):
requirements.add(SIDEDATA_REQUIREMENT) requirements.add(SIDEDATA_REQUIREMENT)
# experimental config: format.exp-use-copies-side-data-changeset # experimental config: format.exp-use-copies-side-data-changeset
if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'): if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
requirements.add(SIDEDATA_REQUIREMENT) requirements.add(SIDEDATA_REQUIREMENT)
requirements.add(COPIESSDC_REQUIREMENT) requirements.add(COPIESSDC_REQUIREMENT)
if ui.configbool(b'experimental', b'treemanifest'): if ui.configbool(b'experimental', b'treemanifest'):
requirements.add(b'treemanifest') requirements.add(b'treemanifest')

tests/test-copies-in-changeset.t

4 sidedata entries 4 sidedata entries
entry-0010 size 0 entry-0010 size 0
entry-0011 size 0 entry-0011 size 0
entry-0012 size 0 entry-0012 size 0
entry-0013 size 1 entry-0013 size 1
$ hg debugsidedata -m -- 0 $ hg debugsidedata -m -- 0
$ cat << EOF > .hg/hgrc $ cat << EOF > .hg/hgrc
> [format] > [format]
> use-side-data = yes > exp-use-side-data = yes
> exp-use-copies-side-data-changeset = no > exp-use-copies-side-data-changeset = no
> EOF > EOF
$ hg debugupgraderepo --run --quiet --no-backup > /dev/null $ hg debugupgraderepo --run --quiet --no-backup > /dev/null
$ hg debugformat -v $ hg debugformat -v
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

tests/test-sidedata.t

========================================================== ==========================================================
Test file dedicated to checking side-data related behavior Test file dedicated to checking side-data related behavior
========================================================== ==========================================================
Check data can be written/read from sidedata Check data can be written/read from sidedata
============================================ ============================================
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> testsidedata=$TESTDIR/testlib/ext-sidedata.py > testsidedata=$TESTDIR/testlib/ext-sidedata.py
> EOF > EOF
$ hg init test-sidedata --config format.use-side-data=yes $ hg init test-sidedata --config format.exp-use-side-data=yes
$ cd test-sidedata $ cd test-sidedata
$ echo aaa > a $ echo aaa > a
$ hg add a $ hg add a
$ hg commit -m a --traceback $ hg commit -m a --traceback
$ echo aaa > b $ echo aaa > b
$ hg add b $ hg add b
$ hg commit -m b $ hg commit -m b
$ echo xxx >> a $ echo xxx >> a
Check upgrade behavior Check upgrade behavior
====================== ======================
Right now, sidedata has not upgrade support Right now, sidedata has not upgrade support
Check that we can upgrade to sidedata Check that we can upgrade to sidedata
------------------------------------- -------------------------------------
$ hg init up-no-side-data --config format.use-side-data=no $ hg init up-no-side-data --config format.exp-use-side-data=no
$ hg debugformat -v -R up-no-side-data $ hg debugformat -v -R up-no-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: no no no sidedata: no no no
copies-sdc: no no no copies-sdc: no 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-no-side-data --config format.use-side-data=yes $ hg debugformat -v -R up-no-side-data --config format.exp-use-side-data=yes
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: no yes no sidedata: no yes no
copies-sdc: no no no copies-sdc: no 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-no-side-data --config format.use-side-data=yes > /dev/null $ hg debugupgraderepo -R up-no-side-data --config format.exp-use-side-data=yes > /dev/null
Check that we can downgrade from sidedata Check that we can downgrade from sidedata
----------------------------------------- -----------------------------------------
$ hg init up-side-data --config format.use-side-data=yes $ hg init up-side-data --config format.exp-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
copies-sdc: no no no copies-sdc: no 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.exp-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
copies-sdc: no no no copies-sdc: no 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 > /dev/null $ hg debugupgraderepo -R up-side-data --config format.exp-use-side-data=no > /dev/null

tests/test-upgrade-repo.t

#endif #endif
Check upgrading to a side-data revlog Check upgrading to a side-data revlog
------------------------------------- -------------------------------------
upgrade upgrade
$ hg --config format.use-side-data=yes debugupgraderepo --run --no-backup --config "extensions.sidedata=$TESTDIR/testlib/ext-sidedata.py" >/dev/null $ hg --config format.exp-use-side-data=yes debugupgraderepo --run --no-backup --config "extensions.sidedata=$TESTDIR/testlib/ext-sidedata.py" >/dev/null
$ hg debugformat -v $ hg debugformat -v
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
copies-sdc: no no no copies-sdc: no no no
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 downgrade
$ hg debugupgraderepo --config format.use-side-data=no --run --no-backup > /dev/null $ hg debugupgraderepo --config format.exp-use-side-data=no --run --no-backup > /dev/null
$ hg debugformat -v $ hg debugformat -v
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: no no no sidedata: no no no
copies-sdc: no no no copies-sdc: no no no
sparserevlog sparserevlog
store store
$ hg debugsidedata -c 0 $ hg debugsidedata -c 0
upgrade from hgrc upgrade from hgrc
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [format] > [format]
> use-side-data=yes > exp-use-side-data=yes
> EOF > EOF
$ hg debugupgraderepo --run --no-backup > /dev/null $ hg debugupgraderepo --run --no-backup > /dev/null
$ hg debugformat -v $ hg debugformat -v
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