Skip to content
Snippets Groups Projects
Commit ddc55fb2 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

clone-bundles: check we generate a valid specification

The short bundle-spec are ambiguous and should be expanded to a full one before
clone bundle can use it. We fix the issue and add a test actually using the
generated manifest for a clone bundle operation.
parent 0913a49e
No related branches found
No related tags found
2 merge requests!618Draft: 6.5rc0,!614bridge automatic clone bundle generation and inline clone bundle serving
......@@ -858,6 +858,7 @@
'op_id': op_id,
}
for t in targets:
t = bundlecaches.parsebundlespec(repo, t, strict=False).as_spec()
if new_bundle_needed(repo, bundles, ratio, abs_revs, t, revs):
data = generic_data.copy()
data['bundle_type'] = t
......
......@@ -40,5 +40,5 @@
adding file changes
2 changesets found
added 2 changesets with 2 changes to 2 files
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
$ cat ../server/.hg/clonebundles.manifest
......@@ -44,3 +44,3 @@
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -46,5 +46,5 @@
$ ls -1 ../final-upload
full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Newer bundles are generated with more pushes
......@@ -62,6 +62,6 @@
adding file changes
4 changesets found
added 2 changesets with 2 changes to 2 files
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
$ cat ../server/.hg/clonebundles.manifest
......@@ -66,4 +66,4 @@
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-4_revs-6427147b985a_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -69,6 +69,6 @@
$ ls -1 ../final-upload
full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Older bundles are cleaned up with more pushes
......@@ -84,6 +84,6 @@
adding changesets
adding manifests
adding file changes
clone-bundles: deleting bundle full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob)
6 changesets found
added 2 changesets with 2 changes to 2 files
......@@ -88,5 +88,5 @@
6 changesets found
added 2 changesets with 2 changes to 2 files
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
$ cat ../server/.hg/clonebundles.manifest
......@@ -91,4 +91,4 @@
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -94,6 +94,6 @@
$ ls -1 ../final-upload
full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Test conditions to get them generated
......@@ -115,5 +115,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -119,6 +119,6 @@
$ ls -1 ../final-upload
full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Check absolute number of revisions
......@@ -135,6 +135,6 @@
adding changesets
adding manifests
adding file changes
clone-bundles: deleting bundle full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob)
8 changesets found
added 1 changesets with 1 changes to 1 files
......@@ -139,4 +139,4 @@
8 changesets found
added 1 changesets with 1 changes to 1 files
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
$ cat ../server/.hg/clonebundles.manifest
......@@ -142,3 +142,3 @@
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -144,6 +144,6 @@
$ ls -1 ../final-upload
full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
(that one would not generate new bundles)
......@@ -158,5 +158,5 @@
adding file changes
added 1 changesets with 1 changes to 1 files
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -162,6 +162,6 @@
$ ls -1 ../final-upload
full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Test generation through the dedicated command
......@@ -204,7 +204,7 @@
generation logic.
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: deleting bundle full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
clone-bundles: starting bundle generation: v2
clone-bundles: deleting bundle full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob)
clone-bundles: starting bundle generation: bzip2-v2
10 changesets found
$ cat ../server/.hg/clonebundles.manifest
......@@ -209,4 +209,4 @@
10 changesets found
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -212,9 +212,9 @@
$ ls -1 ../final-upload
full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Check the command cleans up older bundles when possible
-------------------------------------------------------
$ hg -R ../server/ admin::clone-bundles-refresh
......@@ -215,8 +215,8 @@
$ ls -1 ../server/.hg/tmp-bundles
Check the command cleans up older bundles when possible
-------------------------------------------------------
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: deleting bundle full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob)
$ cat ../server/.hg/clonebundles.manifest
......@@ -222,3 +222,3 @@
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -224,5 +224,5 @@
$ ls -1 ../final-upload
full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Nothing is generated when the bundles are sufficiently up to date
......@@ -278,9 +278,9 @@
refresh the bundles
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: starting bundle generation: v1
clone-bundles: starting bundle generation: bzip2-v1
11 changesets found
the bundle for the "new" format should have been added
$ cat ../server/.hg/clonebundles.manifest
......@@ -282,8 +282,8 @@
11 changesets found
the bundle for the "new" format should have been added
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -289,6 +289,6 @@
$ ls -1 ../final-upload
full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Changing the ratio
......@@ -304,10 +304,10 @@
refresh the bundles
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
11 changesets found
the "outdated' bundle should be refreshed
$ cat ../server/.hg/clonebundles.manifest
......@@ -308,9 +308,9 @@
11 changesets found
the "outdated' bundle should be refreshed
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
file:/*/$TESTTMP/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -316,7 +316,7 @@
$ ls -1 ../final-upload
full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Test more command options
......@@ -326,9 +326,9 @@
---------------
$ hg -R ../server/ admin::clone-bundles-clear
clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
Nothing should remain
......@@ -346,9 +346,9 @@
$ hg -R ../server/ admin::clone-bundles-refresh --background
11 changesets found
11 changesets found
clone-bundles: starting bundle generation: v1
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v1
clone-bundles: starting bundle generation: bzip2-v2
bundles should have been generated
$ cat ../server/.hg/clonebundles.manifest
......@@ -351,7 +351,7 @@
bundles should have been generated
$ cat ../server/.hg/clonebundles.manifest
file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
file:/*/$TESTTMP/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
file:/*/$TESTTMP/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../final-upload
......@@ -357,9 +357,9 @@
$ ls -1 ../final-upload
full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
$ ls -1 ../server/.hg/tmp-bundles
Test HTTP URL
=========================
$ hg -R ../server/ admin::clone-bundles-clear
......@@ -360,14 +360,14 @@
$ ls -1 ../server/.hg/tmp-bundles
Test HTTP URL
=========================
$ hg -R ../server/ admin::clone-bundles-clear
clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
$ cat >> ../server/.hg/hgrc << EOF
> [clone-bundles]
> url-template = https://example.com/final-upload/{basename}
> EOF
$ hg -R ../server/ admin::clone-bundles-refresh
......@@ -368,8 +368,8 @@
$ cat >> ../server/.hg/hgrc << EOF
> [clone-bundles]
> url-template = https://example.com/final-upload/{basename}
> EOF
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: starting bundle generation: v1
clone-bundles: starting bundle generation: bzip2-v1
11 changesets found
......@@ -375,8 +375,8 @@
11 changesets found
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
11 changesets found
bundles should have been generated with the SNIREQUIRED option
$ cat ../server/.hg/clonebundles.manifest
......@@ -377,11 +377,11 @@
11 changesets found
bundles should have been generated with the SNIREQUIRED option
$ cat ../server/.hg/clonebundles.manifest
https://example.com/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 REQUIRESNI=true (glob)
https://example.com/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 REQUIRESNI=true (glob)
https://example.com/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 REQUIRESNI=true (glob)
https://example.com/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 REQUIRESNI=true (glob)
Test serving them through inline-clone bundle
=============================================
......@@ -391,11 +391,11 @@
> auto-generate.serve-inline=yes
> EOF
$ hg -R ../server/ admin::clone-bundles-clear
clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
initial generation
------------------
$ hg -R ../server/ admin::clone-bundles-refresh
......@@ -396,8 +396,8 @@
initial generation
------------------
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: starting bundle generation: v1
clone-bundles: starting bundle generation: bzip2-v1
11 changesets found
......@@ -403,4 +403,4 @@
11 changesets found
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
11 changesets found
$ cat ../server/.hg/clonebundles.manifest
......@@ -405,5 +405,5 @@
11 changesets found
$ cat ../server/.hg/clonebundles.manifest
peer-bundle-cache://full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
peer-bundle-cache://full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
peer-bundle-cache://full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
peer-bundle-cache://full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../server/.hg/bundle-cache
......@@ -409,6 +409,6 @@
$ ls -1 ../server/.hg/bundle-cache
full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
$ ls -1 ../final-upload
Regeneration eventually cleanup the old ones
......@@ -430,5 +430,5 @@
check first regeneration
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: starting bundle generation: v1
clone-bundles: starting bundle generation: bzip2-v1
13 changesets found
......@@ -434,4 +434,4 @@
13 changesets found
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
13 changesets found
$ cat ../server/.hg/clonebundles.manifest
......@@ -436,5 +436,5 @@
13 changesets found
$ cat ../server/.hg/clonebundles.manifest
peer-bundle-cache://full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
peer-bundle-cache://full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
peer-bundle-cache://full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
peer-bundle-cache://full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../server/.hg/bundle-cache
......@@ -440,8 +440,8 @@
$ ls -1 ../server/.hg/bundle-cache
full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
$ ls -1 ../final-upload
check first regeneration (should cleanup the one before that last)
......@@ -459,7 +459,7 @@
added 2 changesets with 2 changes to 2 files
$ hg -R ../server/ admin::clone-bundles-refresh
clone-bundles: deleting inline bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting inline bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: starting bundle generation: v1
clone-bundles: deleting inline bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: deleting inline bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob)
clone-bundles: starting bundle generation: bzip2-v1
15 changesets found
......@@ -465,4 +465,4 @@
15 changesets found
clone-bundles: starting bundle generation: v2
clone-bundles: starting bundle generation: bzip2-v2
15 changesets found
$ cat ../server/.hg/clonebundles.manifest
......@@ -467,5 +467,5 @@
15 changesets found
$ cat ../server/.hg/clonebundles.manifest
peer-bundle-cache://full-v1-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=v1 (glob)
peer-bundle-cache://full-v2-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=v2 (glob)
peer-bundle-cache://full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob)
peer-bundle-cache://full-bzip2-v2-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob)
$ ls -1 ../server/.hg/bundle-cache
......@@ -471,6 +471,6 @@
$ ls -1 ../server/.hg/bundle-cache
full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob)
full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-v2-15_revs-17615b3984c2_tip-*_acbr.hg (glob)
full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob)
full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob)
full-bzip2-v2-15_revs-17615b3984c2_tip-*_acbr.hg (glob)
$ ls -1 ../final-upload
......@@ -476,1 +476,15 @@
$ ls -1 ../final-upload
Check the url is correct
------------------------
$ hg clone -U ssh://user@dummy/server ssh-inline-clone
applying clone bundle from peer-bundle-cache://full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob)
adding changesets
adding manifests
adding file changes
added 15 changesets with 15 changes to 15 files
finished applying clone bundle
searching for changes
no changes found
15 local changesets published
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment