[Updated] D12075: test-bundle: split each variant in there own section
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Tue Jan 25 09:23:38 UTC 2022
Closed by commit rHG23db8460974b: test-bundle: split each variant in there own section (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D12075?vs=31840&id=31951
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D12075/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D12075
AFFECTED FILES
tests/test-bundle.t
CHANGE DETAILS
diff --git a/tests/test-bundle.t b/tests/test-bundle.t
--- a/tests/test-bundle.t
+++ b/tests/test-bundle.t
@@ -292,32 +292,56 @@
packed1 is produced properly
-#if reporevlogstore
+
+#if reporevlogstore rust
$ hg -R test debugcreatestreamclonebundle packed.hg
- writing 2664 bytes for 6 files (no-zstd !)
- writing 2665 bytes for 6 files (zstd !)
- bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust !)
- bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog (rust !)
+ writing 2665 bytes for 6 files
+ bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog
+
+ $ f -B 64 --size --sha1 --hexdump packed.hg
+ packed.hg: size=2860, sha1=81d7a2e535892cda51e82c200f818de2cca828d3
+ 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
+ 0010: 00 00 00 00 0a 69 00 36 67 65 6e 65 72 61 6c 64 |.....i.6generald|
+ 0020: 65 6c 74 61 2c 70 65 72 73 69 73 74 65 6e 74 2d |elta,persistent-|
+ 0030: 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f 67 76 31 |nodemap,revlogv1|
+ $ hg debugbundle --spec packed.hg
+ none-packed1;requirements%3Dgeneraldelta%2Cpersistent-nodemap%2Crevlogv1%2Csparserevlog
+#endif
+
+#if reporevlogstore no-rust zstd
+
+ $ hg -R test debugcreatestreamclonebundle packed.hg
+ writing 2665 bytes for 6 files
+ bundle requirements: generaldelta, revlogv1, sparserevlog
$ f -B 64 --size --sha1 --hexdump packed.hg
- packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5 (no-zstd !)
- packed.hg: size=2841, sha1=8b645a65f49b0ae43042a9f3da56d4bfdf1c7f99 (zstd no-rust !)
- packed.hg: size=2860, sha1=81d7a2e535892cda51e82c200f818de2cca828d3 (rust !)
+ packed.hg: size=2841, sha1=8b645a65f49b0ae43042a9f3da56d4bfdf1c7f99
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
- 0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald| (no-zstd !)
- 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp| (no-zstd !)
- 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/| (no-zstd !)
- 0010: 00 00 00 00 0a 69 00 23 67 65 6e 65 72 61 6c 64 |.....i.#generald| (zstd no-rust !)
- 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp| (zstd no-rust !)
- 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/| (zstd no-rust !)
- 0010: 00 00 00 00 0a 69 00 36 67 65 6e 65 72 61 6c 64 |.....i.6generald| (rust !)
- 0020: 65 6c 74 61 2c 70 65 72 73 69 73 74 65 6e 74 2d |elta,persistent-| (rust !)
- 0030: 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f 67 76 31 |nodemap,revlogv1| (rust !)
+ 0010: 00 00 00 00 0a 69 00 23 67 65 6e 65 72 61 6c 64 |.....i.#generald|
+ 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
+ 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
+ $ hg debugbundle --spec packed.hg
+ none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog
+#endif
+
+#if reporevlogstore no-rust no-zstd
+ $ hg -R test debugcreatestreamclonebundle packed.hg
+ writing 2664 bytes for 6 files
+ bundle requirements: generaldelta, revlogv1, sparserevlog
+
+ $ f -B 64 --size --sha1 --hexdump packed.hg
+ packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5
+ 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
+ 0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald|
+ 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
+ 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
$ hg debugbundle --spec packed.hg
- none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog (no-rust !)
- none-packed1;requirements%3Dgeneraldelta%2Cpersistent-nodemap%2Crevlogv1%2Csparserevlog (rust !)
+ none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog
+#endif
+
+#if reporevlogstore
generaldelta requirement is not listed in stream clone bundles unless used
@@ -326,25 +350,66 @@
$ touch foo
$ hg -q commit -A -m initial
$ cd ..
+
+#endif
+
+#if reporevlogstore rust
+
$ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
writing 301 bytes for 3 files
- bundle requirements: revlogv1 (no-rust !)
- bundle requirements: persistent-nodemap, revlogv1 (rust !)
+ bundle requirements: persistent-nodemap, revlogv1
+
+ $ f -B 64 --size --sha1 --hexdump packednongd.hg
+ packednongd.hg: size=402, sha1=d3cc1417f0e8142cf9340aaaa520b660ad3ec3ea
+ 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
+ 0010: 00 00 00 00 01 2d 00 1c 70 65 72 73 69 73 74 65 |.....-..persiste|
+ 0020: 6e 74 2d 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f |nt-nodemap,revlo|
+ 0030: 67 76 31 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 |gv1.data/foo.i.6|
+
+ $ hg debugbundle --spec packednongd.hg
+ none-packed1;requirements%3Dpersistent-nodemap%2Crevlogv1
+
+#endif
+
+#if reporevlogstore no-rust zstd
+
+ $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
+ writing 301 bytes for 3 files
+ bundle requirements: revlogv1
$ f -B 64 --size --sha1 --hexdump packednongd.hg
- packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f (no-rust !)
- packednongd.hg: size=402, sha1=d3cc1417f0e8142cf9340aaaa520b660ad3ec3ea (rust !)
+ packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
- 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1| (no-rust !)
- 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..| (no-rust !)
- 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| (no-rust !)
- 0010: 00 00 00 00 01 2d 00 1c 70 65 72 73 69 73 74 65 |.....-..persiste| (rust !)
- 0020: 6e 74 2d 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f |nt-nodemap,revlo| (rust !)
- 0030: 67 76 31 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 |gv1.data/foo.i.6| (rust !)
+ 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
+ 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
+ 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
$ hg debugbundle --spec packednongd.hg
- none-packed1;requirements%3Drevlogv1 (no-rust !)
- none-packed1;requirements%3Dpersistent-nodemap%2Crevlogv1 (rust !)
+ none-packed1;requirements%3Drevlogv1
+
+
+#endif
+
+#if reporevlogstore no-rust no-zstd
+
+ $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
+ writing 301 bytes for 3 files
+ bundle requirements: revlogv1
+
+ $ f -B 64 --size --sha1 --hexdump packednongd.hg
+ packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
+ 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
+ 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
+ 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
+ 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
+
+ $ hg debugbundle --spec packednongd.hg
+ none-packed1;requirements%3Drevlogv1
+
+
+#endif
+
+#if reporevlogstore
Warning emitted when packed bundles contain secret changesets
@@ -355,11 +420,36 @@
$ hg phase --force --secret -r .
$ cd ..
+#endif
+
+#if reporevlogstore rust
+
$ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
(warning: stream clone bundle will contain secret revisions)
writing 301 bytes for 3 files
- bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust !)
- bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog (rust !)
+ bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog
+
+#endif
+
+#if reporevlogstore no-rust zstd
+
+ $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
+ (warning: stream clone bundle will contain secret revisions)
+ writing 301 bytes for 3 files
+ bundle requirements: generaldelta, revlogv1, sparserevlog
+
+#endif
+
+#if reporevlogstore no-rust no-zstd
+
+ $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
+ (warning: stream clone bundle will contain secret revisions)
+ writing 301 bytes for 3 files
+ bundle requirements: generaldelta, revlogv1, sparserevlog
+
+#endif
+
+#if reporevlogstore
Unpacking packed1 bundles with "hg unbundle" isn't allowed
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220125/ab1ad947/attachment-0002.html>
More information about the Mercurial-patches
mailing list