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