/brz/remove-bazaar

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