##// END OF EJS Templates
bundle: emit full snapshot as is, without doing a redelta...
marmoute -
r50678:e1953a34 default
parent child Browse files
Show More
@@ -458,6 +458,10 b' def emitrevisions('
458 if debug_info is not None:
458 if debug_info is not None:
459 debug_delta_source = "storage"
459 debug_delta_source = "storage"
460 baserev = deltaparentrev
460 baserev = deltaparentrev
461 elif deltaparentrev == nullrev:
462 if debug_info is not None:
463 debug_delta_source = "storage"
464 baserev = deltaparentrev
461 else:
465 else:
462 if deltaparentrev != nullrev and debug_info is not None:
466 if deltaparentrev != nullrev and debug_info is not None:
463 debug_info['denied-base-not-available'] += 1
467 debug_info['denied-base-not-available'] += 1
@@ -123,13 +123,13 b' No changes, just a different message:'
123 uncompressed size of bundle content:
123 uncompressed size of bundle content:
124 254 (changelog)
124 254 (changelog)
125 163 (manifests)
125 163 (manifests)
126 131 a
126 133 a
127 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
127 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/47343646fa3d-c2758885-amend.hg
128 1 changesets found
128 1 changesets found
129 uncompressed size of bundle content:
129 uncompressed size of bundle content:
130 250 (changelog)
130 250 (changelog)
131 163 (manifests)
131 163 (manifests)
132 131 a
132 133 a
133 adding branch
133 adding branch
134 adding changesets
134 adding changesets
135 adding manifests
135 adding manifests
@@ -267,13 +267,13 b' then, test editing custom commit message'
267 uncompressed size of bundle content:
267 uncompressed size of bundle content:
268 249 (changelog)
268 249 (changelog)
269 163 (manifests)
269 163 (manifests)
270 133 a
270 135 a
271 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
271 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/a9a13940fc03-7c2e8674-amend.hg
272 1 changesets found
272 1 changesets found
273 uncompressed size of bundle content:
273 uncompressed size of bundle content:
274 257 (changelog)
274 257 (changelog)
275 163 (manifests)
275 163 (manifests)
276 133 a
276 135 a
277 adding branch
277 adding branch
278 adding changesets
278 adding changesets
279 adding manifests
279 adding manifests
@@ -303,13 +303,13 b' Same, but with changes in working dir (d'
303 uncompressed size of bundle content:
303 uncompressed size of bundle content:
304 257 (changelog)
304 257 (changelog)
305 163 (manifests)
305 163 (manifests)
306 133 a
306 135 a
307 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
307 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/64a124ba1b44-10374b8f-amend.hg
308 1 changesets found
308 1 changesets found
309 uncompressed size of bundle content:
309 uncompressed size of bundle content:
310 257 (changelog)
310 257 (changelog)
311 163 (manifests)
311 163 (manifests)
312 135 a
312 137 a
313 adding branch
313 adding branch
314 adding changesets
314 adding changesets
315 adding manifests
315 adding manifests
@@ -46,8 +46,8 b' multihead push works.'
46 remote: bc22f9a30a82 multihead1
46 remote: bc22f9a30a82 multihead1
47 remote: ee4802bf6864 multihead2
47 remote: ee4802bf6864 multihead2
48 $ scratchnodes
48 $ scratchnodes
49 bc22f9a30a821118244deacbd732e394ed0b686c ab1bc557aa090a9e4145512c734b6e8a828393a5
49 bc22f9a30a821118244deacbd732e394ed0b686c de1b7d132ba98f0172cd974e3e69dfa80faa335c
50 ee4802bf6864326a6b3dcfff5a03abc2a0a69b8f ab1bc557aa090a9e4145512c734b6e8a828393a5
50 ee4802bf6864326a6b3dcfff5a03abc2a0a69b8f de1b7d132ba98f0172cd974e3e69dfa80faa335c
51
51
52 Create two new scratch bookmarks
52 Create two new scratch bookmarks
53 $ hg up 0
53 $ hg up 0
@@ -1122,7 +1122,7 b' redo pull with --lfrev and check it pull'
1122 6 changesets found
1122 6 changesets found
1123 uncompressed size of bundle content:
1123 uncompressed size of bundle content:
1124 1389 (changelog)
1124 1389 (changelog)
1125 1599 (manifests)
1125 1698 (manifests)
1126 254 .hglf/large1
1126 254 .hglf/large1
1127 564 .hglf/large3
1127 564 .hglf/large3
1128 572 .hglf/sub/large4
1128 572 .hglf/sub/large4
@@ -315,7 +315,7 b' Check that the right ancestors is used w'
315 adding manifests
315 adding manifests
316 adding file changes
316 adding file changes
317 adding f1.txt revisions
317 adding f1.txt revisions
318 bundle2-input-part: total payload size 1686
318 bundle2-input-part: total payload size 1739
319 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
319 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
320 bundle2-input-part: total payload size 74
320 bundle2-input-part: total payload size 74
321 bundle2-input-part: "phase-heads" supported
321 bundle2-input-part: "phase-heads" supported
@@ -296,6 +296,21 b' snapshot again.'
296 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
296 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
297 DBG-DELTAS: FILELOG:my-file.txt: rev=4: delta-base=4 * (glob)
297 DBG-DELTAS: FILELOG:my-file.txt: rev=4: delta-base=4 * (glob)
298
298
299 Check that "forced" behavior do not challenge the delta, even if it is full.
300 ---------------------------------------------------------------------------
301
302 A full bundle should be accepted as full bundle without recomputation
303
304 $ cp -ar local-pre-pull-full local-forced-full
305 $ hg -R local-forced-full pull --quiet \
306 > --config 'paths.default:delta-reuse-policy=forced'
307 DBG-DELTAS: CHANGELOG: * (glob)
308 DBG-DELTAS: CHANGELOG: * (glob)
309 DBG-DELTAS: MANIFESTLOG: * (glob)
310 DBG-DELTAS: MANIFESTLOG: * (glob)
311 DBG-DELTAS: FILELOG:my-file.txt: rev=3: delta-base=2 * (glob)
312 DBG-DELTAS: FILELOG:my-file.txt: rev=4: delta-base=4 is-cached=1 - search-rounds=0 try-count=0 - delta-type=full snap-depth=0 - * (glob)
313
299 Check that "forced" behavior do not challenge the delta, even if it is bad.
314 Check that "forced" behavior do not challenge the delta, even if it is bad.
300 ---------------------------------------------------------------------------
315 ---------------------------------------------------------------------------
301
316
@@ -305,9 +320,11 b' Note: If the bundling process becomes sm'
305 (as the server won't be sending "bad" deltas anymore) and might need something
320 (as the server won't be sending "bad" deltas anymore) and might need something
306 more subtle to test this behavior.
321 more subtle to test this behavior.
307
322
308 $ cp -ar local-pre-pull-full local-forced-full
323 $ hg bundle -R peer-bad-delta-with-full --all --config devel.bundle.delta=p1 all-p1.hg
309 $ hg -R local-forced-full pull --quiet \
324 5 changesets found
310 > --config 'paths.default:delta-reuse-policy=forced'
325 $ cp -ar local-pre-pull-full local-forced-full-p1
326 $ hg -R local-forced-full-p1 pull --quiet \
327 > --config 'paths.*:delta-reuse-policy=forced' all-p1.hg
311 DBG-DELTAS: CHANGELOG: * (glob)
328 DBG-DELTAS: CHANGELOG: * (glob)
312 DBG-DELTAS: CHANGELOG: * (glob)
329 DBG-DELTAS: CHANGELOG: * (glob)
313 DBG-DELTAS: MANIFESTLOG: * (glob)
330 DBG-DELTAS: MANIFESTLOG: * (glob)
General Comments 0
You need to be logged in to leave comments. Login now