This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11982

stream-clone: stop considering working copy only requirements
ClosedPublic

Authored by marmoute on Jan 12 2022, 9:08 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGeb5c33f1d08f: stream-clone: stop considering working copy only requirements
Summary

Now that the ducks are properly aligned on there shelve, it becomes easy to fix
the list of requirements to consider for stream. We remove the working copy
specific ones and add some missing revlog specific ones.

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.Jan 12 2022, 9:08 AM
marmoute planned changes to this revision.Jan 16 2022, 6:54 PM

While working on this code further I noticed something odd with the supportedformat/_basesupported differences and this changes might not be correct. At least not until I reach the end of this rabbit hole. The series depending on it is still fine to review as I do not expect changes to theses patches.

marmoute added a parent revision: D12084: stream-clone: also filter the requirement we put in the bundle 2.Jan 24 2022, 9:51 AM
marmoute retitled this revision from stream-clone: only consider store requirements to stream-clone: stop considering working copy only requirements.
marmoute edited the summary of this revision. (Show Details)
marmoute updated this revision to Diff 31788.
Alphare accepted this revision.Jan 24 2022, 11:21 AM
This revision is now accepted and ready to land.Jan 24 2022, 11:21 AM
baymax updated this revision to Diff 31850.Jan 24 2022, 1:11 PM

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

Revision Contents
Changeset List

Diff 31962

mercurial/requirements.py

# #
# requirements not in this list are safe to be altered during stream-clone. # requirements not in this list are safe to be altered during stream-clone.
# #
# note: the list is currently inherited from previous code and miss some relevant requirement while containing some irrelevant ones. # note: the list is currently inherited from previous code and miss some relevant requirement while containing some irrelevant ones.
STREAM_FIXED_REQUIREMENTS = { STREAM_FIXED_REQUIREMENTS = {
BOOKMARKS_IN_STORE_REQUIREMENT, BOOKMARKS_IN_STORE_REQUIREMENT,
CHANGELOGV2_REQUIREMENT, CHANGELOGV2_REQUIREMENT,
COPIESSDC_REQUIREMENT, COPIESSDC_REQUIREMENT,
DIRSTATE_V2_REQUIREMENT,
GENERALDELTA_REQUIREMENT, GENERALDELTA_REQUIREMENT,
INTERNAL_PHASE_REQUIREMENT,
NODEMAP_REQUIREMENT, NODEMAP_REQUIREMENT,
REVLOG_COMPRESSION_ZSTD, REVLOG_COMPRESSION_ZSTD,
REVLOGV1_REQUIREMENT, REVLOGV1_REQUIREMENT,
REVLOGV2_REQUIREMENT, REVLOGV2_REQUIREMENT,
SHARESAFE_REQUIREMENT,
SPARSEREVLOG_REQUIREMENT, SPARSEREVLOG_REQUIREMENT,
TREEMANIFEST_REQUIREMENT, TREEMANIFEST_REQUIREMENT,
} }

tests/test-clone-stream-format.t

This file contains tests case that deal with format change accross stream clone This file contains tests case that deal with format change accross stream clone
#require serve no-reposimplestore no-chg #require serve no-reposimplestore no-chg
#testcases stream-legacy stream-bundle2 #testcases stream-legacy stream-bundle2
#if stream-legacy #if stream-legacy
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [server] > [server]
> bundle2.stream = no > bundle2.stream = no
> EOF > EOF
#endif #endif
Initialize repository Initialize repository
$ hg init server $ hg init server --config format.use-share-safe=yes
$ cd server $ cd server
$ sh $TESTDIR/testlib/stream_clone_setup.sh $ sh $TESTDIR/testlib/stream_clone_setup.sh
adding 00changelog-ab349180a0405010.nd adding 00changelog-ab349180a0405010.nd
adding 00changelog.d adding 00changelog.d
adding 00changelog.i adding 00changelog.i
adding 00changelog.n adding 00changelog.n
adding 00manifest.d adding 00manifest.d
adding 00manifest.i adding 00manifest.i
$ hg clone --quiet --stream -U http://localhost:$HGPORT clone-from-share $ hg clone --quiet --stream -U http://localhost:$HGPORT clone-from-share
$ hg -R clone-from-share verify $ hg -R clone-from-share verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 3 changesets with 1088 changes to 1088 files checked 3 changesets with 1088 changes to 1088 files
$ hg debugrequires -R clone-from-share | grep share $ hg debugrequires -R clone-from-share | egrep 'share$'
[1] [1]
$ killdaemons.py $ killdaemons.py
Test streaming from/to repository without a share-safe
======================================================
$ rm hg-*.pid errors-*.txt
$ hg clone --pull --config format.use-share-safe=no server server-no-share-safe
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 1088 changes to 1088 files
new changesets 96ee1d7354c4:5223b5e3265f
updating to branch default
1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg verify -R server-no-share-safe
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 1088 changes to 1088 files
$ hg -R server serve -p $HGPORT -d --pid-file=hg-1.pid --error errors-1.txt
$ cat hg-1.pid > $DAEMON_PIDS
$ hg -R server-no-share-safe serve -p $HGPORT2 -d --pid-file=hg-2.pid --error errors-2.txt
$ cat hg-2.pid >> $DAEMON_PIDS
$ hg debugrequires -R server | grep share-safe
share-safe
$ hg debugrequires -R server-no-share-safe | grep share-safe
[1]
share-safe → no-share-safe cloning
$ hg clone --quiet --stream -U http://localhost:$HGPORT clone-remove-share-safe --config format.use-share-safe=no
$ cat errors-1.txt
$ hg -R clone-remove-share-safe verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 1088 changes to 1088 files
$ hg debugrequires -R clone-remove-share-safe | grep share-safe
[1]
no-share-safe → share-safe cloning
$ hg clone --quiet --stream -U http://localhost:$HGPORT2 clone-add-share-safe --config format.use-share-safe=yes
$ cat errors-2.txt
$ hg -R clone-add-share-safe verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 1088 changes to 1088 files
$ hg debugrequires -R clone-add-share-safe | grep share-safe
share-safe
$ killdaemons.py