Show More
@@ -858,6 +858,7 b' def auto_bundle_needed_actions(repo, bun' | |||||
858 | 'op_id': op_id, |
|
858 | 'op_id': op_id, | |
859 | } |
|
859 | } | |
860 | for t in targets: |
|
860 | for t in targets: | |
|
861 | t = bundlecaches.parsebundlespec(repo, t, strict=False).as_spec() | |||
861 | if new_bundle_needed(repo, bundles, ratio, abs_revs, t, revs): |
|
862 | if new_bundle_needed(repo, bundles, ratio, abs_revs, t, revs): | |
862 | data = generic_data.copy() |
|
863 | data = generic_data.copy() | |
863 | data['bundle_type'] = t |
|
864 | data['bundle_type'] = t |
@@ -40,11 +40,11 b' Test bundles are generated on push' | |||||
40 | adding file changes |
|
40 | adding file changes | |
41 | 2 changesets found |
|
41 | 2 changesets found | |
42 | added 2 changesets with 2 changes to 2 files |
|
42 | added 2 changesets with 2 changes to 2 files | |
43 | clone-bundles: starting bundle generation: v2 |
|
43 | clone-bundles: starting bundle generation: bzip2-v2 | |
44 | $ cat ../server/.hg/clonebundles.manifest |
|
44 | $ cat ../server/.hg/clonebundles.manifest | |
45 | file:/*/$TESTTMP/final-upload/full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
45 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
46 | $ ls -1 ../final-upload |
|
46 | $ ls -1 ../final-upload | |
47 | full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) |
|
47 | full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) | |
48 | $ ls -1 ../server/.hg/tmp-bundles |
|
48 | $ ls -1 ../server/.hg/tmp-bundles | |
49 |
|
49 | |||
50 | Newer bundles are generated with more pushes |
|
50 | Newer bundles are generated with more pushes | |
@@ -62,13 +62,13 b' Newer bundles are generated with more pu' | |||||
62 | adding file changes |
|
62 | adding file changes | |
63 | 4 changesets found |
|
63 | 4 changesets found | |
64 | added 2 changesets with 2 changes to 2 files |
|
64 | added 2 changesets with 2 changes to 2 files | |
65 | clone-bundles: starting bundle generation: v2 |
|
65 | clone-bundles: starting bundle generation: bzip2-v2 | |
66 |
|
66 | |||
67 | $ cat ../server/.hg/clonebundles.manifest |
|
67 | $ cat ../server/.hg/clonebundles.manifest | |
68 | file:/*/$TESTTMP/final-upload/full-v2-4_revs-6427147b985a_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
68 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
69 | $ ls -1 ../final-upload |
|
69 | $ ls -1 ../final-upload | |
70 | full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) |
|
70 | full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) | |
71 | full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) |
|
71 | full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) | |
72 | $ ls -1 ../server/.hg/tmp-bundles |
|
72 | $ ls -1 ../server/.hg/tmp-bundles | |
73 |
|
73 | |||
74 | Older bundles are cleaned up with more pushes |
|
74 | Older bundles are cleaned up with more pushes | |
@@ -84,16 +84,16 b' Older bundles are cleaned up with more p' | |||||
84 | adding changesets |
|
84 | adding changesets | |
85 | adding manifests |
|
85 | adding manifests | |
86 | adding file changes |
|
86 | adding file changes | |
87 | clone-bundles: deleting bundle full-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) |
|
87 | clone-bundles: deleting bundle full-bzip2-v2-2_revs-aaff8d2ffbbf_tip-*_txn.hg (glob) | |
88 | 6 changesets found |
|
88 | 6 changesets found | |
89 | added 2 changesets with 2 changes to 2 files |
|
89 | added 2 changesets with 2 changes to 2 files | |
90 | clone-bundles: starting bundle generation: v2 |
|
90 | clone-bundles: starting bundle generation: bzip2-v2 | |
91 |
|
91 | |||
92 | $ cat ../server/.hg/clonebundles.manifest |
|
92 | $ cat ../server/.hg/clonebundles.manifest | |
93 | file:/*/$TESTTMP/final-upload/full-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
93 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
94 | $ ls -1 ../final-upload |
|
94 | $ ls -1 ../final-upload | |
95 | full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) |
|
95 | full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) | |
96 | full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) |
|
96 | full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) | |
97 | $ ls -1 ../server/.hg/tmp-bundles |
|
97 | $ ls -1 ../server/.hg/tmp-bundles | |
98 |
|
98 | |||
99 | Test conditions to get them generated |
|
99 | Test conditions to get them generated | |
@@ -115,10 +115,10 b' Check ratio' | |||||
115 | adding file changes |
|
115 | adding file changes | |
116 | added 1 changesets with 1 changes to 1 files |
|
116 | added 1 changesets with 1 changes to 1 files | |
117 | $ cat ../server/.hg/clonebundles.manifest |
|
117 | $ cat ../server/.hg/clonebundles.manifest | |
118 | file:/*/$TESTTMP/final-upload/full-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
118 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
119 | $ ls -1 ../final-upload |
|
119 | $ ls -1 ../final-upload | |
120 | full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) |
|
120 | full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) | |
121 | full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) |
|
121 | full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) | |
122 | $ ls -1 ../server/.hg/tmp-bundles |
|
122 | $ ls -1 ../server/.hg/tmp-bundles | |
123 |
|
123 | |||
124 | Check absolute number of revisions |
|
124 | Check absolute number of revisions | |
@@ -135,15 +135,15 b' Check absolute number of revisions' | |||||
135 | adding changesets |
|
135 | adding changesets | |
136 | adding manifests |
|
136 | adding manifests | |
137 | adding file changes |
|
137 | adding file changes | |
138 | clone-bundles: deleting bundle full-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) |
|
138 | clone-bundles: deleting bundle full-bzip2-v2-4_revs-6427147b985a_tip-*_txn.hg (glob) | |
139 | 8 changesets found |
|
139 | 8 changesets found | |
140 | added 1 changesets with 1 changes to 1 files |
|
140 | added 1 changesets with 1 changes to 1 files | |
141 | clone-bundles: starting bundle generation: v2 |
|
141 | clone-bundles: starting bundle generation: bzip2-v2 | |
142 | $ cat ../server/.hg/clonebundles.manifest |
|
142 | $ cat ../server/.hg/clonebundles.manifest | |
143 | file:/*/$TESTTMP/final-upload/full-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
143 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
144 | $ ls -1 ../final-upload |
|
144 | $ ls -1 ../final-upload | |
145 | full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) |
|
145 | full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) | |
146 | full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) |
|
146 | full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) | |
147 | $ ls -1 ../server/.hg/tmp-bundles |
|
147 | $ ls -1 ../server/.hg/tmp-bundles | |
148 |
|
148 | |||
149 | (that one would not generate new bundles) |
|
149 | (that one would not generate new bundles) | |
@@ -158,10 +158,10 b' Check absolute number of revisions' | |||||
158 | adding file changes |
|
158 | adding file changes | |
159 | added 1 changesets with 1 changes to 1 files |
|
159 | added 1 changesets with 1 changes to 1 files | |
160 | $ cat ../server/.hg/clonebundles.manifest |
|
160 | $ cat ../server/.hg/clonebundles.manifest | |
161 | file:/*/$TESTTMP/final-upload/full-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=v2 (glob) |
|
161 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg BUNDLESPEC=bzip2-v2 (glob) | |
162 | $ ls -1 ../final-upload |
|
162 | $ ls -1 ../final-upload | |
163 | full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) |
|
163 | full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) | |
164 | full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) |
|
164 | full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) | |
165 | $ ls -1 ../server/.hg/tmp-bundles |
|
165 | $ ls -1 ../server/.hg/tmp-bundles | |
166 |
|
166 | |||
167 | Test generation through the dedicated command |
|
167 | Test generation through the dedicated command | |
@@ -204,25 +204,25 b' Running the command should detect the st' | |||||
204 | generation logic. |
|
204 | generation logic. | |
205 |
|
205 | |||
206 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
206 | $ hg -R ../server/ admin::clone-bundles-refresh | |
207 | clone-bundles: deleting bundle full-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) |
|
207 | clone-bundles: deleting bundle full-bzip2-v2-6_revs-b1010e95ea00_tip-*_txn.hg (glob) | |
208 | clone-bundles: starting bundle generation: v2 |
|
208 | clone-bundles: starting bundle generation: bzip2-v2 | |
209 | 10 changesets found |
|
209 | 10 changesets found | |
210 | $ cat ../server/.hg/clonebundles.manifest |
|
210 | $ cat ../server/.hg/clonebundles.manifest | |
211 | file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
211 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
212 | $ ls -1 ../final-upload |
|
212 | $ ls -1 ../final-upload | |
213 | full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) |
|
213 | full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) | |
214 | full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) |
|
214 | full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) | |
215 | $ ls -1 ../server/.hg/tmp-bundles |
|
215 | $ ls -1 ../server/.hg/tmp-bundles | |
216 |
|
216 | |||
217 | Check the command cleans up older bundles when possible |
|
217 | Check the command cleans up older bundles when possible | |
218 | ------------------------------------------------------- |
|
218 | ------------------------------------------------------- | |
219 |
|
219 | |||
220 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
220 | $ hg -R ../server/ admin::clone-bundles-refresh | |
221 | clone-bundles: deleting bundle full-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) |
|
221 | clone-bundles: deleting bundle full-bzip2-v2-8_revs-8353e8af1306_tip-*_txn.hg (glob) | |
222 | $ cat ../server/.hg/clonebundles.manifest |
|
222 | $ cat ../server/.hg/clonebundles.manifest | |
223 | file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
223 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
224 | $ ls -1 ../final-upload |
|
224 | $ ls -1 ../final-upload | |
225 | full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) |
|
225 | full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) | |
226 | $ ls -1 ../server/.hg/tmp-bundles |
|
226 | $ ls -1 ../server/.hg/tmp-bundles | |
227 |
|
227 | |||
228 | Nothing is generated when the bundles are sufficiently up to date |
|
228 | Nothing is generated when the bundles are sufficiently up to date | |
@@ -278,17 +278,17 b' change configuration' | |||||
278 | refresh the bundles |
|
278 | refresh the bundles | |
279 |
|
279 | |||
280 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
280 | $ hg -R ../server/ admin::clone-bundles-refresh | |
281 | clone-bundles: starting bundle generation: v1 |
|
281 | clone-bundles: starting bundle generation: bzip2-v1 | |
282 | 11 changesets found |
|
282 | 11 changesets found | |
283 |
|
283 | |||
284 | the bundle for the "new" format should have been added |
|
284 | the bundle for the "new" format should have been added | |
285 |
|
285 | |||
286 | $ cat ../server/.hg/clonebundles.manifest |
|
286 | $ cat ../server/.hg/clonebundles.manifest | |
287 | file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
287 | file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
288 | file:/*/$TESTTMP/final-upload/full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
288 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
289 | $ ls -1 ../final-upload |
|
289 | $ ls -1 ../final-upload | |
290 | full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
290 | full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
291 | full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) |
|
291 | full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) | |
292 | $ ls -1 ../server/.hg/tmp-bundles |
|
292 | $ ls -1 ../server/.hg/tmp-bundles | |
293 |
|
293 | |||
294 | Changing the ratio |
|
294 | Changing the ratio | |
@@ -304,19 +304,19 b' Changing the ratio to something that wou' | |||||
304 | refresh the bundles |
|
304 | refresh the bundles | |
305 |
|
305 | |||
306 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
306 | $ hg -R ../server/ admin::clone-bundles-refresh | |
307 | clone-bundles: starting bundle generation: v2 |
|
307 | clone-bundles: starting bundle generation: bzip2-v2 | |
308 | 11 changesets found |
|
308 | 11 changesets found | |
309 |
|
309 | |||
310 |
|
310 | |||
311 | the "outdated' bundle should be refreshed |
|
311 | the "outdated' bundle should be refreshed | |
312 |
|
312 | |||
313 | $ cat ../server/.hg/clonebundles.manifest |
|
313 | $ cat ../server/.hg/clonebundles.manifest | |
314 | file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
314 | file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
315 | file:/*/$TESTTMP/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
315 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
316 | $ ls -1 ../final-upload |
|
316 | $ ls -1 ../final-upload | |
317 | full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
317 | full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
318 | full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) |
|
318 | full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) | |
319 | full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
319 | full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
320 | $ ls -1 ../server/.hg/tmp-bundles |
|
320 | $ ls -1 ../server/.hg/tmp-bundles | |
321 |
|
321 | |||
322 | Test more command options |
|
322 | Test more command options | |
@@ -326,9 +326,9 b' bundle clearing' | |||||
326 | --------------- |
|
326 | --------------- | |
327 |
|
327 | |||
328 | $ hg -R ../server/ admin::clone-bundles-clear |
|
328 | $ hg -R ../server/ admin::clone-bundles-clear | |
329 | clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
329 | clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
330 | clone-bundles: deleting bundle full-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) |
|
330 | clone-bundles: deleting bundle full-bzip2-v2-10_revs-3b6f57f17d70_tip-*_acbr.hg (glob) | |
331 | clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
331 | clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
332 |
|
332 | |||
333 | Nothing should remain |
|
333 | Nothing should remain | |
334 |
|
334 | |||
@@ -346,42 +346,42 b' process to end)' | |||||
346 | $ hg -R ../server/ admin::clone-bundles-refresh --background |
|
346 | $ hg -R ../server/ admin::clone-bundles-refresh --background | |
347 | 11 changesets found |
|
347 | 11 changesets found | |
348 | 11 changesets found |
|
348 | 11 changesets found | |
349 | clone-bundles: starting bundle generation: v1 |
|
349 | clone-bundles: starting bundle generation: bzip2-v1 | |
350 | clone-bundles: starting bundle generation: v2 |
|
350 | clone-bundles: starting bundle generation: bzip2-v2 | |
351 |
|
351 | |||
352 | bundles should have been generated |
|
352 | bundles should have been generated | |
353 |
|
353 | |||
354 | $ cat ../server/.hg/clonebundles.manifest |
|
354 | $ cat ../server/.hg/clonebundles.manifest | |
355 | file:/*/$TESTTMP/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
355 | file:/*/$TESTTMP/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
356 | file:/*/$TESTTMP/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
356 | file:/*/$TESTTMP/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
357 | $ ls -1 ../final-upload |
|
357 | $ ls -1 ../final-upload | |
358 | full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
358 | full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
359 | full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
359 | full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
360 | $ ls -1 ../server/.hg/tmp-bundles |
|
360 | $ ls -1 ../server/.hg/tmp-bundles | |
361 |
|
361 | |||
362 | Test HTTP URL |
|
362 | Test HTTP URL | |
363 | ========================= |
|
363 | ========================= | |
364 |
|
364 | |||
365 | $ hg -R ../server/ admin::clone-bundles-clear |
|
365 | $ hg -R ../server/ admin::clone-bundles-clear | |
366 | clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
366 | clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
367 | clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
367 | clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
368 |
|
368 | |||
369 | $ cat >> ../server/.hg/hgrc << EOF |
|
369 | $ cat >> ../server/.hg/hgrc << EOF | |
370 | > [clone-bundles] |
|
370 | > [clone-bundles] | |
371 | > url-template = https://example.com/final-upload/{basename} |
|
371 | > url-template = https://example.com/final-upload/{basename} | |
372 | > EOF |
|
372 | > EOF | |
373 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
373 | $ hg -R ../server/ admin::clone-bundles-refresh | |
374 | clone-bundles: starting bundle generation: v1 |
|
374 | clone-bundles: starting bundle generation: bzip2-v1 | |
375 | 11 changesets found |
|
375 | 11 changesets found | |
376 | clone-bundles: starting bundle generation: v2 |
|
376 | clone-bundles: starting bundle generation: bzip2-v2 | |
377 | 11 changesets found |
|
377 | 11 changesets found | |
378 |
|
378 | |||
379 |
|
379 | |||
380 | bundles should have been generated with the SNIREQUIRED option |
|
380 | bundles should have been generated with the SNIREQUIRED option | |
381 |
|
381 | |||
382 | $ cat ../server/.hg/clonebundles.manifest |
|
382 | $ cat ../server/.hg/clonebundles.manifest | |
383 | https://example.com/final-upload/full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 REQUIRESNI=true (glob) |
|
383 | https://example.com/final-upload/full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 REQUIRESNI=true (glob) | |
384 | https://example.com/final-upload/full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 REQUIRESNI=true (glob) |
|
384 | https://example.com/final-upload/full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 REQUIRESNI=true (glob) | |
385 |
|
385 | |||
386 | Test serving them through inline-clone bundle |
|
386 | Test serving them through inline-clone bundle | |
387 | ============================================= |
|
387 | ============================================= | |
@@ -391,24 +391,24 b' Test serving them through inline-clone b' | |||||
391 | > auto-generate.serve-inline=yes |
|
391 | > auto-generate.serve-inline=yes | |
392 | > EOF |
|
392 | > EOF | |
393 | $ hg -R ../server/ admin::clone-bundles-clear |
|
393 | $ hg -R ../server/ admin::clone-bundles-clear | |
394 | clone-bundles: deleting bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
394 | clone-bundles: deleting bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
395 | clone-bundles: deleting bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
395 | clone-bundles: deleting bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
396 |
|
396 | |||
397 | initial generation |
|
397 | initial generation | |
398 | ------------------ |
|
398 | ------------------ | |
399 |
|
399 | |||
400 |
|
400 | |||
401 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
401 | $ hg -R ../server/ admin::clone-bundles-refresh | |
402 | clone-bundles: starting bundle generation: v1 |
|
402 | clone-bundles: starting bundle generation: bzip2-v1 | |
403 | 11 changesets found |
|
403 | 11 changesets found | |
404 | clone-bundles: starting bundle generation: v2 |
|
404 | clone-bundles: starting bundle generation: bzip2-v2 | |
405 | 11 changesets found |
|
405 | 11 changesets found | |
406 | $ cat ../server/.hg/clonebundles.manifest |
|
406 | $ cat ../server/.hg/clonebundles.manifest | |
407 | peer-bundle-cache://full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
407 | peer-bundle-cache://full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
408 | peer-bundle-cache://full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
408 | peer-bundle-cache://full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
409 | $ ls -1 ../server/.hg/bundle-cache |
|
409 | $ ls -1 ../server/.hg/bundle-cache | |
410 | full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
410 | full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
411 | full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
411 | full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
412 | $ ls -1 ../final-upload |
|
412 | $ ls -1 ../final-upload | |
413 |
|
413 | |||
414 | Regeneration eventually cleanup the old ones |
|
414 | Regeneration eventually cleanup the old ones | |
@@ -430,18 +430,18 b' create more content' | |||||
430 | check first regeneration |
|
430 | check first regeneration | |
431 |
|
431 | |||
432 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
432 | $ hg -R ../server/ admin::clone-bundles-refresh | |
433 | clone-bundles: starting bundle generation: v1 |
|
433 | clone-bundles: starting bundle generation: bzip2-v1 | |
434 | 13 changesets found |
|
434 | 13 changesets found | |
435 | clone-bundles: starting bundle generation: v2 |
|
435 | clone-bundles: starting bundle generation: bzip2-v2 | |
436 | 13 changesets found |
|
436 | 13 changesets found | |
437 | $ cat ../server/.hg/clonebundles.manifest |
|
437 | $ cat ../server/.hg/clonebundles.manifest | |
438 | peer-bundle-cache://full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
438 | peer-bundle-cache://full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
439 | peer-bundle-cache://full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
439 | peer-bundle-cache://full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
440 | $ ls -1 ../server/.hg/bundle-cache |
|
440 | $ ls -1 ../server/.hg/bundle-cache | |
441 | full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
441 | full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
442 | full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) |
|
442 | full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) | |
443 | full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
443 | full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
444 | full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) |
|
444 | full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) | |
445 | $ ls -1 ../final-upload |
|
445 | $ ls -1 ../final-upload | |
446 |
|
446 | |||
447 | check first regeneration (should cleanup the one before that last) |
|
447 | check first regeneration (should cleanup the one before that last) | |
@@ -459,18 +459,32 b' check first regeneration (should cleanup' | |||||
459 | added 2 changesets with 2 changes to 2 files |
|
459 | added 2 changesets with 2 changes to 2 files | |
460 |
|
460 | |||
461 | $ hg -R ../server/ admin::clone-bundles-refresh |
|
461 | $ hg -R ../server/ admin::clone-bundles-refresh | |
462 | clone-bundles: deleting inline bundle full-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
462 | clone-bundles: deleting inline bundle full-bzip2-v1-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
463 | clone-bundles: deleting inline bundle full-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) |
|
463 | clone-bundles: deleting inline bundle full-bzip2-v2-11_revs-4226b1cd5fda_tip-*_acbr.hg (glob) | |
464 | clone-bundles: starting bundle generation: v1 |
|
464 | clone-bundles: starting bundle generation: bzip2-v1 | |
465 | 15 changesets found |
|
465 | 15 changesets found | |
466 | clone-bundles: starting bundle generation: v2 |
|
466 | clone-bundles: starting bundle generation: bzip2-v2 | |
467 | 15 changesets found |
|
467 | 15 changesets found | |
468 | $ cat ../server/.hg/clonebundles.manifest |
|
468 | $ cat ../server/.hg/clonebundles.manifest | |
469 | peer-bundle-cache://full-v1-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=v1 (glob) |
|
469 | peer-bundle-cache://full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=bzip2-v1 (glob) | |
470 | peer-bundle-cache://full-v2-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=v2 (glob) |
|
470 | peer-bundle-cache://full-bzip2-v2-15_revs-17615b3984c2_tip-*_acbr.hg BUNDLESPEC=bzip2-v2 (glob) | |
471 | $ ls -1 ../server/.hg/bundle-cache |
|
471 | $ ls -1 ../server/.hg/bundle-cache | |
472 | full-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) |
|
472 | full-bzip2-v1-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) | |
473 | full-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob) |
|
473 | full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob) | |
474 | full-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) |
|
474 | full-bzip2-v2-13_revs-8a81f9be54ea_tip-*_acbr.hg (glob) | |
475 | full-v2-15_revs-17615b3984c2_tip-*_acbr.hg (glob) |
|
475 | full-bzip2-v2-15_revs-17615b3984c2_tip-*_acbr.hg (glob) | |
476 | $ ls -1 ../final-upload |
|
476 | $ ls -1 ../final-upload | |
|
477 | ||||
|
478 | Check the url is correct | |||
|
479 | ------------------------ | |||
|
480 | ||||
|
481 | $ hg clone -U ssh://user@dummy/server ssh-inline-clone | |||
|
482 | applying clone bundle from peer-bundle-cache://full-bzip2-v1-15_revs-17615b3984c2_tip-*_acbr.hg (glob) | |||
|
483 | adding changesets | |||
|
484 | adding manifests | |||
|
485 | adding file changes | |||
|
486 | added 15 changesets with 15 changes to 15 files | |||
|
487 | finished applying clone bundle | |||
|
488 | searching for changes | |||
|
489 | no changes found | |||
|
490 | 15 local changesets published |
General Comments 0
You need to be logged in to leave comments.
Login now