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