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