/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Knit versionedfile implementation.
18
19
A knit is a versioned file implementation that supports efficient append only
20
updates.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
21
22
Knit file layout:
23
lifeless: the data file is made up of "delta records".  each delta record has a delta header 
24
that contains; (1) a version id, (2) the size of the delta (in lines), and (3)  the digest of 
25
the -expanded data- (ie, the delta applied to the parent).  the delta also ends with a 
26
end-marker; simply "end VERSION"
27
28
delta can be line or full contents.a
29
... the 8's there are the index number of the annotation.
30
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
31
59,59,3
32
8
33
8         if ie.executable:
34
8             e.set('executable', 'yes')
35
130,130,2
36
8         if elt.get('executable') == 'yes':
37
8             ie.executable = True
38
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 
39
40
41
whats in an index:
42
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
43
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
44
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
45
09:33 < lifeless> right
46
09:33 < jrydberg> lifeless: the position and size is the range in the data file
47
48
49
so the index sequence is the dictionary compressed sequence number used
50
in the deltas to provide line annotation
51
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
52
"""
53
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
54
# TODOS:
55
# 10:16 < lifeless> make partial index writes safe
56
# 10:16 < lifeless> implement 'knit.check()' like weave.check()
57
# 10:17 < lifeless> record known ghosts so we can detect when they are filled in rather than the current 'reweave 
58
#                    always' approach.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
59
# move sha1 out of the content so that join is faster at verifying parents
60
# record content length ?
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
61
                  
62
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
63
from copy import copy
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
64
from cStringIO import StringIO
1596.2.28 by Robert Collins
more knit profile based tuning.
65
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
66
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
67
import os
1628.1.2 by Robert Collins
More knit micro-optimisations.
68
import sys
1756.2.29 by Aaron Bentley
Remove basis knit support
69
import warnings
2762.3.1 by Robert Collins
* The compression used within the bzr repository has changed from zlib
70
from zlib import Z_DEFAULT_COMPRESSION
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
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import (
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
76
    annotate,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
77
    pack,
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
78
    trace,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
79
    )
80
""")
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
81
from bzrlib import (
82
    cache_utf8,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
83
    debug,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
84
    diff,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
85
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
86
    osutils,
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
87
    patiencediff,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
88
    progress,
1551.15.46 by Aaron Bentley
Move plan merge to tree
89
    merge,
2196.2.1 by John Arbash Meinel
Merge Dmitry's optimizations and minimize the actual diff.
90
    ui,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
91
    )
92
from bzrlib.errors import (
93
    FileExists,
94
    NoSuchFile,
95
    KnitError,
96
    InvalidRevisionId,
97
    KnitCorrupt,
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
98
    KnitDataStreamIncompatible,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
99
    KnitHeaderError,
100
    RevisionNotPresent,
101
    RevisionAlreadyPresent,
102
    )
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
103
from bzrlib.tuned_gzip import GzipFile, bytes_to_gzip
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
104
from bzrlib.osutils import (
105
    contains_whitespace,
106
    contains_linebreaks,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
107
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
108
    sha_strings,
109
    )
1756.2.29 by Aaron Bentley
Remove basis knit support
110
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.
111
from bzrlib.tsort import topo_sort
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
112
import bzrlib.ui
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
113
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
114
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
115
116
117
# TODO: Split out code specific to this format into an associated object.
118
119
# TODO: Can we put in some kind of value to check that the index and data
120
# files belong together?
121
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
122
# 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.
123
124
# TODO: function to check whole file
125
126
# TODO: atomically append data, then measure backwards from the cursor
127
# position after writing to work out where it was located.  we may need to
128
# bypass python file buffering.
129
130
DATA_SUFFIX = '.knit'
131
INDEX_SUFFIX = '.kndx'
132
133
134
class KnitContent(object):
135
    """Content of a knit version to which deltas can be applied."""
136
137
    def annotate(self):
138
        """Return a list of (origin, text) tuples."""
139
        return list(self.annotate_iter())
140
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
141
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
142
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
143
        raise NotImplementedError(self.apply_delta)
144
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
145
    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.
146
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
147
        new_texts = new_lines.text()
148
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
149
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
150
        for tag, i1, i2, j1, j2 in s.get_opcodes():
151
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
152
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
153
            # ofrom, oto, length, data
154
            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.
155
156
    def line_delta(self, new_lines):
157
        return list(self.line_delta_iter(new_lines))
158
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
159
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
160
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
161
        """Extract SequenceMatcher.get_matching_blocks() from a knit delta"""
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
162
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
163
        s_pos = 0
164
        t_pos = 0
165
        for s_begin, s_end, t_len, new_text in knit_delta:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
166
            true_n = s_begin - s_pos
167
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
168
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
169
                # knit deltas do not provide reliable info about whether the
170
                # last line of a file matches, due to eol handling.
171
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
172
                    n-=1
173
                if n > 0:
174
                    yield s_pos, t_pos, n
175
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
176
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
177
        n = target_len - t_pos
178
        if n > 0:
179
            if source[s_pos + n -1] != target[t_pos + n -1]:
180
                n-=1
181
            if n > 0:
182
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
183
        yield s_pos + (target_len - t_pos), target_len, 0
184
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
185
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
186
class AnnotatedKnitContent(KnitContent):
187
    """Annotated content."""
188
189
    def __init__(self, lines):
190
        self._lines = lines
191
192
    def annotate_iter(self):
193
        """Yield tuples of (origin, text) for each content line."""
194
        return iter(self._lines)
195
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
196
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
197
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
198
        offset = 0
199
        lines = self._lines
200
        for start, end, count, delta_lines in delta:
201
            lines[offset+start:offset+end] = delta_lines
202
            offset = offset + (start - end) + count
203
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
204
    def strip_last_line_newline(self):
205
        line = self._lines[-1][1].rstrip('\n')
206
        self._lines[-1] = (self._lines[-1][0], line)
207
208
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
209
        try:
210
            return [text for origin, text in self._lines]
211
        except ValueError, e:
212
            # most commonly (only?) caused by the internal form of the knit
213
            # missing annotation information because of a bug - see thread
214
            # around 20071015
215
            raise KnitCorrupt(self,
216
                "line in annotated knit missing annotation information: %s"
217
                % (e,))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
218
219
    def copy(self):
220
        return AnnotatedKnitContent(self._lines[:])
221
222
223
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
224
    """Unannotated content.
225
    
226
    When annotate[_iter] is called on this content, the same version is reported
227
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
228
    objects.
229
    """
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
230
231
    def __init__(self, lines, version_id):
232
        self._lines = lines
233
        self._version_id = version_id
234
235
    def annotate_iter(self):
236
        """Yield tuples of (origin, text) for each content line."""
237
        for line in self._lines:
238
            yield self._version_id, line
239
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
240
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
241
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
242
        offset = 0
243
        lines = self._lines
244
        for start, end, count, delta_lines in delta:
245
            lines[offset+start:offset+end] = delta_lines
246
            offset = offset + (start - end) + count
247
        self._version_id = new_version_id
248
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
249
    def copy(self):
250
        return PlainKnitContent(self._lines[:], self._version_id)
251
252
    def strip_last_line_newline(self):
253
        self._lines[-1] = self._lines[-1].rstrip('\n')
254
255
    def text(self):
256
        return self._lines
257
258
259
class KnitAnnotateFactory(object):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
260
    """Factory for creating annotated Content objects."""
261
262
    annotated = True
263
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
264
    def make(self, lines, version_id):
265
        num_lines = len(lines)
266
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
267
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
268
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
269
        """Convert fulltext to internal representation
270
271
        fulltext content is of the format
272
        revid(utf8) plaintext\n
273
        internal representation is of the format:
274
        (revid, plaintext)
275
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
276
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
277
        #       but the code itself doesn't really depend on that.
278
        #       Figure out a way to not require the overhead of turning the
279
        #       list back into tuples.
280
        lines = [tuple(line.split(' ', 1)) for line in content]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
281
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
282
283
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
284
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
285
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
286
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
287
        """Convert a line based delta into internal representation.
288
289
        line delta is in the form of:
290
        intstart intend intcount
291
        1..count lines:
292
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
293
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
294
        (start, end, count, [1..count tuples (revid, newline)])
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
295
296
        :param plain: If True, the lines are returned as a plain
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
297
            list without annotations, not as a list of (origin, content) tuples, i.e.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
298
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
299
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
300
        result = []
301
        lines = iter(lines)
302
        next = lines.next
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
303
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
304
        cache = {}
305
        def cache_and_return(line):
306
            origin, text = line.split(' ', 1)
307
            return cache.setdefault(origin, origin), text
308
1628.1.2 by Robert Collins
More knit micro-optimisations.
309
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
310
        # Note that the plain test is explicitly pulled out of the
311
        # loop to minimise any performance impact
312
        if plain:
313
            for header in lines:
314
                start, end, count = [int(n) for n in header.split(',')]
315
                contents = [next().split(' ', 1)[1] for i in xrange(count)]
316
                result.append((start, end, count, contents))
317
        else:
318
            for header in lines:
319
                start, end, count = [int(n) for n in header.split(',')]
320
                contents = [tuple(next().split(' ', 1)) for i in xrange(count)]
321
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
322
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
323
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
324
    def get_fulltext_content(self, lines):
325
        """Extract just the content lines from a fulltext."""
326
        return (line.split(' ', 1)[1] for line in lines)
327
328
    def get_linedelta_content(self, lines):
329
        """Extract just the content from a line delta.
330
331
        This doesn't return all of the extra information stored in a delta.
332
        Only the actual content lines.
333
        """
334
        lines = iter(lines)
335
        next = lines.next
336
        for header in lines:
337
            header = header.split(',')
338
            count = int(header[2])
339
            for i in xrange(count):
340
                origin, text = next().split(' ', 1)
341
                yield text
342
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
343
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
344
        """convert a fulltext content record into a serializable form.
345
346
        see parse_fulltext which this inverts.
347
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
348
        # TODO: jam 20070209 We only do the caching thing to make sure that
349
        #       the origin is a valid utf-8 line, eventually we could remove it
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
350
        return ['%s %s' % (o, t) for o, t in content._lines]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
351
352
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
353
        """convert a delta into a serializable form.
354
1628.1.2 by Robert Collins
More knit micro-optimisations.
355
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
356
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
357
        # TODO: jam 20070209 We only do the caching thing to make sure that
358
        #       the origin is a valid utf-8 line, eventually we could remove it
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
359
        out = []
360
        for start, end, c, lines in delta:
361
            out.append('%d,%d,%d\n' % (start, end, c))
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
362
            out.extend(origin + ' ' + text
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
363
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
364
        return out
365
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
366
    def annotate_iter(self, knit, version_id):
367
        content = knit._get_content(version_id)
2770.1.9 by Aaron Bentley
Simplify annotate iterator
368
        return content.annotate_iter()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
369
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
370
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
371
class KnitPlainFactory(object):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
372
    """Factory for creating plain Content objects."""
373
374
    annotated = False
375
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
376
    def make(self, lines, version_id):
377
        return PlainKnitContent(lines, version_id)
378
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
379
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
380
        """This parses an unannotated fulltext.
381
382
        Note that this is not a noop - the internal representation
383
        has (versionid, line) - its just a constant versionid.
384
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
385
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
386
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
387
    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
388
        cur = 0
389
        num_lines = len(lines)
390
        while cur < num_lines:
391
            header = lines[cur]
392
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
393
            start, end, c = [int(n) for n in header.split(',')]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
394
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
395
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
396
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
397
    def parse_line_delta(self, lines, version_id):
398
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
399
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
400
    def get_fulltext_content(self, lines):
401
        """Extract just the content lines from a fulltext."""
402
        return iter(lines)
403
404
    def get_linedelta_content(self, lines):
405
        """Extract just the content from a line delta.
406
407
        This doesn't return all of the extra information stored in a delta.
408
        Only the actual content lines.
409
        """
410
        lines = iter(lines)
411
        next = lines.next
412
        for header in lines:
413
            header = header.split(',')
414
            count = int(header[2])
415
            for i in xrange(count):
416
                yield next()
417
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
418
    def lower_fulltext(self, content):
419
        return content.text()
420
421
    def lower_line_delta(self, delta):
422
        out = []
423
        for start, end, c, lines in delta:
424
            out.append('%d,%d,%d\n' % (start, end, c))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
425
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
426
        return out
427
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
428
    def annotate_iter(self, knit, version_id):
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
429
        return annotate_knit(knit, version_id)
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
430
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
431
432
def make_empty_knit(transport, relpath):
433
    """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.
434
    k = KnitVersionedFile(transport, relpath, 'w', KnitPlainFactory)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
435
436
437
class KnitVersionedFile(VersionedFile):
438
    """Weave-like structure with faster random access.
439
440
    A knit stores a number of texts and a summary of the relationships
441
    between them.  Texts are identified by a string version-id.  Texts
442
    are normally stored and retrieved as a series of lines, but can
443
    also be passed as single strings.
444
445
    Lines are stored with the trailing newline (if any) included, to
446
    avoid special cases for files with no final newline.  Lines are
447
    composed of 8-bit characters, not unicode.  The combination of
448
    these approaches should mean any 'binary' file can be safely
449
    stored and retrieved.
450
    """
451
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
452
    def __init__(self, relpath, transport, file_mode=None, access_mode=None,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
453
        factory=None, delta=True, create=False, create_parent_dir=False,
454
        delay_create=False, dir_mode=None, index=None, access_method=None):
1563.2.25 by Robert Collins
Merge in upstream.
455
        """Construct a knit at location specified by relpath.
456
        
457
        :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
458
        :param create_parent_dir: If True, create the parent directory if 
459
            creating the file fails. (This is used for stores with 
460
            hash-prefixes that may not exist yet)
461
        :param delay_create: The calling code is aware that the knit won't 
462
            actually be created until the first data is stored.
2592.3.1 by Robert Collins
Allow giving KnitVersionedFile an index object to use rather than implicitly creating one.
463
        :param index: An index to use for the knit.
1563.2.25 by Robert Collins
Merge in upstream.
464
        """
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
465
        if access_mode is None:
466
            access_mode = 'w'
1594.2.23 by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files.
467
        super(KnitVersionedFile, self).__init__(access_mode)
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
468
        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.
469
        self.transport = transport
470
        self.filename = relpath
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
471
        self.factory = factory or KnitAnnotateFactory()
472
        self.writable = (access_mode == 'w')
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
473
        self.delta = delta
474
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
475
        self._max_delta_chain = 200
476
2592.3.1 by Robert Collins
Allow giving KnitVersionedFile an index object to use rather than implicitly creating one.
477
        if index is None:
478
            self._index = _KnitIndex(transport, relpath + INDEX_SUFFIX,
479
                access_mode, create=create, file_mode=file_mode,
480
                create_parent_dir=create_parent_dir, delay_create=delay_create,
481
                dir_mode=dir_mode)
482
        else:
483
            self._index = index
2592.3.69 by Robert Collins
Allow specifying an access method to KnitVersionedFile.
484
        if access_method is None:
485
            _access = _KnitAccess(transport, relpath + DATA_SUFFIX, file_mode, dir_mode,
486
                ((create and not len(self)) and delay_create), create_parent_dir)
487
        else:
488
            _access = access_method
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
489
        if create and not len(self) and not delay_create:
490
            _access.create()
491
        self._data = _KnitData(_access)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
492
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
493
    def __repr__(self):
2592.3.159 by Robert Collins
Provide a transport for KnitVersionedFile's __repr__ in pack repositories.
494
        return '%s(%s)' % (self.__class__.__name__,
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
495
                           self.transport.abspath(self.filename))
496
    
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
497
    def _check_should_delta(self, first_parents):
498
        """Iterate back through the parent listing, looking for a fulltext.
499
500
        This is used when we want to decide whether to add a delta or a new
501
        fulltext. It searches for _max_delta_chain parents. When it finds a
502
        fulltext parent, it sees if the total size of the deltas leading up to
503
        it is large enough to indicate that we want a new full text anyway.
504
505
        Return True if we should create a new delta, False if we should use a
506
        full text.
507
        """
508
        delta_size = 0
509
        fulltext_size = None
510
        delta_parents = first_parents
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
511
        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
512
            parent = delta_parents[0]
513
            method = self._index.get_method(parent)
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
514
            index, pos, size = self._index.get_position(parent)
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
515
            if method == 'fulltext':
516
                fulltext_size = size
517
                break
518
            delta_size += size
519
            delta_parents = self._index.get_parents(parent)
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
520
        else:
521
            # 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
522
            return False
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
523
524
        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
525
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
526
    def _add_raw_records(self, records, data):
527
        """Add all the records 'records' with data pre-joined in 'data'.
528
529
        :param records: A list of tuples(version_id, options, parents, size).
530
        :param data: The data for the records. When it is written, the records
531
                     are adjusted to have pos pointing into data by the sum of
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
532
                     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.
533
        """
534
        # write all the data
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
535
        raw_record_sizes = [record[3] for record in records]
536
        positions = self._data.add_raw_records(raw_record_sizes, data)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
537
        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.
538
        index_entries = []
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
539
        for (version_id, options, parents, size), access_memo in zip(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
540
            records, positions):
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
541
            index_entries.append((version_id, options, access_memo, parents))
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
542
            if self._data._do_cache:
543
                self._data._cache[version_id] = data[offset:offset+size]
544
            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.
545
        self._index.add_versions(index_entries)
546
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
547
    def enable_cache(self):
548
        """Start caching data for this knit"""
549
        self._data.enable_cache()
550
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
551
    def clear_cache(self):
552
        """Clear the data cache only."""
553
        self._data.clear_cache()
554
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
555
    def copy_to(self, name, transport):
556
        """See VersionedFile.copy_to()."""
557
        # copy the current index to a temp index to avoid racing with local
558
        # writes
1955.3.30 by John Arbash Meinel
fix small bug
559
        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
560
                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.
561
        # 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()
562
        f = self._data._open_file()
563
        try:
1955.3.8 by John Arbash Meinel
avoid some deprecation warnings in other parts of the code
564
            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()
565
        finally:
566
            f.close()
567
        # move the copied index into place
568
        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.
569
1563.2.13 by Robert Collins
InterVersionedFile implemented.
570
    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
571
        return KnitVersionedFile(name, transport, factory=self.factory,
572
                                 delta=self.delta, create=True)
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
573
    
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
574
    def get_data_stream(self, required_versions):
575
        """Get a data stream for the specified versions.
576
577
        Versions may be returned in any order, not necessarily the order
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
578
        specified.  They are returned in a partial order by compression
579
        parent, so that the deltas can be applied as the data stream is
580
        inserted; however note that compression parents will not be sent
581
        unless they were specifically requested, as the client may already
582
        have them.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
583
2670.3.7 by Andrew Bennetts
Tweak docstring as requested in review.
584
        :param required_versions: The exact set of versions to be extracted.
585
            Unlike some other knit methods, this is not used to generate a
586
            transitive closure, rather it is used precisely as given.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
587
        
588
        :returns: format_signature, list of (version, options, length, parents),
589
            reader_callable.
590
        """
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
591
        required_version_set = frozenset(required_versions)
592
        version_index = {}
593
        # list of revisions that can just be sent without waiting for their
594
        # compression parent
595
        ready_to_send = []
596
        # map from revision to the children based on it
597
        deferred = {}
598
        # first, read all relevant index data, enough to sort into the right
599
        # order to return
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
600
        for version_id in required_versions:
601
            if not self.has_version(version_id):
602
                raise RevisionNotPresent(version_id, self.filename)
603
            options = self._index.get_options(version_id)
604
            parents = self._index.get_parents_with_ghosts(version_id)
2535.3.36 by Andrew Bennetts
Merge bzr.dev
605
            index_memo = self._index.get_position(version_id)
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
606
            version_index[version_id] = (index_memo, options, parents)
607
            if parents and parents[0] in required_version_set:
608
                # must wait until the parent has been sent
609
                deferred.setdefault(parents[0], []). \
610
                    append(version_id)
611
            else:
612
                # either a fulltext, or a delta whose parent the client did
613
                # not ask for and presumably already has
614
                ready_to_send.append(version_id)
615
        # build a list of results to return, plus instructions for data to
616
        # read from the file
617
        copy_queue_records = []
618
        result_version_list = []
619
        while ready_to_send:
620
            # XXX: pushing and popping lists may be a bit inefficient
621
            version_id = ready_to_send.pop()
622
            (index_memo, options, parents) = version_index[version_id]
2535.3.36 by Andrew Bennetts
Merge bzr.dev
623
            copy_queue_records.append((version_id, index_memo))
624
            none, data_pos, data_size = index_memo
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
625
            result_version_list.append((version_id, options, data_size,
626
                parents))
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
627
            if version_id in deferred:
628
                # now we can send all the children of this revision - we could
629
                # put them in anywhere, but doing them immediately might
630
                # give better locality
631
                ready_to_send[:0] = deferred.pop(version_id)
632
        assert len(deferred) == 0, \
633
            "Still have compressed child versions waiting to be sent"
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
634
        # XXX:
635
        # From here down to the return should really be logic in the returned
2535.3.30 by Andrew Bennetts
Delete obsolete comments and other cosmetic changes.
636
        # callable -- in a class that adapts read_records_iter_raw to read
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
637
        # requests.
638
        raw_datum = []
639
        for (version_id, raw_data), \
640
            (version_id2, options, _, parents) in \
641
            izip(self._data.read_records_iter_raw(copy_queue_records),
642
                 result_version_list):
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
643
            assert version_id == version_id2, \
644
                'logic error, inconsistent results'
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
645
            raw_datum.append(raw_data)
646
        pseudo_file = StringIO(''.join(raw_datum))
647
        def read(length):
648
            if length is None:
649
                return pseudo_file.read()
650
            else:
651
                return pseudo_file.read(length)
652
        return (self.get_format_signature(), result_version_list, read)
653
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
654
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
655
        if self._index.get_method(version_id) != 'line-delta':
656
            return None
657
        parent, sha1, noeol, delta = self.get_delta(version_id)
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
658
        return KnitContent.get_line_delta_blocks(delta, source, target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
659
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
660
    def get_delta(self, version_id):
661
        """Get a delta for constructing version from some other version."""
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
662
        self.check_not_reserved_id(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
663
        parents = self.get_parents(version_id)
664
        if len(parents):
665
            parent = parents[0]
666
        else:
667
            parent = None
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
668
        index_memo = self._index.get_position(version_id)
669
        data, sha1 = self._data.read_records(((version_id, index_memo),))[version_id]
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
670
        noeol = 'no-eol' in self._index.get_options(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
671
        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
672
            new_content = self.factory.parse_fulltext(data, version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
673
            if parent is not None:
674
                reference_content = self._get_content(parent)
675
                old_texts = reference_content.text()
676
            else:
677
                old_texts = []
678
            new_texts = new_content.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
679
            delta_seq = patiencediff.PatienceSequenceMatcher(None, old_texts,
680
                                                             new_texts)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
681
            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.
682
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
683
            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.
684
            return parent, sha1, noeol, delta
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
685
686
    def get_format_signature(self):
687
        """See VersionedFile.get_format_signature()."""
688
        if self.factory.annotated:
689
            annotated_part = "annotated"
690
        else:
691
            annotated_part = "plain"
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
692
        return "knit-%s" % (annotated_part,)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
693
        
1594.2.8 by Robert Collins
add ghost aware apis to knits.
694
    def get_graph_with_ghosts(self):
695
        """See VersionedFile.get_graph_with_ghosts()."""
696
        graph_items = self._index.get_graph()
697
        return dict(graph_items)
698
1666.1.6 by Robert Collins
Make knit the default format.
699
    def get_sha1(self, version_id):
2520.4.89 by Aaron Bentley
Add get_sha1s to weaves
700
        return self.get_sha1s([version_id])[0]
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
701
702
    def get_sha1s(self, version_ids):
1666.1.6 by Robert Collins
Make knit the default format.
703
        """See VersionedFile.get_sha1()."""
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
704
        record_map = self._get_record_map(version_ids)
705
        # record entry 2 is the 'digest'.
706
        return [record_map[v][2] for v in version_ids]
1666.1.6 by Robert Collins
Make knit the default format.
707
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
708
    @staticmethod
709
    def get_suffixes():
710
        """See VersionedFile.get_suffixes()."""
711
        return [DATA_SUFFIX, INDEX_SUFFIX]
1563.2.13 by Robert Collins
InterVersionedFile implemented.
712
1594.2.8 by Robert Collins
add ghost aware apis to knits.
713
    def has_ghost(self, version_id):
714
        """True if there is a ghost reference in the file to version_id."""
715
        # maybe we have it
716
        if self.has_version(version_id):
717
            return False
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
718
        # optimisable if needed by memoising the _ghosts set.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
719
        items = self._index.get_graph()
720
        for node, parents in items:
721
            for parent in parents:
722
                if parent not in self._index._cache:
723
                    if parent == version_id:
724
                        return True
725
        return False
726
2535.3.30 by Andrew Bennetts
Delete obsolete comments and other cosmetic changes.
727
    def insert_data_stream(self, (format, data_list, reader_callable)):
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
728
        """Insert knit records from a data stream into this knit.
729
2535.3.5 by Andrew Bennetts
Batch writes as much as possible in insert_data_stream.
730
        If a version in the stream is already present in this knit, it will not
731
        be inserted a second time.  It will be checked for consistency with the
732
        stored version however, and may cause a KnitCorrupt error to be raised
733
        if the data in the stream disagrees with the already stored data.
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
734
        
735
        :seealso: get_data_stream
736
        """
737
        if format != self.get_format_signature():
2670.3.6 by Andrew Bennetts
Remove redundant import.
738
            trace.mutter('incompatible format signature inserting to %r', self)
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
739
            raise KnitDataStreamIncompatible(
740
                format, self.get_format_signature())
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
741
742
        for version_id, options, length, parents in data_list:
743
            if self.has_version(version_id):
744
                # First check: the list of parents.
745
                my_parents = self.get_parents_with_ghosts(version_id)
746
                if my_parents != parents:
747
                    # XXX: KnitCorrupt is not quite the right exception here.
748
                    raise KnitCorrupt(
749
                        self.filename,
750
                        'parents list %r from data stream does not match '
751
                        'already recorded parents %r for %s'
752
                        % (parents, my_parents, version_id))
753
754
                # Also check the SHA-1 of the fulltext this content will
755
                # produce.
756
                raw_data = reader_callable(length)
757
                my_fulltext_sha1 = self.get_sha1(version_id)
758
                df, rec = self._data._parse_record_header(version_id, raw_data)
759
                stream_fulltext_sha1 = rec[3]
760
                if my_fulltext_sha1 != stream_fulltext_sha1:
761
                    # Actually, we don't know if it's this knit that's corrupt,
762
                    # or the data stream we're trying to insert.
763
                    raise KnitCorrupt(
764
                        self.filename, 'sha-1 does not match %s' % version_id)
765
            else:
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
766
                if 'line-delta' in options:
2535.3.61 by Andrew Bennetts
Clarify sanity checking in insert_data_stream.
767
                    # Make sure that this knit record is actually useful: a
768
                    # line-delta is no use unless we have its parent.
769
                    # Fetching from a broken repository with this problem
770
                    # shouldn't break the target repository.
771
                    if not self._index.has_version(parents[0]):
772
                        raise KnitCorrupt(
773
                            self.filename,
774
                            'line-delta from stream references '
775
                            'missing parent %s' % parents[0])
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
776
                self._add_raw_records(
777
                    [(version_id, options, parents, length)],
778
                    reader_callable(length))
779
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
780
    def versions(self):
781
        """See VersionedFile.versions."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
782
        if 'evil' in debug.debug_flags:
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
783
            trace.mutter_callsite(2, "versions scales with size of history")
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
784
        return self._index.get_versions()
785
786
    def has_version(self, version_id):
787
        """See VersionedFile.has_version."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
788
        if 'evil' in debug.debug_flags:
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
789
            trace.mutter_callsite(2, "has_version is a LBYL scenario")
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
790
        return self._index.has_version(version_id)
791
792
    __contains__ = has_version
793
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
794
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
795
                           delta=None, annotated=None,
796
                           left_matching_blocks=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
797
        """Merge annotations for content.  This is done by comparing
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
798
        the annotations based on changed to the text.
799
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
800
        if left_matching_blocks is not None:
801
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
802
        else:
803
            delta_seq = None
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
804
        if annotated:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
805
            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.
806
                merge_content = self._get_content(parent_id, parent_texts)
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
807
                if (parent_id == parents[0] and delta_seq is not None):
808
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
809
                else:
810
                    seq = patiencediff.PatienceSequenceMatcher(
811
                        None, merge_content.text(), content.text())
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
812
                for i, j, n in seq.get_matching_blocks():
813
                    if n == 0:
814
                        continue
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
815
                    # this appears to copy (origin, text) pairs across to the
816
                    # new content for any line that matches the last-checked
817
                    # parent.
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
818
                    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.
819
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
820
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
821
                reference_content = self._get_content(parents[0], parent_texts)
822
                new_texts = content.text()
823
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
824
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
825
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
826
            return self._make_line_delta(delta_seq, content)
827
828
    def _make_line_delta(self, delta_seq, new_content):
829
        """Generate a line delta from delta_seq and new_content."""
830
        diff_hunks = []
831
        for op in delta_seq.get_opcodes():
832
            if op[0] == 'equal':
833
                continue
834
            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.
835
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
836
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
837
    def _get_components_positions(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
838
        """Produce a map of position data for the components of versions.
839
1756.3.22 by Aaron Bentley
Tweaks from review
840
        This data is intended to be used for retrieving the knit records.
1756.3.19 by Aaron Bentley
Documentation and cleanups
841
842
        A dict of version_id to (method, data_pos, data_size, next) is
843
        returned.
844
        method is the way referenced data should be applied.
845
        data_pos is the position of the data in the knit.
846
        data_size is the size of the data in the knit.
847
        next is the build-parent of the version, or None for fulltexts.
848
        """
1756.3.9 by Aaron Bentley
More optimization refactoring
849
        component_data = {}
850
        for version_id in version_ids:
851
            cursor = version_id
852
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
853
            while cursor is not None and cursor not in component_data:
1756.2.29 by Aaron Bentley
Remove basis knit support
854
                method = self._index.get_method(cursor)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
855
                if method == 'fulltext':
856
                    next = None
857
                else:
2592.3.245 by Andrew Bennetts
Commit Martin's faster knit extraction one-liner that was approved by Robert and John.
858
                    next = self.get_parents_with_ghosts(cursor)[0]
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
859
                index_memo = self._index.get_position(cursor)
860
                component_data[cursor] = (method, index_memo, next)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
861
                cursor = next
862
        return component_data
1756.3.18 by Aaron Bentley
More cleanup
863
       
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
864
    def _get_content(self, version_id, parent_texts={}):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
865
        """Returns a content object that makes up the specified
866
        version."""
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
867
        cached_version = parent_texts.get(version_id, None)
868
        if cached_version is not None:
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
869
            if not self.has_version(version_id):
870
                raise RevisionNotPresent(version_id, self.filename)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
871
            return cached_version
872
1756.3.22 by Aaron Bentley
Tweaks from review
873
        text_map, contents_map = self._get_content_maps([version_id])
874
        return contents_map[version_id]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
875
876
    def _check_versions_present(self, version_ids):
877
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
878
        self._index.check_versions_present(version_ids)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
879
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
880
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
881
        nostore_sha, random_id, check_content):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
882
        """See VersionedFile.add_lines_with_ghosts()."""
2805.6.7 by Robert Collins
Review feedback.
883
        self._check_add(version_id, lines, random_id, check_content)
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
884
        return self._add(version_id, lines, parents, self.delta,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
885
            parent_texts, None, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
886
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
887
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
888
        left_matching_blocks, nostore_sha, random_id, check_content):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
889
        """See VersionedFile.add_lines."""
2805.6.7 by Robert Collins
Review feedback.
890
        self._check_add(version_id, lines, random_id, check_content)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
891
        self._check_versions_present(parents)
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
892
        return self._add(version_id, lines[:], parents, self.delta,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
893
            parent_texts, left_matching_blocks, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
894
2805.6.7 by Robert Collins
Review feedback.
895
    def _check_add(self, version_id, lines, random_id, check_content):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
896
        """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.
897
        if contains_whitespace(version_id):
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
898
            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
899
        self.check_not_reserved_id(version_id)
2805.6.4 by Robert Collins
Don't check for existing versions when adding texts with random revision ids.
900
        # Technically this could be avoided if we are happy to allow duplicate
901
        # id insertion when other things than bzr core insert texts, but it
902
        # seems useful for folk using the knit api directly to have some safety
903
        # blanket that we can disable.
904
        if not random_id and self.has_version(version_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
905
            raise RevisionAlreadyPresent(version_id, self.filename)
2805.6.7 by Robert Collins
Review feedback.
906
        if check_content:
907
            self._check_lines_not_unicode(lines)
908
            self._check_lines_are_lines(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
909
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
910
    def _add(self, version_id, lines, parents, delta, parent_texts,
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
911
        left_matching_blocks, nostore_sha, random_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
912
        """Add a set of lines on top of version specified by parents.
913
914
        If delta is true, compress the text as a line-delta against
915
        the first parent.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
916
917
        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.
918
        """
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
919
        # first thing, if the content is something we don't need to store, find
920
        # that out.
921
        line_bytes = ''.join(lines)
922
        digest = sha_string(line_bytes)
923
        if nostore_sha == digest:
924
            raise errors.ExistingContent
1596.2.28 by Robert Collins
more knit profile based tuning.
925
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
926
        present_parents = []
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
927
        if parent_texts is None:
928
            parent_texts = {}
1594.2.8 by Robert Collins
add ghost aware apis to knits.
929
        for parent in parents:
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
930
            if self.has_version(parent):
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
931
                present_parents.append(parent)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
932
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
933
        # can only compress against the left most present parent.
934
        if (delta and
935
            (len(present_parents) == 0 or
936
             present_parents[0] != parents[0])):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
937
            delta = False
938
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
939
        text_length = len(line_bytes)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
940
        options = []
941
        if lines:
942
            if lines[-1][-1] != '\n':
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
943
                # copy the contents of lines.
944
                lines = lines[:]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
945
                options.append('no-eol')
946
                lines[-1] = lines[-1] + '\n'
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
947
                line_bytes += '\n'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
948
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
949
        if delta:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
950
            # To speed the extract of texts the delta chain is limited
951
            # to a fixed number of deltas.  This should minimize both
952
            # 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
953
            delta = self._check_should_delta(present_parents)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
954
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
955
        assert isinstance(version_id, str)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
956
        content = 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.
957
        if delta or (self.factory.annotated and len(present_parents) > 0):
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
958
            # Merge annotations from parent texts if needed.
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
959
            delta_hunks = self._merge_annotations(content, present_parents,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
960
                parent_texts, delta, self.factory.annotated,
961
                left_matching_blocks)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
962
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
963
        if delta:
964
            options.append('line-delta')
965
            store_lines = self.factory.lower_line_delta(delta_hunks)
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
966
            size, bytes = self._data._record_to_data(version_id, digest,
967
                store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
968
        else:
969
            options.append('fulltext')
2888.1.3 by Robert Collins
Review feedback.
970
            # isinstance is slower and we have no hierarchy.
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
971
            if self.factory.__class__ == KnitPlainFactory:
2888.1.3 by Robert Collins
Review feedback.
972
                # Use the already joined bytes saving iteration time in
973
                # _record_to_data.
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
974
                size, bytes = self._data._record_to_data(version_id, digest,
975
                    lines, [line_bytes])
976
            else:
977
                # get mixed annotation + content and feed it into the
978
                # serialiser.
979
                store_lines = self.factory.lower_fulltext(content)
980
                size, bytes = self._data._record_to_data(version_id, digest,
981
                    store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
982
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
983
        access_memo = self._data.add_raw_records([size], bytes)[0]
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
984
        self._index.add_versions(
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
985
            ((version_id, options, access_memo, parents),),
986
            random_id=random_id)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
987
        return digest, text_length, content
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
988
1563.2.19 by Robert Collins
stub out a check for knits.
989
    def check(self, progress_bar=None):
990
        """See VersionedFile.check()."""
991
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
992
    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.
993
        """See VersionedFile.clone_text()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
994
        # FIXME RBC 20060228 make fast by only inserting an index with null 
995
        # delta.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
996
        self.add_lines(new_version_id, parents, self.get_lines(old_version_id))
997
998
    def get_lines(self, version_id):
999
        """See VersionedFile.get_lines()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1000
        return self.get_line_list([version_id])[0]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1001
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1002
    def _get_record_map(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1003
        """Produce a dictionary of knit records.
1004
        
1005
        The keys are version_ids, the values are tuples of (method, content,
1006
        digest, next).
1007
        method is the way the content should be applied.  
1008
        content is a KnitContent object.
1009
        digest is the SHA1 digest of this version id after all steps are done
1010
        next is the build-parent of the version, i.e. the leftmost ancestor.
1011
        If the method is fulltext, next will be None.
1012
        """
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1013
        position_map = self._get_components_positions(version_ids)
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1014
        # c = component_id, m = method, i_m = index_memo, n = next
1015
        records = [(c, i_m) for c, (m, i_m, n) in position_map.iteritems()]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1016
        record_map = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
1017
        for component_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
1018
                self._data.read_records_iter(records):
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1019
            method, index_memo, next = position_map[component_id]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1020
            record_map[component_id] = method, content, digest, next
1021
                          
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1022
        return record_map
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1023
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
1024
    def get_text(self, version_id):
1025
        """See VersionedFile.get_text"""
1026
        return self.get_texts([version_id])[0]
1027
1756.2.1 by Aaron Bentley
Implement get_texts
1028
    def get_texts(self, version_ids):
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1029
        return [''.join(l) for l in self.get_line_list(version_ids)]
1030
1031
    def get_line_list(self, version_ids):
1756.2.1 by Aaron Bentley
Implement get_texts
1032
        """Return the texts of listed versions as a list of strings."""
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
1033
        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
1034
            self.check_not_reserved_id(version_id)
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1035
        text_map, content_map = self._get_content_maps(version_ids)
1036
        return [text_map[v] for v in version_ids]
1037
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
1038
    _get_lf_split_line_list = get_line_list
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
1039
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1040
    def _get_content_maps(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1041
        """Produce maps of text and KnitContents
1042
        
1043
        :return: (text_map, content_map) where text_map contains the texts for
1044
        the requested versions and content_map contains the KnitContents.
1756.3.22 by Aaron Bentley
Tweaks from review
1045
        Both dicts take version_ids as their keys.
1756.3.19 by Aaron Bentley
Documentation and cleanups
1046
        """
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1047
        # FUTURE: This function could be improved for the 'extract many' case
1048
        # by tracking each component and only doing the copy when the number of
1049
        # children than need to apply delta's to it is > 1 or it is part of the
1050
        # final output.
1051
        version_ids = list(version_ids)
1052
        multiple_versions = len(version_ids) != 1
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1053
        record_map = self._get_record_map(version_ids)
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1054
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1055
        text_map = {}
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1056
        content_map = {}
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1057
        final_content = {}
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1058
        for version_id in version_ids:
1059
            components = []
1060
            cursor = version_id
1061
            while cursor is not None:
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1062
                method, data, digest, next = record_map[cursor]
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1063
                components.append((cursor, method, data, digest))
1064
                if cursor in content_map:
1065
                    break
1066
                cursor = next
1067
1756.2.1 by Aaron Bentley
Implement get_texts
1068
            content = None
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
1069
            for component_id, method, data, digest in reversed(components):
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1070
                if component_id in content_map:
1071
                    content = content_map[component_id]
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
1072
                else:
1073
                    if method == 'fulltext':
1074
                        assert content is None
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
1075
                        content = self.factory.parse_fulltext(data, version_id)
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
1076
                    elif method == 'line-delta':
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
1077
                        delta = self.factory.parse_line_delta(data, version_id)
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1078
                        if multiple_versions:
1079
                            # only doing this when we want multiple versions
1080
                            # output avoids list copies - which reference and
1081
                            # dereference many strings.
1082
                            content = content.copy()
1083
                        content.apply_delta(delta, version_id)
1084
                    if multiple_versions:
1085
                        content_map[component_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1086
1087
            if 'no-eol' in self._index.get_options(version_id):
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1088
                if multiple_versions:
1089
                    content = content.copy()
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1090
                content.strip_last_line_newline()
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1091
            final_content[version_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1092
1093
            # digest here is the digest from the last applied component.
1756.3.6 by Aaron Bentley
More multi-text extraction
1094
            text = content.text()
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1095
            actual_sha = sha_strings(text)
1096
            if actual_sha != digest:
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1097
                raise KnitCorrupt(self.filename,
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1098
                    '\n  sha-1 %s'
1099
                    '\n  of reconstructed text does not match'
1100
                    '\n  expected %s'
1101
                    '\n  for version %s' %
1102
                    (actual_sha, digest, version_id))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
1103
            text_map[version_id] = text
1104
        return text_map, final_content
1756.2.1 by Aaron Bentley
Implement get_texts
1105
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1106
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
1107
                                                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.
1108
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
1109
        if version_ids is None:
1110
            version_ids = self.versions()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1111
        if pb is None:
1112
            pb = progress.DummyProgress()
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1113
        # 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.
1114
        # but we need to setup a list of records to visit.
1115
        # we need version_id, position, length
1116
        version_id_records = []
2163.1.1 by John Arbash Meinel
Use a set to make iter_lines_added_or_present *much* faster
1117
        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.
1118
        # filter for available versions
2698.2.4 by Robert Collins
Remove full history scan during iter_lines_added_or_present in KnitVersionedFile.
1119
        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.
1120
            if not self.has_version(version_id):
1121
                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.
1122
        # get a in-component-order queue:
1123
        for version_id in self.versions():
1124
            if version_id in requested_versions:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1125
                index_memo = self._index.get_position(version_id)
1126
                version_id_records.append((version_id, index_memo))
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.
1127
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1128
        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.
1129
        for version_idx, (version_id, data, sha_value) in \
1130
            enumerate(self._data.read_records_iter(version_id_records)):
1131
            pb.update('Walking content.', version_idx, total)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1132
            method = self._index.get_method(version_id)
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1133
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1134
            assert method in ('fulltext', 'line-delta')
1135
            if method == 'fulltext':
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1136
                line_iterator = self.factory.get_fulltext_content(data)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1137
            else:
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1138
                line_iterator = self.factory.get_linedelta_content(data)
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1139
            # XXX: It might be more efficient to yield (version_id,
1140
            # line_iterator) in the future. However for now, this is a simpler
1141
            # change to integrate into the rest of the codebase. RBC 20071110
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1142
            for line in line_iterator:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1143
                yield line, version_id
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1144
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1145
        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.
1146
        
2592.3.43 by Robert Collins
A knit iter_parents API.
1147
    def iter_parents(self, version_ids):
1148
        """Iterate through the parents for many version ids.
1149
1150
        :param version_ids: An iterable yielding version_ids.
1151
        :return: An iterator that yields (version_id, parents). Requested 
1152
            version_ids not present in the versioned file are simply skipped.
1153
            The order is undefined, allowing for different optimisations in
1154
            the underlying implementation.
1155
        """
1156
        return self._index.iter_parents(version_ids)
1157
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1158
    def num_versions(self):
1159
        """See VersionedFile.num_versions()."""
1160
        return self._index.num_versions()
1161
1162
    __len__ = num_versions
1163
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1164
    def annotate_iter(self, version_id):
1165
        """See VersionedFile.annotate_iter."""
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
1166
        return self.factory.annotate_iter(self, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1167
1168
    def get_parents(self, version_id):
1169
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
1170
        # perf notes:
1171
        # optimism counts!
1172
        # 52554 calls in 1264 872 internal down from 3674
1173
        try:
1174
            return self._index.get_parents(version_id)
1175
        except KeyError:
1176
            raise RevisionNotPresent(version_id, self.filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1177
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1178
    def get_parents_with_ghosts(self, version_id):
1179
        """See VersionedFile.get_parents."""
1628.1.2 by Robert Collins
More knit micro-optimisations.
1180
        try:
1181
            return self._index.get_parents_with_ghosts(version_id)
1182
        except KeyError:
1183
            raise RevisionNotPresent(version_id, self.filename)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1184
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1185
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1186
        """See VersionedFile.get_ancestry."""
1187
        if isinstance(versions, basestring):
1188
            versions = [versions]
1189
        if not versions:
1190
            return []
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1191
        return self._index.get_ancestry(versions, topo_sorted)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1192
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1193
    def get_ancestry_with_ghosts(self, versions):
1194
        """See VersionedFile.get_ancestry_with_ghosts."""
1195
        if isinstance(versions, basestring):
1196
            versions = [versions]
1197
        if not versions:
1198
            return []
1199
        return self._index.get_ancestry_with_ghosts(versions)
1200
1664.2.3 by Aaron Bentley
Add failing test case
1201
    def plan_merge(self, ver_a, ver_b):
1664.2.11 by Aaron Bentley
Clarifications from merge review
1202
        """See VersionedFile.plan_merge."""
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1203
        ancestors_b = set(self.get_ancestry(ver_b, topo_sorted=False))
1204
        ancestors_a = set(self.get_ancestry(ver_a, topo_sorted=False))
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1205
        annotated_a = self.annotate(ver_a)
1206
        annotated_b = self.annotate(ver_b)
1551.15.46 by Aaron Bentley
Move plan merge to tree
1207
        return merge._plan_annotate_merge(annotated_a, annotated_b,
1208
                                          ancestors_a, ancestors_b)
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1209
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1210
1211
class _KnitComponentFile(object):
1212
    """One of the files used to implement a knit database"""
1213
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
1214
    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
1215
                 create_parent_dir=False, dir_mode=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1216
        self._transport = transport
1217
        self._filename = filename
1218
        self._mode = mode
1946.2.3 by John Arbash Meinel
Pass around the file mode correctly
1219
        self._file_mode = file_mode
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1220
        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
1221
        self._create_parent_dir = create_parent_dir
1222
        self._need_to_create = False
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1223
2196.2.5 by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it
1224
    def _full_path(self):
1225
        """Return the full path to this file."""
1226
        return self._transport.base + self._filename
1227
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1228
    def check_header(self, fp):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1229
        line = fp.readline()
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1230
        if line == '':
1231
            # An empty file can actually be treated as though the file doesn't
1232
            # 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
1233
            raise errors.NoSuchFile(self._full_path())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1234
        if line != self.HEADER:
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1235
            raise KnitHeaderError(badline=line,
1236
                              filename=self._transport.abspath(self._filename))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1237
1238
    def __repr__(self):
1239
        return '%s(%s)' % (self.__class__.__name__, self._filename)
1240
1241
1242
class _KnitIndex(_KnitComponentFile):
1243
    """Manages knit index file.
1244
1245
    The index is already kept in memory and read on startup, to enable
1246
    fast lookups of revision information.  The cursor of the index
1247
    file is always pointing to the end, making it easy to append
1248
    entries.
1249
1250
    _cache is a cache for fast mapping from version id to a Index
1251
    object.
1252
1253
    _history is a cache for fast mapping from indexes to version ids.
1254
1255
    The index data format is dictionary compressed when it comes to
1256
    parent references; a index entry may only have parents that with a
1257
    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.
1258
1259
    Duplicate entries may be written to the index for a single version id
1260
    if this is done then the latter one completely replaces the former:
1261
    this allows updates to correct version and parent information. 
1262
    Note that the two entries may share the delta, and that successive
1263
    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.
1264
1265
    The index file on disc contains a header, followed by one line per knit
1266
    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).
1267
    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.
1268
    
1269
    The format of a single line is
1270
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1271
    REVISION_ID is a utf8-encoded revision id
1272
    FLAGS is a comma separated list of flags about the record. Values include 
1273
        no-eol, line-delta, fulltext.
1274
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1275
        that the the compressed data starts at.
1276
    LENGTH is the ascii representation of the length of the data file.
1277
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1278
        REVISION_ID.
1279
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1280
        revision id already in the knit that is a parent of REVISION_ID.
1281
    The ' :' marker is the end of record marker.
1282
    
1283
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1284
    when a write is interrupted to the index file, it will result in a line
1285
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1286
    or at the end of the file, then the record that is missing it will be
1287
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1288
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1289
    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.
1290
    to ensure that records always start on new lines even if the last write was
1291
    interrupted. As a result its normal for the last line in the index to be
1292
    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.
1293
    """
1294
1666.1.6 by Robert Collins
Make knit the default format.
1295
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1296
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1297
    # speed of knit parsing went from 280 ms to 280 ms with slots addition.
1298
    # __slots__ = ['_cache', '_history', '_transport', '_filename']
1299
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1300
    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.
1301
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1302
1303
        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.
1304
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1305
         indexes).
1306
        """
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1307
        # only want the _history index to reference the 1st index entry
1308
        # for version_id
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1309
        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
1310
            index = len(self._history)
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1311
            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
1312
        else:
1313
            index = self._cache[version_id][5]
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1314
        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
1315
                                   options,
1316
                                   pos,
1317
                                   size,
1318
                                   parents,
1319
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1320
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
1321
    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
1322
                 create_parent_dir=False, delay_create=False, dir_mode=None):
1323
        _KnitComponentFile.__init__(self, transport, filename, mode,
1324
                                    file_mode=file_mode,
1325
                                    create_parent_dir=create_parent_dir,
1326
                                    dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1327
        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.
1328
        # position in _history is the 'official' index for a revision
1329
        # but the values may have come from a newer entry.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1330
        # 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
1331
        # in the knit.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1332
        self._history = []
1333
        try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1334
            fp = self._transport.get(self._filename)
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1335
            try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1336
                # _load_data may raise NoSuchFile if the target knit is
1337
                # completely empty.
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1338
                _load_data(self, fp)
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1339
            finally:
1340
                fp.close()
1341
        except NoSuchFile:
1342
            if mode != 'w' or not create:
1343
                raise
1344
            elif delay_create:
1345
                self._need_to_create = True
1346
            else:
1347
                self._transport.put_bytes_non_atomic(
1348
                    self._filename, self.HEADER, mode=self._file_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1349
1350
    def get_graph(self):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1351
        """Return a list of the node:parents lists from this knit index."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1352
        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.
1353
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1354
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1355
        """See VersionedFile.get_ancestry."""
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1356
        # get a graph of all the mentioned versions:
1357
        graph = {}
1358
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1359
        cache = self._cache
1360
        while pending:
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1361
            version = pending.pop()
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1362
            # trim ghosts
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1363
            try:
1364
                parents = [p for p in cache[version][4] if p in cache]
1365
            except KeyError:
1366
                raise RevisionNotPresent(version, self._filename)
1367
            # if not completed and not a ghost
1368
            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.
1369
            graph[version] = parents
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1370
        if not topo_sorted:
1371
            return graph.keys()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1372
        return topo_sort(graph.items())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1373
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1374
    def get_ancestry_with_ghosts(self, versions):
1375
        """See VersionedFile.get_ancestry_with_ghosts."""
1376
        # get a graph of all the mentioned versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1377
        self.check_versions_present(versions)
1378
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1379
        graph = {}
1380
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1381
        while pending:
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1382
            version = pending.pop()
1383
            try:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1384
                parents = cache[version][4]
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1385
            except KeyError:
1386
                # ghost, fake it
1387
                graph[version] = []
1388
            else:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1389
                # if not completed
1390
                pending.update([p for p in parents if p not in graph])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1391
                graph[version] = parents
1392
        return topo_sort(graph.items())
1393
2592.3.43 by Robert Collins
A knit iter_parents API.
1394
    def iter_parents(self, version_ids):
1395
        """Iterate through the parents for many version ids.
1396
1397
        :param version_ids: An iterable yielding version_ids.
1398
        :return: An iterator that yields (version_id, parents). Requested 
1399
            version_ids not present in the versioned file are simply skipped.
1400
            The order is undefined, allowing for different optimisations in
1401
            the underlying implementation.
1402
        """
1403
        for version_id in version_ids:
1404
            try:
1405
                yield version_id, tuple(self.get_parents(version_id))
1406
            except KeyError:
1407
                pass
1408
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1409
    def num_versions(self):
1410
        return len(self._history)
1411
1412
    __len__ = num_versions
1413
1414
    def get_versions(self):
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1415
        """Get all the versions in the file. not topologically sorted."""
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1416
        return self._history
1417
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1418
    def _version_list_to_index(self, versions):
1419
        result_list = []
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1420
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1421
        for version in versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1422
            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
1423
                # -- inlined lookup() --
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1424
                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
1425
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1426
            else:
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
1427
                result_list.append('.' + version)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1428
        return ' '.join(result_list)
1429
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1430
    def add_version(self, version_id, options, index_memo, parents):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1431
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1432
        self.add_versions(((version_id, options, index_memo, parents),))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1433
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1434
    def add_versions(self, versions, random_id=False):
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1435
        """Add multiple versions to the index.
1436
        
1437
        :param versions: a list of tuples:
1438
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1439
        :param random_id: If True the ids being added were randomly generated
1440
            and no check for existence will be performed.
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
1441
        """
1442
        lines = []
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1443
        orig_history = self._history[:]
1444
        orig_cache = self._cache.copy()
1445
1446
        try:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1447
            for version_id, options, (index, pos, size), parents in versions:
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
1448
                line = "\n%s %s %s %s %s :" % (version_id,
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1449
                                               ','.join(options),
1450
                                               pos,
1451
                                               size,
1452
                                               self._version_list_to_index(parents))
1453
                assert isinstance(line, str), \
1454
                    'content must be utf-8 encoded: %r' % (line,)
1455
                lines.append(line)
1456
                self._cache_version(version_id, options, pos, size, parents)
1457
            if not self._need_to_create:
1458
                self._transport.append_bytes(self._filename, ''.join(lines))
1459
            else:
1460
                sio = StringIO()
1461
                sio.write(self.HEADER)
1462
                sio.writelines(lines)
1463
                sio.seek(0)
1464
                self._transport.put_file_non_atomic(self._filename, sio,
1465
                                    create_parent_dir=self._create_parent_dir,
1466
                                    mode=self._file_mode,
1467
                                    dir_mode=self._dir_mode)
1468
                self._need_to_create = False
1469
        except:
1470
            # If any problems happen, restore the original values and re-raise
1471
            self._history = orig_history
1472
            self._cache = orig_cache
1473
            raise
1474
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1475
    def has_version(self, version_id):
1476
        """True if the version is in the index."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1477
        return version_id in self._cache
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1478
1479
    def get_position(self, version_id):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1480
        """Return details needed to access the version.
1481
        
1482
        .kndx indices do not support split-out data, so return None for the 
1483
        index field.
1484
1485
        :return: a tuple (None, data position, size) to hand to the access
1486
            logic to get the record.
1487
        """
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1488
        entry = self._cache[version_id]
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1489
        return None, entry[2], entry[3]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1490
1491
    def get_method(self, version_id):
1492
        """Return compression method of specified version."""
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1493
        try:
1494
            options = self._cache[version_id][1]
1495
        except KeyError:
1496
            raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1497
        if 'fulltext' in options:
1498
            return 'fulltext'
1499
        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
1500
            if 'line-delta' not in options:
1501
                raise errors.KnitIndexUnknownMethod(self._full_path(), options)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1502
            return 'line-delta'
1503
1504
    def get_options(self, version_id):
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1505
        """Return a string represention options.
1506
1507
        e.g. foo,bar
1508
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1509
        return self._cache[version_id][1]
1510
1511
    def get_parents(self, version_id):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1512
        """Return parents of specified version ignoring ghosts."""
1513
        return [parent for parent in self._cache[version_id][4] 
1514
                if parent in self._cache]
1515
1516
    def get_parents_with_ghosts(self, version_id):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1517
        """Return parents of specified version with ghosts."""
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1518
        return self._cache[version_id][4] 
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1519
1520
    def check_versions_present(self, version_ids):
1521
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1522
        cache = self._cache
1523
        for version_id in version_ids:
1524
            if version_id not in cache:
1525
                raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1526
1527
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1528
class KnitGraphIndex(object):
1529
    """A knit index that builds on GraphIndex."""
1530
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1531
    def __init__(self, graph_index, deltas=False, parents=True, add_callback=None):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1532
        """Construct a KnitGraphIndex on a graph_index.
1533
1534
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1535
        :param deltas: Allow delta-compressed records.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1536
        :param add_callback: If not None, allow additions to the index and call
1537
            this callback with a list of added GraphIndex nodes:
2592.3.33 by Robert Collins
Change the order of index refs and values to make the no-graph knit index easier.
1538
            [(node, value, node_refs), ...]
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1539
        :param parents: If True, record knits parents, if not do not record 
1540
            parents.
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1541
        """
1542
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1543
        self._deltas = deltas
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1544
        self._add_callback = add_callback
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1545
        self._parents = parents
1546
        if deltas and not parents:
1547
            raise KnitCorrupt(self, "Cannot do delta compression without "
1548
                "parent tracking.")
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1549
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1550
    def _get_entries(self, keys, check_present=False):
1551
        """Get the entries for keys.
1552
        
1553
        :param keys: An iterable of index keys, - 1-tuples.
1554
        """
1555
        keys = set(keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1556
        found_keys = set()
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1557
        if self._parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1558
            for node in self._graph_index.iter_entries(keys):
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1559
                yield node
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1560
                found_keys.add(node[1])
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1561
        else:
1562
            # adapt parentless index to the rest of the code.
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1563
            for node in self._graph_index.iter_entries(keys):
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1564
                yield node[0], node[1], node[2], ()
1565
                found_keys.add(node[1])
2592.3.43 by Robert Collins
A knit iter_parents API.
1566
        if check_present:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1567
            missing_keys = keys.difference(found_keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1568
            if missing_keys:
1569
                raise RevisionNotPresent(missing_keys.pop(), self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1570
1571
    def _present_keys(self, version_ids):
1572
        return set([
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1573
            node[1] for node in self._get_entries(version_ids)])
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1574
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1575
    def _parentless_ancestry(self, versions):
1576
        """Honour the get_ancestry API for parentless knit indices."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1577
        wanted_keys = self._version_ids_to_keys(versions)
1578
        present_keys = self._present_keys(wanted_keys)
1579
        missing = set(wanted_keys).difference(present_keys)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1580
        if missing:
1581
            raise RevisionNotPresent(missing.pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1582
        return list(self._keys_to_version_ids(present_keys))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1583
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1584
    def get_ancestry(self, versions, topo_sorted=True):
1585
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1586
        if not self._parents:
1587
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1588
        # XXX: This will do len(history) index calls - perhaps
1589
        # it should be altered to be a index core feature?
1590
        # get a graph of all the mentioned versions:
1591
        graph = {}
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1592
        ghosts = set()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1593
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1594
        pending = set(versions)
1595
        while pending:
1596
            # get all pending nodes
1597
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1598
            new_nodes = self._get_entries(this_iteration)
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1599
            found = set()
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1600
            pending = set()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1601
            for (index, key, value, node_refs) in new_nodes:
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1602
                # dont ask for ghosties - otherwise
1603
                # we we can end up looping with pending
1604
                # being entirely ghosted.
1605
                graph[key] = [parent for parent in node_refs[0]
1606
                    if parent not in ghosts]
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1607
                # queue parents
1608
                for parent in graph[key]:
1609
                    # dont examine known nodes again
1610
                    if parent in graph:
1611
                        continue
1612
                    pending.add(parent)
1613
                found.add(key)
1614
            ghosts.update(this_iteration.difference(found))
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1615
        if versions.difference(graph):
1616
            raise RevisionNotPresent(versions.difference(graph).pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1617
        if topo_sorted:
1618
            result_keys = topo_sort(graph.items())
1619
        else:
1620
            result_keys = graph.iterkeys()
1621
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1622
1623
    def get_ancestry_with_ghosts(self, versions):
1624
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1625
        if not self._parents:
1626
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1627
        # XXX: This will do len(history) index calls - perhaps
1628
        # it should be altered to be a index core feature?
1629
        # get a graph of all the mentioned versions:
1630
        graph = {}
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1631
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1632
        pending = set(versions)
1633
        while pending:
1634
            # get all pending nodes
1635
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1636
            new_nodes = self._get_entries(this_iteration)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1637
            pending = set()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1638
            for (index, key, value, node_refs) in new_nodes:
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1639
                graph[key] = node_refs[0]
1640
                # queue parents 
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1641
                for parent in graph[key]:
1642
                    # dont examine known nodes again
1643
                    if parent in graph:
1644
                        continue
1645
                    pending.add(parent)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1646
            missing_versions = this_iteration.difference(graph)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1647
            missing_needed = versions.intersection(missing_versions)
1648
            if missing_needed:
1649
                raise RevisionNotPresent(missing_needed.pop(), self)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1650
            for missing_version in missing_versions:
1651
                # add a key, no parents
1652
                graph[missing_version] = []
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1653
                pending.discard(missing_version) # don't look for it
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1654
        result_keys = topo_sort(graph.items())
1655
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1656
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1657
    def get_graph(self):
1658
        """Return a list of the node:parents lists from this knit index."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1659
        if not self._parents:
1660
            return [(key, ()) for key in self.get_versions()]
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1661
        result = []
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1662
        for index, key, value, refs in self._graph_index.iter_all_entries():
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1663
            result.append((key[0], tuple([ref[0] for ref in refs[0]])))
1664
        return result
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1665
2592.3.43 by Robert Collins
A knit iter_parents API.
1666
    def iter_parents(self, version_ids):
1667
        """Iterate through the parents for many version ids.
1668
1669
        :param version_ids: An iterable yielding version_ids.
1670
        :return: An iterator that yields (version_id, parents). Requested 
1671
            version_ids not present in the versioned file are simply skipped.
1672
            The order is undefined, allowing for different optimisations in
1673
            the underlying implementation.
1674
        """
1675
        if self._parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1676
            all_nodes = set(self._get_entries(self._version_ids_to_keys(version_ids)))
2592.3.43 by Robert Collins
A knit iter_parents API.
1677
            all_parents = set()
1678
            present_parents = set()
1679
            for node in all_nodes:
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1680
                all_parents.update(node[3][0])
2592.3.43 by Robert Collins
A knit iter_parents API.
1681
                # any node we are querying must be present
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1682
                present_parents.add(node[1])
2592.3.43 by Robert Collins
A knit iter_parents API.
1683
            unknown_parents = all_parents.difference(present_parents)
1684
            present_parents.update(self._present_keys(unknown_parents))
1685
            for node in all_nodes:
1686
                parents = []
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1687
                for parent in node[3][0]:
2592.3.43 by Robert Collins
A knit iter_parents API.
1688
                    if parent in present_parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1689
                        parents.append(parent[0])
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1690
                yield node[1][0], tuple(parents)
2592.3.43 by Robert Collins
A knit iter_parents API.
1691
        else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1692
            for node in self._get_entries(self._version_ids_to_keys(version_ids)):
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1693
                yield node[1][0], ()
2592.3.43 by Robert Collins
A knit iter_parents API.
1694
2592.3.5 by Robert Collins
Implement KnitGraphIndex.num_versions.
1695
    def num_versions(self):
1696
        return len(list(self._graph_index.iter_all_entries()))
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1697
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1698
    __len__ = num_versions
1699
1700
    def get_versions(self):
1701
        """Get all the versions in the file. not topologically sorted."""
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1702
        return [node[1][0] for node in self._graph_index.iter_all_entries()]
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1703
    
2592.3.9 by Robert Collins
Implement KnitGraphIndex.has_version.
1704
    def has_version(self, version_id):
1705
        """True if the version is in the index."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1706
        return len(self._present_keys(self._version_ids_to_keys([version_id]))) == 1
1707
1708
    def _keys_to_version_ids(self, keys):
1709
        return tuple(key[0] for key in keys)
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1710
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1711
    def get_position(self, version_id):
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1712
        """Return details needed to access the version.
1713
        
1714
        :return: a tuple (index, data position, size) to hand to the access
1715
            logic to get the record.
1716
        """
1717
        node = self._get_node(version_id)
1718
        bits = node[2][1:].split(' ')
1719
        return node[0], int(bits[0]), int(bits[1])
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1720
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1721
    def get_method(self, version_id):
1722
        """Return compression method of specified version."""
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1723
        if not self._deltas:
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1724
            return 'fulltext'
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1725
        return self._parent_compression(self._get_node(version_id)[3][1])
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1726
1727
    def _parent_compression(self, reference_list):
1728
        # use the second reference list to decide if this is delta'd or not.
1729
        if len(reference_list):
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1730
            return 'line-delta'
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1731
        else:
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1732
            return 'fulltext'
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1733
1734
    def _get_node(self, version_id):
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1735
        try:
1736
            return list(self._get_entries(self._version_ids_to_keys([version_id])))[0]
1737
        except IndexError:
1738
            raise RevisionNotPresent(version_id, self)
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1739
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1740
    def get_options(self, version_id):
1741
        """Return a string represention options.
1742
1743
        e.g. foo,bar
1744
        """
1745
        node = self._get_node(version_id)
1746
        if not self._deltas:
1747
            options = ['fulltext']
1748
        else:
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1749
            options = [self._parent_compression(node[3][1])]
1750
        if node[2][0] == 'N':
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1751
            options.append('no-eol')
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
1752
        return options
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1753
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1754
    def get_parents(self, version_id):
1755
        """Return parents of specified version ignoring ghosts."""
2592.3.43 by Robert Collins
A knit iter_parents API.
1756
        parents = list(self.iter_parents([version_id]))
1757
        if not parents:
1758
            # missing key
1759
            raise errors.RevisionNotPresent(version_id, self)
1760
        return parents[0][1]
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1761
1762
    def get_parents_with_ghosts(self, version_id):
1763
        """Return parents of specified version with ghosts."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1764
        nodes = list(self._get_entries(self._version_ids_to_keys([version_id]),
1765
            check_present=True))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1766
        if not self._parents:
1767
            return ()
2624.2.14 by Robert Collins
Add source index to the index iteration API to allow mapping back to the origin of retrieved data.
1768
        return self._keys_to_version_ids(nodes[0][3][0])
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1769
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1770
    def check_versions_present(self, version_ids):
1771
        """Check that all specified versions are present."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1772
        keys = self._version_ids_to_keys(version_ids)
1773
        present = self._present_keys(keys)
1774
        missing = keys.difference(present)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1775
        if missing:
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1776
            raise RevisionNotPresent(missing.pop(), self)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1777
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1778
    def add_version(self, version_id, options, access_memo, parents):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1779
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1780
        return self.add_versions(((version_id, options, access_memo, parents),))
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1781
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1782
    def add_versions(self, versions, random_id=False):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1783
        """Add multiple versions to the index.
1784
        
1785
        This function does not insert data into the Immutable GraphIndex
1786
        backing the KnitGraphIndex, instead it prepares data for insertion by
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1787
        the caller and checks that it is safe to insert then calls
1788
        self._add_callback with the prepared GraphIndex nodes.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1789
1790
        :param versions: a list of tuples:
1791
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1792
        :param random_id: If True the ids being added were randomly generated
1793
            and no check for existence will be performed.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1794
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1795
        if not self._add_callback:
1796
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1797
        # we hope there are no repositories with inconsistent parentage
1798
        # anymore.
1799
        # check for dups
1800
1801
        keys = {}
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1802
        for (version_id, options, access_memo, parents) in versions:
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1803
            index, pos, size = access_memo
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1804
            key = (version_id, )
1805
            parents = tuple((parent, ) for parent in parents)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1806
            if 'no-eol' in options:
1807
                value = 'N'
1808
            else:
1809
                value = ' '
1810
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1811
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1812
                if 'line-delta' in options:
1813
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1814
            if self._parents:
1815
                if self._deltas:
1816
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1817
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1818
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1819
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1820
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1821
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1822
            else:
1823
                if parents:
1824
                    raise KnitCorrupt(self, "attempt to add node with parents "
1825
                        "in parentless index.")
1826
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1827
            keys[key] = (value, node_refs)
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1828
        if not random_id:
1829
            present_nodes = self._get_entries(keys)
1830
            for (index, key, value, node_refs) in present_nodes:
1831
                if (value, node_refs) != keys[key]:
1832
                    raise KnitCorrupt(self, "inconsistent details in add_versions"
1833
                        ": %s %s" % ((value, node_refs), keys[key]))
1834
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1835
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1836
        if self._parents:
1837
            for key, (value, node_refs) in keys.iteritems():
1838
                result.append((key, value, node_refs))
1839
        else:
1840
            for key, (value, node_refs) in keys.iteritems():
1841
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1842
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1843
        
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1844
    def _version_ids_to_keys(self, version_ids):
1845
        return set((version_id, ) for version_id in version_ids)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1846
1847
1848
class _KnitAccess(object):
1849
    """Access to knit records in a .knit file."""
1850
1851
    def __init__(self, transport, filename, _file_mode, _dir_mode,
1852
        _need_to_create, _create_parent_dir):
1853
        """Create a _KnitAccess for accessing and inserting data.
1854
1855
        :param transport: The transport the .knit is located on.
1856
        :param filename: The filename of the .knit.
1857
        """
1858
        self._transport = transport
1859
        self._filename = filename
1860
        self._file_mode = _file_mode
1861
        self._dir_mode = _dir_mode
1862
        self._need_to_create = _need_to_create
1863
        self._create_parent_dir = _create_parent_dir
1864
1865
    def add_raw_records(self, sizes, raw_data):
1866
        """Add raw knit bytes to a storage area.
1867
1868
        The data is spooled to whereever the access method is storing data.
1869
1870
        :param sizes: An iterable containing the size of each raw data segment.
1871
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1872
        :return: A list of memos to retrieve the record later. Each memo is a
1873
            tuple - (index, pos, length), where the index field is always None
1874
            for the .knit access method.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1875
        """
1876
        assert type(raw_data) == str, \
1877
            'data must be plain bytes was %s' % type(raw_data)
1878
        if not self._need_to_create:
1879
            base = self._transport.append_bytes(self._filename, raw_data)
1880
        else:
1881
            self._transport.put_bytes_non_atomic(self._filename, raw_data,
1882
                                   create_parent_dir=self._create_parent_dir,
1883
                                   mode=self._file_mode,
1884
                                   dir_mode=self._dir_mode)
1885
            self._need_to_create = False
1886
            base = 0
1887
        result = []
1888
        for size in sizes:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1889
            result.append((None, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1890
            base += size
1891
        return result
1892
1893
    def create(self):
1894
        """IFF this data access has its own storage area, initialise it.
1895
1896
        :return: None.
1897
        """
1898
        self._transport.put_bytes_non_atomic(self._filename, '',
1899
                                             mode=self._file_mode)
1900
1901
    def open_file(self):
1902
        """IFF this data access can be represented as a single file, open it.
1903
1904
        For knits that are not mapped to a single file on disk this will
1905
        always return None.
1906
1907
        :return: None or a file handle.
1908
        """
1909
        try:
1910
            return self._transport.get(self._filename)
1911
        except NoSuchFile:
1912
            pass
1913
        return None
1914
1915
    def get_raw_records(self, memos_for_retrieval):
1916
        """Get the raw bytes for a records.
1917
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1918
        :param memos_for_retrieval: An iterable containing the (index, pos, 
1919
            length) memo for retrieving the bytes. The .knit method ignores
1920
            the index as there is always only a single file.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1921
        :return: An iterator over the bytes of the records.
1922
        """
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1923
        read_vector = [(pos, size) for (index, pos, size) in memos_for_retrieval]
1924
        for pos, data in self._transport.readv(self._filename, read_vector):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1925
            yield data
1926
1927
1928
class _PackAccess(object):
1929
    """Access to knit records via a collection of packs."""
1930
1931
    def __init__(self, index_to_packs, writer=None):
1932
        """Create a _PackAccess object.
1933
1934
        :param index_to_packs: A dict mapping index objects to the transport
1935
            and file names for obtaining data.
1936
        :param writer: A tuple (pack.ContainerWriter, write_index) which
2670.2.3 by Robert Collins
Review feedback.
1937
            contains the pack to write, and the index that reads from it will
1938
            be associated with.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1939
        """
1940
        if writer:
1941
            self.container_writer = writer[0]
1942
            self.write_index = writer[1]
1943
        else:
1944
            self.container_writer = None
1945
            self.write_index = None
1946
        self.indices = index_to_packs
1947
1948
    def add_raw_records(self, sizes, raw_data):
1949
        """Add raw knit bytes to a storage area.
1950
2670.2.3 by Robert Collins
Review feedback.
1951
        The data is spooled to the container writer in one bytes-record per
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1952
        raw data item.
1953
1954
        :param sizes: An iterable containing the size of each raw data segment.
1955
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1956
        :return: A list of memos to retrieve the record later. Each memo is a
1957
            tuple - (index, pos, length), where the index field is the 
1958
            write_index object supplied to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1959
        """
1960
        assert type(raw_data) == str, \
1961
            'data must be plain bytes was %s' % type(raw_data)
1962
        result = []
1963
        offset = 0
1964
        for size in sizes:
1965
            p_offset, p_length = self.container_writer.add_bytes_record(
1966
                raw_data[offset:offset+size], [])
1967
            offset += size
1968
            result.append((self.write_index, p_offset, p_length))
1969
        return result
1970
1971
    def create(self):
1972
        """Pack based knits do not get individually created."""
1973
1974
    def get_raw_records(self, memos_for_retrieval):
1975
        """Get the raw bytes for a records.
1976
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1977
        :param memos_for_retrieval: An iterable containing the (index, pos, 
1978
            length) memo for retrieving the bytes. The Pack access method
1979
            looks up the pack to use for a given record in its index_to_pack
1980
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1981
        :return: An iterator over the bytes of the records.
1982
        """
1983
        # first pass, group into same-index requests
1984
        request_lists = []
1985
        current_index = None
1986
        for (index, offset, length) in memos_for_retrieval:
1987
            if current_index == index:
1988
                current_list.append((offset, length))
1989
            else:
1990
                if current_index is not None:
1991
                    request_lists.append((current_index, current_list))
1992
                current_index = index
1993
                current_list = [(offset, length)]
1994
        # handle the last entry
1995
        if current_index is not None:
1996
            request_lists.append((current_index, current_list))
1997
        for index, offsets in request_lists:
1998
            transport, path = self.indices[index]
1999
            reader = pack.make_readv_reader(transport, path, offsets)
2000
            for names, read_func in reader.iter_records():
2001
                yield read_func(None)
2002
2003
    def open_file(self):
2004
        """Pack based knits have no single file."""
2005
        return None
2006
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2007
    def set_writer(self, writer, index, (transport, packname)):
2008
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2009
        if index is not None:
2010
            self.indices[index] = (transport, packname)
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2011
        self.container_writer = writer
2012
        self.write_index = index
2013
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2014
2015
class _KnitData(object):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2016
    """Manage extraction of data from a KnitAccess, caching and decompressing.
2017
    
2018
    The KnitData class provides the logic for parsing and using knit records,
2019
    making use of an access method for the low level read and write operations.
2020
    """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2021
2022
    def __init__(self, access):
2023
        """Create a KnitData object.
2024
2025
        :param access: The access method to use. Access methods such as
2026
            _KnitAccess manage the insertion of raw records and the subsequent
2027
            retrieval of the same.
2028
        """
2029
        self._access = access
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2030
        self._checked = False
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
2031
        # TODO: jam 20060713 conceptually, this could spill to disk
2032
        #       if the cached size gets larger than a certain amount
2033
        #       but it complicates the model a bit, so for now just use
2034
        #       a simple dictionary
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2035
        self._cache = {}
2036
        self._do_cache = False
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2037
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2038
    def enable_cache(self):
2039
        """Enable caching of reads."""
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
2040
        self._do_cache = True
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2041
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2042
    def clear_cache(self):
2043
        """Clear the record cache."""
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2044
        self._do_cache = False
2045
        self._cache = {}
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2046
2047
    def _open_file(self):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2048
        return self._access.open_file()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2049
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2050
    def _record_to_data(self, version_id, digest, lines, dense_lines=None):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2051
        """Convert version_id, digest, lines into a raw data block.
2052
        
2888.1.2 by Robert Collins
Cleanup the dense_lines parameter docstring to be more useful.
2053
        :param dense_lines: The bytes of lines but in a denser form. For
2054
            instance, if lines is a list of 1000 bytestrings each ending in \n,
2055
            dense_lines may be a list with one line in it, containing all the
2056
            1000's lines and their \n's. Using dense_lines if it is already
2057
            known is a win because the string join to create bytes in this
2058
            function spends less time resizing the final string.
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2059
        :return: (len, a StringIO instance with the raw data ready to read.)
2060
        """
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2061
        # Note: using a string copy here increases memory pressure with e.g.
2062
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
2063
        # when doing the initial commit of a mozilla tree. RBC 20070921
2064
        bytes = ''.join(chain(
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
2065
            ["version %s %d %s\n" % (version_id,
1596.2.28 by Robert Collins
more knit profile based tuning.
2066
                                     len(lines),
2067
                                     digest)],
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2068
            dense_lines or lines,
2069
            ["end %s\n" % version_id]))
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
2070
        assert bytes.__class__ == str
2071
        compressed_bytes = bytes_to_gzip(bytes)
2072
        return len(compressed_bytes), compressed_bytes
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2073
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2074
    def add_raw_records(self, sizes, raw_data):
1692.4.1 by Robert Collins
Multiple merges:
2075
        """Append a prepared record to the data file.
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2076
        
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2077
        :param sizes: An iterable containing the size of each raw data segment.
2078
        :param raw_data: A bytestring containing the data.
2079
        :return: a list of index data for the way the data was stored.
2080
            See the access method add_raw_records documentation for more
2081
            details.
1692.4.1 by Robert Collins
Multiple merges:
2082
        """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2083
        return self._access.add_raw_records(sizes, raw_data)
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2084
        
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2085
    def _parse_record_header(self, version_id, raw_data):
2086
        """Parse a record header for consistency.
2087
2088
        :return: the header and the decompressor stream.
2089
                 as (stream, header_record)
2090
        """
2091
        df = GzipFile(mode='rb', fileobj=StringIO(raw_data))
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2092
        try:
2093
            rec = self._check_header(version_id, df.readline())
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2094
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2095
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2096
                              "While reading {%s} got %s(%s)"
2097
                              % (version_id, e.__class__.__name__, str(e)))
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2098
        return df, rec
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2099
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2100
    def _check_header(self, version_id, line):
2101
        rec = line.split()
2102
        if len(rec) != 4:
2103
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2104
                              '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
2105
        if rec[1] != version_id:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2106
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2107
                              'unexpected version, wanted %r, got %r'
2108
                              % (version_id, rec[1]))
2109
        return rec
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2110
2111
    def _parse_record(self, version_id, data):
1628.1.2 by Robert Collins
More knit micro-optimisations.
2112
        # profiling notes:
2113
        # 4168 calls in 2880 217 internal
2114
        # 4168 calls to _parse_record_header in 2121
2115
        # 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()
2116
        df = GzipFile(mode='rb', fileobj=StringIO(data))
2117
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2118
        try:
2119
            record_contents = df.readlines()
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2120
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2121
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2122
                              "While reading {%s} got %s(%s)"
2123
                              % (version_id, e.__class__.__name__, str(e)))
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2124
        header = record_contents.pop(0)
2125
        rec = self._check_header(version_id, header)
2126
2127
        last_line = record_contents.pop()
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2128
        if len(record_contents) != int(rec[2]):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2129
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2130
                              'incorrect number of lines %s != %s'
2131
                              ' for version {%s}'
2132
                              % (len(record_contents), int(rec[2]),
2133
                                 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()
2134
        if last_line != 'end %s\n' % rec[1]:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2135
            raise KnitCorrupt(self._access,
2163.2.4 by John Arbash Meinel
Split _KnitData._parse_header up, so that we have 1 readlines() call, rather than readline+readlines()
2136
                              'unexpected version end line %r, wanted %r' 
2137
                              % (last_line, version_id))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2138
        df.close()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2139
        return record_contents, rec[3]
2140
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2141
    def read_records_iter_raw(self, records):
2142
        """Read text records from data file and yield raw data.
2143
2144
        This unpacks enough of the text record to validate the id is
2145
        as expected but thats all.
2146
        """
2147
        # setup an iterator of the external records:
2148
        # uses readv so nice and fast we hope.
1756.3.23 by Aaron Bentley
Remove knit caches
2149
        if len(records):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2150
            # 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
2151
            if self._cache:
2152
                # Don't check _cache if it is empty
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2153
                needed_offsets = [index_memo for version_id, index_memo
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2154
                                              in records
2155
                                              if version_id not in self._cache]
2156
            else:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2157
                needed_offsets = [index_memo for version_id, index_memo
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2158
                                               in records]
2159
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2160
            raw_records = self._access.get_raw_records(needed_offsets)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2161
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2162
        for version_id, index_memo in records:
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2163
            if version_id in self._cache:
2164
                # This data has already been validated
2165
                data = self._cache[version_id]
2166
            else:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2167
                data = raw_records.next()
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2168
                if self._do_cache:
2169
                    self._cache[version_id] = data
2170
2171
                # validate the header
2172
                df, rec = self._parse_record_header(version_id, data)
2173
                df.close()
1756.3.23 by Aaron Bentley
Remove knit caches
2174
            yield version_id, data
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2175
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2176
    def read_records_iter(self, records):
2177
        """Read text records from data file and yield result.
2178
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2179
        The result will be returned in whatever is the fastest to read.
2180
        Not by the order requested. Also, multiple requests for the same
2181
        record will only yield 1 response.
2182
        :param records: A list of (version_id, pos, len) entries
2183
        :return: Yields (version_id, contents, digest) in the order
2184
                 read, not the order requested
2185
        """
2186
        if not records:
2187
            return
2188
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2189
        if self._cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2190
            # Skip records we have alread seen
2191
            yielded_records = set()
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
2192
            needed_records = set()
2193
            for record in records:
2194
                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.
2195
                    if record[0] in yielded_records:
2196
                        continue
2197
                    yielded_records.add(record[0])
2198
                    data = self._cache[record[0]]
2199
                    content, digest = self._parse_record(record[0], data)
2200
                    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
2201
                else:
2202
                    needed_records.add(record)
2203
            needed_records = sorted(needed_records, key=operator.itemgetter(1))
2204
        else:
2205
            needed_records = sorted(set(records), key=operator.itemgetter(1))
1756.3.23 by Aaron Bentley
Remove knit caches
2206
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2207
        if not needed_records:
2208
            return
2209
2210
        # The transport optimizes the fetching as well 
2211
        # (ie, reads continuous ranges.)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2212
        raw_data = self._access.get_raw_records(
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2213
            [index_memo for version_id, index_memo in needed_records])
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2214
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2215
        for (version_id, index_memo), data in \
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2216
                izip(iter(needed_records), raw_data):
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2217
            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
2218
            if self._do_cache:
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2219
                self._cache[version_id] = data
1756.3.23 by Aaron Bentley
Remove knit caches
2220
            yield version_id, content, digest
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2221
2222
    def read_records(self, records):
2223
        """Read records into a dictionary."""
2224
        components = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2225
        for record_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
2226
                self.read_records_iter(records):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2227
            components[record_id] = (content, digest)
2228
        return components
2229
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2230
2231
class InterKnit(InterVersionedFile):
2232
    """Optimised code paths for knit to knit operations."""
2233
    
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2234
    _matching_file_from_factory = KnitVersionedFile
2235
    _matching_file_to_factory = KnitVersionedFile
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2236
    
2237
    @staticmethod
2238
    def is_compatible(source, target):
2239
        """Be compatible with knits.  """
2240
        try:
2241
            return (isinstance(source, KnitVersionedFile) and
2242
                    isinstance(target, KnitVersionedFile))
2243
        except AttributeError:
2244
            return False
2245
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2246
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2247
        """See InterVersionedFile.join."""
2248
        assert isinstance(self.source, KnitVersionedFile)
2249
        assert isinstance(self.target, KnitVersionedFile)
2250
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
2251
        # If the source and target are mismatched w.r.t. annotations vs
2252
        # plain, the data needs to be converted accordingly
2253
        if self.source.factory.annotated == self.target.factory.annotated:
2254
            converter = None
2255
        elif self.source.factory.annotated:
2256
            converter = self._anno_to_plain_converter
2257
        else:
2258
            # We're converting from a plain to an annotated knit. This requires
2259
            # building the annotations from scratch. The generic join code
2260
            # handles this implicitly so we delegate to it.
2261
            return super(InterKnit, self).join(pb, msg, version_ids,
2262
                ignore_missing)
2263
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
2264
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2265
        if not version_ids:
2266
            return 0
2267
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2268
        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.
2269
        try:
2270
            version_ids = list(version_ids)
2271
            if None in version_ids:
2272
                version_ids.remove(None)
2273
    
2274
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
2275
            this_versions = set(self.target._index.get_versions())
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2276
            # XXX: For efficiency we should not look at the whole index,
2277
            #      we only need to consider the referenced revisions - they
2278
            #      must all be present, or the method must be full-text.
2279
            #      TODO, RBC 20070919
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2280
            needed_versions = self.source_ancestry - this_versions
2281
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2282
            if not needed_versions:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2283
                return 0
1910.2.65 by Aaron Bentley
Remove the check-parent patch
2284
            full_list = topo_sort(self.source.get_graph())
2285
    
2286
            version_list = [i for i in full_list if (not self.target.has_version(i)
2287
                            and i in needed_versions)]
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2288
    
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2289
            # plan the join:
2290
            copy_queue = []
2291
            copy_queue_records = []
2292
            copy_set = set()
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2293
            for version_id in version_list:
2294
                options = self.source._index.get_options(version_id)
2295
                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.
2296
                # 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.
2297
                for parent in parents:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2298
                    # if source has the parent, we must :
2299
                    # * already have it or
2300
                    # * have it scheduled already
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2301
                    # otherwise we don't care
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2302
                    assert (self.target.has_version(parent) or
2303
                            parent in copy_set or
2304
                            not self.source.has_version(parent))
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2305
                index_memo = self.source._index.get_position(version_id)
2306
                copy_queue_records.append((version_id, index_memo))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2307
                copy_queue.append((version_id, options, parents))
2308
                copy_set.add(version_id)
2309
2310
            # data suck the join:
2311
            count = 0
2312
            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.
2313
            raw_datum = []
2314
            raw_records = []
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2315
            for (version_id, raw_data), \
2316
                (version_id2, options, parents) in \
2317
                izip(self.source._data.read_records_iter_raw(copy_queue_records),
2318
                     copy_queue):
2319
                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.
2320
                count = count + 1
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2321
                pb.update("Joining knit", count, total)
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
2322
                if converter:
2323
                    size, raw_data = converter(raw_data, version_id, options,
2324
                        parents)
2851.4.1 by Ian Clatworthy
Support joining plain knits to annotated knits and vice versa
2325
                else:
2326
                    size = len(raw_data)
2327
                raw_records.append((version_id, options, parents, size))
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
2328
                raw_datum.append(raw_data)
2329
            self.target._add_raw_records(raw_records, ''.join(raw_datum))
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2330
            return count
2331
        finally:
2332
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2333
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
2334
    def _anno_to_plain_converter(self, raw_data, version_id, options,
2335
                                 parents):
2336
        """Convert annotated content to plain content."""
2337
        data, digest = self.source._data._parse_record(version_id, raw_data)
2338
        if 'fulltext' in options:
2339
            content = self.source.factory.parse_fulltext(data, version_id)
2340
            lines = self.target.factory.lower_fulltext(content)
2341
        else:
2342
            delta = self.source.factory.parse_line_delta(data, version_id,
2343
                plain=True)
2344
            lines = self.target.factory.lower_line_delta(delta)
2345
        return self.target._data._record_to_data(version_id, digest, lines)
2346
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2347
2348
InterVersionedFile.register_optimiser(InterKnit)
1596.2.24 by Robert Collins
Gzipfile was slightly slower than ideal.
2349
2350
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2351
class WeaveToKnit(InterVersionedFile):
2352
    """Optimised code paths for weave to knit operations."""
2353
    
2354
    _matching_file_from_factory = bzrlib.weave.WeaveFile
2355
    _matching_file_to_factory = KnitVersionedFile
2356
    
2357
    @staticmethod
2358
    def is_compatible(source, target):
2359
        """Be compatible with weaves to knits."""
2360
        try:
2361
            return (isinstance(source, bzrlib.weave.Weave) and
2362
                    isinstance(target, KnitVersionedFile))
2363
        except AttributeError:
2364
            return False
2365
2366
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
2367
        """See InterVersionedFile.join."""
2368
        assert isinstance(self.source, bzrlib.weave.Weave)
2369
        assert isinstance(self.target, KnitVersionedFile)
2370
2371
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
2372
2373
        if not version_ids:
2374
            return 0
2375
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2376
        pb = ui.ui_factory.nested_progress_bar()
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2377
        try:
2378
            version_ids = list(version_ids)
2379
    
2380
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
2381
            this_versions = set(self.target._index.get_versions())
2382
            needed_versions = self.source_ancestry - this_versions
2383
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2384
            if not needed_versions:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2385
                return 0
2386
            full_list = topo_sort(self.source.get_graph())
2387
    
2388
            version_list = [i for i in full_list if (not self.target.has_version(i)
2389
                            and i in needed_versions)]
2390
    
2391
            # do the join:
2392
            count = 0
2393
            total = len(version_list)
2394
            for version_id in version_list:
2395
                pb.update("Converting to knit", count, total)
2396
                parents = self.source.get_parents(version_id)
2397
                # check that its will be a consistent copy:
2398
                for parent in parents:
2399
                    # if source has the parent, we must already have it
2400
                    assert (self.target.has_version(parent))
2401
                self.target.add_lines(
2402
                    version_id, parents, self.source.get_lines(version_id))
2403
                count = count + 1
2404
            return count
2405
        finally:
2406
            pb.finished()
2407
2408
2409
InterVersionedFile.register_optimiser(WeaveToKnit)
2410
2411
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2412
# Deprecated, use PatienceSequenceMatcher instead
2413
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2414
2415
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2416
def annotate_knit(knit, revision_id):
2417
    """Annotate a knit with no cached annotations.
2418
2419
    This implementation is for knits with no cached annotations.
2420
    It will work for knits with cached annotations, but this is not
2421
    recommended.
2422
    """
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2423
    ancestry = knit.get_ancestry(revision_id)
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2424
    fulltext = dict(zip(ancestry, knit.get_line_list(ancestry)))
2425
    annotations = {}
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2426
    for candidate in ancestry:
2770.1.4 by Aaron Bentley
Further optimize annotation, using existing matching blocks
2427
        if candidate in annotations:
2428
            continue
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2429
        parents = knit.get_parents(candidate)
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2430
        if len(parents) == 0:
2431
            blocks = None
2432
        elif knit._index.get_method(candidate) != 'line-delta':
2433
            blocks = None
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2434
        else:
2770.1.8 by Aaron Bentley
Use topo-sorted ancestry for generating annotations
2435
            parent, sha1, noeol, delta = knit.get_delta(candidate)
2436
            blocks = KnitContent.get_line_delta_blocks(delta,
2437
                fulltext[parents[0]], fulltext[candidate])
2438
        annotations[candidate] = list(annotate.reannotate([annotations[p]
2439
            for p in parents], fulltext[candidate], candidate, blocks))
2770.1.3 by Aaron Bentley
Rework knit annotation as stack-based
2440
    return iter(annotations[revision_id])
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2441
2442
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2443
try:
2484.1.12 by John Arbash Meinel
Switch the layout to use a matching _knit_load_data_py.py and _knit_load_data_c.pyx
2444
    from bzrlib._knit_load_data_c import _load_data_c as _load_data
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2445
except ImportError:
2484.1.12 by John Arbash Meinel
Switch the layout to use a matching _knit_load_data_py.py and _knit_load_data_c.pyx
2446
    from bzrlib._knit_load_data_py import _load_data_py as _load_data