Show More
@@ -601,6 +601,11 b' def isgooddeltainfo(revlog, deltainfo, r' | |||||
601 |
|
601 | |||
602 | return True |
|
602 | return True | |
603 |
|
603 | |||
|
604 | # If a revision's full text is that much bigger than a base candidate full | |||
|
605 | # text's, it is very unlikely that it will produce a valid delta. We no longer | |||
|
606 | # consider these candidates. | |||
|
607 | LIMIT_BASE2TEXT = 50 | |||
|
608 | ||||
604 | def _candidategroups(revlog, textlen, p1, p2, cachedelta): |
|
609 | def _candidategroups(revlog, textlen, p1, p2, cachedelta): | |
605 | """Provides group of revision to be tested as delta base |
|
610 | """Provides group of revision to be tested as delta base | |
606 |
|
611 | |||
@@ -614,6 +619,7 b' def _candidategroups(revlog, textlen, p1' | |||||
614 |
|
619 | |||
615 | deltalength = revlog.length |
|
620 | deltalength = revlog.length | |
616 | deltaparent = revlog.deltaparent |
|
621 | deltaparent = revlog.deltaparent | |
|
622 | sparse = revlog._sparserevlog | |||
617 | good = None |
|
623 | good = None | |
618 |
|
624 | |||
619 | deltas_limit = textlen * LIMIT_DELTA2TEXT |
|
625 | deltas_limit = textlen * LIMIT_DELTA2TEXT | |
@@ -644,6 +650,8 b' def _candidategroups(revlog, textlen, p1' | |||||
644 | # filter out delta base that will never produce good delta |
|
650 | # filter out delta base that will never produce good delta | |
645 | if deltas_limit < revlog.length(rev): |
|
651 | if deltas_limit < revlog.length(rev): | |
646 | continue |
|
652 | continue | |
|
653 | if sparse and revlog.rawsize(rev) < (textlen // LIMIT_BASE2TEXT): | |||
|
654 | continue | |||
647 | # no delta for rawtext-changing revs (see "candelta" for why) |
|
655 | # no delta for rawtext-changing revs (see "candelta" for why) | |
648 | if revlog.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS: |
|
656 | if revlog.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS: | |
649 | continue |
|
657 | continue |
@@ -184,8 +184,8 b' Basic clone' | |||||
184 | #if stream-bundle2 |
|
184 | #if stream-bundle2 | |
185 | $ hg clone --stream -U http://localhost:$HGPORT clone1 |
|
185 | $ hg clone --stream -U http://localhost:$HGPORT clone1 | |
186 | streaming all changes |
|
186 | streaming all changes | |
187 |
1030 files to transfer, 96. |
|
187 | 1030 files to transfer, 96.5 KB of data | |
188 |
transferred 96. |
|
188 | transferred 96.5 KB in * seconds (* */sec) (glob) | |
189 |
|
189 | |||
190 | $ ls -1 clone1/.hg/cache |
|
190 | $ ls -1 clone1/.hg/cache | |
191 | branch2-served |
|
191 | branch2-served | |
@@ -201,11 +201,11 b' getbundle requests with stream=1 are unc' | |||||
201 |
|
201 | |||
202 |
|
202 | |||
203 | $ f --size --hex --bytes 256 body |
|
203 | $ f --size --hex --bytes 256 body | |
204 |
body: size=1122 |
|
204 | body: size=112262 | |
205 | 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| |
|
205 | 0000: 04 6e 6f 6e 65 48 47 32 30 00 00 00 00 00 00 00 |.noneHG20.......| | |
206 | 0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......| |
|
206 | 0010: 7f 07 53 54 52 45 41 4d 32 00 00 00 00 03 00 09 |..STREAM2.......| | |
207 | 0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98| |
|
207 | 0020: 05 09 04 0c 44 62 79 74 65 63 6f 75 6e 74 39 38 |....Dbytecount98| | |
208 |
0030: 37 35 |
|
208 | 0030: 37 37 35 66 69 6c 65 63 6f 75 6e 74 31 30 33 30 |775filecount1030| | |
209 | 0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote| |
|
209 | 0040: 72 65 71 75 69 72 65 6d 65 6e 74 73 64 6f 74 65 |requirementsdote| | |
210 | 0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%| |
|
210 | 0050: 6e 63 6f 64 65 25 32 43 66 6e 63 61 63 68 65 25 |ncode%2Cfncache%| | |
211 | 0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2| |
|
211 | 0060: 32 43 67 65 6e 65 72 61 6c 64 65 6c 74 61 25 32 |2Cgeneraldelta%2| | |
@@ -232,8 +232,8 b' getbundle requests with stream=1 are unc' | |||||
232 | #if stream-bundle2 |
|
232 | #if stream-bundle2 | |
233 | $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed |
|
233 | $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed | |
234 | streaming all changes |
|
234 | streaming all changes | |
235 |
1030 files to transfer, 96. |
|
235 | 1030 files to transfer, 96.5 KB of data | |
236 |
transferred 96. |
|
236 | transferred 96.5 KB in * seconds (* */sec) (glob) | |
237 | #endif |
|
237 | #endif | |
238 |
|
238 | |||
239 | Clone with background file closing enabled |
|
239 | Clone with background file closing enabled | |
@@ -274,12 +274,12 b' Clone with background file closing enabl' | |||||
274 | bundle2-input-bundle: with-transaction |
|
274 | bundle2-input-bundle: with-transaction | |
275 | bundle2-input-part: "stream2" (params: 3 mandatory) supported |
|
275 | bundle2-input-part: "stream2" (params: 3 mandatory) supported | |
276 | applying stream bundle |
|
276 | applying stream bundle | |
277 |
1030 files to transfer, 96. |
|
277 | 1030 files to transfer, 96.5 KB of data | |
278 | starting 4 threads for background file closing |
|
278 | starting 4 threads for background file closing | |
279 | starting 4 threads for background file closing |
|
279 | starting 4 threads for background file closing | |
280 | updating the branch cache |
|
280 | updating the branch cache | |
281 |
transferred 96. |
|
281 | transferred 96.5 KB in * seconds (* */sec) (glob) | |
282 |
bundle2-input-part: total payload size 1120 |
|
282 | bundle2-input-part: total payload size 112094 | |
283 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
283 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
284 | bundle2-input-bundle: 1 parts total |
|
284 | bundle2-input-bundle: 1 parts total | |
285 | checking for updated bookmarks |
|
285 | checking for updated bookmarks | |
@@ -318,8 +318,8 b' Streaming of secrets can be overridden b' | |||||
318 | #if stream-bundle2 |
|
318 | #if stream-bundle2 | |
319 | $ hg clone --stream -U http://localhost:$HGPORT secret-allowed |
|
319 | $ hg clone --stream -U http://localhost:$HGPORT secret-allowed | |
320 | streaming all changes |
|
320 | streaming all changes | |
321 |
1030 files to transfer, 96. |
|
321 | 1030 files to transfer, 96.5 KB of data | |
322 |
transferred 96. |
|
322 | transferred 96.5 KB in * seconds (* */sec) (glob) | |
323 | #endif |
|
323 | #endif | |
324 |
|
324 | |||
325 | $ killdaemons.py |
|
325 | $ killdaemons.py |
General Comments 0
You need to be logged in to leave comments.
Login now