mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
ae52f1bd3c
Summary: Previously pushrebase pushes would send a tree pack part as well as a rebase pack part. The tree pack part was ignored. Let's make receiving tree pack parts on the server an error, and instead make the client not send them if it's doing a pushrebase push. A future diff will come back and add support for non-pushrebase push of tree packs. This diff just makes use sure that the new logic won't run during pushrebase. Reviewed By: ryanmce Differential Revision: D7267802 fbshipit-source-id: cabff989c178afb3706b77a03a299bcf3195f289
101 lines
2.6 KiB
Raku
101 lines
2.6 KiB
Raku
$ . "$TESTDIR/library.sh"
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
> [extensions]
|
|
> pushrebase=
|
|
> remotenames=
|
|
> [treemanifest]
|
|
> sendtrees=True
|
|
> EOF
|
|
|
|
Setup the server
|
|
|
|
$ hginit master
|
|
$ cd master
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> bundle2hooks=
|
|
> treemanifest=
|
|
> [treemanifest]
|
|
> server=True
|
|
> [remotefilelog]
|
|
> server=True
|
|
> shallowtrees=True
|
|
> EOF
|
|
|
|
Make local commits on the server
|
|
$ mkdir subdir
|
|
$ echo x > subdir/x
|
|
$ hg commit -qAm 'add subdir/x'
|
|
$ hg book master
|
|
|
|
The following will turn on sendtrees mode for a hybrid client and verify it
|
|
sends them during a push and during bundle operations.
|
|
|
|
Create flat manifest clients
|
|
$ cd ..
|
|
$ hgcloneshallow ssh://user@dummy/master client1 -q
|
|
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
|
|
$ hgcloneshallow ssh://user@dummy/master client2 -q
|
|
|
|
Transition to hybrid flat+tree client
|
|
$ cat >> client1/.hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fbamend=
|
|
> fastmanifest=
|
|
> treemanifest=
|
|
> [fastmanifest]
|
|
> usetree=True
|
|
> usecache=False
|
|
> [treemanifest]
|
|
> demanddownload=True
|
|
> EOF
|
|
$ cat >> client2/.hg/hgrc <<EOF
|
|
> [extensions]
|
|
> fbamend=
|
|
> fastmanifest=
|
|
> treemanifest=
|
|
> [fastmanifest]
|
|
> usetree=True
|
|
> usecache=False
|
|
> [treemanifest]
|
|
> demanddownload=True
|
|
> EOF
|
|
|
|
Make a draft commit
|
|
$ cd client1
|
|
$ echo f >> subdir/x
|
|
$ hg commit -qm "hybrid commit"
|
|
2 trees fetched over * (glob)
|
|
$ hg debugdatapack .hg/store/packs/manifests/*datapack
|
|
.hg/store/packs/manifests/da9af3771b30963e2eb5624a2df366eb989223c1:
|
|
subdir:
|
|
Node Delta Base Delta Length Blob Size
|
|
97c1b2747888 000000000000 43 (missing)
|
|
|
|
(empty name):
|
|
Node Delta Base Delta Length Blob Size
|
|
c0196aba344d 000000000000 49 (missing)
|
|
|
|
|
|
Test bundling/unbundling
|
|
$ hg bundle -r . --base '.^' ../treebundle.hg --debug | grep treegroup
|
|
bundle2-output-part: "b2x:treegroup2" (params: 3 mandatory) streamed payload
|
|
|
|
$ cd ../client2
|
|
$ hg unbundle ../treebundle.hg --debug | grep treegroup
|
|
bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported
|
|
$ hg debugdatapack .hg/store/packs/manifests/*datapack
|
|
.hg/store/packs/manifests/da9af3771b30963e2eb5624a2df366eb989223c1:
|
|
subdir:
|
|
Node Delta Base Delta Length Blob Size
|
|
97c1b2747888 000000000000 43 (missing)
|
|
|
|
(empty name):
|
|
Node Delta Base Delta Length Blob Size
|
|
c0196aba344d 000000000000 49 (missing)
|
|
|
|
Test pushing
|
|
$ hg push -r tip --to master --debug | grep rebasepackpart
|
|
bundle2-output-part: "b2x:rebasepackpart" (params: 3 mandatory) streamed payload
|