Show More
@@ -198,7 +198,7 b' Check the path.*:pulled-delta-reuse-poli' | |||||
198 |
|
198 | |||
199 | Get a repository with the bad parent picked and a clone ready to pull the merge |
|
199 | Get a repository with the bad parent picked and a clone ready to pull the merge | |
200 |
|
200 | |||
201 |
$ cp -a |
|
201 | $ cp -aR bundle-reuse-enabled peer-bad-delta | |
202 | $ hg clone peer-bad-delta local-pre-pull --rev `cat large.node` --rev `cat small.node` --quiet |
|
202 | $ hg clone peer-bad-delta local-pre-pull --rev `cat large.node` --rev `cat small.node` --quiet | |
203 | DBG-DELTAS: CHANGELOG: * (glob) |
|
203 | DBG-DELTAS: CHANGELOG: * (glob) | |
204 | DBG-DELTAS: CHANGELOG: * (glob) |
|
204 | DBG-DELTAS: CHANGELOG: * (glob) | |
@@ -222,7 +222,7 b' Pull with no value (so the default)' | |||||
222 |
|
222 | |||
223 | default is to reuse the (bad) delta |
|
223 | default is to reuse the (bad) delta | |
224 |
|
224 | |||
225 |
$ cp -a |
|
225 | $ cp -aR local-pre-pull local-no-value | |
226 | $ hg -R local-no-value pull --quiet |
|
226 | $ hg -R local-no-value pull --quiet | |
227 | DBG-DELTAS: CHANGELOG: * (glob) |
|
227 | DBG-DELTAS: CHANGELOG: * (glob) | |
228 | DBG-DELTAS: MANIFESTLOG: * (glob) |
|
228 | DBG-DELTAS: MANIFESTLOG: * (glob) | |
@@ -233,7 +233,7 b' Pull with explicitly the default' | |||||
233 |
|
233 | |||
234 | default is to reuse the (bad) delta |
|
234 | default is to reuse the (bad) delta | |
235 |
|
235 | |||
236 |
$ cp -a |
|
236 | $ cp -aR local-pre-pull local-default | |
237 | $ hg -R local-default pull --quiet --config 'paths.default:pulled-delta-reuse-policy=default' |
|
237 | $ hg -R local-default pull --quiet --config 'paths.default:pulled-delta-reuse-policy=default' | |
238 | DBG-DELTAS: CHANGELOG: * (glob) |
|
238 | DBG-DELTAS: CHANGELOG: * (glob) | |
239 | DBG-DELTAS: MANIFESTLOG: * (glob) |
|
239 | DBG-DELTAS: MANIFESTLOG: * (glob) | |
@@ -244,7 +244,7 b' Pull with no-reuse' | |||||
244 |
|
244 | |||
245 | We don't reuse the base, so we get a better delta |
|
245 | We don't reuse the base, so we get a better delta | |
246 |
|
246 | |||
247 |
$ cp -a |
|
247 | $ cp -aR local-pre-pull local-no-reuse | |
248 | $ hg -R local-no-reuse pull --quiet --config 'paths.default:pulled-delta-reuse-policy=no-reuse' |
|
248 | $ hg -R local-no-reuse pull --quiet --config 'paths.default:pulled-delta-reuse-policy=no-reuse' | |
249 | DBG-DELTAS: CHANGELOG: * (glob) |
|
249 | DBG-DELTAS: CHANGELOG: * (glob) | |
250 | DBG-DELTAS: MANIFESTLOG: * (glob) |
|
250 | DBG-DELTAS: MANIFESTLOG: * (glob) | |
@@ -255,7 +255,7 b' Pull with try-base' | |||||
255 |
|
255 | |||
256 | We requested to use the (bad) delta |
|
256 | We requested to use the (bad) delta | |
257 |
|
257 | |||
258 |
$ cp -a |
|
258 | $ cp -aR local-pre-pull local-try-base | |
259 | $ hg -R local-try-base pull --quiet --config 'paths.default:pulled-delta-reuse-policy=try-base' |
|
259 | $ hg -R local-try-base pull --quiet --config 'paths.default:pulled-delta-reuse-policy=try-base' | |
260 | DBG-DELTAS: CHANGELOG: * (glob) |
|
260 | DBG-DELTAS: CHANGELOG: * (glob) | |
261 | DBG-DELTAS: MANIFESTLOG: * (glob) |
|
261 | DBG-DELTAS: MANIFESTLOG: * (glob) | |
@@ -266,8 +266,8 b' Case where we force a "bad" delta to be ' | |||||
266 |
|
266 | |||
267 | We build a very different file content to force a full snapshot |
|
267 | We build a very different file content to force a full snapshot | |
268 |
|
268 | |||
269 |
$ cp -a |
|
269 | $ cp -aR peer-bad-delta peer-bad-delta-with-full | |
270 |
$ cp -a |
|
270 | $ cp -aR local-pre-pull local-pre-pull-full | |
271 | $ echo '[paths]' >> local-pre-pull-full/.hg/hgrc |
|
271 | $ echo '[paths]' >> local-pre-pull-full/.hg/hgrc | |
272 | $ echo 'default=../peer-bad-delta-with-full' >> local-pre-pull-full/.hg/hgrc |
|
272 | $ echo 'default=../peer-bad-delta-with-full' >> local-pre-pull-full/.hg/hgrc | |
273 |
|
273 | |||
@@ -286,7 +286,7 b' The bundling process creates a delta aga' | |||||
286 | is an invalid chain for the client, so it is not considered and we do a full |
|
286 | is an invalid chain for the client, so it is not considered and we do a full | |
287 | snapshot again. |
|
287 | snapshot again. | |
288 |
|
288 | |||
289 |
$ cp -a |
|
289 | $ cp -aR local-pre-pull-full local-try-base-full | |
290 | $ hg -R local-try-base-full pull --quiet \ |
|
290 | $ hg -R local-try-base-full pull --quiet \ | |
291 | > --config 'paths.default:pulled-delta-reuse-policy=try-base' |
|
291 | > --config 'paths.default:pulled-delta-reuse-policy=try-base' | |
292 | DBG-DELTAS: CHANGELOG: * (glob) |
|
292 | DBG-DELTAS: CHANGELOG: * (glob) | |
@@ -301,7 +301,7 b' Check that "forced" behavior do not chal' | |||||
301 |
|
301 | |||
302 | A full bundle should be accepted as full bundle without recomputation |
|
302 | A full bundle should be accepted as full bundle without recomputation | |
303 |
|
303 | |||
304 |
$ cp -a |
|
304 | $ cp -aR local-pre-pull-full local-forced-full | |
305 | $ hg -R local-forced-full pull --quiet \ |
|
305 | $ hg -R local-forced-full pull --quiet \ | |
306 | > --config 'paths.default:pulled-delta-reuse-policy=forced' |
|
306 | > --config 'paths.default:pulled-delta-reuse-policy=forced' | |
307 | DBG-DELTAS: CHANGELOG: * (glob) |
|
307 | DBG-DELTAS: CHANGELOG: * (glob) | |
@@ -322,7 +322,7 b' more subtle to test this behavior.' | |||||
322 |
|
322 | |||
323 | $ hg bundle -R peer-bad-delta-with-full --all --config devel.bundle.delta=p1 all-p1.hg |
|
323 | $ hg bundle -R peer-bad-delta-with-full --all --config devel.bundle.delta=p1 all-p1.hg | |
324 | 5 changesets found |
|
324 | 5 changesets found | |
325 |
$ cp -a |
|
325 | $ cp -aR local-pre-pull-full local-forced-full-p1 | |
326 | $ hg -R local-forced-full-p1 pull --quiet \ |
|
326 | $ hg -R local-forced-full-p1 pull --quiet \ | |
327 | > --config 'paths.*:pulled-delta-reuse-policy=forced' all-p1.hg |
|
327 | > --config 'paths.*:pulled-delta-reuse-policy=forced' all-p1.hg | |
328 | DBG-DELTAS: CHANGELOG: * (glob) |
|
328 | DBG-DELTAS: CHANGELOG: * (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now