/brz/remove-bazaar

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