/brz/remove-bazaar

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