bundle: expand the graph we us for bundletype/bundlespec tests
We are about to test more things, especially phase bundling, so we need a graph
a bit more complex than a single node.
The test "code" was a bit simplified in the process, but no test-semantic
changes were made.
--- a/tests/test-bundle-type.t Tue Mar 07 04:50:29 2023 +0100
+++ b/tests/test-bundle-type.t Wed Mar 08 15:21:39 2023 +0100
@@ -4,125 +4,196 @@
$ hg init t2
$ cd t1
$ echo blablablablabla > file.txt
- $ hg ci -Ama
+ $ hg ci -A -m commit_root
adding file.txt
- $ hg log | grep summary
- summary: a
- $ hg bundle ../b1 ../t2
+ $ echo kapoue > file.txt
+ $ hg ci -m commit_1
+ $ echo scrabageul > file.txt
+ $ hg ci -m commit_2
+ $ hg up 'desc("commit_root")'
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ echo flagabalagla > file.txt
+ $ hg ci -m commit_3
+ created new head
+ $ echo aliofia > file.txt
+ $ hg ci -m commit_4
+ $ echo alklqo > file.txt
+ $ hg ci -m commit_5
+ $ echo peakfeo > file.txt
+ $ hg ci -m commit_6
+ $ hg log -GT '[{phase}] {desc|firstline}\n'
+ @ [draft] commit_6
+ |
+ o [draft] commit_5
+ |
+ o [draft] commit_4
+ |
+ o [draft] commit_3
+ |
+ | o [draft] commit_2
+ | |
+ | o [draft] commit_1
+ |/
+ o [draft] commit_root
+
+
+ $ hg bundle ../b1.hg ../t2
searching for changes
- 1 changesets found
+ 7 changesets found
+ $ cd ..
- $ cd ../t2
- $ hg unbundle ../b1
+ $ hg -R t2 unbundle ./b1.hg
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files
- new changesets c35a0f9217e6 (1 drafts)
- (run 'hg update' to get a working copy)
- $ hg up
+ added 7 changesets with 7 changes to 1 files (+1 heads)
+ new changesets ac39af4a9f7d:b9f5f740a8cd (7 drafts)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+ $ hg -R t2 up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg log | grep summary
- summary: a
- $ cd ..
+ updated to "b9f5f740a8cd: commit_6"
+ 1 other heads for branch "default"
+ $ hg -R t2 log -GT '[{phase}] {desc|firstline}\n'
+ @ [draft] commit_6
+ |
+ o [draft] commit_5
+ |
+ o [draft] commit_4
+ |
+ o [draft] commit_3
+ |
+ | o [draft] commit_2
+ | |
+ | o [draft] commit_1
+ |/
+ o [draft] commit_root
+
Unknown compression type is rejected
$ hg init t3
- $ cd t3
- $ hg -q unbundle ../b1
- $ hg bundle -a -t unknown out.hg
+ $ hg -R t3 -q unbundle ./b1.hg
+ $ hg -R t3 bundle -a -t unknown out.hg
abort: unknown is not a recognized bundle specification
(see 'hg help bundlespec' for supported values for --type)
[10]
- $ hg bundle -a -t unknown-v2 out.hg
+ $ hg -R t3 bundle -a -t unknown-v2 out.hg
abort: unknown compression is not supported
(see 'hg help bundlespec' for supported values for --type)
[10]
- $ cd ..
-
test bundle types
$ testbundle() {
> echo % test bundle type $1
- > hg init t$1
- > cd t1
- > hg bundle -t $1 ../b$1 ../t$1
- > f -q -B6 -D ../b$1; echo
- > cd ../t$1
- > hg debugbundle ../b$1
- > hg debugbundle --spec ../b$1
+ > hg -R t1 bundle --all --type $1 ./b-$1.hg
+ > f -q -B6 -D ./b-$1.hg; echo
+ > hg debugbundle ./b-$1.hg
+ > hg debugbundle --spec ./b-$1.hg
> echo
- > cd ..
> }
$ for t in "None" "bzip2" "gzip" "none-v2" "v2" "v1" "gzip-v1"; do
> testbundle $t
> done
% test bundle type None
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
none-v2
% test bundle type bzip2
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {Compression: BZ}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
bzip2-v2
% test bundle type gzip
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {Compression: GZ}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
gzip-v2
% test bundle type none-v2
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
none-v2
% test bundle type v2
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {Compression: BZ}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
bzip2-v2
% test bundle type v1
- searching for changes
- 1 changesets found
+ 7 changesets found
HG10BZ
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
bzip2-v1
% test bundle type gzip-v1
- searching for changes
- 1 changesets found
+ 7 changesets found
HG10GZ
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
gzip-v1
@@ -167,22 +238,32 @@
> testbundle $t
> done
% test bundle type zstd
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {Compression: ZS}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
zstd-v2
% test bundle type zstd-v2
- searching for changes
- 1 changesets found
+ 7 changesets found
HG20\x00\x00 (esc)
Stream params: {Compression: ZS}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
cache:rev-branch-cache -- {} (mandatory: False)
zstd-v2
@@ -192,11 +273,11 @@
$ hg --config format.usegeneraldelta=false init nogd
$ hg -q -R nogd pull t1
$ hg -R nogd bundle -a -t zstd nogd-zstd
- 1 changesets found
+ 7 changesets found
zstd-v1 always fails
- $ hg -R tzstd bundle -a -t zstd-v1 zstd-v1
+ $ hg -R t1 bundle -a -t zstd-v1 zstd-v1
abort: compression engine zstd is not supported on v1 bundles
(see 'hg help bundlespec' for supported values for --type)
[10]
@@ -243,26 +324,44 @@
Test controlling the changegroup version
$ hg -R t1 bundle --config experimental.changegroup3=yes -a -t v2 ./v2-cg-default.hg
- 1 changesets found
+ 7 changesets found
$ hg debugbundle ./v2-cg-default.hg --part-type changegroup
Stream params: {Compression: BZ}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
$ hg debugbundle ./v2-cg-default.hg --spec
bzip2-v2
$ hg -R t1 bundle --config experimental.changegroup3=yes -a -t 'v2;cg.version=02' ./v2-cg-02.hg
- 1 changesets found
+ 7 changesets found
$ hg debugbundle ./v2-cg-02.hg --part-type changegroup
Stream params: {Compression: BZ}
- changegroup -- {nbchanges: 1, version: 02} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 02} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
$ hg debugbundle ./v2-cg-02.hg --spec
bzip2-v2
$ hg -R t1 bundle --config experimental.changegroup3=yes -a -t 'v2;cg.version=03' ./v2-cg-03.hg
- 1 changesets found
+ 7 changesets found
$ hg debugbundle ./v2-cg-03.hg --part-type changegroup
Stream params: {Compression: BZ}
- changegroup -- {nbchanges: 1, version: 03} (mandatory: True)
- c35a0f9217e65d1fdb90c936ffa7dbe679f83ddf
+ changegroup -- {nbchanges: 7, version: 03} (mandatory: True)
+ ac39af4a9f7d2aaa7d244720e57838be9bf63b03
+ 901e97fadc587978ec52f2fa76af4aefc2d191e8
+ a8c3a1ed30eb71f03f476c5fa7ead831ef991a55
+ 66e2c4b43e0cf8f0bdff0733a0b97ce57874e35d
+ 624e609639853fe22c88d42a8fd1f53a0e9b7ebe
+ 2ea90778052ba7558fab36e3fd5d149512ff986b
+ b9f5f740a8cd76700020e3903ee55ecff78bd3e5
$ hg debugbundle ./v2-cg-03.hg --spec
bzip2-v2;cg.version=03