This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12197

upgrade: make dirstate-v2 format variant compatible with share
ClosedPublic

Authored by marmoute on Feb 16 2022, 4:37 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6e77083683a7: upgrade: make dirstate-v2 format variant compatible with share
Summary

This only affects the dirstate and is safe to upgrade in the share.

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.Feb 16 2022, 4:37 AM
Alphare accepted this revision.Feb 16 2022, 4:46 AM
This revision is now accepted and ready to land.Feb 16 2022, 4:46 AM

Revision Contents
Changeset List

Diff 32242

mercurial/upgrade_utils/actions.py

upgrademessage = _(b'"hg status" will be faster') upgrademessage = _(b'"hg status" will be faster')
touches_filelogs = False touches_filelogs = False
touches_manifests = False touches_manifests = False
touches_changelog = False touches_changelog = False
touches_requirements = True touches_requirements = True
touches_dirstate = True touches_dirstate = True
compatible_with_share = True
@registerformatvariant @registerformatvariant
class dotencode(requirementformatvariant): class dotencode(requirementformatvariant):
name = b'dotencode' name = b'dotencode'
_requirement = requirements.DOTENCODE_REQUIREMENT _requirement = requirements.DOTENCODE_REQUIREMENT

tests/test-upgrade-repo.t

#require no-reposimplestore #require no-reposimplestore
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> share = > share =
> [format] > [format]
> # stabilize test accross variant > # stabilize test accross variant
> revlog-compression=zlib > revlog-compression=zlib
> [storage]
> dirstate-v2.slow-path=allow
> EOF > EOF
store and revlogv1 are required in source store and revlogv1 are required in source
$ hg --config format.usestore=false init no-store $ hg --config format.usestore=false init no-store
$ hg -R no-store debugupgraderepo $ hg -R no-store debugupgraderepo
abort: cannot upgrade repository; requirement missing: store abort: cannot upgrade repository; requirement missing: store
[255] [255]
$ hg init no-revlogv1 $ hg init no-revlogv1
$ cat > no-revlogv1/.hg/requires << EOF $ cat > no-revlogv1/.hg/requires << EOF
> dotencode > dotencode
> fncache > fncache
> generaldelta > generaldelta
> store > store
> EOF > EOF
$ hg -R no-revlogv1 debugupgraderepo $ hg -R no-revlogv1 debugupgraderepo
abort: cannot upgrade repository; missing a revlog version abort: cannot upgrade repository; missing a revlog version
[255] [255]
Cannot upgrade shared repositories Cannot upgrade shared repositories
$ hg init share-parent $ hg init share-parent
$ hg -R share-parent debugbuilddag -n .+9
$ hg -R share-parent up tip
10 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -q share share-parent share-child $ hg -q share share-parent share-child
$ hg -R share-child debugupgraderepo --config format.sparse-revlog=no $ hg -R share-child debugupgraderepo --config format.sparse-revlog=no
abort: cannot use these actions on a share repository: sparserevlog abort: cannot use these actions on a share repository: sparserevlog
(upgrade the main repository directly) (upgrade the main repository directly)
[255] [255]
Unless the action is compatible with share
$ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=yes --quiet
requirements
preserved: * (glob)
added: dirstate-v2
no revlogs to process
$ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=yes --quiet --run
upgrade will perform the following actions:
requirements
preserved: * (glob)
added: dirstate-v2
no revlogs to process
$ hg debugformat -R share-child | grep dirstate-v2
dirstate-v2: yes
$ hg debugformat -R share-parent | grep dirstate-v2
dirstate-v2: no
$ hg status --all -R share-child
C nf0
C nf1
C nf2
C nf3
C nf4
C nf5
C nf6
C nf7
C nf8
C nf9
$ hg log -l 3 -R share-child
changeset: 9:0059eb38e4a4
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:09 1970 +0000
summary: r9
changeset: 8:4d5be70c8130
user: debugbuilddag
date: Thu Jan 01 00:00:08 1970 +0000
summary: r8
changeset: 7:e60bfe72517e
user: debugbuilddag
date: Thu Jan 01 00:00:07 1970 +0000
summary: r7
$ hg status --all -R share-parent
C nf0
C nf1
C nf2
C nf3
C nf4
C nf5
C nf6
C nf7
C nf8
C nf9
$ hg log -l 3 -R share-parent
changeset: 9:0059eb38e4a4
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:09 1970 +0000
summary: r9
changeset: 8:4d5be70c8130
user: debugbuilddag
date: Thu Jan 01 00:00:08 1970 +0000
summary: r8
changeset: 7:e60bfe72517e
user: debugbuilddag
date: Thu Jan 01 00:00:07 1970 +0000
summary: r7
$ hg -R share-child debugupgraderepo --config format.use-dirstate-v2=no --quiet --run
upgrade will perform the following actions:
requirements
preserved: * (glob)
removed: dirstate-v2
no revlogs to process
$ hg debugformat -R share-child | grep dirstate-v2
dirstate-v2: no
$ hg debugformat -R share-parent | grep dirstate-v2
dirstate-v2: no
$ hg status --all -R share-child
C nf0
C nf1
C nf2
C nf3
C nf4
C nf5
C nf6
C nf7
C nf8
C nf9
$ hg log -l 3 -R share-child
changeset: 9:0059eb38e4a4
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:09 1970 +0000
summary: r9
changeset: 8:4d5be70c8130
user: debugbuilddag
date: Thu Jan 01 00:00:08 1970 +0000
summary: r8
changeset: 7:e60bfe72517e
user: debugbuilddag
date: Thu Jan 01 00:00:07 1970 +0000
summary: r7
$ hg status --all -R share-parent
C nf0
C nf1
C nf2
C nf3
C nf4
C nf5
C nf6
C nf7
C nf8
C nf9
$ hg log -l 3 -R share-parent
changeset: 9:0059eb38e4a4
tag: tip
user: debugbuilddag
date: Thu Jan 01 00:00:09 1970 +0000
summary: r9
changeset: 8:4d5be70c8130
user: debugbuilddag
date: Thu Jan 01 00:00:08 1970 +0000
summary: r8
changeset: 7:e60bfe72517e
user: debugbuilddag
date: Thu Jan 01 00:00:07 1970 +0000
summary: r7
Do not yet support upgrading treemanifest repos Do not yet support upgrading treemanifest repos
$ hg --config experimental.treemanifest=true init treemanifest $ hg --config experimental.treemanifest=true init treemanifest
$ hg -R treemanifest debugupgraderepo $ hg -R treemanifest debugupgraderepo
abort: cannot upgrade repository; unsupported source requirement: treemanifest abort: cannot upgrade repository; unsupported source requirement: treemanifest
[255] [255]