This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10662

changelogv2: `copies-side-data` now implies `changelogv2`
ClosedPublic

Authored by marmoute on May 4 2021, 10:15 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGa07381751dc9: changelogv2: `copies-side-data` now implies `changelogv2`
Summary

To store information about file changes and copies only requires sidedata
support for the changelog. So we only enables changelogv2. This is less
impactful and should help us to ship the changeset centric copy tracing sooner.

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.May 4 2021, 10:15 AM
baymax updated this revision to Diff 27901.May 11 2021, 1:47 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 17 2021, 5:49 PM
This revision is now accepted and ready to land.May 17 2021, 5:49 PM

Revision Contents
Changeset List

Diff 28055

mercurial/localrepo.py

if scmutil.gdinitconfig(ui): if scmutil.gdinitconfig(ui):
requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT) requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
if ui.configbool(b'format', b'sparse-revlog'): if ui.configbool(b'format', b'sparse-revlog'):
requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT) requirements.add(requirementsmod.SPARSEREVLOG_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.discard(requirementsmod.REVLOGV1_REQUIREMENT) requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
requirements.add(requirementsmod.COPIESSDC_REQUIREMENT) requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
if ui.configbool(b'experimental', b'treemanifest'): if ui.configbool(b'experimental', b'treemanifest'):
requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT) requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
changelogv2 = ui.config(b'format', b'exp-use-changelog-v2') changelogv2 = ui.config(b'format', b'exp-use-changelog-v2')
if changelogv2 == b'enable-unstable-format-and-corrupt-my-data': if changelogv2 == b'enable-unstable-format-and-corrupt-my-data':
requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT) requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)

tests/test-copies-chain-merge.t

fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
share-safe: no no no share-safe: no no no
sparserevlog: yes yes yes sparserevlog: yes yes yes
persistent-nodemap: no no no (no-rust !) persistent-nodemap: no no no (no-rust !)
persistent-nodemap: yes yes no (rust !) persistent-nodemap: yes yes no (rust !)
copies-sdc: no yes no copies-sdc: no yes no
revlog-v2: no yes no revlog-v2: no no no
changelog-v2: no no no changelog-v2: no yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: * (glob) compression: * (glob)
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo --run --quiet $ hg debugupgraderepo --run --quiet
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: * (glob) preserved: * (glob)
removed: revlogv1 added: exp-changelog-v2, exp-copies-sidedata-changeset
added: exp-copies-sidedata-changeset, exp-revlogv2.2
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
#endif #endif
fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
share-safe: no no no share-safe: no no no
sparserevlog: yes yes yes sparserevlog: yes yes yes
persistent-nodemap: no no no (no-rust !) persistent-nodemap: no no no (no-rust !)
persistent-nodemap: yes yes no (rust !) persistent-nodemap: yes yes no (rust !)
copies-sdc: no yes no copies-sdc: no yes no
revlog-v2: no yes no revlog-v2: no no no
changelog-v2: no no no changelog-v2: no yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: * (glob) compression: * (glob)
compression-level: default default default compression-level: default default default
$ hg debugupgraderepo --run --quiet $ hg debugupgraderepo --run --quiet
upgrade will perform the following actions: upgrade will perform the following actions:
requirements requirements
preserved: * (glob) preserved: * (glob)
removed: revlogv1 added: exp-changelog-v2, exp-copies-sidedata-changeset
added: exp-copies-sidedata-changeset, exp-revlogv2.2
processed revlogs: processed revlogs:
- all-filelogs - all-filelogs
- changelog - changelog
- manifest - manifest
#endif #endif

tests/test-copies-in-changeset.t

fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
share-safe: no no no share-safe: no no no
sparserevlog: yes yes yes sparserevlog: yes yes yes
persistent-nodemap: no no no (no-rust !) persistent-nodemap: no no no (no-rust !)
persistent-nodemap: yes yes no (rust !) persistent-nodemap: yes yes no (rust !)
copies-sdc: yes yes no copies-sdc: yes yes no
revlog-v2: yes yes no revlog-v2: no no no
changelog-v2: no no no changelog-v2: yes yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib (no-zstd !) compression: zlib zlib zlib (no-zstd !)
compression: zstd zstd zstd (zstd !) compression: zstd zstd zstd (zstd !)
compression-level: default default default compression-level: default default default
#else #else
$ hg debugformat -v $ hg debugformat -v
format-variant repo config default format-variant repo config default
fncache: yes yes yes fncache: yes yes yes
fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
share-safe: no no no share-safe: no no no
sparserevlog: yes yes yes sparserevlog: yes yes yes
persistent-nodemap: no no no (no-rust !) persistent-nodemap: no no no (no-rust !)
persistent-nodemap: yes yes no (rust !) persistent-nodemap: yes yes no (rust !)
copies-sdc: yes yes no copies-sdc: yes yes no
revlog-v2: yes yes no revlog-v2: no no no
changelog-v2: no no no changelog-v2: yes yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib (no-zstd !) compression: zlib zlib zlib (no-zstd !)
compression: zstd zstd zstd (zstd !) compression: zstd zstd zstd (zstd !)
compression-level: default default default compression-level: default default default
$ hg debugsidedata -c -- 0 $ hg debugsidedata -c -- 0
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
$ hg debugsidedata -c -- 1 $ hg debugsidedata -c -- 1
fncache: yes yes yes fncache: yes yes yes
dotencode: yes yes yes dotencode: yes yes yes
generaldelta: yes yes yes generaldelta: yes yes yes
share-safe: no no no share-safe: no no no
sparserevlog: yes yes yes sparserevlog: yes yes yes
persistent-nodemap: no no no (no-rust !) persistent-nodemap: no no no (no-rust !)
persistent-nodemap: yes yes no (rust !) persistent-nodemap: yes yes no (rust !)
copies-sdc: yes yes no copies-sdc: yes yes no
revlog-v2: yes yes no revlog-v2: no no no
changelog-v2: no no no changelog-v2: yes yes no
plain-cl-delta: yes yes yes plain-cl-delta: yes yes yes
compression: zlib zlib zlib (no-zstd !) compression: zlib zlib zlib (no-zstd !)
compression: zstd zstd zstd (zstd !) compression: zstd zstd zstd (zstd !)
compression-level: default default default compression-level: default default default
$ hg debugsidedata -c -- 0 $ hg debugsidedata -c -- 0
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
$ hg debugsidedata -c -- 1 $ hg debugsidedata -c -- 1
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
$ hg debugsidedata -m -- 0 $ hg debugsidedata -m -- 0
#endif #endif
$ cd .. $ cd ..