mercurial-scm/hg-stable: mercurial/revlogutils/deltas.py annotate

annotate mercurial/revlogutils/deltas.py @ 51352:410afe5b13fc

delta-find: clarify some comment and code in is_good_delta_info We move the comment closer to the code it describ and we compute an intermediate value without using the `textlen` variable, as it will stop being defined in a future patch. This will clarify future patches.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Thu, 04 Jan 2024 15:35:57 +0100
parents	176d530f59af
children	5c0693553cb6

rev	line source
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	1 # revlogdeltas.py - Logic around delta computation for revlog
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
46819 d4ba4d51f85f contributor: change mentions of mpm to olivia Rapha?l Gom?s <rgomes@octobus.net> parents: 43089 diff changeset	3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	4 # Copyright 2018 Octobus <contact@octobus.net>
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10047 diff changeset	7 # GNU General Public License version 2 or any later version.
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	8 """Helper class to compute deltas stored inside revlogs"""
8227 0a9542703300 turn some comments back into module docstrings Martin Geisler <mg@lazybytes.net> parents: 8226 diff changeset	9
27361 29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	10
39510 3ca144f1c8dd snapshot: search for unrelated but reusable full-snapshot Boris Feld <boris.feld@octobus.net> parents: 39509 diff changeset	11 import collections
27361 29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	12 import struct
29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	13
29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	14 # import stuff from node for others to import from revlog
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	15 from ..node import nullrev
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	16 from ..i18n import _
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	17
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	18 from .constants import (
47458 c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	19 COMP_MODE_DEFAULT,
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	20 COMP_MODE_INLINE,
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	21 COMP_MODE_PLAIN,
49879 bcae90c53def delta-find: add a delta-reuse policy that blindly accepts incoming deltas Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49795 diff changeset	22 DELTA_BASE_REUSE_FORCE,
49791 05db41701ece find-delta: pass the cache-delta usage policy alongside the cache-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49789 diff changeset	23 DELTA_BASE_REUSE_NO,
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	24 KIND_CHANGELOG,
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	25 KIND_FILELOG,
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	26 KIND_MANIFESTLOG,
39356 729082bb9938 revlog: split constants into a new `revlogutils.constants` module Boris Feld <boris.feld@octobus.net> parents: 39260 diff changeset	27 REVIDX_ISCENSORED,
729082bb9938 revlog: split constants into a new `revlogutils.constants` module Boris Feld <boris.feld@octobus.net> parents: 39260 diff changeset	28 REVIDX_RAWTEXT_CHANGING_FLAGS,
729082bb9938 revlog: split constants into a new `revlogutils.constants` module Boris Feld <boris.feld@octobus.net> parents: 39260 diff changeset	29 )
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	30
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	31 from ..thirdparty import attr
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	32
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	33 from .. import (
27361 29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	34 error,
29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	35 mdiff,
41111 38e88450138c delta: have a native implementation of _findsnapshot Boris Feld <boris.feld@octobus.net> parents: 41082 diff changeset	36 util,
27361 29f50344fa83 revlog: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 27251 diff changeset	37 )
10913 f2ecc5733c89 revlog: factor out _maxinline global. Greg Ward <greg-hg@gerg.ca> parents: 10404 diff changeset	38
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	39 from . import flagutil
42994 dff95420480f flagprocessors: make `processflagsraw` a module level function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42884 diff changeset	40
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	41 # maximum <delta-chain-data>/<revision-text-length> ratio
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	42 LIMIT_DELTA2TEXT = 2
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	43
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	44
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	45 class _testrevlog:
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	46 """minimalist fake revlog to use in doctests"""
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	47
40684 85b14f0dc334 doctest: add a `issnapshot` method to _testrevlog Boris Feld <boris.feld@octobus.net> parents: 40655 diff changeset	48 def __init__(self, data, density=0.5, mingap=0, snapshot=()):
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	49 """data is an list of revision payload boundaries"""
51050 127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	50 from .. import revlog
127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	51
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	52 self._data = data
51050 127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	53 self.data_config = revlog.DataConfig()
127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	54 self.data_config.sr_density_threshold = density
127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	55 self.data_config.sr_min_gap_size = mingap
127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	56 self.delta_config = revlog.DeltaConfig()
127656e0b97b revlog: use the new Config classes in _testrevlog Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51025 diff changeset	57 self.feature_config = revlog.FeatureConfig()
40684 85b14f0dc334 doctest: add a `issnapshot` method to _testrevlog Boris Feld <boris.feld@octobus.net> parents: 40655 diff changeset	58 self._snapshot = set(snapshot)
40748 39d29542fe40 sparse-revlog: put the native implementation of slicechunktodensity to use Boris Feld <boris.feld@octobus.net> parents: 40698 diff changeset	59 self.index = None
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	60
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	61 def start(self, rev):
41082 88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	62 if rev == nullrev:
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	63 return 0
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	64 if rev == 0:
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	65 return 0
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	66 return self._data[rev - 1]
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	67
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	68 def end(self, rev):
41082 88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	69 if rev == nullrev:
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	70 return 0
38637 e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	71 return self._data[rev]
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	72
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	73 def length(self, rev):
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	74 return self.end(rev) - self.start(rev)
e33f784f2a44 revlog: introduce a tiny mock of a revlog class Boris Feld <boris.feld@octobus.net> parents: 38636 diff changeset	75
38718 f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	76 def __len__(self):
f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	77 return len(self._data)
f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	78
40684 85b14f0dc334 doctest: add a `issnapshot` method to _testrevlog Boris Feld <boris.feld@octobus.net> parents: 40655 diff changeset	79 def issnapshot(self, rev):
41082 88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	80 if rev == nullrev:
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	81 return True
40684 85b14f0dc334 doctest: add a `issnapshot` method to _testrevlog Boris Feld <boris.feld@octobus.net> parents: 40655 diff changeset	82 return rev in self._snapshot
85b14f0dc334 doctest: add a `issnapshot` method to _testrevlog Boris Feld <boris.feld@octobus.net> parents: 40655 diff changeset	83
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	84
40651 3ac23dad6364 sparse-revlog: drop unused deltainfo parameter from _slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40650 diff changeset	85 def slicechunk(revlog, revs, targetsize=None):
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	86 """slice revs to reduce the amount of unrelated data to be read from disk.
e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	87
e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	88 ``revs`` is sliced into groups that should be read in one time.
e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	89 Assume that revs are sorted.
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	90
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	91 The initial chunk is sliced until the overall density (payload/chunks-span
51067 8c614fa16330 revlog: remove legacy usage of `_srdensitythreshold` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51065 diff changeset	92 ratio) is above `revlog.data_config.sr_density_threshold`. No gap smaller
51068 533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	93 than `revlog.data_config.sr_min_gap_size` is skipped.
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	94
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	95 If `targetsize` is set, no chunk larger than `targetsize` will be yield.
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	96 For consistency with other slicing choice, this limit won't go lower than
51068 533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	97 `revlog.data_config.sr_min_gap_size`.
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	98
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	99 If individual revisions chunk are larger than this limit, they will still
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	100 be raised individually.
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	101
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	102 >>> data = [
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	103 ... 5, #00 (5)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	104 ... 10, #01 (5)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	105 ... 12, #02 (2)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	106 ... 12, #03 (empty)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	107 ... 27, #04 (15)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	108 ... 31, #05 (4)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	109 ... 31, #06 (empty)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	110 ... 42, #07 (11)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	111 ... 47, #08 (5)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	112 ... 47, #09 (empty)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	113 ... 48, #10 (1)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	114 ... 51, #11 (3)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	115 ... 74, #12 (23)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	116 ... 85, #13 (11)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	117 ... 86, #14 (1)
f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	118 ... 91, #15 (5)
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	119 ... ]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	120 >>> revlog = _testrevlog(data, snapshot=range(16))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	121
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	122 >>> list(slicechunk(revlog, list(range(16))))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	123 [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]]
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	124 >>> list(slicechunk(revlog, [0, 15]))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	125 [[0], [15]]
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	126 >>> list(slicechunk(revlog, [0, 11, 15]))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	127 [[0], [11], [15]]
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	128 >>> list(slicechunk(revlog, [0, 11, 13, 15]))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	129 [[0], [11, 13, 15]]
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	130 >>> list(slicechunk(revlog, [1, 2, 3, 5, 8, 10, 11, 14]))
38640 f62b8fb0a484 revlog: document and test _slicechunk Boris Feld <boris.feld@octobus.net> parents: 38639 diff changeset	131 [[1, 2], [5, 8, 10, 11], [14]]
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	132
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	133 Slicing with a maximum chunk size
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	134 >>> list(slicechunk(revlog, [0, 11, 13, 15], targetsize=15))
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	135 [[0], [11], [13], [15]]
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	136 >>> list(slicechunk(revlog, [0, 11, 13, 15], targetsize=20))
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	137 [[0], [11], [13, 15]]
41082 88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	138
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	139 Slicing involving nullrev
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	140 >>> list(slicechunk(revlog, [-1, 0, 11, 13, 15], targetsize=20))
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	141 [[-1, 0], [11], [13, 15]]
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	142 >>> list(slicechunk(revlog, [-1, 13, 15], targetsize=5))
88d813cd9acd revlog: fix pure python slicing test when chain contains nullrev Boris Feld <boris.feld@octobus.net> parents: 41036 diff changeset	143 [[-1], [13], [15]]
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	144 """
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	145 if targetsize is not None:
51068 533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	146 targetsize = max(targetsize, revlog.data_config.sr_min_gap_size)
38718 f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	147 # targetsize should not be specified when evaluating delta candidates:
f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	148 # * targetsize is used to ensure we stay within specification when reading,
40748 39d29542fe40 sparse-revlog: put the native implementation of slicechunktodensity to use Boris Feld <boris.feld@octobus.net> parents: 40698 diff changeset	149 densityslicing = getattr(revlog.index, 'slicechunktodensity', None)
39d29542fe40 sparse-revlog: put the native implementation of slicechunktodensity to use Boris Feld <boris.feld@octobus.net> parents: 40698 diff changeset	150 if densityslicing is None:
39d29542fe40 sparse-revlog: put the native implementation of slicechunktodensity to use Boris Feld <boris.feld@octobus.net> parents: 40698 diff changeset	151 densityslicing = lambda x, y, z: _slicechunktodensity(revlog, x, y, z)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	152 for chunk in densityslicing(
51068 533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	153 revs,
533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	154 revlog.data_config.sr_density_threshold,
533d6943f6a3 revlog: remove legacy usage of `_srmingapsize` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51067 diff changeset	155 revlog.data_config.sr_min_gap_size,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	156 ):
38643 967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	157 for subchunk in _slicechunktosize(revlog, chunk, targetsize):
967fee55e8d9 revlog: postprocess chunk to slice them down to a certain size Boris Feld <boris.feld@octobus.net> parents: 38642 diff changeset	158 yield subchunk
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	159
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	160
38718 f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	161 def _slicechunktosize(revlog, revs, targetsize=None):
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	162 """slice revs to match the target size
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	163
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	164 This is intended to be used on chunk that density slicing selected by that
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	165 are still too large compared to the read garantee of revlog. This might
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	166 happens when "minimal gap size" interrupted the slicing or when chain are
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	167 built in a way that create large blocks next to each other.
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	168
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	169 >>> data = [
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	170 ... 3, #0 (3)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	171 ... 5, #1 (2)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	172 ... 6, #2 (1)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	173 ... 8, #3 (2)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	174 ... 8, #4 (empty)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	175 ... 11, #5 (3)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	176 ... 12, #6 (1)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	177 ... 13, #7 (1)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	178 ... 14, #8 (1)
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	179 ... ]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	180
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	181 == All snapshots cases ==
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	182 >>> revlog = _testrevlog(data, snapshot=range(9))
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	183
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	184 Cases where chunk is already small enough
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	185 >>> list(_slicechunktosize(revlog, [0], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	186 [[0]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	187 >>> list(_slicechunktosize(revlog, [6, 7], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	188 [[6, 7]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	189 >>> list(_slicechunktosize(revlog, [0], None))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	190 [[0]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	191 >>> list(_slicechunktosize(revlog, [6, 7], None))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	192 [[6, 7]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	193
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	194 cases where we need actual slicing
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	195 >>> list(_slicechunktosize(revlog, [0, 1], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	196 [[0], [1]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	197 >>> list(_slicechunktosize(revlog, [1, 3], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	198 [[1], [3]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	199 >>> list(_slicechunktosize(revlog, [1, 2, 3], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	200 [[1, 2], [3]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	201 >>> list(_slicechunktosize(revlog, [3, 5], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	202 [[3], [5]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	203 >>> list(_slicechunktosize(revlog, [3, 4, 5], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	204 [[3], [5]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	205 >>> list(_slicechunktosize(revlog, [5, 6, 7, 8], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	206 [[5], [6, 7, 8]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	207 >>> list(_slicechunktosize(revlog, [0, 1, 2, 3, 4, 5, 6, 7, 8], 3))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	208 [[0], [1, 2], [3], [5], [6, 7, 8]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	209
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	210 Case with too large individual chunk (must return valid chunk)
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	211 >>> list(_slicechunktosize(revlog, [0, 1], 2))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	212 [[0], [1]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	213 >>> list(_slicechunktosize(revlog, [1, 3], 1))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	214 [[1], [3]]
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	215 >>> list(_slicechunktosize(revlog, [3, 4, 5], 2))
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	216 [[3], [5]]
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	217
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	218 == No Snapshot cases ==
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	219 >>> revlog = _testrevlog(data)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	220
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	221 Cases where chunk is already small enough
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	222 >>> list(_slicechunktosize(revlog, [0], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	223 [[0]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	224 >>> list(_slicechunktosize(revlog, [6, 7], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	225 [[6, 7]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	226 >>> list(_slicechunktosize(revlog, [0], None))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	227 [[0]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	228 >>> list(_slicechunktosize(revlog, [6, 7], None))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	229 [[6, 7]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	230
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	231 cases where we need actual slicing
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	232 >>> list(_slicechunktosize(revlog, [0, 1], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	233 [[0], [1]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	234 >>> list(_slicechunktosize(revlog, [1, 3], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	235 [[1], [3]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	236 >>> list(_slicechunktosize(revlog, [1, 2, 3], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	237 [[1], [2, 3]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	238 >>> list(_slicechunktosize(revlog, [3, 5], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	239 [[3], [5]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	240 >>> list(_slicechunktosize(revlog, [3, 4, 5], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	241 [[3], [4, 5]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	242 >>> list(_slicechunktosize(revlog, [5, 6, 7, 8], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	243 [[5], [6, 7, 8]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	244 >>> list(_slicechunktosize(revlog, [0, 1, 2, 3, 4, 5, 6, 7, 8], 3))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	245 [[0], [1, 2], [3], [5], [6, 7, 8]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	246
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	247 Case with too large individual chunk (must return valid chunk)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	248 >>> list(_slicechunktosize(revlog, [0, 1], 2))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	249 [[0], [1]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	250 >>> list(_slicechunktosize(revlog, [1, 3], 1))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	251 [[1], [3]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	252 >>> list(_slicechunktosize(revlog, [3, 4, 5], 2))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	253 [[3], [5]]
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	254
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	255 == mixed case ==
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	256 >>> revlog = _testrevlog(data, snapshot=[0, 1, 2])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	257 >>> list(_slicechunktosize(revlog, list(range(9)), 5))
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	258 [[0, 1], [2], [3, 4, 5], [6, 7, 8]]
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	259 """
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	260 assert targetsize is None or 0 <= targetsize
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	261 startdata = revlog.start(revs[0])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	262 enddata = revlog.end(revs[-1])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	263 fullspan = enddata - startdata
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	264 if targetsize is None or fullspan <= targetsize:
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	265 yield revs
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	266 return
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	267
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	268 startrevidx = 0
40698 2eb48aa0acce sparse-revlog: align endrevidx usages in the _slicechunktosize Boris Feld <boris.feld@octobus.net> parents: 40697 diff changeset	269 endrevidx = 1
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	270 iterrevs = enumerate(revs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	271 next(iterrevs) # skip first rev.
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	272 # first step: get snapshots out of the way
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	273 for idx, r in iterrevs:
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	274 span = revlog.end(r) - startdata
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	275 snapshot = revlog.issnapshot(r)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	276 if span <= targetsize and snapshot:
40698 2eb48aa0acce sparse-revlog: align endrevidx usages in the _slicechunktosize Boris Feld <boris.feld@octobus.net> parents: 40697 diff changeset	277 endrevidx = idx + 1
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	278 else:
40698 2eb48aa0acce sparse-revlog: align endrevidx usages in the _slicechunktosize Boris Feld <boris.feld@octobus.net> parents: 40697 diff changeset	279 chunk = _trimchunk(revlog, revs, startrevidx, endrevidx)
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	280 if chunk:
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	281 yield chunk
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	282 startrevidx = idx
e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	283 startdata = revlog.start(r)
40698 2eb48aa0acce sparse-revlog: align endrevidx usages in the _slicechunktosize Boris Feld <boris.feld@octobus.net> parents: 40697 diff changeset	284 endrevidx = idx + 1
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	285 if not snapshot:
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	286 break
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	287
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	288 # for the others, we use binary slicing to quickly converge toward valid
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	289 # chunks (otherwise, we might end up looking for start/end of many
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	290 # revisions). This logic is not looking for the perfect slicing point, it
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	291 # focuses on quickly converging toward valid chunks.
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	292 nbitem = len(revs)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	293 while (enddata - startdata) > targetsize:
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	294 endrevidx = nbitem
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	295 if nbitem - startrevidx <= 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	296 break # protect against individual chunk larger than limit
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	297 localenddata = revlog.end(revs[endrevidx - 1])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	298 span = localenddata - startdata
40697 fd1d41ccbe38 sparse-revlog: use `span` variable as intended Boris Feld <boris.feld@octobus.net> parents: 40685 diff changeset	299 while span > targetsize:
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	300 if endrevidx - startrevidx <= 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	301 break # protect against individual chunk larger than limit
40685 9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	302 endrevidx -= (endrevidx - startrevidx) // 2
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	303 localenddata = revlog.end(revs[endrevidx - 1])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	304 span = localenddata - startdata
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	305 chunk = _trimchunk(revlog, revs, startrevidx, endrevidx)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	306 if chunk:
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	307 yield chunk
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	308 startrevidx = endrevidx
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	309 startdata = revlog.start(revs[startrevidx])
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	310
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	311 chunk = _trimchunk(revlog, revs, startrevidx)
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	312 if chunk:
9c3c697267db sparse-revlog: rework the way we enforce chunk size limit Boris Feld <boris.feld@octobus.net> parents: 40684 diff changeset	313 yield chunk
38642 e59e27e52297 revlog: add function to slice chunk down to a given size Boris Feld <boris.feld@octobus.net> parents: 38641 diff changeset	314
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	315
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	316 def _slicechunktodensity(revlog, revs, targetdensity=0.5, mingapsize=0):
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	317 """slice revs to reduce the amount of unrelated data to be read from disk.
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	318
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	319 ``revs`` is sliced into groups that should be read in one time.
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	320 Assume that revs are sorted.
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	321
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	322 The initial chunk is sliced until the overall density (payload/chunks-span
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	323 ratio) is above `targetdensity`. No gap smaller than `mingapsize` is
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	324 skipped.
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	325
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	326 >>> revlog = _testrevlog([
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	327 ... 5, #00 (5)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	328 ... 10, #01 (5)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	329 ... 12, #02 (2)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	330 ... 12, #03 (empty)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	331 ... 27, #04 (15)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	332 ... 31, #05 (4)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	333 ... 31, #06 (empty)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	334 ... 42, #07 (11)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	335 ... 47, #08 (5)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	336 ... 47, #09 (empty)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	337 ... 48, #10 (1)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	338 ... 51, #11 (3)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	339 ... 74, #12 (23)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	340 ... 85, #13 (11)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	341 ... 86, #14 (1)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	342 ... 91, #15 (5)
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	343 ... ])
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	344
38655 cd1c484e31e8 revlog: adjust doctest examples to be portable to Python 3 Augie Fackler <augie@google.com> parents: 38644 diff changeset	345 >>> list(_slicechunktodensity(revlog, list(range(16))))
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	346 [[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	347 >>> list(_slicechunktodensity(revlog, [0, 15]))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	348 [[0], [15]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	349 >>> list(_slicechunktodensity(revlog, [0, 11, 15]))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	350 [[0], [11], [15]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	351 >>> list(_slicechunktodensity(revlog, [0, 11, 13, 15]))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	352 [[0], [11, 13, 15]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	353 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14]))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	354 [[1, 2], [5, 8, 10, 11], [14]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	355 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	356 ... mingapsize=20))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	357 [[1, 2, 3, 5, 8, 10, 11], [14]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	358 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	359 ... targetdensity=0.95))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	360 [[1, 2], [5], [8, 10, 11], [14]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	361 >>> list(_slicechunktodensity(revlog, [1, 2, 3, 5, 8, 10, 11, 14],
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	362 ... targetdensity=0.95, mingapsize=12))
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	363 [[1, 2], [5, 8, 10, 11], [14]]
feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	364 """
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	365 start = revlog.start
e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	366 length = revlog.length
e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	367
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	368 if len(revs) <= 1:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	369 yield revs
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	370 return
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	371
40651 3ac23dad6364 sparse-revlog: drop unused deltainfo parameter from _slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40650 diff changeset	372 deltachainspan = segmentspan(revlog, revs)
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	373
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	374 if deltachainspan < mingapsize:
38635 d083ae26c325 revlog: early return in _slicechunk when span is already small enough Boris Feld <boris.feld@octobus.net> parents: 38634 diff changeset	375 yield revs
d083ae26c325 revlog: early return in _slicechunk when span is already small enough Boris Feld <boris.feld@octobus.net> parents: 38634 diff changeset	376 return
d083ae26c325 revlog: early return in _slicechunk when span is already small enough Boris Feld <boris.feld@octobus.net> parents: 38634 diff changeset	377
38718 f8762ea73e0d sparse-revlog: implement algorithm to write sparse delta chains (issue5480) Paul Morelle <paul.morelle@octobus.net> parents: 38717 diff changeset	378 readdata = deltachainspan
40653 bfbfd15d65bd sparse-revlog: fast-path before computing payload size Boris Feld <boris.feld@octobus.net> parents: 40652 diff changeset	379 chainpayload = sum(length(r) for r in revs)
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	380
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	381 if deltachainspan:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	382 density = chainpayload / float(deltachainspan)
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	383 else:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	384 density = 1.0
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	385
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	386 if density >= targetdensity:
38634 f0ea8b847831 revlog: early return in _slicechunk when density is already good Paul Morelle <paul.morelle@octobus.net> parents: 38632 diff changeset	387 yield revs
f0ea8b847831 revlog: early return in _slicechunk when density is already good Paul Morelle <paul.morelle@octobus.net> parents: 38632 diff changeset	388 return
f0ea8b847831 revlog: early return in _slicechunk when density is already good Paul Morelle <paul.morelle@octobus.net> parents: 38632 diff changeset	389
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	390 # Store the gaps in a heap to have them sorted by decreasing size
40654 54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	391 gaps = []
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	392 prevend = None
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	393 for i, rev in enumerate(revs):
40651 3ac23dad6364 sparse-revlog: drop unused deltainfo parameter from _slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40650 diff changeset	394 revstart = start(rev)
3ac23dad6364 sparse-revlog: drop unused deltainfo parameter from _slicechunktodensity Boris Feld <boris.feld@octobus.net> parents: 40650 diff changeset	395 revlen = length(rev)
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	396
34898 1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	397 # Skip empty revisions to form larger holes
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	398 if revlen == 0:
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	399 continue
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	400
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	401 if prevend is not None:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	402 gapsize = revstart - prevend
34881 8c9b08a0c48c sparse-read: skip gaps too small to be worth splitting Paul Morelle <paul.morelle@octobus.net> parents: 34880 diff changeset	403 # only consider holes that are large enough
38641 feba6be0941b revlog: extract density based slicing into its own function Boris Feld <boris.feld@octobus.net> parents: 38640 diff changeset	404 if gapsize > mingapsize:
40654 54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	405 gaps.append((gapsize, i))
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	406
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	407 prevend = revstart + revlen
40654 54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	408 # sort the gaps to pop them from largest to small
54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	409 gaps.sort()
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	410
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	411 # Collect the indices of the largest holes until the density is acceptable
40655 526ee887c4d5 sparse-revlog: stop using a heap to track selected gap Boris Feld <boris.feld@octobus.net> parents: 40654 diff changeset	412 selected = []
40654 54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	413 while gaps and density < targetdensity:
54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	414 gapsize, gapidx = gaps.pop()
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	415
40655 526ee887c4d5 sparse-revlog: stop using a heap to track selected gap Boris Feld <boris.feld@octobus.net> parents: 40654 diff changeset	416 selected.append(gapidx)
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	417
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	418 # the gap sizes are stored as negatives to be sorted decreasingly
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	419 # by the heap
40654 54de23400b2a sparse-revlog: stop using a heap to track gaps Boris Feld <boris.feld@octobus.net> parents: 40653 diff changeset	420 readdata -= gapsize
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	421 if readdata > 0:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	422 density = chainpayload / float(readdata)
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	423 else:
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	424 density = 1.0
40655 526ee887c4d5 sparse-revlog: stop using a heap to track selected gap Boris Feld <boris.feld@octobus.net> parents: 40654 diff changeset	425 selected.sort()
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	426
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	427 # Cut the revs at collected indices
9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	428 previdx = 0
40655 526ee887c4d5 sparse-revlog: stop using a heap to track selected gap Boris Feld <boris.feld@octobus.net> parents: 40654 diff changeset	429 for idx in selected:
34898 1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	430
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	431 chunk = _trimchunk(revlog, revs, previdx, idx)
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	432 if chunk:
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	433 yield chunk
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	434
34880 9e18ab7f7240 sparse-read: move from a recursive-based approach to a heap-based one Boris Feld <boris.feld@octobus.net> parents: 34825 diff changeset	435 previdx = idx
34898 1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	436
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	437 chunk = _trimchunk(revlog, revs, previdx)
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	438 if chunk:
1bde8e8e5de0 sparse-read: ignore trailing empty revs in each read chunk Paul Morelle <paul.morelle@octobus.net> parents: 34881 diff changeset	439 yield chunk
34824 e2ad93bcc084 revlog: introduce an experimental flag to slice chunks reads when too sparse Paul Morelle <paul.morelle@octobus.net> parents: 34823 diff changeset	440
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	441
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	442 def _trimchunk(revlog, revs, startidx, endidx=None):
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	443 """returns revs[startidx:endidx] without empty trailing revs
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	444
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	445 Doctest Setup
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	446 >>> revlog = _testrevlog([
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	447 ... 5, #0
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	448 ... 10, #1
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	449 ... 12, #2
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	450 ... 12, #3 (empty)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	451 ... 17, #4
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	452 ... 21, #5
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	453 ... 21, #6 (empty)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	454 ... ])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	455
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	456 Contiguous cases:
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	457 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	458 [0, 1, 2, 3, 4, 5]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	459 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0, 5)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	460 [0, 1, 2, 3, 4]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	461 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 0, 4)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	462 [0, 1, 2]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	463 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 2, 4)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	464 [2]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	465 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 3)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	466 [3, 4, 5]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	467 >>> _trimchunk(revlog, [0, 1, 2, 3, 4, 5, 6], 3, 5)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	468 [3, 4]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	469
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	470 Discontiguous cases:
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	471 >>> _trimchunk(revlog, [1, 3, 5, 6], 0)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	472 [1, 3, 5]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	473 >>> _trimchunk(revlog, [1, 3, 5, 6], 0, 2)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	474 [1]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	475 >>> _trimchunk(revlog, [1, 3, 5, 6], 1, 3)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	476 [3, 5]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	477 >>> _trimchunk(revlog, [1, 3, 5, 6], 1)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	478 [3, 5]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	479 """
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	480 length = revlog.length
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	481
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	482 if endidx is None:
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	483 endidx = len(revs)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	484
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	485 # If we have a non-emtpy delta candidate, there are nothing to trim
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	486 if revs[endidx - 1] < len(revlog):
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	487 # Trim empty revs at the end, except the very first revision of a chain
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	488 while (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	489 endidx > 1 and endidx > startidx and length(revs[endidx - 1]) == 0
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	490 ):
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	491 endidx -= 1
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	492
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	493 return revs[startidx:endidx]
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	494
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	495
40652 a32ccd32982b sparse-revlog: drop unused deltainfo parameter from segmentspan Boris Feld <boris.feld@octobus.net> parents: 40651 diff changeset	496 def segmentspan(revlog, revs):
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	497 """Get the byte span of a segment of revisions
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	498
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	499 revs is a sorted array of revision numbers
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	500
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	501 >>> revlog = _testrevlog([
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	502 ... 5, #0
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	503 ... 10, #1
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	504 ... 12, #2
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	505 ... 12, #3 (empty)
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	506 ... 17, #4
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	507 ... ])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	508
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	509 >>> segmentspan(revlog, [0, 1, 2, 3, 4])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	510 17
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	511 >>> segmentspan(revlog, [0, 4])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	512 17
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	513 >>> segmentspan(revlog, [3, 4])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	514 5
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	515 >>> segmentspan(revlog, [1, 2, 3,])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	516 7
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	517 >>> segmentspan(revlog, [1, 3])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	518 7
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	519 """
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	520 if not revs:
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	521 return 0
40652 a32ccd32982b sparse-revlog: drop unused deltainfo parameter from segmentspan Boris Feld <boris.feld@octobus.net> parents: 40651 diff changeset	522 end = revlog.end(revs[-1])
39357 655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	523 return end - revlog.start(revs[0])
655b5b465953 revlog: split functionality related to deltas computation in a new module Boris Feld <boris.feld@octobus.net> parents: 39356 diff changeset	524
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	525
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	526 def _textfromdelta(revlog, baserev, delta, p1, p2, flags, expectednode):
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	527 """build full text from a (base, delta) pair and other metadata"""
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	528 # special case deltas which replace entire base; no need to decode
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	529 # base revision. this neatly avoids censored bases, which throw when
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	530 # they're decoded.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	531 hlen = struct.calcsize(b">lll")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	532 if delta[:hlen] == mdiff.replacediffheader(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	533 revlog.rawsize(baserev), len(delta) - hlen
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	534 ):
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	535 fulltext = delta[hlen:]
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	536 else:
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	537 # deltabase is rawtext before changed by flag processors, which is
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	538 # equivalent to non-raw text
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	539 basetext = revlog.revision(baserev)
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	540 fulltext = mdiff.patch(basetext, delta)
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	541
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	542 try:
42994 dff95420480f flagprocessors: make `processflagsraw` a module level function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 42884 diff changeset	543 validatehash = flagutil.processflagsraw(revlog, fulltext, flags)
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	544 if validatehash:
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	545 revlog.checkhash(fulltext, expectednode, p1=p1, p2=p2)
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	546 if flags & REVIDX_ISCENSORED:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	547 raise error.StorageError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	548 _(b'node %s is not censored') % expectednode
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	549 )
39790 4a2466b2a434 revlog: drop some more error aliases (API) Gregory Szorc <gregory.szorc@gmail.com> parents: 39789 diff changeset	550 except error.CensoredNodeError:
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	551 # must pass the censored index flag to add censored revisions
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	552 if not flags & REVIDX_ISCENSORED:
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	553 raise
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	554 return fulltext
fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	555
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	556
35638 edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	557 @attr.s(slots=True, frozen=True)
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	558 class _deltainfo:
35638 edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	559 distance = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	560 deltalen = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	561 data = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	562 base = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	563 chainbase = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	564 chainlen = attr.ib()
edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	565 compresseddeltalen = attr.ib()
39187 e0da43e2f71f revlog: compute snapshot depth on delta info Boris Feld <boris.feld@octobus.net> parents: 39185 diff changeset	566 snapshotdepth = attr.ib()
35638 edc9330acac1 revlog: introduce 'deltainfo' to distinguish from 'delta' Paul Morelle <paul.morelle@octobus.net> parents: 35637 diff changeset	567
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	568
47264 b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	569 def drop_u_compression(delta):
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	570 """turn into a "u" (no-compression) into no-compression without header
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	571
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	572 This is useful for revlog format that has better compression method.
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	573 """
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	574 assert delta.data[0] == b'u', delta.data[0]
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	575 return _deltainfo(
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	576 delta.distance,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	577 delta.deltalen - 1,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	578 (b'', delta.data[1]),
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	579 delta.base,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	580 delta.chainbase,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	581 delta.chainlen,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	582 delta.compresseddeltalen,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	583 delta.snapshotdepth,
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	584 )
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	585
b876f0bf7366 revlog: introduce a plain compression mode Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46819 diff changeset	586
40991 42f59d3f714d delta: exclude base candidate much smaller than the target Boris Feld <boris.feld@octobus.net> parents: 40970 diff changeset	587 # If a revision's full text is that much bigger than a base candidate full
42f59d3f714d delta: exclude base candidate much smaller than the target Boris Feld <boris.feld@octobus.net> parents: 40970 diff changeset	588 # text's, it is very unlikely that it will produce a valid delta. We no longer
42f59d3f714d delta: exclude base candidate much smaller than the target Boris Feld <boris.feld@octobus.net> parents: 40970 diff changeset	589 # consider these candidates.
41036 b373477948df revlog: limit base to rev size ratio to 500 instead of 50 Boris Feld <boris.feld@octobus.net> parents: 40992 diff changeset	590 LIMIT_BASE2TEXT = 500
40991 42f59d3f714d delta: exclude base candidate much smaller than the target Boris Feld <boris.feld@octobus.net> parents: 40970 diff changeset	591
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	592
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	593 class _DeltaSearch:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	594 """perform the search of a good delta for a single revlog revision
50354 ca1522fe4ec8 delta-find: assume the target-rev if not specified Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49886 diff changeset	595
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	596 note: some of the deltacomputer.finddeltainfo logic should probably move
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	597 here.
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	598 """
50355 0232571255d3 delta-find: never do anything fancy when general delta is off Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50354 diff changeset	599
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	600 def __init__(
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	601 self,
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	602 revlog,
51340 49401b7dec0c delta-find: feed revinfo to _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51338 diff changeset	603 revinfo,
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	604 p1,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	605 p2,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	606 cachedelta,
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	607 excluded_bases=None,
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	608 target_rev=None,
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	609 snapshot_cache=None,
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	610 ):
51335 c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	611 # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	612 # so we should never end up asking such question. Adding the assert as
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	613 # a safe-guard to detect anything that would be fishy in this regard.
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	614 assert (
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	615 cachedelta is None
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	616 or cachedelta[2] != DELTA_BASE_REUSE_FORCE
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	617 or not revlog.delta_config.general_delta
c9ab452e5611 delta-find: check DELTA_BASE_REUSE_FORCE in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51334 diff changeset	618 )
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	619 self.revlog = revlog
51340 49401b7dec0c delta-find: feed revinfo to _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51338 diff changeset	620 self.revinfo = revinfo
49401b7dec0c delta-find: feed revinfo to _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51338 diff changeset	621 self.textlen = revinfo.textlen
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	622 self.p1 = p1
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	623 self.p2 = p2
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	624 self.cachedelta = cachedelta
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	625 self.excluded_bases = excluded_bases
51334 047358417d01 delta-find: move target_rev in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51333 diff changeset	626 if target_rev is None:
047358417d01 delta-find: move target_rev in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51333 diff changeset	627 self.target_rev = len(self.revlog)
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	628 self.target_rev = target_rev
51333 87fce139e927 delta-find: move snapshot_cache in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51332 diff changeset	629 if snapshot_cache is None:
87fce139e927 delta-find: move snapshot_cache in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51332 diff changeset	630 # map: base-rev: [snapshot-revs]
87fce139e927 delta-find: move snapshot_cache in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51332 diff changeset	631 snapshot_cache = SnapshotCache()
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	632 self.snapshot_cache = snapshot_cache
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	633
51336 01db705bbe32 delta-find: move tested in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51335 diff changeset	634 self.tested = {nullrev}
01db705bbe32 delta-find: move tested in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51335 diff changeset	635
51344 d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	636 self._candidates_iterator = self._candidate_groups()
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	637 self._last_good = None
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	638 self.current_group = self._candidates_iterator.send(self._last_good)
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	639
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	640 @property
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	641 def done(self):
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	642 """True when all possible candidate have been tested"""
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	643 return self.current_group is None
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	644
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	645 def next_group(self, good_delta=None):
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	646 """move to the next group to test
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	647
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	648 The group of revision to test will be available in
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	649 `self.current_group`. If the previous group had any good delta, the
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	650 best one can be passed as the `good_delta` parameter to help selecting
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	651 the next group.
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	652
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	653 If not revision remains to be, `self.done` will be True and
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	654 `self.current_group` will be None.
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	655 """
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	656 if good_delta is not None:
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	657 self._last_good = good_delta.base
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	658 self.current_group = self._candidates_iterator.send(self._last_good)
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	659
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	660 def _candidate_groups(self):
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	661 """Provides group of revision to be tested as delta base
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	662
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	663 This top level function focus on emitting groups with unique and
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	664 worthwhile content. See _raw_candidate_groups for details about the
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	665 group order.
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	666 """
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	667 # should we try to build a delta?
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	668 if not (len(self.revlog) and self.revlog._storedeltachains):
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	669 yield None
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	670 return
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	671
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	672 if not self.revlog.delta_config.general_delta:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	673 # before general delta, there is only one possible delta base
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	674 yield (self.target_rev - 1,)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	675 yield None
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	676 return
49879 bcae90c53def delta-find: add a delta-reuse policy that blindly accepts incoming deltas Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49795 diff changeset	677
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	678 good = None
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	679
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	680 group_chunk_size = self.revlog.delta_config.candidate_group_chunk_size
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	681
51336 01db705bbe32 delta-find: move tested in the _DeltaSearch.__init__ Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51335 diff changeset	682 tested = self.tested # prefetch for speed and code compactness
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	683 candidates = self._refined_groups()
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	684 while True:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	685 temptative = candidates.send(good)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	686 if temptative is None:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	687 break
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	688 group = self._pre_filter_candidate_revs(temptative)
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	689 if group:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	690 # When the size of the candidate group is big, it can result in
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	691 # a quite significant performance impact. To reduce this, we
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	692 # can send them in smaller batches until the new batch does not
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	693 # provide any improvements.
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	694 #
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	695 # This might reduce the overall efficiency of the compression
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	696 # in some corner cases, but that should also prevent very
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	697 # pathological cases from being an issue. (eg. 20 000
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	698 # candidates).
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	699 #
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	700 # XXX note that the ordering of the group becomes important as
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	701 # it now impacts the final result. The current order is
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	702 # unprocessed and can be improved.
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	703 if group_chunk_size == 0:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	704 tested.update(group)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	705 good = yield tuple(group)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	706 else:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	707 prev_good = good
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	708 for start in range(0, len(group), group_chunk_size):
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	709 sub_group = group[start : start + group_chunk_size]
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	710 tested.update(sub_group)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	711 good = yield tuple(sub_group)
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	712 if prev_good == good:
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	713 break
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	714
c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	715 yield None
39363 1c6ff52fe9cf revlogdeltas: split candidate groups selection from the filtering logic Boris Feld <boris.feld@octobus.net> parents: 39362 diff changeset	716
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	717 def _pre_filter_candidate_revs(self, temptative):
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	718 """filter possible candidate before computing a delta
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	719
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	720 This function use various criteria to pre-filter candidate delta base
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	721 before we compute a delta and evaluate its quality.
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	722
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	723 Such pre-filter limit the number of computed delta, an expensive operation.
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	724
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	725 return the updated list of revision to test
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	726 """
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	727 deltalength = self.revlog.length
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	728 deltaparent = self.revlog.deltaparent
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	729
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	730 tested = self.tested
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	731 group = []
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	732 for rev in temptative:
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	733 # skip over empty delta (no need to include them in a chain)
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	734 while not (rev == nullrev or rev in tested or deltalength(rev)):
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	735 tested.add(rev)
02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	736 rev = deltaparent(rev)
51346 898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	737 if self._pre_filter_rev(rev):
898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	738 group.append(rev)
898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	739 else:
898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	740 self.tested.add(rev)
898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	741 return group
898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	742
51348 2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	743 def _pre_filter_rev_universal(self, rev):
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	744 """pre filtering that is need in all cases.
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	745
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	746 return True if it seems okay to test a rev, False otherwise.
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	747
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	748 used by _pre_filter_rev.
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	749 """
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	750 # no need to try a delta against nullrev, this will be done as
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	751 # a last resort.
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	752 if rev == nullrev:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	753 return False
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	754 # filter out revision we tested already
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	755 if rev in self.tested:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	756 return False
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	757
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	758 # an higher authority deamed the base unworthy (e.g. censored)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	759 if self.excluded_bases is not None and rev in self.excluded_bases:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	760 return False
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	761 # We are in some recomputation cases and that rev is too high
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	762 # in the revlog
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	763 if self.target_rev is not None and rev >= self.target_rev:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	764 return False
51348 2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	765 # no delta for rawtext-changing revs (see "candelta" for why)
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	766 if self.revlog.flags(rev) & REVIDX_RAWTEXT_CHANGING_FLAGS:
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	767 return False
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	768 return True
2407af4f2eea delta-find: split the generic part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51347 diff changeset	769
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	770 def _pre_filter_rev_sparse(self, rev):
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	771 """pre filtering that is needed in sparse revlog cases
51346 898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	772
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	773 return True if it seems okay to test a rev, False otherwise.
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	774
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	775 used by _pre_filter_rev.
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	776 """
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	777 assert self.revlog.delta_config.sparse_revlog
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	778 # if the revision we test again is too small, the resulting delta
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	779 # will be large anyway as that amount of data to be added is big
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	780 if self.revlog.rawsize(rev) < (self.textlen // LIMIT_BASE2TEXT):
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	781 return False
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	782
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	783 if self.revlog.delta_config.upper_bound_comp is not None:
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	784 maxcomp = self.revlog.delta_config.upper_bound_comp
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	785 basenotsnap = (self.p1, self.p2, nullrev)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	786 if rev not in basenotsnap and self.revlog.issnapshot(rev):
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	787 snapshotdepth = self.revlog.snapshotdepth(rev)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	788 # If text is significantly larger than the base, we can
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	789 # expect the resulting delta to be proportional to the size
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	790 # difference
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	791 revsize = self.revlog.rawsize(rev)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	792 rawsizedistance = max(self.textlen - revsize, 0)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	793 # use an estimate of the compression upper bound.
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	794 lowestrealisticdeltalen = rawsizedistance // maxcomp
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	795
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	796 # check the absolute constraint on the delta size
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	797 snapshotlimit = self.textlen >> snapshotdepth
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	798 if snapshotlimit < lowestrealisticdeltalen:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	799 # delta lower bound is larger than accepted upper
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	800 # bound
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	801 return False
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	802
51347 ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	803 # check the relative constraint on the delta size
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	804 revlength = self.revlog.length(rev)
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	805 if revlength < lowestrealisticdeltalen:
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	806 # delta probable lower bound is larger than target
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	807 # base
ac8b798e602b delta-find: drop the temporary indent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51346 diff changeset	808 return False
51346 898c212e1b2f delta-find: move pre-filtering of individual revision in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51345 diff changeset	809 return True
51345 02cc19f4f091 delta-find: move pre-filtering of candidates in its own function Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51344 diff changeset	810
51350 1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	811 def _pre_filter_rev_delta_chain(self, rev):
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	812 """pre filtering that is needed in sparse revlog cases
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	813
51350 1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	814 return True if it seems okay to test a rev, False otherwise.
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	815
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	816 used by _pre_filter_rev.
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	817 """
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	818 deltas_limit = self.revinfo.textlen * LIMIT_DELTA2TEXT
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	819 # filter out delta base that will never produce good delta
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	820 #
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	821 # if the delta of that base is already bigger than the limit
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	822 # for the delta chain size, doing a delta is hopeless.
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	823 if deltas_limit < self.revlog.length(rev):
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	824 return False
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	825
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	826 # If we reach here, we are about to build and test a delta.
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	827 # The delta building process will compute the chaininfo in all
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	828 # case, since that computation is cached, it is fine to access
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	829 # it here too.
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	830 chainlen, chainsize = self.revlog._chaininfo(rev)
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	831 # if chain will be too long, skip base
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	832 if (
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	833 self.revlog.delta_config.max_chain_len
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	834 and chainlen >= self.revlog.delta_config.max_chain_len
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	835 ):
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	836 return False
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	837 # if chain already have too much data, skip base
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	838 if deltas_limit < chainsize:
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	839 return False
51350 1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	840 return True
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	841
51350 1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	842 def _pre_filter_rev(self, rev):
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	843 """return True if it seems okay to test a rev, False otherwise"""
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	844 if not self._pre_filter_rev_universal(rev):
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	845 return False
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	846 if not self._pre_filter_rev_delta_chain(rev):
1ea56b10dd4a delta-find: split the delta-chain part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51349 diff changeset	847 return False
51349 9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	848 if self.revlog.delta_config.sparse_revlog:
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	849 if not self._pre_filter_rev_sparse(rev):
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	850 return False
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	851
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	852 return True
9a1239c362ae delta-find: split the "sparse" part of `_pre_filter_rev` in a method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51348 diff changeset	853
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	854 def _refined_groups(self):
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	855 good = None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	856 # First we try to reuse a the delta contained in the bundle. (or from
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	857 # the source revlog)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	858 #
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	859 # This logic only applies to general delta repositories and can be
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	860 # disabled through configuration. Disabling reuse source delta is
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	861 # useful when we want to make sure we recomputed "optimal" deltas.
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	862 debug_info = None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	863 if (
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	864 self.cachedelta is not None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	865 and self.cachedelta[2] > DELTA_BASE_REUSE_NO
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	866 ):
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	867 # Assume what we received from the server is a good choice
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	868 # build delta will reuse the cache
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	869 if debug_info is not None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	870 debug_info['cached-delta.tested'] += 1
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	871 good = yield (self.cachedelta[0],)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	872 if good is not None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	873 if debug_info is not None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	874 debug_info['cached-delta.accepted'] += 1
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	875 yield None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	876 return
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	877 groups = self._raw_groups()
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	878 for candidates in groups:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	879 good = yield candidates
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	880 if good is not None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	881 break
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	882
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	883 # If sparse revlog is enabled, we can try to refine the available
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	884 # deltas
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	885 if not self.revlog.delta_config.sparse_revlog:
39518 993d7e2c8b79 snapshot: make sure we'll never refine delta base from a reused source Boris Feld <boris.feld@octobus.net> parents: 39517 diff changeset	886 yield None
993d7e2c8b79 snapshot: make sure we'll never refine delta base from a reused source Boris Feld <boris.feld@octobus.net> parents: 39517 diff changeset	887 return
40415 bafa1c4bb7a8 sparse-revlog: only refine delta candidates in the sparse case (issue6006) Boris Feld <boris.feld@octobus.net> parents: 39793 diff changeset	888
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	889 # if we have a refinable value, try to refine it
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	890 if (
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	891 good is not None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	892 and good not in (self.p1, self.p2)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	893 and self.revlog.issnapshot(good)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	894 ):
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	895 # refine snapshot down
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	896 previous = None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	897 while previous != good:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	898 previous = good
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	899 base = self.revlog.deltaparent(good)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	900 if base == nullrev:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	901 break
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	902 good = yield (base,)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	903 # refine snapshot up
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	904 if not self.snapshot_cache.snapshots:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	905 self.snapshot_cache.update(self.revlog, good + 1)
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	906 previous = None
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	907 while good != previous:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	908 previous = good
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	909 children = tuple(
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	910 sorted(c for c in self.snapshot_cache.snapshots[good])
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	911 )
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	912 good = yield children
39520 5aef5afa8654 snapshot: refine candidate snapshot base upward Boris Feld <boris.feld@octobus.net> parents: 39519 diff changeset	913
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	914 if debug_info is not None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	915 if good is None:
c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	916 debug_info['no-solution'] += 1
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	917
51331 c83074405276 delta-find: move `_refinedgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51330 diff changeset	918 yield None
39513 2f9f7889549b snapshot: introduce an intermediate `_refinedgroups` generator Boris Feld <boris.feld@octobus.net> parents: 39512 diff changeset	919
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	920 def _raw_groups(self):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	921 """Provides group of revision to be tested as delta base
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	922
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	923 This lower level function focus on emitting delta theorically
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	924 interresting without looking it any practical details.
39363 1c6ff52fe9cf revlogdeltas: split candidate groups selection from the filtering logic Boris Feld <boris.feld@octobus.net> parents: 39362 diff changeset	925
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	926 The group order aims at providing fast or small candidates first.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	927 """
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	928 # Why search for delta base if we cannot use a delta base ?
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	929 assert self.revlog.delta_config.general_delta
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	930 # also see issue6056
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	931 sparse = self.revlog.delta_config.sparse_revlog
51342 2e169a222e63 delta-find: fix the computation of the `prev` value Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51341 diff changeset	932 prev = self.target_rev - 1
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	933 deltachain = lambda rev: self.revlog._deltachain(rev)[0]
39363 1c6ff52fe9cf revlogdeltas: split candidate groups selection from the filtering logic Boris Feld <boris.feld@octobus.net> parents: 39362 diff changeset	934
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	935 # exclude already lazy tested base if any
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	936 parents = [p for p in (self.p1, self.p2) if p != nullrev]
39361 507f5b1dd7c8 revlogdeltas: extract _getcandidaterevs in a function Boris Feld <boris.feld@octobus.net> parents: 39360 diff changeset	937
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	938 if (
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	939 not self.revlog.delta_config.delta_both_parents
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	940 and len(parents) == 2
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	941 ):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	942 parents.sort()
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	943 # To minimize the chance of having to build a fulltext,
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	944 # pick first whichever parent is closest to us (max rev)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	945 yield (parents[1],)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	946 # then the other one (min rev) if the first did not fit
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	947 yield (parents[0],)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	948 elif len(parents) > 0:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	949 # Test all parents (1 or 2), and keep the best candidate
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	950 yield parents
39361 507f5b1dd7c8 revlogdeltas: extract _getcandidaterevs in a function Boris Feld <boris.feld@octobus.net> parents: 39360 diff changeset	951
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	952 if sparse and parents:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	953 # See if we can use an existing snapshot in the parent chains to
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	954 # use as a base for a new intermediate-snapshot
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	955 #
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	956 # search for snapshot in parents delta chain map: snapshot-level:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	957 # snapshot-rev
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	958 parents_snaps = collections.defaultdict(set)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	959 candidate_chains = [deltachain(p) for p in parents]
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	960 for chain in candidate_chains:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	961 for idx, s in enumerate(chain):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	962 if not self.revlog.issnapshot(s):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	963 break
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	964 parents_snaps[idx].add(s)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	965 snapfloor = min(parents_snaps[0]) + 1
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	966 self.snapshot_cache.update(self.revlog, snapfloor)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	967 # search for the highest "unrelated" revision
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	968 #
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	969 # Adding snapshots used by "unrelated" revision increase the odd we
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	970 # reuse an independant, yet better snapshot chain.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	971 #
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	972 # XXX instead of building a set of revisions, we could lazily
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	973 # enumerate over the chains. That would be more efficient, however
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	974 # we stick to simple code for now.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	975 all_revs = set()
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	976 for chain in candidate_chains:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	977 all_revs.update(chain)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	978 other = None
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	979 for r in self.revlog.revs(prev, snapfloor):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	980 if r not in all_revs:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	981 other = r
39511 e72130f58f5d snapshot: consider all snapshots in the parents' chains Boris Feld <boris.feld@octobus.net> parents: 39510 diff changeset	982 break
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	983 if other is not None:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	984 # To avoid unfair competition, we won't use unrelated
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	985 # intermediate snapshot that are deeper than the ones from the
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	986 # parent delta chain.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	987 max_depth = max(parents_snaps.keys())
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	988 chain = deltachain(other)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	989 for depth, s in enumerate(chain):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	990 if s < snapfloor:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	991 continue
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	992 if max_depth < depth:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	993 break
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	994 if not self.revlog.issnapshot(s):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	995 break
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	996 parents_snaps[depth].add(s)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	997 # Test them as possible intermediate snapshot base We test them
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	998 # from highest to lowest level. High level one are more likely to
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	999 # result in small delta
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1000 floor = None
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1001 for idx, snaps in sorted(parents_snaps.items(), reverse=True):
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1002 siblings = set()
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1003 for s in snaps:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1004 siblings.update(self.snapshot_cache.snapshots[s])
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1005 # Before considering making a new intermediate snapshot, we
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1006 # check if an existing snapshot, children of base we consider,
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1007 # would be suitable.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1008 #
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1009 # It give a change to reuse a delta chain "unrelated" to the
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1010 # current revision instead of starting our own. Without such
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1011 # re-use, topological branches would keep reopening new chains.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1012 # Creating more and more snapshot as the repository grow.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1013
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1014 if floor is not None:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1015 # We only do this for siblings created after the one in our
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1016 # parent's delta chain. Those created before has less
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1017 # chances to be valid base since our ancestors had to
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1018 # create a new snapshot.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1019 siblings = [r for r in siblings if floor < r]
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1020 yield tuple(sorted(siblings))
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1021 # then test the base from our parent's delta chain.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1022 yield tuple(sorted(snaps))
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1023 floor = min(snaps)
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1024 # No suitable base found in the parent chain, search if any full
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1025 # snapshots emitted since parent's base would be a suitable base
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1026 # for an intermediate snapshot.
39512 6a53842727c1 snapshot: consider unrelated snapshots at a similar level first Boris Feld <boris.feld@octobus.net> parents: 39511 diff changeset	1027 #
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1028 # It give a chance to reuse a delta chain unrelated to the current
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1029 # revisions instead of starting our own. Without such re-use,
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1030 # topological branches would keep reopening new full chains.
39512 6a53842727c1 snapshot: consider unrelated snapshots at a similar level first Boris Feld <boris.feld@octobus.net> parents: 39511 diff changeset	1031 # Creating more and more snapshot as the repository grow.
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1032 full = [
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1033 r
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1034 for r in self.snapshot_cache.snapshots[nullrev]
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1035 if snapfloor <= r
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1036 ]
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1037 yield tuple(sorted(full))
39512 6a53842727c1 snapshot: consider unrelated snapshots at a similar level first Boris Feld <boris.feld@octobus.net> parents: 39511 diff changeset	1038
51332 a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1039 if not sparse:
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1040 # other approach failed try against prev to hopefully save us a
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1041 # fulltext.
a227e061bb4b delta-find: move `_rawgroups` on the `_DeltaSearch` object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51331 diff changeset	1042 yield (prev,)
39361 507f5b1dd7c8 revlogdeltas: extract _getcandidaterevs in a function Boris Feld <boris.feld@octobus.net> parents: 39360 diff changeset	1043
51341 7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1044 def is_good_delta_info(self, deltainfo):
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1045 """Returns True if the given delta is good. Good means that it is
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1046 within the disk span, disk size, and chain length bounds that we know
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1047 to be performant."""
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1048 if deltainfo is None:
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1049 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1050
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1051 # the DELTA_BASE_REUSE_FORCE case should have been taken care of sooner
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1052 # so we should never end up asking such question. Adding the assert as
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1053 # a safe-guard to detect anything that would be fishy in this regard.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1054 assert (
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1055 self.revinfo.cachedelta is None
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1056 or self.revinfo.cachedelta[2] != DELTA_BASE_REUSE_FORCE
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1057 or not self.revlog.delta_config.general_delta
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1058 )
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1059
51351 176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1060 # Bad delta from new delta size:
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1061 #
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1062 # If the delta size is larger than the target text, storing the delta
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1063 # will be inefficient.
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1064 if self.revinfo.textlen < deltainfo.deltalen:
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1065 return False
176d530f59af delta-find: move delta size check earlier in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51350 diff changeset	1066
51341 7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1067 # - 'deltainfo.distance' is the distance from the base revision --
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1068 # bounding it limits the amount of I/O we need to do.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1069
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1070 textlen = self.revinfo.textlen
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1071 defaultmax = textlen * 4
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1072 maxdist = self.revlog.delta_config.max_deltachain_span
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1073 if not maxdist:
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1074 maxdist = deltainfo.distance # ensure the conditional pass
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1075 maxdist = max(maxdist, defaultmax)
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1076
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1077 # Bad delta from read span:
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1078 #
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1079 # If the span of data read is larger than the maximum allowed.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1080 #
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1081 # In the sparse-revlog case, we rely on the associated "sparse
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1082 # reading" to avoid issue related to the span of data. In theory, it
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1083 # would be possible to build pathological revlog where delta pattern
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1084 # would lead to too many reads. However, they do not happen in
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1085 # practice at all. So we skip the span check entirely.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1086 if (
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1087 not self.revlog.delta_config.sparse_revlog
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1088 and maxdist < deltainfo.distance
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1089 ):
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1090 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1091
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1092 # Bad delta from cumulated payload size:
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1093 #
51352 410afe5b13fc delta-find: clarify some comment and code in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51351 diff changeset	1094 # - 'deltainfo.compresseddeltalen' is the sum of the total size of
410afe5b13fc delta-find: clarify some comment and code in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51351 diff changeset	1095 # deltas we need to apply -- bounding it limits the amount of CPU
410afe5b13fc delta-find: clarify some comment and code in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51351 diff changeset	1096 # we consume.
410afe5b13fc delta-find: clarify some comment and code in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51351 diff changeset	1097 max_chain_data = self.revinfo.textlen * LIMIT_DELTA2TEXT
51341 7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1098 # If the sum of delta get larger than K * target text length.
51352 410afe5b13fc delta-find: clarify some comment and code in is_good_delta_info Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51351 diff changeset	1099 if max_chain_data < deltainfo.compresseddeltalen:
51341 7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1100 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1101
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1102 # Bad delta from chain length:
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1103 #
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1104 # If the number of delta in the chain gets too high.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1105 if (
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1106 self.revlog.delta_config.max_chain_len
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1107 and self.revlog.delta_config.max_chain_len < deltainfo.chainlen
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1108 ):
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1109 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1110
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1111 # bad delta from intermediate snapshot size limit
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1112 #
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1113 # If an intermediate snapshot size is higher than the limit. The
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1114 # limit exist to prevent endless chain of intermediate delta to be
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1115 # created.
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1116 if (
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1117 deltainfo.snapshotdepth is not None
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1118 and (textlen >> deltainfo.snapshotdepth) < deltainfo.deltalen
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1119 ):
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1120 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1121
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1122 # bad delta if new intermediate snapshot is larger than the previous
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1123 # snapshot
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1124 if (
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1125 deltainfo.snapshotdepth
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1126 and self.revlog.length(deltainfo.base) < deltainfo.deltalen
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1127 ):
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1128 return False
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1129
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1130 return True
7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1131
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1132
49792 efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1133 class SnapshotCache:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1134 __slots__ = ('snapshots', '_start_rev', '_end_rev')
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1135
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1136 def __init__(self):
49793 b670eb3dd6c9 delta-find: use sets instead of list in the snapshot cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49792 diff changeset	1137 self.snapshots = collections.defaultdict(set)
49792 efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1138 self._start_rev = None
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1139 self._end_rev = None
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1140
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1141 def update(self, revlog, start_rev=0):
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1142 """find snapshots from start_rev to tip"""
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1143 nb_revs = len(revlog)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1144 end_rev = nb_revs - 1
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1145 if start_rev > end_rev:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1146 return # range is empty
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1147
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1148 if self._start_rev is None:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1149 assert self._end_rev is None
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1150 self._update(revlog, start_rev, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1151 elif not (self._start_rev <= start_rev and end_rev <= self._end_rev):
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1152 if start_rev < self._start_rev:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1153 self._update(revlog, start_rev, self._start_rev - 1)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1154 if self._end_rev < end_rev:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1155 self._update(revlog, self._end_rev + 1, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1156
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1157 if self._start_rev is None:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1158 assert self._end_rev is None
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1159 self._end_rev = end_rev
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1160 self._start_rev = start_rev
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1161 else:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1162 self._start_rev = min(self._start_rev, start_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1163 self._end_rev = max(self._end_rev, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1164 assert self._start_rev <= self._end_rev, (
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1165 self._start_rev,
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1166 self._end_rev,
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1167 )
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1168
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1169 def _update(self, revlog, start_rev, end_rev):
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1170 """internal method that actually do update content"""
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1171 assert self._start_rev is None or (
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1172 start_rev < self._start_rev or start_rev > self._end_rev
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1173 ), (self._start_rev, self._end_rev, start_rev, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1174 assert self._start_rev is None or (
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1175 end_rev < self._start_rev or end_rev > self._end_rev
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1176 ), (self._start_rev, self._end_rev, start_rev, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1177 cache = self.snapshots
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50698 diff changeset	1178 if hasattr(revlog.index, 'findsnapshots'):
49792 efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1179 revlog.index.findsnapshots(cache, start_rev, end_rev)
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1180 else:
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1181 deltaparent = revlog.deltaparent
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1182 issnapshot = revlog.issnapshot
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1183 for rev in revlog.revs(start_rev, end_rev):
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1184 if issnapshot(rev):
49793 b670eb3dd6c9 delta-find: use sets instead of list in the snapshot cache Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49792 diff changeset	1185 cache[deltaparent(rev)].add(rev)
49792 efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1186
efbbc2f9121e delta-find: use a smarter object for snapshot caching Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49791 diff changeset	1187
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	1188 class deltacomputer:
51329 da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1189 """object capable of computing delta and finding delta for multiple revision
da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1190
da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1191 This object is meant to compute and find multiple delta applied to the same
da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1192 revlog.
da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1193 """
da7ecb4deaec delta-find: add a small docstring to deltacomputer Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51095 diff changeset	1194
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1195 def __init__(
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1196 self,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1197 revlog,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1198 write_debug=None,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1199 debug_search=False,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1200 debug_info=None,
35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1201 ):
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1202 self.revlog = revlog
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1203 self._write_debug = write_debug
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1204 if write_debug is None:
c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1205 self._debug_search = False
c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1206 else:
c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1207 self._debug_search = debug_search
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1208 self._debug_info = debug_info
49795 c261a628e525 delta-find: use a single snapshot cache when applying a group to an object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49794 diff changeset	1209 self._snapshot_cache = SnapshotCache()
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1210
50377 5d210ff4b657 delta-find: move the `gather_debug` logic in a property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50357 diff changeset	1211 @property
5d210ff4b657 delta-find: move the `gather_debug` logic in a property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50357 diff changeset	1212 def _gather_debug(self):
5d210ff4b657 delta-find: move the `gather_debug` logic in a property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50357 diff changeset	1213 return self._write_debug is not None or self._debug_info is not None
5d210ff4b657 delta-find: move the `gather_debug` logic in a property Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50357 diff changeset	1214
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1215 def buildtext(self, revinfo):
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1216 """Builds a fulltext version of a revision
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1217
47405 34cc102c73f5 revlog: move `revisioninfo` in `revlogutils` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47264 diff changeset	1218 revinfo: revisioninfo instance that contains all needed info
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1219 """
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1220 btext = revinfo.btext
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1221 if btext[0] is not None:
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1222 return btext[0]
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1223
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1224 revlog = self.revlog
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1225 cachedelta = revinfo.cachedelta
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1226 baserev = cachedelta[0]
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1227 delta = cachedelta[1]
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1228
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1229 fulltext = btext[0] = _textfromdelta(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1230 revlog,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1231 baserev,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1232 delta,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1233 revinfo.p1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1234 revinfo.p2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1235 revinfo.flags,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1236 revinfo.node,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1237 )
39358 fd0150a3c2fe revlogdeltas: extra fulltext building in its own function Boris Feld <boris.feld@octobus.net> parents: 39357 diff changeset	1238 return fulltext
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1239
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1240 def _builddeltadiff(self, base, revinfo):
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1241 revlog = self.revlog
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1242 t = self.buildtext(revinfo)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1243 if revlog.iscensored(base):
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1244 # deltas based on a censored revision must replace the
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1245 # full content in one patch, so delta works everywhere
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1246 header = mdiff.replacediffheader(revlog.rawsize(base), len(t))
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1247 delta = header + t
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1248 else:
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1249 ptext = revlog.rawdata(base)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1250 delta = mdiff.textdiff(ptext, t)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1251
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1252 return delta
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1253
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1254 def _builddeltainfo(self, revinfo, base, target_rev=None):
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1255 # can we use the cached delta?
42481 6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1256 revlog = self.revlog
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1257 chainbase = revlog.chainbase(base)
51051 f636103c4d67 revlog: remove legacy usage of `_generaldelta` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51050 diff changeset	1258 if revlog.delta_config.general_delta:
42481 6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1259 deltabase = base
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1260 else:
50356 2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1261 if target_rev is not None and base != target_rev - 1:
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1262 msg = (
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1263 b'general delta cannot use delta for something else '
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1264 b'than `prev`: %d<-%d'
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1265 )
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1266 msg %= (base, target_rev)
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1267 raise error.ProgrammingError(msg)
42481 6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1268 deltabase = chainbase
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1269 snapshotdepth = None
51065 f71f07a679b4 revlog: remove legacy usage of `_sparserevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51063 diff changeset	1270 if revlog.delta_config.sparse_revlog and deltabase == nullrev:
42481 6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1271 snapshotdepth = 0
51065 f71f07a679b4 revlog: remove legacy usage of `_sparserevlog` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51063 diff changeset	1272 elif revlog.delta_config.sparse_revlog and revlog.issnapshot(deltabase):
42481 6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1273 # A delta chain should always be one full snapshot,
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1274 # zero or more semi-snapshots, and zero or more deltas
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1275 p1, p2 = revlog.rev(revinfo.p1), revlog.rev(revinfo.p2)
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1276 if deltabase not in (p1, p2) and revlog.issnapshot(deltabase):
6e9ba867a946 delta: move some delta chain related computation earlier in deltainfo Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42480 diff changeset	1277 snapshotdepth = len(revlog._deltachain(deltabase)[0])
39611 a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1278 delta = None
a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1279 if revinfo.cachedelta:
49789 0fca63953810 find-delta: minor preparatory change Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49788 diff changeset	1280 cachebase = revinfo.cachedelta[0]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1281 # check if the diff still apply
39611 a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1282 currentbase = cachebase
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1283 while (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1284 currentbase != nullrev
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1285 and currentbase != base
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1286 and self.revlog.length(currentbase) == 0
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1287 ):
39611 a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1288 currentbase = self.revlog.deltaparent(currentbase)
51072 26dcdbe15024 revlog: remove legacy usage of `_lazydeltabase` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51068 diff changeset	1289 if self.revlog.delta_config.lazy_delta and currentbase == base:
39611 a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1290 delta = revinfo.cachedelta[1]
a911932d5003 revlog: reuse cached delta for identical base revision (issue5975) Boris Feld <boris.feld@octobus.net> parents: 39610 diff changeset	1291 if delta is None:
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1292 delta = self._builddeltadiff(base, revinfo)
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1293 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1294 msg = b"DBG-DELTAS-SEARCH: uncompressed-delta-size=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1295 msg %= len(delta)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1296 self._write_debug(msg)
42483 c1c1872d25d1 deltas: skip if projected compressed size does not match text size constraint Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42482 diff changeset	1297 # snapshotdept need to be neither None nor 0 level snapshot
51087 5645524c6b62 revlog: also migrates `revlog.upperboundcomp` to ConfigClass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51072 diff changeset	1298 if revlog.delta_config.upper_bound_comp is not None and snapshotdepth:
5645524c6b62 revlog: also migrates `revlog.upperboundcomp` to ConfigClass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51072 diff changeset	1299 lowestrealisticdeltalen = (
5645524c6b62 revlog: also migrates `revlog.upperboundcomp` to ConfigClass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51072 diff changeset	1300 len(delta) // revlog.delta_config.upper_bound_comp
5645524c6b62 revlog: also migrates `revlog.upperboundcomp` to ConfigClass Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51072 diff changeset	1301 )
42483 c1c1872d25d1 deltas: skip if projected compressed size does not match text size constraint Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42482 diff changeset	1302 snapshotlimit = revinfo.textlen >> snapshotdepth
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1303 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1304 msg = b"DBG-DELTAS-SEARCH: projected-lower-size=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1305 msg %= lowestrealisticdeltalen
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1306 self._write_debug(msg)
42483 c1c1872d25d1 deltas: skip if projected compressed size does not match text size constraint Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42482 diff changeset	1307 if snapshotlimit < lowestrealisticdeltalen:
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1308 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1309 msg = b"DBG-DELTAS-SEARCH: DISCARDED (snapshot limit)\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1310 self._write_debug(msg)
42483 c1c1872d25d1 deltas: skip if projected compressed size does not match text size constraint Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42482 diff changeset	1311 return None
42484 9b5fbe5ead89 deltas: skip if projected compressed size is bigger than previous snapshot Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42483 diff changeset	1312 if revlog.length(base) < lowestrealisticdeltalen:
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1313 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1314 msg = b"DBG-DELTAS-SEARCH: DISCARDED (prev size)\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1315 self._write_debug(msg)
42484 9b5fbe5ead89 deltas: skip if projected compressed size is bigger than previous snapshot Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42483 diff changeset	1316 return None
51095 a82704902db8 revlog: move the compression/decompression logic on the inner object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51087 diff changeset	1317 header, data = revlog._inner.compress(delta)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1318 deltalen = len(header) + len(data)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1319 offset = revlog.end(len(revlog) - 1)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1320 dist = deltalen + offset - revlog.start(chainbase)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1321 chainlen, compresseddeltalen = revlog._chaininfo(base)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1322 chainlen += 1
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1323 compresseddeltalen += deltalen
39187 e0da43e2f71f revlog: compute snapshot depth on delta info Boris Feld <boris.feld@octobus.net> parents: 39185 diff changeset	1324
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1325 return _deltainfo(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1326 dist,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1327 deltalen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1328 (header, data),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1329 deltabase,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1330 chainbase,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1331 chainlen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1332 compresseddeltalen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1333 snapshotdepth,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1334 )
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1335
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1336 def _fullsnapshotinfo(self, revinfo, curr):
509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1337 rawtext = self.buildtext(revinfo)
51095 a82704902db8 revlog: move the compression/decompression logic on the inner object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51087 diff changeset	1338 data = self.revlog._inner.compress(rawtext)
39360 5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1339 compresseddeltalen = deltalen = dist = len(data[1]) + len(data[0])
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1340 deltabase = chainbase = curr
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1341 snapshotdepth = 0
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1342 chainlen = 1
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1343
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1344 return _deltainfo(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1345 dist,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1346 deltalen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1347 data,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1348 deltabase,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1349 chainbase,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1350 chainlen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1351 compresseddeltalen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1352 snapshotdepth,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1353 )
39360 5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1354
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1355 def finddeltainfo(self, revinfo, excluded_bases=None, target_rev=None):
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1356 """Find an acceptable delta against a candidate revision
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1357
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1358 revinfo: information about the revision (instance of _revisioninfo)
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1359
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1360 Returns the first acceptable candidate revision, as ordered by
39361 507f5b1dd7c8 revlogdeltas: extract _getcandidaterevs in a function Boris Feld <boris.feld@octobus.net> parents: 39360 diff changeset	1361 _candidategroups
39360 5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1362
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1363 If no suitable deltabase is found, we return delta info for a full
5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1364 snapshot.
47407 1efe3cdef53a revlog: add a ways to blacklist some revision when searching for a delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47405 diff changeset	1365
1efe3cdef53a revlog: add a ways to blacklist some revision when searching for a delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47405 diff changeset	1366 `excluded_bases` is an optional set of revision that cannot be used as
1efe3cdef53a revlog: add a ways to blacklist some revision when searching for a delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47405 diff changeset	1367 a delta base. Use this to recompute delta suitable in censor or strip
1efe3cdef53a revlog: add a ways to blacklist some revision when searching for a delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47405 diff changeset	1368 context.
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1369 """
47462 93f4e183b3f5 deltas: at a `target_rev` parameter to finddeltainfo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47458 diff changeset	1370 if target_rev is None:
47463 f8330a3fc39f censor: implement censoring for revlogv2 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47462 diff changeset	1371 target_rev = len(self.revlog)
47462 93f4e183b3f5 deltas: at a `target_rev` parameter to finddeltainfo Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47458 diff changeset	1372
50382 f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1373 gather_debug = self._gather_debug
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1374 cachedelta = revinfo.cachedelta
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1375 revlog = self.revlog
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1376 p1r = p2r = None
50382 f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1377
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1378 if excluded_bases is None:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1379 excluded_bases = set()
50382 f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1380
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1381 if gather_debug:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1382 start = util.timer()
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1383 dbg = self._one_dbg_data()
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1384 dbg['revision'] = target_rev
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1385 p1r = revlog.rev(revinfo.p1)
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1386 p2r = revlog.rev(revinfo.p2)
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1387 if p1r != nullrev:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1388 p1_chain_len = revlog._chaininfo(p1r)[0]
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1389 else:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1390 p1_chain_len = -1
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1391 if p2r != nullrev:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1392 p2_chain_len = revlog._chaininfo(p2r)[0]
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1393 else:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1394 p2_chain_len = -1
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1395 dbg['p1-chain-len'] = p1_chain_len
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1396 dbg['p2-chain-len'] = p2_chain_len
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1397
50383 bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1398 # 1) if the revision is empty, no amount of delta can beat it
bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1399 #
bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1400 # 2) no delta for flag processor revision (see "candelta" for why)
bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1401 # not calling candelta since only one revision needs test, also to
bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1402 # avoid overhead fetching flags again.
bfb6404089a5 delta-find: gather the condition to blindly use a full snapshot together Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50382 diff changeset	1403 if not revinfo.textlen or revinfo.flags & REVIDX_RAWTEXT_CHANGING_FLAGS:
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1404 deltainfo = self._fullsnapshotinfo(revinfo, target_rev)
50384 485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1405 if gather_debug:
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1406 end = util.timer()
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1407 dbg['duration'] = end - start
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1408 dbg[
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1409 'delta-base'
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1410 ] = deltainfo.base # pytype: disable=attribute-error
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1411 dbg['search_round_count'] = 0
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1412 dbg['using-cached-base'] = False
50384 485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1413 dbg['delta_try_count'] = 0
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1414 dbg['type'] = b"full"
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1415 dbg['snapshot-depth'] = 0
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1416 self._dbg_process_data(dbg)
485c9410b75a deltafind: issue debug information when we fast-path rivial case too Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50383 diff changeset	1417 return deltainfo
39122 dbb3e9e44fce revlog: do not search for delta for empty content Boris Feld <boris.feld@octobus.net> parents: 39121 diff changeset	1418
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1419 deltainfo = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1420
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1421 # If this source delta are to be forcibly reuse, let us comply early.
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1422 if (
51051 f636103c4d67 revlog: remove legacy usage of `_generaldelta` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51050 diff changeset	1423 revlog.delta_config.general_delta
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1424 and revinfo.cachedelta is not None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1425 and revinfo.cachedelta[2] == DELTA_BASE_REUSE_FORCE
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1426 ):
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1427 base = revinfo.cachedelta[0]
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1428 if base == nullrev:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1429 dbg_type = b"full"
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1430 deltainfo = self._fullsnapshotinfo(revinfo, target_rev)
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1431 if gather_debug:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1432 snapshotdepth = 0
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1433 elif base not in excluded_bases:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1434 delta = revinfo.cachedelta[1]
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1435 header, data = revlog.compress(delta)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1436 deltalen = len(header) + len(data)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1437 if gather_debug:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1438 offset = revlog.end(len(revlog) - 1)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1439 chainbase = revlog.chainbase(base)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1440 distance = deltalen + offset - revlog.start(chainbase)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1441 chainlen, compresseddeltalen = revlog._chaininfo(base)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1442 chainlen += 1
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1443 compresseddeltalen += deltalen
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1444 if base == p1r or base == p2r:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1445 dbg_type = b"delta"
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1446 snapshotdepth = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1447 elif not revlog.issnapshot(base):
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1448 snapshotdepth = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1449 else:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1450 dbg_type = b"snapshot"
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1451 snapshotdepth = revlog.snapshotdepth(base) + 1
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1452 else:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1453 distance = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1454 chainbase = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1455 chainlen = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1456 compresseddeltalen = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1457 snapshotdepth = None
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1458 deltainfo = _deltainfo(
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1459 distance=distance,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1460 deltalen=deltalen,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1461 data=(header, data),
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1462 base=base,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1463 chainbase=chainbase,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1464 chainlen=chainlen,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1465 compresseddeltalen=compresseddeltalen,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1466 snapshotdepth=snapshotdepth,
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1467 )
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1468
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1469 if deltainfo is not None:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1470 if gather_debug:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1471 end = util.timer()
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1472 dbg['duration'] = end - start
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1473 dbg[
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1474 'delta-base'
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1475 ] = deltainfo.base # pytype: disable=attribute-error
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1476 dbg['search_round_count'] = 0
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1477 dbg['using-cached-base'] = True
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1478 dbg['delta_try_count'] = 0
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1479 dbg['type'] = b"full"
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1480 if snapshotdepth is None:
51343 0d92d62ecde0 delta-find: use "-1" as depth snapshot-dept for non snapshot in debug Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51342 diff changeset	1481 dbg['snapshot-depth'] = -1
50386 e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1482 else:
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1483 dbg['snapshot-depth'] = snapshotdepth
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1484 self._dbg_process_data(dbg)
e77ca247b85b delta-find: fix pulled-delta-reuse-policy=forced behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50384 diff changeset	1485 return deltainfo
47407 1efe3cdef53a revlog: add a ways to blacklist some revision when searching for a delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47405 diff changeset	1486
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1487 # count the number of different delta we tried (for debug purpose)
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1488 dbg_try_count = 0
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1489 # count the number of "search round" we did. (for debug purpose)
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1490 dbg_try_rounds = 0
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1491 dbg_type = b'unknown'
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1492
50382 f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1493 if p1r is None:
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1494 p1r = revlog.rev(revinfo.p1)
f930b1b1d671 delta-find: initialize the debug information much sooner (when possible) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50381 diff changeset	1495 p2r = revlog.rev(revinfo.p2)
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1496
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1497 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1498 msg = b"DBG-DELTAS-SEARCH: SEARCH rev=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1499 msg %= target_rev
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1500 self._write_debug(msg)
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1501
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	1502 search = _DeltaSearch(
49740 2afee2176775 delta-find: expand a function definition and call before extendin it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49739 diff changeset	1503 self.revlog,
51340 49401b7dec0c delta-find: feed revinfo to _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51338 diff changeset	1504 revinfo,
49740 2afee2176775 delta-find: expand a function definition and call before extendin it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49739 diff changeset	1505 p1r,
2afee2176775 delta-find: expand a function definition and call before extendin it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49739 diff changeset	1506 p2r,
2afee2176775 delta-find: expand a function definition and call before extendin it Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49739 diff changeset	1507 cachedelta,
49741 e706bb41fdb3 delta-find: move pre-filtering with other pre-filtering logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49740 diff changeset	1508 excluded_bases,
e706bb41fdb3 delta-find: move pre-filtering with other pre-filtering logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49740 diff changeset	1509 target_rev,
49795 c261a628e525 delta-find: use a single snapshot cache when applying a group to an object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49794 diff changeset	1510 snapshot_cache=self._snapshot_cache,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42994 diff changeset	1511 )
51330 c82e03b102a6 delta-find: introduce a _DeltaSearch object Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51329 diff changeset	1512
51344 d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1513 while not search.done:
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1514 current_group = search.current_group
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1515 # current_group can be `None`, but not is search.done is False
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1516 # We add this assert to help pytype
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1517 assert current_group is not None
d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1518 candidaterevs = current_group
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1519 dbg_try_rounds += 1
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1520 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1521 prev = None
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1522 if deltainfo is not None:
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1523 prev = deltainfo.base
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1524
49737 78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1525 if (
78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1526 cachedelta is not None
78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1527 and len(candidaterevs) == 1
78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1528 and cachedelta[0] in candidaterevs
78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1529 ):
78ba41878f2e delta-find: add debug information about reuse of cached data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49249 diff changeset	1530 round_type = b"cached-delta"
50381 ebb292ffdf4d delta-find: fix `parents` round detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50380 diff changeset	1531 elif p1r in candidaterevs or p2r in candidaterevs:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1532 round_type = b"parents"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1533 elif prev is not None and all(c < prev for c in candidaterevs):
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1534 round_type = b"refine-down"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1535 elif prev is not None and all(c > prev for c in candidaterevs):
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1536 round_type = b"refine-up"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1537 else:
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1538 round_type = b"search-down"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1539 msg = b"DBG-DELTAS-SEARCH: ROUND #%d - %d candidates - %s\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1540 msg %= (dbg_try_rounds, len(candidaterevs), round_type)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1541 self._write_debug(msg)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1542 nominateddeltas = []
39515 04b75f3a3f2a snapshot: add refining logic at the findeltainfo level Boris Feld <boris.feld@octobus.net> parents: 39514 diff changeset	1543 if deltainfo is not None:
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1544 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1545 msg = (
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1546 b"DBG-DELTAS-SEARCH: CONTENDER: rev=%d - length=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1547 )
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1548 msg %= (deltainfo.base, deltainfo.deltalen)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1549 self._write_debug(msg)
39515 04b75f3a3f2a snapshot: add refining logic at the findeltainfo level Boris Feld <boris.feld@octobus.net> parents: 39514 diff changeset	1550 # if we already found a good delta,
04b75f3a3f2a snapshot: add refining logic at the findeltainfo level Boris Feld <boris.feld@octobus.net> parents: 39514 diff changeset	1551 # challenge it against refined candidates
04b75f3a3f2a snapshot: add refining logic at the findeltainfo level Boris Feld <boris.feld@octobus.net> parents: 39514 diff changeset	1552 nominateddeltas.append(deltainfo)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1553 for candidaterev in candidaterevs:
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1554 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1555 msg = b"DBG-DELTAS-SEARCH: CANDIDATE: rev=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1556 msg %= candidaterev
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1557 self._write_debug(msg)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1558 candidate_type = None
50381 ebb292ffdf4d delta-find: fix `parents` round detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50380 diff changeset	1559 if candidaterev == p1r:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1560 candidate_type = b"p1"
50381 ebb292ffdf4d delta-find: fix `parents` round detection Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50380 diff changeset	1561 elif candidaterev == p2r:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1562 candidate_type = b"p2"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1563 elif self.revlog.issnapshot(candidaterev):
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1564 candidate_type = b"snapshot-%d"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1565 candidate_type %= self.revlog.snapshotdepth(
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1566 candidaterev
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1567 )
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1568
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1569 if candidate_type is not None:
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1570 msg = b"DBG-DELTAS-SEARCH: type=%s\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1571 msg %= candidate_type
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1572 self._write_debug(msg)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1573 msg = b"DBG-DELTAS-SEARCH: size=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1574 msg %= self.revlog.length(candidaterev)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1575 self._write_debug(msg)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1576 msg = b"DBG-DELTAS-SEARCH: base=%d\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1577 msg %= self.revlog.deltaparent(candidaterev)
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1578 self._write_debug(msg)
49741 e706bb41fdb3 delta-find: move pre-filtering with other pre-filtering logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49740 diff changeset	1579
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1580 dbg_try_count += 1
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1581
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1582 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1583 delta_start = util.timer()
50356 2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1584 candidatedelta = self._builddeltainfo(
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1585 revinfo,
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1586 candidaterev,
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1587 target_rev=target_rev,
2a6949ab9d23 delta-find: add a simple safeguard to prevent bad non-general-delta Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50355 diff changeset	1588 )
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1589 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1590 delta_end = util.timer()
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1591 msg = b"DBG-DELTAS-SEARCH: delta-search-time=%f\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1592 msg %= delta_end - delta_start
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1593 self._write_debug(msg)
42482 465f2d0df9ae deltas: accept and skip None return for delta info Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42481 diff changeset	1594 if candidatedelta is not None:
51341 7455cae67260 delta-find: move is_good_delta_info on the _DeltaSearch class Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51340 diff changeset	1595 if search.is_good_delta_info(candidatedelta):
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1596 if self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1597 msg = b"DBG-DELTAS-SEARCH: DELTA: length=%d (GOOD)\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1598 msg %= candidatedelta.deltalen
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1599 self._write_debug(msg)
42482 465f2d0df9ae deltas: accept and skip None return for delta info Valentin Gatien-Baron <vgatien-baron@janestreet.com> parents: 42481 diff changeset	1600 nominateddeltas.append(candidatedelta)
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1601 elif self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1602 msg = b"DBG-DELTAS-SEARCH: DELTA: length=%d (BAD)\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1603 msg %= candidatedelta.deltalen
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1604 self._write_debug(msg)
50378 c84cc0ac77e4 delta-fine: use the `_debug_search` attribute directly Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50377 diff changeset	1605 elif self._debug_search:
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1606 msg = b"DBG-DELTAS-SEARCH: NO-DELTA\n"
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1607 self._write_debug(msg)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1608 if nominateddeltas:
f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1609 deltainfo = min(nominateddeltas, key=lambda x: x.deltalen)
51344 d0d869fccd20 delta-find: move away from the generator API for _DeltaSearch Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51343 diff changeset	1610 search.next_group(deltainfo)
35738 f90f6fd130c1 revlog: group delta computation methods under _deltacomputer object Paul Morelle <paul.morelle@octobus.net> parents: 35737 diff changeset	1611
39360 5d343a24bff5 revlogdeltas: always return a delta info object in finddeltainfo Boris Feld <boris.feld@octobus.net> parents: 39359 diff changeset	1612 if deltainfo is None:
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1613 dbg_type = b"full"
51025 509f0f7fc89e delta-computer: stop explicitly taking file handle Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50952 diff changeset	1614 deltainfo = self._fullsnapshotinfo(revinfo, target_rev)
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1615 elif deltainfo.snapshotdepth: # pytype: disable=attribute-error
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1616 dbg_type = b"snapshot"
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1617 else:
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1618 dbg_type = b"delta"
e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1619
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1620 if gather_debug:
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1621 end = util.timer()
49885 d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1622 if dbg_type == b'full':
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1623 used_cached = (
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1624 cachedelta is not None
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1625 and dbg_try_rounds == 0
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1626 and dbg_try_count == 0
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1627 and cachedelta[0] == nullrev
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1628 )
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1629 else:
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1630 used_cached = (
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1631 cachedelta is not None
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1632 and dbg_try_rounds == 1
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1633 and dbg_try_count == 1
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1634 and deltainfo.base == cachedelta[0]
d57b966cdeb1 delta-find: properly report full snapshot used from cache as such Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49879 diff changeset	1635 )
50380 d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1636 dbg['duration'] = end - start
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1637 dbg[
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1638 'delta-base'
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1639 ] = deltainfo.base # pytype: disable=attribute-error
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1640 dbg['search_round_count'] = dbg_try_rounds
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1641 dbg['using-cached-base'] = used_cached
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1642 dbg['delta_try_count'] = dbg_try_count
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1643 dbg['type'] = dbg_type
49249 b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1644 if (
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1645 deltainfo.snapshotdepth # pytype: disable=attribute-error
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1646 is not None
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1647 ):
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1648 dbg[
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1649 'snapshot-depth'
b909dd35d9ab deltas: add a debug-delta-find command to analyse delta search Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49247 diff changeset	1650 ] = deltainfo.snapshotdepth # pytype: disable=attribute-error
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1651 else:
51343 0d92d62ecde0 delta-find: use "-1" as depth snapshot-dept for non snapshot in debug Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51342 diff changeset	1652 dbg['snapshot-depth'] = -1
50379 4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1653 self._dbg_process_data(dbg)
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1654 return deltainfo
49247 e6b7c6fbeb48 deltas: add code to display information about the result of `finddeltainfo` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49037 diff changeset	1655
50380 d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1656 def _one_dbg_data(self):
51338 46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1657 dbg = {
50380 d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1658 'duration': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1659 'revision': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1660 'delta-base': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1661 'search_round_count': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1662 'using-cached-base': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1663 'delta_try_count': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1664 'type': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1665 'p1-chain-len': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1666 'p2-chain-len': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1667 'snapshot-depth': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1668 'target-revlog': None,
d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1669 }
51338 46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1670 target_revlog = b"UNKNOWN"
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1671 target_type = self.revlog.target[0]
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1672 target_key = self.revlog.target[1]
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1673 if target_type == KIND_CHANGELOG:
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1674 target_revlog = b'CHANGELOG:'
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1675 elif target_type == KIND_MANIFESTLOG:
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1676 target_revlog = b'MANIFESTLOG:'
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1677 if target_key:
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1678 target_revlog += b'%s:' % target_key
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1679 elif target_type == KIND_FILELOG:
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1680 target_revlog = b'FILELOG:'
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1681 if target_key:
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1682 target_revlog += b'%s:' % target_key
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1683 dbg['target-revlog'] = target_revlog
46415df4eb1c delta-find: move filing of some debug data in `_one_dbg_data` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51337 diff changeset	1684 return dbg
50380 d1dc4a03125e delta-find: intrduce a `_one_dbg_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50379 diff changeset	1685
50379 4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1686 def _dbg_process_data(self, dbg):
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1687 if self._debug_info is not None:
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1688 self._debug_info.append(dbg)
49739 35d4c2124073 debug: add an option to display statistic about a unbundling operation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49737 diff changeset	1689
50379 4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1690 if self._write_debug is not None:
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1691 msg = (
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1692 b"DBG-DELTAS:"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1693 b" %-12s"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1694 b" rev=%d:"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1695 b" delta-base=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1696 b" is-cached=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1697 b" - search-rounds=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1698 b" try-count=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1699 b" - delta-type=%-6s"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1700 b" snap-depth=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1701 b" - p1-chain-length=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1702 b" p2-chain-length=%d"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1703 b" - duration=%f"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1704 b"\n"
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1705 )
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1706 msg %= (
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1707 dbg["target-revlog"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1708 dbg["revision"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1709 dbg["delta-base"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1710 dbg["using-cached-base"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1711 dbg["search_round_count"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1712 dbg["delta_try_count"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1713 dbg["type"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1714 dbg["snapshot-depth"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1715 dbg["p1-chain-len"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1716 dbg["p2-chain-len"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1717 dbg["duration"],
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1718 )
4d84b6d52e93 delta-find: move final debug processing in a `_dbg_process_data` method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50378 diff changeset	1719 self._write_debug(msg)
47458 c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1720
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1721
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1722 def delta_compression(default_compression_header, deltainfo):
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1723 """return (COMPRESSION_MODE, deltainfo)
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1724
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1725 used by revlog v2+ format to dispatch between PLAIN and DEFAULT
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1726 compression.
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1727 """
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1728 h, d = deltainfo.data
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1729 compression_mode = COMP_MODE_INLINE
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1730 if not h and not d:
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1731 # not data to store at all... declare them uncompressed
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1732 compression_mode = COMP_MODE_PLAIN
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1733 elif not h:
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1734 t = d[0:1]
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1735 if t == b'\0':
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1736 compression_mode = COMP_MODE_PLAIN
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1737 elif t == default_compression_header:
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1738 compression_mode = COMP_MODE_DEFAULT
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1739 elif h == b'u':
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1740 # we have a more efficient way to declare uncompressed
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1741 h = b''
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1742 compression_mode = COMP_MODE_PLAIN
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1743 deltainfo = drop_u_compression(deltainfo)
c6844912c327 revlog: factor the logic to determine the delta compression out Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47407 diff changeset	1744 return compression_mode, deltainfo

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/revlogutils/deltas.py @ 51352:410afe5b13fc