/brz/remove-bazaar

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