/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 Canonical Ltd
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2
# Written by Martin Pool.
3
# Modified by Johan Rydberg <jrydberg@gnu.org>
4
# Modified by Robert Collins <robert.collins@canonical.com>
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
5
# Modified by Aaron Bentley <aaron.bentley@utoronto.ca>
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
6
#
7
# This program is free software; you can redistribute it and/or modify
8
# it under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 2 of the License, or
10
# (at your option) any later version.
11
#
12
# This program is distributed in the hope that it will be useful,
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with this program; if not, write to the Free Software
19
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20
21
"""Knit versionedfile implementation.
22
23
A knit is a versioned file implementation that supports efficient append only
24
updates.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
25
26
Knit file layout:
27
lifeless: the data file is made up of "delta records".  each delta record has a delta header 
28
that contains; (1) a version id, (2) the size of the delta (in lines), and (3)  the digest of 
29
the -expanded data- (ie, the delta applied to the parent).  the delta also ends with a 
30
end-marker; simply "end VERSION"
31
32
delta can be line or full contents.a
33
... the 8's there are the index number of the annotation.
34
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
35
59,59,3
36
8
37
8         if ie.executable:
38
8             e.set('executable', 'yes')
39
130,130,2
40
8         if elt.get('executable') == 'yes':
41
8             ie.executable = True
42
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 
43
44
45
whats in an index:
46
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
47
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
48
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
49
09:33 < lifeless> right
50
09:33 < jrydberg> lifeless: the position and size is the range in the data file
51
52
53
so the index sequence is the dictionary compressed sequence number used
54
in the deltas to provide line annotation
55
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
56
"""
57
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
58
# TODOS:
59
# 10:16 < lifeless> make partial index writes safe
60
# 10:16 < lifeless> implement 'knit.check()' like weave.check()
61
# 10:17 < lifeless> record known ghosts so we can detect when they are filled in rather than the current 'reweave 
62
#                    always' approach.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
63
# move sha1 out of the content so that join is faster at verifying parents
64
# record content length ?
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
65
                  
66
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
67
from copy import copy
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
68
from cStringIO import StringIO
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
69
import difflib
1596.2.28 by Robert Collins
more knit profile based tuning.
70
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
71
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
72
import os
1628.1.2 by Robert Collins
More knit micro-optimisations.
73
import sys
1756.2.29 by Aaron Bentley
Remove basis knit support
74
import warnings
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
75
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
76
import bzrlib
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
77
from bzrlib import (
78
    cache_utf8,
79
    errors,
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
80
    patiencediff,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
81
    progress,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
82
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
83
from bzrlib.errors import FileExists, NoSuchFile, KnitError, \
84
        InvalidRevisionId, KnitCorrupt, KnitHeaderError, \
85
        RevisionNotPresent, RevisionAlreadyPresent
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
86
from bzrlib.tuned_gzip import GzipFile
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
87
from bzrlib.trace import mutter
88
from bzrlib.osutils import contains_whitespace, contains_linebreaks, \
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
89
     sha_strings
1756.2.29 by Aaron Bentley
Remove basis knit support
90
from bzrlib.symbol_versioning import DEPRECATED_PARAMETER, deprecated_passed
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
91
from bzrlib.tsort import topo_sort
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
92
import bzrlib.weave
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
93
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
94
95
96
# TODO: Split out code specific to this format into an associated object.
97
98
# TODO: Can we put in some kind of value to check that the index and data
99
# files belong together?
100
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
101
# TODO: accommodate binaries, perhaps by storing a byte count
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
102
103
# TODO: function to check whole file
104
105
# TODO: atomically append data, then measure backwards from the cursor
106
# position after writing to work out where it was located.  we may need to
107
# bypass python file buffering.
108
109
DATA_SUFFIX = '.knit'
110
INDEX_SUFFIX = '.kndx'
111
112
113
class KnitContent(object):
114
    """Content of a knit version to which deltas can be applied."""
115
116
    def __init__(self, lines):
117
        self._lines = lines
118
119
    def annotate_iter(self):
120
        """Yield tuples of (origin, text) for each content line."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
121
        return iter(self._lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
122
123
    def annotate(self):
124
        """Return a list of (origin, text) tuples."""
125
        return list(self.annotate_iter())
126
127
    def line_delta_iter(self, new_lines):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
128
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
129
        new_texts = new_lines.text()
130
        old_texts = self.text()
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
131
        s = KnitSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
132
        for tag, i1, i2, j1, j2 in s.get_opcodes():
133
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
134
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
135
            # ofrom, oto, length, data
136
            yield i1, i2, j2 - j1, new_lines._lines[j1:j2]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
137
138
    def line_delta(self, new_lines):
139
        return list(self.line_delta_iter(new_lines))
140
141
    def text(self):
142
        return [text for origin, text in self._lines]
143
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
144
    def copy(self):
145
        return KnitContent(self._lines[:])
146
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
147
148
class _KnitFactory(object):
149
    """Base factory for creating content objects."""
150
151
    def make(self, lines, version):
152
        num_lines = len(lines)
153
        return KnitContent(zip([version] * num_lines, lines))
154
155
156
class KnitAnnotateFactory(_KnitFactory):
157
    """Factory for creating annotated Content objects."""
158
159
    annotated = True
160
161
    def parse_fulltext(self, content, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
162
        """Convert fulltext to internal representation
163
164
        fulltext content is of the format
165
        revid(utf8) plaintext\n
166
        internal representation is of the format:
167
        (revid, plaintext)
168
        """
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
169
        decode_utf8 = cache_utf8.decode
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
170
        lines = []
171
        for line in content:
172
            origin, text = line.split(' ', 1)
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
173
            lines.append((decode_utf8(origin), text))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
174
        return KnitContent(lines)
175
176
    def parse_line_delta_iter(self, lines):
1628.1.2 by Robert Collins
More knit micro-optimisations.
177
        for result_item in self.parse_line_delta[lines]:
178
            yield result_item
179
180
    def parse_line_delta(self, lines, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
181
        """Convert a line based delta into internal representation.
182
183
        line delta is in the form of:
184
        intstart intend intcount
185
        1..count lines:
186
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
187
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
188
        (start, end, count, [1..count tuples (revid, newline)])
189
        """
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
190
        decode_utf8 = cache_utf8.decode
1628.1.2 by Robert Collins
More knit micro-optimisations.
191
        result = []
192
        lines = iter(lines)
193
        next = lines.next
194
        # walk through the lines parsing.
195
        for header in lines:
196
            start, end, count = [int(n) for n in header.split(',')]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
197
            contents = []
1628.1.2 by Robert Collins
More knit micro-optimisations.
198
            remaining = count
199
            while remaining:
200
                origin, text = next().split(' ', 1)
201
                remaining -= 1
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
202
                contents.append((decode_utf8(origin), text))
1628.1.2 by Robert Collins
More knit micro-optimisations.
203
            result.append((start, end, count, contents))
204
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
205
206
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
207
        """convert a fulltext content record into a serializable form.
208
209
        see parse_fulltext which this inverts.
210
        """
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
211
        encode_utf8 = cache_utf8.encode
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
212
        return ['%s %s' % (encode_utf8(o), t) for o, t in content._lines]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
213
214
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
215
        """convert a delta into a serializable form.
216
1628.1.2 by Robert Collins
More knit micro-optimisations.
217
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
218
        """
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
219
        encode_utf8 = cache_utf8.encode
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
220
        out = []
221
        for start, end, c, lines in delta:
222
            out.append('%d,%d,%d\n' % (start, end, c))
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
223
            out.extend(encode_utf8(origin) + ' ' + text
224
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
225
        return out
226
227
228
class KnitPlainFactory(_KnitFactory):
229
    """Factory for creating plain Content objects."""
230
231
    annotated = False
232
233
    def parse_fulltext(self, content, version):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
234
        """This parses an unannotated fulltext.
235
236
        Note that this is not a noop - the internal representation
237
        has (versionid, line) - its just a constant versionid.
238
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
239
        return self.make(content, version)
240
241
    def parse_line_delta_iter(self, lines, version):
242
        while lines:
243
            header = lines.pop(0)
244
            start, end, c = [int(n) for n in header.split(',')]
245
            yield start, end, c, zip([version] * c, lines[:c])
246
            del lines[:c]
247
248
    def parse_line_delta(self, lines, version):
249
        return list(self.parse_line_delta_iter(lines, version))
250
    
251
    def lower_fulltext(self, content):
252
        return content.text()
253
254
    def lower_line_delta(self, delta):
255
        out = []
256
        for start, end, c, lines in delta:
257
            out.append('%d,%d,%d\n' % (start, end, c))
258
            out.extend([text for origin, text in lines])
259
        return out
260
261
262
def make_empty_knit(transport, relpath):
263
    """Construct a empty knit at the specified location."""
1563.2.5 by Robert Collins
Remove unused transaction references from knit.py and the versionedfile interface.
264
    k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
265
    k._data._open_file()
266
267
268
class KnitVersionedFile(VersionedFile):
269
    """Weave-like structure with faster random access.
270
271
    A knit stores a number of texts and a summary of the relationships
272
    between them.  Texts are identified by a string version-id.  Texts
273
    are normally stored and retrieved as a series of lines, but can
274
    also be passed as single strings.
275
276
    Lines are stored with the trailing newline (if any) included, to
277
    avoid special cases for files with no final newline.  Lines are
278
    composed of 8-bit characters, not unicode.  The combination of
279
    these approaches should mean any 'binary' file can be safely
280
    stored and retrieved.
281
    """
282
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
283
    def __init__(self, relpath, transport, file_mode=None, access_mode=None,
1756.2.29 by Aaron Bentley
Remove basis knit support
284
                 factory=None, basis_knit=DEPRECATED_PARAMETER, delta=True,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
285
                 create=False, create_parent_dir=False, delay_create=False,
286
                 dir_mode=None):
1563.2.25 by Robert Collins
Merge in upstream.
287
        """Construct a knit at location specified by relpath.
288
        
289
        :param create: If not True, only open an existing knit.
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
290
        :param create_parent_dir: If True, create the parent directory if 
291
            creating the file fails. (This is used for stores with 
292
            hash-prefixes that may not exist yet)
293
        :param delay_create: The calling code is aware that the knit won't 
294
            actually be created until the first data is stored.
1563.2.25 by Robert Collins
Merge in upstream.
295
        """
1756.2.29 by Aaron Bentley
Remove basis knit support
296
        if deprecated_passed(basis_knit):
297
            warnings.warn("KnitVersionedFile.__(): The basis_knit parameter is"
298
                 " deprecated as of bzr 0.9.",
299
                 DeprecationWarning, stacklevel=2)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
300
        if access_mode is None:
301
            access_mode = 'w'
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
302
        super(KnitVersionedFile, self).__init__(access_mode)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
303
        assert access_mode in ('r', 'w'), "invalid mode specified %r" % access_mode
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
304
        self.transport = transport
305
        self.filename = relpath
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
306
        self.factory = factory or KnitAnnotateFactory()
307
        self.writable = (access_mode == 'w')
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
308
        self.delta = delta
309
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
310
        self._max_delta_chain = 200
311
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
312
        self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX,
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
313
            access_mode, create=create, file_mode=file_mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
314
            create_parent_dir=create_parent_dir, delay_create=delay_create,
315
            dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
316
        self._data = _KnitData(transport, relpath + DATA_SUFFIX,
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
317
            access_mode, create=create and not len(self), file_mode=file_mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
318
            create_parent_dir=create_parent_dir, delay_create=delay_create,
319
            dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
320
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
321
    def __repr__(self):
322
        return '%s(%s)' % (self.__class__.__name__, 
323
                           self.transport.abspath(self.filename))
324
    
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
325
    def _check_should_delta(self, first_parents):
326
        """Iterate back through the parent listing, looking for a fulltext.
327
328
        This is used when we want to decide whether to add a delta or a new
329
        fulltext. It searches for _max_delta_chain parents. When it finds a
330
        fulltext parent, it sees if the total size of the deltas leading up to
331
        it is large enough to indicate that we want a new full text anyway.
332
333
        Return True if we should create a new delta, False if we should use a
334
        full text.
335
        """
336
        delta_size = 0
337
        fulltext_size = None
338
        delta_parents = first_parents
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
339
        for count in xrange(self._max_delta_chain):
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
340
            parent = delta_parents[0]
341
            method = self._index.get_method(parent)
342
            pos, size = self._index.get_position(parent)
343
            if method == 'fulltext':
344
                fulltext_size = size
345
                break
346
            delta_size += size
347
            delta_parents = self._index.get_parents(parent)
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
348
        else:
349
            # We couldn't find a fulltext, so we must create a new one
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
350
            return False
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
351
352
        return fulltext_size > delta_size
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
353
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
354
    def _add_delta(self, version_id, parents, delta_parent, sha1, noeol, delta):
355
        """See VersionedFile._add_delta()."""
356
        self._check_add(version_id, []) # should we check the lines ?
357
        self._check_versions_present(parents)
358
        present_parents = []
359
        ghosts = []
360
        parent_texts = {}
361
        for parent in parents:
362
            if not self.has_version(parent):
363
                ghosts.append(parent)
364
            else:
365
                present_parents.append(parent)
366
367
        if delta_parent is None:
368
            # reconstitute as full text.
369
            assert len(delta) == 1 or len(delta) == 0
370
            if len(delta):
371
                assert delta[0][0] == 0
1596.2.38 by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready.
372
                assert delta[0][1] == 0, delta[0][1]
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
373
            return super(KnitVersionedFile, self)._add_delta(version_id,
374
                                                             parents,
375
                                                             delta_parent,
376
                                                             sha1,
377
                                                             noeol,
378
                                                             delta)
379
380
        digest = sha1
381
382
        options = []
383
        if noeol:
384
            options.append('no-eol')
385
386
        if delta_parent is not None:
387
            # determine the current delta chain length.
388
            # To speed the extract of texts the delta chain is limited
389
            # to a fixed number of deltas.  This should minimize both
390
            # I/O and the time spend applying deltas.
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
391
            # The window was changed to a maximum of 200 deltas, but also added
392
            # was a check that the total compressed size of the deltas is
393
            # smaller than the compressed size of the fulltext.
394
            if not self._check_should_delta([delta_parent]):
395
                # We don't want a delta here, just do a normal insertion.
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
396
                return super(KnitVersionedFile, self)._add_delta(version_id,
397
                                                                 parents,
398
                                                                 delta_parent,
399
                                                                 sha1,
400
                                                                 noeol,
401
                                                                 delta)
402
403
        options.append('line-delta')
404
        store_lines = self.factory.lower_line_delta(delta)
405
406
        where, size = self._data.add_record(version_id, digest, store_lines)
407
        self._index.add_version(version_id, options, where, size, parents)
408
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
409
    def _add_raw_records(self, records, data):
410
        """Add all the records 'records' with data pre-joined in 'data'.
411
412
        :param records: A list of tuples(version_id, options, parents, size).
413
        :param data: The data for the records. When it is written, the records
414
                     are adjusted to have pos pointing into data by the sum of
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
415
                     the preceding records sizes.
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
416
        """
417
        # write all the data
418
        pos = self._data.add_raw_record(data)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
419
        offset = 0
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
420
        index_entries = []
421
        for (version_id, options, parents, size) in records:
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
422
            index_entries.append((version_id, options, pos+offset,
423
                                  size, parents))
424
            if self._data._do_cache:
425
                self._data._cache[version_id] = data[offset:offset+size]
426
            offset += size
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
427
        self._index.add_versions(index_entries)
428
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
429
    def enable_cache(self):
430
        """Start caching data for this knit"""
431
        self._data.enable_cache()
432
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
433
    def clear_cache(self):
434
        """Clear the data cache only."""
435
        self._data.clear_cache()
436
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
437
    def copy_to(self, name, transport):
438
        """See VersionedFile.copy_to()."""
439
        # copy the current index to a temp index to avoid racing with local
440
        # writes
1955.3.30 by John Arbash Meinel
fix small bug
441
        transport.put_file_non_atomic(name + INDEX_SUFFIX + '.tmp',
1955.3.24 by John Arbash Meinel
Update Knit to use the new non_atomic_foo functions
442
                self.transport.get(self._index._filename))
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
443
        # copy the data file
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
444
        f = self._data._open_file()
445
        try:
1955.3.8 by John Arbash Meinel
avoid some deprecation warnings in other parts of the code
446
            transport.put_file(name + DATA_SUFFIX, f)
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
447
        finally:
448
            f.close()
449
        # move the copied index into place
450
        transport.move(name + INDEX_SUFFIX + '.tmp', name + INDEX_SUFFIX)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
451
1563.2.13 by Robert Collins
InterVersionedFile implemented.
452
    def create_empty(self, name, transport, mode=None):
1955.3.8 by John Arbash Meinel
avoid some deprecation warnings in other parts of the code
453
        return KnitVersionedFile(name, transport, factory=self.factory,
454
                                 delta=self.delta, create=True)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
455
    
1594.2.21 by Robert Collins
Teach versioned files to prevent mutation after finishing.
456
    def _fix_parents(self, version, new_parents):
1594.2.7 by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc.
457
        """Fix the parents list for version.
458
        
459
        This is done by appending a new version to the index
460
        with identical data except for the parents list.
461
        the parents list must be a superset of the current
462
        list.
463
        """
464
        current_values = self._index._cache[version]
465
        assert set(current_values[4]).difference(set(new_parents)) == set()
466
        self._index.add_version(version,
467
                                current_values[1], 
468
                                current_values[2],
469
                                current_values[3],
470
                                new_parents)
471
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
472
    def get_delta(self, version_id):
473
        """Get a delta for constructing version from some other version."""
474
        if not self.has_version(version_id):
475
            raise RevisionNotPresent(version_id, self.filename)
476
        
477
        parents = self.get_parents(version_id)
478
        if len(parents):
479
            parent = parents[0]
480
        else:
481
            parent = None
482
        data_pos, data_size = self._index.get_position(version_id)
483
        data, sha1 = self._data.read_records(((version_id, data_pos, data_size),))[version_id]
484
        version_idx = self._index.lookup(version_id)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
485
        noeol = 'no-eol' in self._index.get_options(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
486
        if 'fulltext' == self._index.get_method(version_id):
487
            new_content = self.factory.parse_fulltext(data, version_idx)
488
            if parent is not None:
489
                reference_content = self._get_content(parent)
490
                old_texts = reference_content.text()
491
            else:
492
                old_texts = []
493
            new_texts = new_content.text()
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
494
            delta_seq = KnitSequenceMatcher(None, old_texts, new_texts)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
495
            return parent, sha1, noeol, self._make_line_delta(delta_seq, new_content)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
496
        else:
497
            delta = self.factory.parse_line_delta(data, version_idx)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
498
            return parent, sha1, noeol, delta
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
499
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
500
    def get_graph_with_ghosts(self):
501
        """See VersionedFile.get_graph_with_ghosts()."""
502
        graph_items = self._index.get_graph()
503
        return dict(graph_items)
504
1666.1.6 by Robert Collins
Make knit the default format.
505
    def get_sha1(self, version_id):
506
        """See VersionedFile.get_sha1()."""
1910.2.65 by Aaron Bentley
Remove the check-parent patch
507
        record_map = self._get_record_map([version_id])
508
        method, content, digest, next = record_map[version_id]
509
        return digest 
1666.1.6 by Robert Collins
Make knit the default format.
510
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
511
    @staticmethod
512
    def get_suffixes():
513
        """See VersionedFile.get_suffixes()."""
514
        return [DATA_SUFFIX, INDEX_SUFFIX]
1563.2.13 by Robert Collins
InterVersionedFile implemented.
515
1594.2.8 by Robert Collins
add ghost aware apis to knits.
516
    def has_ghost(self, version_id):
517
        """True if there is a ghost reference in the file to version_id."""
518
        # maybe we have it
519
        if self.has_version(version_id):
520
            return False
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
521
        # optimisable if needed by memoising the _ghosts set.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
522
        items = self._index.get_graph()
523
        for node, parents in items:
524
            for parent in parents:
525
                if parent not in self._index._cache:
526
                    if parent == version_id:
527
                        return True
528
        return False
529
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
530
    def versions(self):
531
        """See VersionedFile.versions."""
532
        return self._index.get_versions()
533
534
    def has_version(self, version_id):
535
        """See VersionedFile.has_version."""
536
        return self._index.has_version(version_id)
537
538
    __contains__ = has_version
539
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
540
    def _merge_annotations(self, content, parents, parent_texts={},
541
                           delta=None, annotated=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
542
        """Merge annotations for content.  This is done by comparing
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
543
        the annotations based on changed to the text.
544
        """
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
545
        if annotated:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
546
            delta_seq = None
547
            for parent_id in parents:
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
548
                merge_content = self._get_content(parent_id, parent_texts)
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
549
                seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
550
                                   None, merge_content.text(), content.text())
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
551
                if delta_seq is None:
552
                    # setup a delta seq to reuse.
553
                    delta_seq = seq
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
554
                for i, j, n in seq.get_matching_blocks():
555
                    if n == 0:
556
                        continue
557
                    # this appears to copy (origin, text) pairs across to the new
558
                    # content for any line that matches the last-checked parent.
559
                    # FIXME: save the sequence control data for delta compression
560
                    # against the most relevant parent rather than rediffing.
561
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
562
        if delta:
563
            if not annotated:
564
                reference_content = self._get_content(parents[0], parent_texts)
565
                new_texts = content.text()
566
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
567
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
568
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
569
            return self._make_line_delta(delta_seq, content)
570
571
    def _make_line_delta(self, delta_seq, new_content):
572
        """Generate a line delta from delta_seq and new_content."""
573
        diff_hunks = []
574
        for op in delta_seq.get_opcodes():
575
            if op[0] == 'equal':
576
                continue
577
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
578
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
579
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
580
    def _get_components_positions(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
581
        """Produce a map of position data for the components of versions.
582
1756.3.22 by Aaron Bentley
Tweaks from review
583
        This data is intended to be used for retrieving the knit records.
1756.3.19 by Aaron Bentley
Documentation and cleanups
584
585
        A dict of version_id to (method, data_pos, data_size, next) is
586
        returned.
587
        method is the way referenced data should be applied.
588
        data_pos is the position of the data in the knit.
589
        data_size is the size of the data in the knit.
590
        next is the build-parent of the version, or None for fulltexts.
591
        """
1756.3.9 by Aaron Bentley
More optimization refactoring
592
        component_data = {}
593
        for version_id in version_ids:
594
            cursor = version_id
595
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
596
            while cursor is not None and cursor not in component_data:
1756.2.29 by Aaron Bentley
Remove basis knit support
597
                method = self._index.get_method(cursor)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
598
                if method == 'fulltext':
599
                    next = None
600
                else:
1756.2.29 by Aaron Bentley
Remove basis knit support
601
                    next = self.get_parents(cursor)[0]
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
602
                data_pos, data_size = self._index.get_position(cursor)
603
                component_data[cursor] = (method, data_pos, data_size, next)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
604
                cursor = next
605
        return component_data
1756.3.18 by Aaron Bentley
More cleanup
606
       
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
607
    def _get_content(self, version_id, parent_texts={}):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
608
        """Returns a content object that makes up the specified
609
        version."""
610
        if not self.has_version(version_id):
611
            raise RevisionNotPresent(version_id, self.filename)
612
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
613
        cached_version = parent_texts.get(version_id, None)
614
        if cached_version is not None:
615
            return cached_version
616
1756.3.22 by Aaron Bentley
Tweaks from review
617
        text_map, contents_map = self._get_content_maps([version_id])
618
        return contents_map[version_id]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
619
620
    def _check_versions_present(self, version_ids):
621
        """Check that all specified versions are present."""
622
        version_ids = set(version_ids)
623
        for r in list(version_ids):
624
            if self._index.has_version(r):
625
                version_ids.remove(r)
626
        if version_ids:
627
            raise RevisionNotPresent(list(version_ids)[0], self.filename)
628
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
629
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
630
        """See VersionedFile.add_lines_with_ghosts()."""
631
        self._check_add(version_id, lines)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
632
        return self._add(version_id, lines[:], parents, self.delta, parent_texts)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
633
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
634
    def _add_lines(self, version_id, parents, lines, parent_texts):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
635
        """See VersionedFile.add_lines."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
636
        self._check_add(version_id, lines)
637
        self._check_versions_present(parents)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
638
        return self._add(version_id, lines[:], parents, self.delta, parent_texts)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
639
640
    def _check_add(self, version_id, lines):
641
        """check that version_id and lines are safe to add."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
642
        assert self.writable, "knit is not opened for write"
643
        ### FIXME escape. RBC 20060228
644
        if contains_whitespace(version_id):
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
645
            raise InvalidRevisionId(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
646
        if self.has_version(version_id):
647
            raise RevisionAlreadyPresent(version_id, self.filename)
1666.1.6 by Robert Collins
Make knit the default format.
648
        self._check_lines_not_unicode(lines)
649
        self._check_lines_are_lines(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
650
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
651
    def _add(self, version_id, lines, parents, delta, parent_texts):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
652
        """Add a set of lines on top of version specified by parents.
653
654
        If delta is true, compress the text as a line-delta against
655
        the first parent.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
656
657
        Any versions not present will be converted into ghosts.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
658
        """
1596.2.28 by Robert Collins
more knit profile based tuning.
659
        #  461    0   6546.0390     43.9100   bzrlib.knit:489(_add)
660
        # +400    0    889.4890    418.9790   +bzrlib.knit:192(lower_fulltext)
661
        # +461    0   1364.8070    108.8030   +bzrlib.knit:996(add_record)
662
        # +461    0    193.3940     41.5720   +bzrlib.knit:898(add_version)
663
        # +461    0    134.0590     18.3810   +bzrlib.osutils:361(sha_strings)
664
        # +461    0     36.3420     15.4540   +bzrlib.knit:146(make)
665
        # +1383   0      8.0370      8.0370   +<len>
666
        # +61     0     13.5770      7.9190   +bzrlib.knit:199(lower_line_delta)
667
        # +61     0    963.3470      7.8740   +bzrlib.knit:427(_get_content)
668
        # +61     0    973.9950      5.2950   +bzrlib.knit:136(line_delta)
669
        # +61     0   1918.1800      5.2640   +bzrlib.knit:359(_merge_annotations)
670
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
671
        present_parents = []
1594.2.8 by Robert Collins
add ghost aware apis to knits.
672
        ghosts = []
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
673
        if parent_texts is None:
674
            parent_texts = {}
1594.2.8 by Robert Collins
add ghost aware apis to knits.
675
        for parent in parents:
676
            if not self.has_version(parent):
677
                ghosts.append(parent)
1594.2.9 by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all.
678
            else:
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
679
                present_parents.append(parent)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
680
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
681
        if delta and not len(present_parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
682
            delta = False
683
684
        digest = sha_strings(lines)
685
        options = []
686
        if lines:
687
            if lines[-1][-1] != '\n':
688
                options.append('no-eol')
689
                lines[-1] = lines[-1] + '\n'
690
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
691
        if len(present_parents) and delta:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
692
            # To speed the extract of texts the delta chain is limited
693
            # to a fixed number of deltas.  This should minimize both
694
            # I/O and the time spend applying deltas.
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
695
            delta = self._check_should_delta(present_parents)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
696
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
697
        lines = self.factory.make(lines, version_id)
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
698
        if delta or (self.factory.annotated and len(present_parents) > 0):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
699
            # Merge annotations from parent texts if so is needed.
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
700
            delta_hunks = self._merge_annotations(lines, present_parents, parent_texts,
701
                                                  delta, self.factory.annotated)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
702
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
703
        if delta:
704
            options.append('line-delta')
705
            store_lines = self.factory.lower_line_delta(delta_hunks)
706
        else:
707
            options.append('fulltext')
708
            store_lines = self.factory.lower_fulltext(lines)
709
710
        where, size = self._data.add_record(version_id, digest, store_lines)
711
        self._index.add_version(version_id, options, where, size, parents)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
712
        return lines
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
713
1563.2.19 by Robert Collins
stub out a check for knits.
714
    def check(self, progress_bar=None):
715
        """See VersionedFile.check()."""
716
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
717
    def _clone_text(self, new_version_id, old_version_id, parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
718
        """See VersionedFile.clone_text()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
719
        # FIXME RBC 20060228 make fast by only inserting an index with null 
720
        # delta.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
721
        self.add_lines(new_version_id, parents, self.get_lines(old_version_id))
722
723
    def get_lines(self, version_id):
724
        """See VersionedFile.get_lines()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
725
        return self.get_line_list([version_id])[0]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
726
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
727
    def _get_record_map(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
728
        """Produce a dictionary of knit records.
729
        
730
        The keys are version_ids, the values are tuples of (method, content,
731
        digest, next).
732
        method is the way the content should be applied.  
733
        content is a KnitContent object.
734
        digest is the SHA1 digest of this version id after all steps are done
735
        next is the build-parent of the version, i.e. the leftmost ancestor.
736
        If the method is fulltext, next will be None.
737
        """
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
738
        position_map = self._get_components_positions(version_ids)
1756.3.22 by Aaron Bentley
Tweaks from review
739
        # c = component_id, m = method, p = position, s = size, n = next
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
740
        records = [(c, p, s) for c, (m, p, s, n) in position_map.iteritems()]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
741
        record_map = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
742
        for component_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
743
                self._data.read_records_iter(records):
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
744
            method, position, size, next = position_map[component_id]
745
            record_map[component_id] = method, content, digest, next
746
                          
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
747
        return record_map
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
748
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
749
    def get_text(self, version_id):
750
        """See VersionedFile.get_text"""
751
        return self.get_texts([version_id])[0]
752
1756.2.1 by Aaron Bentley
Implement get_texts
753
    def get_texts(self, version_ids):
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
754
        return [''.join(l) for l in self.get_line_list(version_ids)]
755
756
    def get_line_list(self, version_ids):
1756.2.1 by Aaron Bentley
Implement get_texts
757
        """Return the texts of listed versions as a list of strings."""
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
758
        text_map, content_map = self._get_content_maps(version_ids)
759
        return [text_map[v] for v in version_ids]
760
761
    def _get_content_maps(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
762
        """Produce maps of text and KnitContents
763
        
764
        :return: (text_map, content_map) where text_map contains the texts for
765
        the requested versions and content_map contains the KnitContents.
1756.3.22 by Aaron Bentley
Tweaks from review
766
        Both dicts take version_ids as their keys.
1756.3.19 by Aaron Bentley
Documentation and cleanups
767
        """
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
768
        for version_id in version_ids:
1756.2.1 by Aaron Bentley
Implement get_texts
769
            if not self.has_version(version_id):
770
                raise RevisionNotPresent(version_id, self.filename)
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
771
        record_map = self._get_record_map(version_ids)
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
772
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
773
        text_map = {}
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
774
        content_map = {}
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
775
        final_content = {}
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
776
        for version_id in version_ids:
777
            components = []
778
            cursor = version_id
779
            while cursor is not None:
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
780
                method, data, digest, next = record_map[cursor]
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
781
                components.append((cursor, method, data, digest))
782
                if cursor in content_map:
783
                    break
784
                cursor = next
785
1756.2.1 by Aaron Bentley
Implement get_texts
786
            content = None
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
787
            for component_id, method, data, digest in reversed(components):
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
788
                if component_id in content_map:
789
                    content = content_map[component_id]
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
790
                else:
791
                    version_idx = self._index.lookup(component_id)
792
                    if method == 'fulltext':
793
                        assert content is None
794
                        content = self.factory.parse_fulltext(data, version_idx)
795
                    elif method == 'line-delta':
796
                        delta = self.factory.parse_line_delta(data[:], 
797
                                                              version_idx)
798
                        content = content.copy()
799
                        content._lines = self._apply_delta(content._lines, 
800
                                                           delta)
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
801
                    content_map[component_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
802
803
            if 'no-eol' in self._index.get_options(version_id):
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
804
                content = content.copy()
1756.2.1 by Aaron Bentley
Implement get_texts
805
                line = content._lines[-1][1].rstrip('\n')
806
                content._lines[-1] = (content._lines[-1][0], line)
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
807
            final_content[version_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
808
809
            # digest here is the digest from the last applied component.
1756.3.6 by Aaron Bentley
More multi-text extraction
810
            text = content.text()
811
            if sha_strings(text) != digest:
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
812
                raise KnitCorrupt(self.filename, 
813
                                  'sha-1 does not match %s' % version_id)
1756.2.1 by Aaron Bentley
Implement get_texts
814
1756.3.6 by Aaron Bentley
More multi-text extraction
815
            text_map[version_id] = text 
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
816
        return text_map, final_content 
1756.2.1 by Aaron Bentley
Implement get_texts
817
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
818
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
819
                                                pb=None):
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
820
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
821
        if version_ids is None:
822
            version_ids = self.versions()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
823
        if pb is None:
824
            pb = progress.DummyProgress()
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
825
        # we don't care about inclusions, the caller cares.
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
826
        # but we need to setup a list of records to visit.
827
        # we need version_id, position, length
828
        version_id_records = []
1594.3.1 by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
829
        requested_versions = list(version_ids)
830
        # filter for available versions
831
        for version_id in requested_versions:
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
832
            if not self.has_version(version_id):
833
                raise RevisionNotPresent(version_id, self.filename)
1594.3.1 by Robert Collins
Merge transaction finalisation and ensure iter_lines_added_or_present in knits does a old-to-new read in the knit.
834
        # get a in-component-order queue:
835
        version_ids = []
836
        for version_id in self.versions():
837
            if version_id in requested_versions:
838
                version_ids.append(version_id)
839
                data_pos, length = self._index.get_position(version_id)
840
                version_id_records.append((version_id, data_pos, length))
841
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
842
        total = len(version_id_records)
2147.1.3 by John Arbash Meinel
In knit.py we were re-using a variable in 2 loops, causing bogus progress messages to be generated.
843
        for version_idx, (version_id, data, sha_value) in \
844
            enumerate(self._data.read_records_iter(version_id_records)):
845
            pb.update('Walking content.', version_idx, total)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
846
            method = self._index.get_method(version_id)
847
            version_idx = self._index.lookup(version_id)
848
            assert method in ('fulltext', 'line-delta')
849
            if method == 'fulltext':
850
                content = self.factory.parse_fulltext(data, version_idx)
851
                for line in content.text():
852
                    yield line
853
            else:
854
                delta = self.factory.parse_line_delta(data, version_idx)
855
                for start, end, count, lines in delta:
856
                    for origin, line in lines:
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
857
                        yield line
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
858
        pb.update('Walking content.', total, total)
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
859
        
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
860
    def num_versions(self):
861
        """See VersionedFile.num_versions()."""
862
        return self._index.num_versions()
863
864
    __len__ = num_versions
865
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
866
    def annotate_iter(self, version_id):
867
        """See VersionedFile.annotate_iter."""
868
        content = self._get_content(version_id)
869
        for origin, text in content.annotate_iter():
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
870
            yield origin, text
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
871
872
    def get_parents(self, version_id):
873
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
874
        # perf notes:
875
        # optimism counts!
876
        # 52554 calls in 1264 872 internal down from 3674
877
        try:
878
            return self._index.get_parents(version_id)
879
        except KeyError:
880
            raise RevisionNotPresent(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
881
1594.2.8 by Robert Collins
add ghost aware apis to knits.
882
    def get_parents_with_ghosts(self, version_id):
883
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
884
        try:
885
            return self._index.get_parents_with_ghosts(version_id)
886
        except KeyError:
887
            raise RevisionNotPresent(version_id, self.filename)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
888
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
889
    def get_ancestry(self, versions):
890
        """See VersionedFile.get_ancestry."""
891
        if isinstance(versions, basestring):
892
            versions = [versions]
893
        if not versions:
894
            return []
895
        self._check_versions_present(versions)
896
        return self._index.get_ancestry(versions)
897
1594.2.8 by Robert Collins
add ghost aware apis to knits.
898
    def get_ancestry_with_ghosts(self, versions):
899
        """See VersionedFile.get_ancestry_with_ghosts."""
900
        if isinstance(versions, basestring):
901
            versions = [versions]
902
        if not versions:
903
            return []
904
        self._check_versions_present(versions)
905
        return self._index.get_ancestry_with_ghosts(versions)
906
1594.2.6 by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved.
907
    #@deprecated_method(zero_eight)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
908
    def walk(self, version_ids):
909
        """See VersionedFile.walk."""
910
        # We take the short path here, and extract all relevant texts
911
        # and put them in a weave and let that do all the work.  Far
912
        # from optimal, but is much simpler.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
913
        # FIXME RB 20060228 this really is inefficient!
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
914
        from bzrlib.weave import Weave
915
916
        w = Weave(self.filename)
917
        ancestry = self.get_ancestry(version_ids)
918
        sorted_graph = topo_sort(self._index.get_graph())
919
        version_list = [vid for vid in sorted_graph if vid in ancestry]
920
        
921
        for version_id in version_list:
922
            lines = self.get_lines(version_id)
923
            w.add_lines(version_id, self.get_parents(version_id), lines)
924
925
        for lineno, insert_id, dset, line in w.walk(version_ids):
926
            yield lineno, insert_id, dset, line
927
1664.2.3 by Aaron Bentley
Add failing test case
928
    def plan_merge(self, ver_a, ver_b):
1664.2.11 by Aaron Bentley
Clarifications from merge review
929
        """See VersionedFile.plan_merge."""
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
930
        ancestors_b = set(self.get_ancestry(ver_b))
931
        def status_a(revision, text):
932
            if revision in ancestors_b:
933
                return 'killed-b', text
934
            else:
935
                return 'new-a', text
936
        
937
        ancestors_a = set(self.get_ancestry(ver_a))
938
        def status_b(revision, text):
939
            if revision in ancestors_a:
940
                return 'killed-a', text
941
            else:
942
                return 'new-b', text
943
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
944
        annotated_a = self.annotate(ver_a)
945
        annotated_b = self.annotate(ver_b)
1664.2.11 by Aaron Bentley
Clarifications from merge review
946
        plain_a = [t for (a, t) in annotated_a]
947
        plain_b = [t for (a, t) in annotated_b]
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
948
        blocks = KnitSequenceMatcher(None, plain_a, plain_b).get_matching_blocks()
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
949
        a_cur = 0
950
        b_cur = 0
951
        for ai, bi, l in blocks:
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
952
            # process all mismatched sections
953
            # (last mismatched section is handled because blocks always
954
            # includes a 0-length last block)
955
            for revision, text in annotated_a[a_cur:ai]:
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
956
                yield status_a(revision, text)
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
957
            for revision, text in annotated_b[b_cur:bi]:
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
958
                yield status_b(revision, text)
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
959
1664.2.11 by Aaron Bentley
Clarifications from merge review
960
            # and now the matched section
1664.2.13 by Aaron Bentley
Knit plan_merge uses slices instead of xenumerate
961
            a_cur = ai + l
962
            b_cur = bi + l
963
            for text_a, text_b in zip(plain_a[ai:a_cur], plain_b[bi:b_cur]):
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
964
                assert text_a == text_b
965
                yield "unchanged", text_a
966
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
967
968
class _KnitComponentFile(object):
969
    """One of the files used to implement a knit database"""
970
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
971
    def __init__(self, transport, filename, mode, file_mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
972
                 create_parent_dir=False, dir_mode=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
973
        self._transport = transport
974
        self._filename = filename
975
        self._mode = mode
1946.2.3 by John Arbash Meinel
Pass around the file mode correctly
976
        self._file_mode = file_mode
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
977
        self._dir_mode = dir_mode
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
978
        self._create_parent_dir = create_parent_dir
979
        self._need_to_create = False
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
980
981
    def check_header(self, fp):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
982
        line = fp.readline()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
983
        if line != self.HEADER:
984
            raise KnitHeaderError(badline=line)
985
986
    def commit(self):
987
        """Commit is a nop."""
988
989
    def __repr__(self):
990
        return '%s(%s)' % (self.__class__.__name__, self._filename)
991
992
993
class _KnitIndex(_KnitComponentFile):
994
    """Manages knit index file.
995
996
    The index is already kept in memory and read on startup, to enable
997
    fast lookups of revision information.  The cursor of the index
998
    file is always pointing to the end, making it easy to append
999
    entries.
1000
1001
    _cache is a cache for fast mapping from version id to a Index
1002
    object.
1003
1004
    _history is a cache for fast mapping from indexes to version ids.
1005
1006
    The index data format is dictionary compressed when it comes to
1007
    parent references; a index entry may only have parents that with a
1008
    lover index number.  As a result, the index is topological sorted.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
1009
1010
    Duplicate entries may be written to the index for a single version id
1011
    if this is done then the latter one completely replaces the former:
1012
    this allows updates to correct version and parent information. 
1013
    Note that the two entries may share the delta, and that successive
1014
    annotations and references MUST point to the first entry.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1015
1016
    The index file on disc contains a header, followed by one line per knit
1017
    record. The same revision can be present in an index file more than once.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1018
    The first occurrence gets assigned a sequence number starting from 0. 
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1019
    
1020
    The format of a single line is
1021
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1022
    REVISION_ID is a utf8-encoded revision id
1023
    FLAGS is a comma separated list of flags about the record. Values include 
1024
        no-eol, line-delta, fulltext.
1025
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1026
        that the the compressed data starts at.
1027
    LENGTH is the ascii representation of the length of the data file.
1028
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1029
        REVISION_ID.
1030
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1031
        revision id already in the knit that is a parent of REVISION_ID.
1032
    The ' :' marker is the end of record marker.
1033
    
1034
    partial writes:
1035
    when a write is interrupted to the index file, it will result in a line that
1036
    does not end in ' :'. If the ' :' is not present at the end of a line, or at
1037
    the end of the file, then the record that is missing it will be ignored by
1038
    the parser.
1039
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1040
    When writing new records to the index file, the data is preceded by '\n'
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1041
    to ensure that records always start on new lines even if the last write was
1042
    interrupted. As a result its normal for the last line in the index to be
1043
    missing a trailing newline. One can be added with no harmful effects.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1044
    """
1045
1666.1.6 by Robert Collins
Make knit the default format.
1046
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1047
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1048
    # speed of knit parsing went from 280 ms to 280 ms with slots addition.
1049
    # __slots__ = ['_cache', '_history', '_transport', '_filename']
1050
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1051
    def _cache_version(self, version_id, options, pos, size, parents):
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1052
        """Cache a version record in the history array and index cache.
1053
        
1054
        This is inlined into __init__ for performance. KEEP IN SYNC.
1055
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1056
         indexes).
1057
        """
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1058
        # only want the _history index to reference the 1st index entry
1059
        # for version_id
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1060
        if version_id not in self._cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1061
            index = len(self._history)
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1062
            self._history.append(version_id)
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1063
        else:
1064
            index = self._cache[version_id][5]
1065
        self._cache[version_id] = (version_id, 
1066
                                   options,
1067
                                   pos,
1068
                                   size,
1069
                                   parents,
1070
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1071
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1072
    def __init__(self, transport, filename, mode, create=False, file_mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1073
                 create_parent_dir=False, delay_create=False, dir_mode=None):
1074
        _KnitComponentFile.__init__(self, transport, filename, mode,
1075
                                    file_mode=file_mode,
1076
                                    create_parent_dir=create_parent_dir,
1077
                                    dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1078
        self._cache = {}
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
1079
        # position in _history is the 'official' index for a revision
1080
        # but the values may have come from a newer entry.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1081
        # so - wc -l of a knit index is != the number of unique names
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1082
        # in the knit.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1083
        self._history = []
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1084
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1085
        try:
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1086
            count = 0
1087
            total = 1
1088
            try:
1089
                pb.update('read knit index', count, total)
1090
                fp = self._transport.get(self._filename)
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
1091
                try:
1092
                    self.check_header(fp)
1093
                    # readlines reads the whole file at once:
1094
                    # bad for transports like http, good for local disk
1095
                    # we save 60 ms doing this one change (
1096
                    # from calling readline each time to calling
1097
                    # readlines once.
1098
                    # probably what we want for nice behaviour on
1099
                    # http is a incremental readlines that yields, or
1100
                    # a check for local vs non local indexes,
1101
                    for l in fp.readlines():
1102
                        rec = l.split()
1103
                        if len(rec) < 5 or rec[-1] != ':':
1104
                            # corrupt line.
1105
                            # FIXME: in the future we should determine if its a
1106
                            # short write - and ignore it 
1107
                            # or a different failure, and raise. RBC 20060407
1108
                            continue
1109
                        count += 1
1110
                        total += 1
1111
                        #pb.update('read knit index', count, total)
1112
                        # See self._parse_parents
1113
                        parents = []
1114
                        for value in rec[4:-1]:
1115
                            if '.' == value[0]:
1116
                                # uncompressed reference
1117
                                parents.append(value[1:])
1118
                            else:
1119
                                # this is 15/4000ms faster than isinstance,
1120
                                # (in lsprof)
1121
                                # this function is called thousands of times a 
1122
                                # second so small variations add up.
1123
                                assert value.__class__ is str
1124
                                parents.append(self._history[int(value)])
1125
                        # end self._parse_parents
1126
                        # self._cache_version(rec[0], 
1127
                        #                     rec[1].split(','),
1128
                        #                     int(rec[2]),
1129
                        #                     int(rec[3]),
1130
                        #                     parents)
1131
                        # --- self._cache_version
1132
                        # only want the _history index to reference the 1st 
1133
                        # index entry for version_id
1134
                        version_id = rec[0]
1135
                        if version_id not in self._cache:
1136
                            index = len(self._history)
1137
                            self._history.append(version_id)
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1138
                        else:
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
1139
                            index = self._cache[version_id][5]
1140
                        self._cache[version_id] = (version_id,
1141
                                                   rec[1].split(','),
1142
                                                   int(rec[2]),
1143
                                                   int(rec[3]),
1144
                                                   parents,
1145
                                                   index)
1146
                        # --- self._cache_version 
1147
                finally:
1148
                    fp.close()
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1149
            except NoSuchFile, e:
1150
                if mode != 'w' or not create:
1151
                    raise
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1152
                if delay_create:
1153
                    self._need_to_create = True
1154
                else:
1946.2.10 by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic
1155
                    self._transport.put_bytes_non_atomic(self._filename,
1946.2.8 by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
1156
                        self.HEADER, mode=self._file_mode)
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1157
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1158
        finally:
1159
            pb.update('read knit index', total, total)
1160
            pb.finished()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1161
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1162
    def _parse_parents(self, compressed_parents):
1163
        """convert a list of string parent values into version ids.
1164
1165
        ints are looked up in the index.
1166
        .FOO values are ghosts and converted in to FOO.
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1167
1168
        NOTE: the function is retained here for clarity, and for possible
1169
              use in partial index reads. However bulk processing now has
1170
              it inlined in __init__ for inner-loop optimisation.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1171
        """
1172
        result = []
1173
        for value in compressed_parents:
1596.2.15 by Robert Collins
Microprofiling of knit parsing.
1174
            if value[-1] == '.':
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1175
                # uncompressed reference
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1176
                result.append(value[1:])
1177
            else:
1596.2.15 by Robert Collins
Microprofiling of knit parsing.
1178
                # this is 15/4000ms faster than isinstance,
1179
                # this function is called thousands of times a 
1180
                # second so small variations add up.
1181
                assert value.__class__ is str
1596.2.11 by Robert Collins
Remove utf8 debugging code
1182
                result.append(self._history[int(value)])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1183
        return result
1184
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1185
    def get_graph(self):
1186
        graph = []
1187
        for version_id, index in self._cache.iteritems():
1188
            graph.append((version_id, index[4]))
1189
        return graph
1190
1191
    def get_ancestry(self, versions):
1192
        """See VersionedFile.get_ancestry."""
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1193
        # get a graph of all the mentioned versions:
1194
        graph = {}
1195
        pending = set(versions)
1196
        while len(pending):
1197
            version = pending.pop()
1198
            parents = self._cache[version][4]
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1199
            # got the parents ok
1200
            # trim ghosts
1201
            parents = [parent for parent in parents if parent in self._cache]
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1202
            for parent in parents:
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1203
                # if not completed and not a ghost
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1204
                if parent not in graph:
1205
                    pending.add(parent)
1206
            graph[version] = parents
1207
        return topo_sort(graph.items())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1208
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1209
    def get_ancestry_with_ghosts(self, versions):
1210
        """See VersionedFile.get_ancestry_with_ghosts."""
1211
        # get a graph of all the mentioned versions:
1212
        graph = {}
1213
        pending = set(versions)
1214
        while len(pending):
1215
            version = pending.pop()
1216
            try:
1217
                parents = self._cache[version][4]
1218
            except KeyError:
1219
                # ghost, fake it
1220
                graph[version] = []
1221
                pass
1222
            else:
1223
                # got the parents ok
1224
                for parent in parents:
1225
                    if parent not in graph:
1226
                        pending.add(parent)
1227
                graph[version] = parents
1228
        return topo_sort(graph.items())
1229
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1230
    def num_versions(self):
1231
        return len(self._history)
1232
1233
    __len__ = num_versions
1234
1235
    def get_versions(self):
1236
        return self._history
1237
1238
    def idx_to_name(self, idx):
1239
        return self._history[idx]
1240
1241
    def lookup(self, version_id):
1242
        assert version_id in self._cache
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1243
        return self._cache[version_id][5]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1244
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1245
    def _version_list_to_index(self, versions):
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1246
        encode_utf8 = cache_utf8.encode
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1247
        result_list = []
1248
        for version in versions:
1249
            if version in self._cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
1250
                # -- inlined lookup() --
1251
                result_list.append(str(self._cache[version][5]))
1252
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1253
            else:
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
1254
                result_list.append('.' + encode_utf8(version))
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1255
        return ' '.join(result_list)
1256
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1257
    def add_version(self, version_id, options, pos, size, parents):
1258
        """Add a version record to the index."""
1692.4.1 by Robert Collins
Multiple merges:
1259
        self.add_versions(((version_id, options, pos, size, parents),))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1260
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1261
    def add_versions(self, versions):
1262
        """Add multiple versions to the index.
1263
        
1264
        :param versions: a list of tuples:
1265
                         (version_id, options, pos, size, parents).
1266
        """
1267
        lines = []
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1268
        encode_utf8 = cache_utf8.encode
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1269
        orig_history = self._history[:]
1270
        orig_cache = self._cache.copy()
1271
1272
        try:
1273
            for version_id, options, pos, size, parents in versions:
1274
                line = "\n%s %s %s %s %s :" % (encode_utf8(version_id),
1275
                                               ','.join(options),
1276
                                               pos,
1277
                                               size,
1278
                                               self._version_list_to_index(parents))
1279
                assert isinstance(line, str), \
1280
                    'content must be utf-8 encoded: %r' % (line,)
1281
                lines.append(line)
1282
                self._cache_version(version_id, options, pos, size, parents)
1283
            if not self._need_to_create:
1284
                self._transport.append_bytes(self._filename, ''.join(lines))
1285
            else:
1286
                sio = StringIO()
1287
                sio.write(self.HEADER)
1288
                sio.writelines(lines)
1289
                sio.seek(0)
1290
                self._transport.put_file_non_atomic(self._filename, sio,
1291
                                    create_parent_dir=self._create_parent_dir,
1292
                                    mode=self._file_mode,
1293
                                    dir_mode=self._dir_mode)
1294
                self._need_to_create = False
1295
        except:
1296
            # If any problems happen, restore the original values and re-raise
1297
            self._history = orig_history
1298
            self._cache = orig_cache
1299
            raise
1300
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1301
    def has_version(self, version_id):
1302
        """True if the version is in the index."""
1711.9.11 by John Arbash Meinel
change return foo in bar to return (foo in bar)
1303
        return (version_id in self._cache)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1304
1305
    def get_position(self, version_id):
1306
        """Return data position and size of specified version."""
1307
        return (self._cache[version_id][2], \
1308
                self._cache[version_id][3])
1309
1310
    def get_method(self, version_id):
1311
        """Return compression method of specified version."""
1312
        options = self._cache[version_id][1]
1313
        if 'fulltext' in options:
1314
            return 'fulltext'
1315
        else:
1316
            assert 'line-delta' in options
1317
            return 'line-delta'
1318
1319
    def get_options(self, version_id):
1320
        return self._cache[version_id][1]
1321
1322
    def get_parents(self, version_id):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1323
        """Return parents of specified version ignoring ghosts."""
1324
        return [parent for parent in self._cache[version_id][4] 
1325
                if parent in self._cache]
1326
1327
    def get_parents_with_ghosts(self, version_id):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1328
        """Return parents of specified version with ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1329
        return self._cache[version_id][4] 
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1330
1331
    def check_versions_present(self, version_ids):
1332
        """Check that all specified versions are present."""
1333
        version_ids = set(version_ids)
1334
        for version_id in list(version_ids):
1335
            if version_id in self._cache:
1336
                version_ids.remove(version_id)
1337
        if version_ids:
1338
            raise RevisionNotPresent(list(version_ids)[0], self.filename)
1339
1340
1341
class _KnitData(_KnitComponentFile):
1342
    """Contents of the knit data file"""
1343
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1344
    def __init__(self, transport, filename, mode, create=False, file_mode=None,
1946.2.16 by John Arbash Meinel
Small cleanup
1345
                 create_parent_dir=False, delay_create=False,
1346
                 dir_mode=None):
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1347
        _KnitComponentFile.__init__(self, transport, filename, mode,
1946.2.3 by John Arbash Meinel
Pass around the file mode correctly
1348
                                    file_mode=file_mode,
1946.2.16 by John Arbash Meinel
Small cleanup
1349
                                    create_parent_dir=create_parent_dir,
1350
                                    dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1351
        self._checked = False
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
1352
        # TODO: jam 20060713 conceptually, this could spill to disk
1353
        #       if the cached size gets larger than a certain amount
1354
        #       but it complicates the model a bit, so for now just use
1355
        #       a simple dictionary
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1356
        self._cache = {}
1357
        self._do_cache = False
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1358
        if create:
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1359
            if delay_create:
1360
                self._need_to_create = create
1361
            else:
1946.2.10 by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic
1362
                self._transport.put_bytes_non_atomic(self._filename, '',
1946.2.8 by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
1363
                                                     mode=self._file_mode)
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1364
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1365
    def enable_cache(self):
1366
        """Enable caching of reads."""
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
1367
        self._do_cache = True
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1368
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1369
    def clear_cache(self):
1370
        """Clear the record cache."""
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1371
        self._do_cache = False
1372
        self._cache = {}
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1373
1374
    def _open_file(self):
1711.7.25 by John Arbash Meinel
try/finally to close files, _KnitData was keeping a handle to a file it never used again, and using transport.rename() when it wanted transport.move()
1375
        try:
1376
            return self._transport.get(self._filename)
1377
        except NoSuchFile:
1378
            pass
1379
        return None
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1380
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1381
    def _record_to_data(self, version_id, digest, lines):
1382
        """Convert version_id, digest, lines into a raw data block.
1383
        
1384
        :return: (len, a StringIO instance with the raw data ready to read.)
1385
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1386
        sio = StringIO()
1387
        data_file = GzipFile(None, mode='wb', fileobj=sio)
1908.4.10 by John Arbash Meinel
Small cleanups
1388
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1389
        version_id_utf8 = cache_utf8.encode(version_id)
1908.4.5 by John Arbash Meinel
Some small tweaks to knit and tuned_gzip to shave off another couple seconds
1390
        data_file.writelines(chain(
1908.4.3 by John Arbash Meinel
Shave another second off of _record_to_data time, by optimizing single write versus multiple writes
1391
            ["version %s %d %s\n" % (version_id_utf8,
1596.2.28 by Robert Collins
more knit profile based tuning.
1392
                                     len(lines),
1393
                                     digest)],
1394
            lines,
1908.4.5 by John Arbash Meinel
Some small tweaks to knit and tuned_gzip to shave off another couple seconds
1395
            ["end %s\n" % version_id_utf8]))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1396
        data_file.close()
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1397
        length= sio.tell()
1596.2.28 by Robert Collins
more knit profile based tuning.
1398
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1399
        sio.seek(0)
1400
        return length, sio
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1401
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1402
    def add_raw_record(self, raw_data):
1692.4.1 by Robert Collins
Multiple merges:
1403
        """Append a prepared record to the data file.
1404
        
1405
        :return: the offset in the data file raw_data was written.
1406
        """
1596.2.9 by Robert Collins
Utf8 safety in knit indexes.
1407
        assert isinstance(raw_data, str), 'data must be plain bytes'
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1408
        if not self._need_to_create:
1946.2.8 by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
1409
            return self._transport.append_bytes(self._filename, raw_data)
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1410
        else:
1946.2.10 by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic
1411
            self._transport.put_bytes_non_atomic(self._filename, raw_data,
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1412
                                   create_parent_dir=self._create_parent_dir,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1413
                                   mode=self._file_mode,
1414
                                   dir_mode=self._dir_mode)
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1415
            self._need_to_create = False
1416
            return 0
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1417
        
1418
    def add_record(self, version_id, digest, lines):
1419
        """Write new text record to disk.  Returns the position in the
1420
        file where it was written."""
1421
        size, sio = self._record_to_data(version_id, digest, lines)
1422
        # write to disk
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1423
        if not self._need_to_create:
1946.2.8 by John Arbash Meinel
[merge] transport_bytes: bring knit churn up-to-date with new *{bytes,file} functions
1424
            start_pos = self._transport.append_file(self._filename, sio)
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1425
        else:
1946.2.10 by John Arbash Meinel
[merge] up-to-date with Transport.put_*_non_atomic
1426
            self._transport.put_file_non_atomic(self._filename, sio,
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1427
                               create_parent_dir=self._create_parent_dir,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1428
                               mode=self._file_mode,
1429
                               dir_mode=self._dir_mode)
1946.2.1 by John Arbash Meinel
2 changes to knits. Delay creating the .knit or .kndx file until we have actually tried to write data. Because of this, we must allow the Knit to create the prefix directories
1430
            self._need_to_create = False
1431
            start_pos = 0
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1432
        if self._do_cache:
1433
            self._cache[version_id] = sio.getvalue()
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1434
        return start_pos, size
1435
1436
    def _parse_record_header(self, version_id, raw_data):
1437
        """Parse a record header for consistency.
1438
1439
        :return: the header and the decompressor stream.
1440
                 as (stream, header_record)
1441
        """
1442
        df = GzipFile(mode='rb', fileobj=StringIO(raw_data))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1443
        rec = df.readline().split()
1444
        if len(rec) != 4:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1445
            raise KnitCorrupt(self._filename, 'unexpected number of elements in record header')
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1446
        if cache_utf8.decode(rec[1]) != version_id:
1594.3.3 by Robert Collins
Bugfix error message output in knit error raising.
1447
            raise KnitCorrupt(self._filename, 
1594.3.4 by Robert Collins
Change urllib ranges implementation to be one coalesced range per http request.
1448
                              'unexpected version, wanted %r, got %r' % (
1449
                                version_id, rec[1]))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1450
        return df, rec
1451
1452
    def _parse_record(self, version_id, data):
1628.1.2 by Robert Collins
More knit micro-optimisations.
1453
        # profiling notes:
1454
        # 4168 calls in 2880 217 internal
1455
        # 4168 calls to _parse_record_header in 2121
1456
        # 4168 calls to readlines in 330
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1457
        df, rec = self._parse_record_header(version_id, data)
1628.1.2 by Robert Collins
More knit micro-optimisations.
1458
        record_contents = df.readlines()
1459
        l = record_contents.pop()
1460
        assert len(record_contents) == int(rec[2])
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
1461
        if l != 'end %s\n' % cache_utf8.encode(version_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1462
            raise KnitCorrupt(self._filename, 'unexpected version end line %r, wanted %r' 
1463
                        % (l, version_id))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1464
        df.close()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1465
        return record_contents, rec[3]
1466
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1467
    def read_records_iter_raw(self, records):
1468
        """Read text records from data file and yield raw data.
1469
1470
        This unpacks enough of the text record to validate the id is
1471
        as expected but thats all.
1472
        """
1473
        # setup an iterator of the external records:
1474
        # uses readv so nice and fast we hope.
1756.3.23 by Aaron Bentley
Remove knit caches
1475
        if len(records):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1476
            # grab the disk data needed.
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1477
            if self._cache:
1478
                # Don't check _cache if it is empty
1479
                needed_offsets = [(pos, size) for version_id, pos, size
1480
                                              in records
1481
                                              if version_id not in self._cache]
1482
            else:
1483
                needed_offsets = [(pos, size) for version_id, pos, size
1484
                                               in records]
1485
1486
            raw_records = self._transport.readv(self._filename, needed_offsets)
1487
                
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1488
1489
        for version_id, pos, size in records:
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1490
            if version_id in self._cache:
1491
                # This data has already been validated
1492
                data = self._cache[version_id]
1493
            else:
1494
                pos, data = raw_records.next()
1495
                if self._do_cache:
1496
                    self._cache[version_id] = data
1497
1498
                # validate the header
1499
                df, rec = self._parse_record_header(version_id, data)
1500
                df.close()
1756.3.23 by Aaron Bentley
Remove knit caches
1501
            yield version_id, data
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1502
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1503
    def read_records_iter(self, records):
1504
        """Read text records from data file and yield result.
1505
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1506
        The result will be returned in whatever is the fastest to read.
1507
        Not by the order requested. Also, multiple requests for the same
1508
        record will only yield 1 response.
1509
        :param records: A list of (version_id, pos, len) entries
1510
        :return: Yields (version_id, contents, digest) in the order
1511
                 read, not the order requested
1512
        """
1513
        if not records:
1514
            return
1515
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1516
        if self._cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1517
            # Skip records we have alread seen
1518
            yielded_records = set()
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1519
            needed_records = set()
1520
            for record in records:
1521
                if record[0] in self._cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1522
                    if record[0] in yielded_records:
1523
                        continue
1524
                    yielded_records.add(record[0])
1525
                    data = self._cache[record[0]]
1526
                    content, digest = self._parse_record(record[0], data)
1527
                    yield (record[0], content, digest)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1528
                else:
1529
                    needed_records.add(record)
1530
            needed_records = sorted(needed_records, key=operator.itemgetter(1))
1531
        else:
1532
            needed_records = sorted(set(records), key=operator.itemgetter(1))
1756.3.23 by Aaron Bentley
Remove knit caches
1533
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1534
        if not needed_records:
1535
            return
1536
1537
        # The transport optimizes the fetching as well 
1538
        # (ie, reads continuous ranges.)
1539
        readv_response = self._transport.readv(self._filename,
1540
            [(pos, size) for version_id, pos, size in needed_records])
1541
1542
        for (version_id, pos, size), (pos, data) in \
1543
                izip(iter(needed_records), readv_response):
1544
            content, digest = self._parse_record(version_id, data)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1545
            if self._do_cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1546
                self._cache[version_id] = data
1756.3.23 by Aaron Bentley
Remove knit caches
1547
            yield version_id, content, digest
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1548
1549
    def read_records(self, records):
1550
        """Read records into a dictionary."""
1551
        components = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1552
        for record_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
1553
                self.read_records_iter(records):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1554
            components[record_id] = (content, digest)
1555
        return components
1556
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1557
1558
class InterKnit(InterVersionedFile):
1559
    """Optimised code paths for knit to knit operations."""
1560
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1561
    _matching_file_from_factory = KnitVersionedFile
1562
    _matching_file_to_factory = KnitVersionedFile
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1563
    
1564
    @staticmethod
1565
    def is_compatible(source, target):
1566
        """Be compatible with knits.  """
1567
        try:
1568
            return (isinstance(source, KnitVersionedFile) and
1569
                    isinstance(target, KnitVersionedFile))
1570
        except AttributeError:
1571
            return False
1572
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1573
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1574
        """See InterVersionedFile.join."""
1575
        assert isinstance(self.source, KnitVersionedFile)
1576
        assert isinstance(self.target, KnitVersionedFile)
1577
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
1578
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
1579
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1580
        if not version_ids:
1581
            return 0
1582
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1583
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1584
        try:
1585
            version_ids = list(version_ids)
1586
            if None in version_ids:
1587
                version_ids.remove(None)
1588
    
1589
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
1590
            this_versions = set(self.target._index.get_versions())
1591
            needed_versions = self.source_ancestry - this_versions
1592
            cross_check_versions = self.source_ancestry.intersection(this_versions)
1593
            mismatched_versions = set()
1594
            for version in cross_check_versions:
1595
                # scan to include needed parents.
1596
                n1 = set(self.target.get_parents_with_ghosts(version))
1597
                n2 = set(self.source.get_parents_with_ghosts(version))
1598
                if n1 != n2:
1599
                    # FIXME TEST this check for cycles being introduced works
1600
                    # the logic is we have a cycle if in our graph we are an
1601
                    # ancestor of any of the n2 revisions.
1602
                    for parent in n2:
1603
                        if parent in n1:
1604
                            # safe
1605
                            continue
1606
                        else:
1607
                            parent_ancestors = self.source.get_ancestry(parent)
1608
                            if version in parent_ancestors:
1609
                                raise errors.GraphCycleError([parent, version])
1610
                    # ensure this parent will be available later.
1611
                    new_parents = n2.difference(n1)
1612
                    needed_versions.update(new_parents.difference(this_versions))
1613
                    mismatched_versions.add(version)
1614
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1615
            if not needed_versions and not mismatched_versions:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1616
                return 0
1910.2.65 by Aaron Bentley
Remove the check-parent patch
1617
            full_list = topo_sort(self.source.get_graph())
1618
    
1619
            version_list = [i for i in full_list if (not self.target.has_version(i)
1620
                            and i in needed_versions)]
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1621
    
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1622
            # plan the join:
1623
            copy_queue = []
1624
            copy_queue_records = []
1625
            copy_set = set()
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1626
            for version_id in version_list:
1627
                options = self.source._index.get_options(version_id)
1628
                parents = self.source._index.get_parents_with_ghosts(version_id)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1629
                # check that its will be a consistent copy:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1630
                for parent in parents:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1631
                    # if source has the parent, we must :
1632
                    # * already have it or
1633
                    # * have it scheduled already
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1634
                    # otherwise we don't care
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1635
                    assert (self.target.has_version(parent) or
1636
                            parent in copy_set or
1637
                            not self.source.has_version(parent))
1638
                data_pos, data_size = self.source._index.get_position(version_id)
1639
                copy_queue_records.append((version_id, data_pos, data_size))
1640
                copy_queue.append((version_id, options, parents))
1641
                copy_set.add(version_id)
1642
1643
            # data suck the join:
1644
            count = 0
1645
            total = len(version_list)
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1646
            raw_datum = []
1647
            raw_records = []
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1648
            for (version_id, raw_data), \
1649
                (version_id2, options, parents) in \
1650
                izip(self.source._data.read_records_iter_raw(copy_queue_records),
1651
                     copy_queue):
1652
                assert version_id == version_id2, 'logic error, inconsistent results'
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1653
                count = count + 1
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1654
                pb.update("Joining knit", count, total)
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1655
                raw_records.append((version_id, options, parents, len(raw_data)))
1656
                raw_datum.append(raw_data)
1657
            self.target._add_raw_records(raw_records, ''.join(raw_datum))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1658
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1659
            for version in mismatched_versions:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
1660
                # FIXME RBC 20060309 is this needed?
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1661
                n1 = set(self.target.get_parents_with_ghosts(version))
1662
                n2 = set(self.source.get_parents_with_ghosts(version))
1663
                # write a combined record to our history preserving the current 
1664
                # parents as first in the list
1665
                new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1666
                self.target.fix_parents(version, new_parents)
1667
            return count
1668
        finally:
1669
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1670
1671
1672
InterVersionedFile.register_optimiser(InterKnit)
1596.2.24 by Robert Collins
Gzipfile was slightly slower than ideal.
1673
1674
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1675
class WeaveToKnit(InterVersionedFile):
1676
    """Optimised code paths for weave to knit operations."""
1677
    
1678
    _matching_file_from_factory = bzrlib.weave.WeaveFile
1679
    _matching_file_to_factory = KnitVersionedFile
1680
    
1681
    @staticmethod
1682
    def is_compatible(source, target):
1683
        """Be compatible with weaves to knits."""
1684
        try:
1685
            return (isinstance(source, bzrlib.weave.Weave) and
1686
                    isinstance(target, KnitVersionedFile))
1687
        except AttributeError:
1688
            return False
1689
1690
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1691
        """See InterVersionedFile.join."""
1692
        assert isinstance(self.source, bzrlib.weave.Weave)
1693
        assert isinstance(self.target, KnitVersionedFile)
1694
1695
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1696
1697
        if not version_ids:
1698
            return 0
1699
1700
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1701
        try:
1702
            version_ids = list(version_ids)
1703
    
1704
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
1705
            this_versions = set(self.target._index.get_versions())
1706
            needed_versions = self.source_ancestry - this_versions
1707
            cross_check_versions = self.source_ancestry.intersection(this_versions)
1708
            mismatched_versions = set()
1709
            for version in cross_check_versions:
1710
                # scan to include needed parents.
1711
                n1 = set(self.target.get_parents_with_ghosts(version))
1712
                n2 = set(self.source.get_parents(version))
1713
                # if all of n2's parents are in n1, then its fine.
1714
                if n2.difference(n1):
1715
                    # FIXME TEST this check for cycles being introduced works
1716
                    # the logic is we have a cycle if in our graph we are an
1717
                    # ancestor of any of the n2 revisions.
1718
                    for parent in n2:
1719
                        if parent in n1:
1720
                            # safe
1721
                            continue
1722
                        else:
1723
                            parent_ancestors = self.source.get_ancestry(parent)
1724
                            if version in parent_ancestors:
1725
                                raise errors.GraphCycleError([parent, version])
1726
                    # ensure this parent will be available later.
1727
                    new_parents = n2.difference(n1)
1728
                    needed_versions.update(new_parents.difference(this_versions))
1729
                    mismatched_versions.add(version)
1730
    
1731
            if not needed_versions and not mismatched_versions:
1732
                return 0
1733
            full_list = topo_sort(self.source.get_graph())
1734
    
1735
            version_list = [i for i in full_list if (not self.target.has_version(i)
1736
                            and i in needed_versions)]
1737
    
1738
            # do the join:
1739
            count = 0
1740
            total = len(version_list)
1741
            for version_id in version_list:
1742
                pb.update("Converting to knit", count, total)
1743
                parents = self.source.get_parents(version_id)
1744
                # check that its will be a consistent copy:
1745
                for parent in parents:
1746
                    # if source has the parent, we must already have it
1747
                    assert (self.target.has_version(parent))
1748
                self.target.add_lines(
1749
                    version_id, parents, self.source.get_lines(version_id))
1750
                count = count + 1
1751
1752
            for version in mismatched_versions:
1753
                # FIXME RBC 20060309 is this needed?
1754
                n1 = set(self.target.get_parents_with_ghosts(version))
1755
                n2 = set(self.source.get_parents(version))
1756
                # write a combined record to our history preserving the current 
1757
                # parents as first in the list
1758
                new_parents = self.target.get_parents_with_ghosts(version) + list(n2.difference(n1))
1759
                self.target.fix_parents(version, new_parents)
1760
            return count
1761
        finally:
1762
            pb.finished()
1763
1764
1765
InterVersionedFile.register_optimiser(WeaveToKnit)
1766
1767
1711.2.11 by John Arbash Meinel
Rename patiencediff.SequenceMatcher => PatienceSequenceMatcher and knit.SequenceMatcher => KnitSequenceMatcher
1768
class KnitSequenceMatcher(difflib.SequenceMatcher):
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
1769
    """Knit tuned sequence matcher.
1770
1771
    This is based on profiling of difflib which indicated some improvements
1772
    for our usage pattern.
1773
    """
1774
1775
    def find_longest_match(self, alo, ahi, blo, bhi):
1776
        """Find longest matching block in a[alo:ahi] and b[blo:bhi].
1777
1778
        If isjunk is not defined:
1779
1780
        Return (i,j,k) such that a[i:i+k] is equal to b[j:j+k], where
1781
            alo <= i <= i+k <= ahi
1782
            blo <= j <= j+k <= bhi
1783
        and for all (i',j',k') meeting those conditions,
1784
            k >= k'
1785
            i <= i'
1786
            and if i == i', j <= j'
1787
1788
        In other words, of all maximal matching blocks, return one that
1789
        starts earliest in a, and of all those maximal matching blocks that
1790
        start earliest in a, return the one that starts earliest in b.
1791
1792
        >>> s = SequenceMatcher(None, " abcd", "abcd abcd")
1793
        >>> s.find_longest_match(0, 5, 0, 9)
1794
        (0, 4, 5)
1795
1796
        If isjunk is defined, first the longest matching block is
1797
        determined as above, but with the additional restriction that no
1798
        junk element appears in the block.  Then that block is extended as
1799
        far as possible by matching (only) junk elements on both sides.  So
1800
        the resulting block never matches on junk except as identical junk
1801
        happens to be adjacent to an "interesting" match.
1802
1803
        Here's the same example as before, but considering blanks to be
1804
        junk.  That prevents " abcd" from matching the " abcd" at the tail
1805
        end of the second sequence directly.  Instead only the "abcd" can
1806
        match, and matches the leftmost "abcd" in the second sequence:
1807
1808
        >>> s = SequenceMatcher(lambda x: x==" ", " abcd", "abcd abcd")
1809
        >>> s.find_longest_match(0, 5, 0, 9)
1810
        (1, 0, 4)
1811
1812
        If no blocks match, return (alo, blo, 0).
1813
1814
        >>> s = SequenceMatcher(None, "ab", "c")
1815
        >>> s.find_longest_match(0, 2, 0, 1)
1816
        (0, 0, 0)
1817
        """
1818
1819
        # CAUTION:  stripping common prefix or suffix would be incorrect.
1820
        # E.g.,
1821
        #    ab
1822
        #    acab
1823
        # Longest matching block is "ab", but if common prefix is
1824
        # stripped, it's "a" (tied with "b").  UNIX(tm) diff does so
1825
        # strip, so ends up claiming that ab is changed to acab by
1826
        # inserting "ca" in the middle.  That's minimal but unintuitive:
1827
        # "it's obvious" that someone inserted "ac" at the front.
1828
        # Windiff ends up at the same place as diff, but by pairing up
1829
        # the unique 'b's and then matching the first two 'a's.
1830
1831
        a, b, b2j, isbjunk = self.a, self.b, self.b2j, self.isbjunk
1832
        besti, bestj, bestsize = alo, blo, 0
1833
        # find longest junk-free match
1834
        # during an iteration of the loop, j2len[j] = length of longest
1835
        # junk-free match ending with a[i-1] and b[j]
1836
        j2len = {}
1837
        # nothing = []
1838
        b2jget = b2j.get
1839
        for i in xrange(alo, ahi):
1840
            # look at all instances of a[i] in b; note that because
1841
            # b2j has no junk keys, the loop is skipped if a[i] is junk
1842
            j2lenget = j2len.get
1843
            newj2len = {}
1844
            
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1845
            # changing b2j.get(a[i], nothing) to a try:KeyError pair produced the
1596.2.35 by Robert Collins
Subclass SequenceMatcher to get a slightly faster (in our case) find_longest_match routine.
1846
            # following improvement
1847
            #     704  0   4650.5320   2620.7410   bzrlib.knit:1336(find_longest_match)
1848
            # +326674  0   1655.1210   1655.1210   +<method 'get' of 'dict' objects>
1849
            #  +76519  0    374.6700    374.6700   +<method 'has_key' of 'dict' objects>
1850
            # to 
1851
            #     704  0   3733.2820   2209.6520   bzrlib.knit:1336(find_longest_match)
1852
            #  +211400 0   1147.3520   1147.3520   +<method 'get' of 'dict' objects>
1853
            #  +76519  0    376.2780    376.2780   +<method 'has_key' of 'dict' objects>
1854
1855
            try:
1856
                js = b2j[a[i]]
1857
            except KeyError:
1858
                pass
1859
            else:
1860
                for j in js:
1861
                    # a[i] matches b[j]
1862
                    if j >= blo:
1863
                        if j >= bhi:
1864
                            break
1865
                        k = newj2len[j] = 1 + j2lenget(-1 + j, 0)
1866
                        if k > bestsize:
1867
                            besti, bestj, bestsize = 1 + i-k, 1 + j-k, k
1868
            j2len = newj2len
1869
1870
        # Extend the best by non-junk elements on each end.  In particular,
1871
        # "popular" non-junk elements aren't in b2j, which greatly speeds
1872
        # the inner loop above, but also means "the best" match so far
1873
        # doesn't contain any junk *or* popular non-junk elements.
1874
        while besti > alo and bestj > blo and \
1875
              not isbjunk(b[bestj-1]) and \
1876
              a[besti-1] == b[bestj-1]:
1877
            besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1878
        while besti+bestsize < ahi and bestj+bestsize < bhi and \
1879
              not isbjunk(b[bestj+bestsize]) and \
1880
              a[besti+bestsize] == b[bestj+bestsize]:
1881
            bestsize += 1
1882
1883
        # Now that we have a wholly interesting match (albeit possibly
1884
        # empty!), we may as well suck up the matching junk on each
1885
        # side of it too.  Can't think of a good reason not to, and it
1886
        # saves post-processing the (possibly considerable) expense of
1887
        # figuring out what to do with it.  In the case of an empty
1888
        # interesting match, this is clearly the right thing to do,
1889
        # because no other kind of match is possible in the regions.
1890
        while besti > alo and bestj > blo and \
1891
              isbjunk(b[bestj-1]) and \
1892
              a[besti-1] == b[bestj-1]:
1893
            besti, bestj, bestsize = besti-1, bestj-1, bestsize+1
1894
        while besti+bestsize < ahi and bestj+bestsize < bhi and \
1895
              isbjunk(b[bestj+bestsize]) and \
1896
              a[besti+bestsize] == b[bestj+bestsize]:
1897
            bestsize = bestsize + 1
1898
1899
        return besti, bestj, bestsize
1900