/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Knit versionedfile implementation.
18
19
A knit is a versioned file implementation that supports efficient append only
20
updates.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
21
22
Knit file layout:
23
lifeless: the data file is made up of "delta records".  each delta record has a delta header 
24
that contains; (1) a version id, (2) the size of the delta (in lines), and (3)  the digest of 
25
the -expanded data- (ie, the delta applied to the parent).  the delta also ends with a 
26
end-marker; simply "end VERSION"
27
28
delta can be line or full contents.a
29
... the 8's there are the index number of the annotation.
30
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
31
59,59,3
32
8
33
8         if ie.executable:
34
8             e.set('executable', 'yes')
35
130,130,2
36
8         if elt.get('executable') == 'yes':
37
8             ie.executable = True
38
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 
39
40
41
whats in an index:
42
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
43
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
44
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
45
09:33 < lifeless> right
46
09:33 < jrydberg> lifeless: the position and size is the range in the data file
47
48
49
so the index sequence is the dictionary compressed sequence number used
50
in the deltas to provide line annotation
51
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
52
"""
53
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
54
# TODOS:
55
# 10:16 < lifeless> make partial index writes safe
56
# 10:16 < lifeless> implement 'knit.check()' like weave.check()
57
# 10:17 < lifeless> record known ghosts so we can detect when they are filled in rather than the current 'reweave 
58
#                    always' approach.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
59
# move sha1 out of the content so that join is faster at verifying parents
60
# record content length ?
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
61
                  
62
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
63
from copy import copy
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
64
from cStringIO import StringIO
1596.2.28 by Robert Collins
more knit profile based tuning.
65
from itertools import izip, chain
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
66
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
67
import os
1628.1.2 by Robert Collins
More knit micro-optimisations.
68
import sys
1756.2.29 by Aaron Bentley
Remove basis knit support
69
import warnings
2762.3.1 by Robert Collins
* The compression used within the bzr repository has changed from zlib
70
from zlib import Z_DEFAULT_COMPRESSION
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
71
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
72
import bzrlib
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import (
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
76
    annotate,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
77
    graph as _mod_graph,
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
78
    lru_cache,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
79
    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.
80
    trace,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
81
    )
82
""")
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
83
from bzrlib import (
84
    cache_utf8,
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
85
    debug,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
86
    diff,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
87
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
88
    osutils,
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
89
    patiencediff,
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
90
    progress,
1551.15.46 by Aaron Bentley
Move plan merge to tree
91
    merge,
2196.2.1 by John Arbash Meinel
Merge Dmitry's optimizations and minimize the actual diff.
92
    ui,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
93
    )
94
from bzrlib.errors import (
95
    FileExists,
96
    NoSuchFile,
97
    KnitError,
98
    InvalidRevisionId,
99
    KnitCorrupt,
100
    KnitHeaderError,
101
    RevisionNotPresent,
102
    RevisionAlreadyPresent,
103
    )
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
104
from bzrlib.graph import Graph
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
105
from bzrlib.osutils import (
106
    contains_whitespace,
107
    contains_linebreaks,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
108
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
109
    sha_strings,
110
    )
3287.6.5 by Robert Collins
Deprecate VersionedFile.has_ghost.
111
from bzrlib.symbol_versioning import (
112
    DEPRECATED_PARAMETER,
113
    deprecated_method,
114
    deprecated_passed,
115
    one_four,
116
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
117
from bzrlib.tsort import topo_sort
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
118
from bzrlib.tuned_gzip import GzipFile, bytes_to_gzip
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
119
import bzrlib.ui
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
120
from bzrlib.versionedfile import VersionedFile, InterVersionedFile
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
121
import bzrlib.weave
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
122
123
124
# TODO: Split out code specific to this format into an associated object.
125
126
# TODO: Can we put in some kind of value to check that the index and data
127
# files belong together?
128
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
129
# 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.
130
131
# TODO: function to check whole file
132
133
# TODO: atomically append data, then measure backwards from the cursor
134
# position after writing to work out where it was located.  we may need to
135
# bypass python file buffering.
136
137
DATA_SUFFIX = '.knit'
138
INDEX_SUFFIX = '.kndx'
139
140
141
class KnitContent(object):
142
    """Content of a knit version to which deltas can be applied."""
143
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
144
    def __init__(self):
145
        self._should_strip_eol = False
146
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
147
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
148
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
149
        raise NotImplementedError(self.apply_delta)
150
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
151
    def cleanup_eol(self, copy_on_mutate=True):
152
        if self._should_strip_eol:
153
            if copy_on_mutate:
154
                self._lines = self._lines[:]
155
            self.strip_last_line_newline()
156
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
157
    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.
158
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
159
        new_texts = new_lines.text()
160
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
161
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
162
        for tag, i1, i2, j1, j2 in s.get_opcodes():
163
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
164
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
165
            # ofrom, oto, length, data
166
            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.
167
168
    def line_delta(self, new_lines):
169
        return list(self.line_delta_iter(new_lines))
170
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
171
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
172
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
173
        """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
174
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
175
        s_pos = 0
176
        t_pos = 0
177
        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
178
            true_n = s_begin - s_pos
179
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
180
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
181
                # knit deltas do not provide reliable info about whether the
182
                # last line of a file matches, due to eol handling.
183
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
184
                    n-=1
185
                if n > 0:
186
                    yield s_pos, t_pos, n
187
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
188
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
189
        n = target_len - t_pos
190
        if n > 0:
191
            if source[s_pos + n -1] != target[t_pos + n -1]:
192
                n-=1
193
            if n > 0:
194
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
195
        yield s_pos + (target_len - t_pos), target_len, 0
196
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
197
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.
198
class AnnotatedKnitContent(KnitContent):
199
    """Annotated content."""
200
201
    def __init__(self, lines):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
202
        KnitContent.__init__(self)
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.
203
        self._lines = lines
204
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
205
    def annotate(self):
206
        """Return a list of (origin, text) for each content line."""
207
        return list(self._lines)
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.
208
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
209
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
210
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
211
        offset = 0
212
        lines = self._lines
213
        for start, end, count, delta_lines in delta:
214
            lines[offset+start:offset+end] = delta_lines
215
            offset = offset + (start - end) + count
216
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.
217
    def strip_last_line_newline(self):
218
        line = self._lines[-1][1].rstrip('\n')
219
        self._lines[-1] = (self._lines[-1][0], line)
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
220
        self._should_strip_eol = False
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.
221
222
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
223
        try:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
224
            lines = [text for origin, text in self._lines]
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
225
        except ValueError, e:
226
            # most commonly (only?) caused by the internal form of the knit
227
            # missing annotation information because of a bug - see thread
228
            # around 20071015
229
            raise KnitCorrupt(self,
230
                "line in annotated knit missing annotation information: %s"
231
                % (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.
232
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
233
        if self._should_strip_eol:
234
            anno, line = lines[-1]
235
            lines[-1] = (anno, line.rstrip('\n'))
236
        return lines
237
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.
238
    def copy(self):
239
        return AnnotatedKnitContent(self._lines[:])
240
241
242
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
243
    """Unannotated content.
244
    
245
    When annotate[_iter] is called on this content, the same version is reported
246
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
247
    objects.
248
    """
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
249
250
    def __init__(self, lines, version_id):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
251
        KnitContent.__init__(self)
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.
252
        self._lines = lines
253
        self._version_id = version_id
254
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
255
    def annotate(self):
256
        """Return a list of (origin, text) for each content line."""
257
        return [(self._version_id, line) for line in self._lines]
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.
258
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
259
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
260
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
261
        offset = 0
262
        lines = self._lines
263
        for start, end, count, delta_lines in delta:
264
            lines[offset+start:offset+end] = delta_lines
265
            offset = offset + (start - end) + count
266
        self._version_id = new_version_id
267
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.
268
    def copy(self):
269
        return PlainKnitContent(self._lines[:], self._version_id)
270
271
    def strip_last_line_newline(self):
272
        self._lines[-1] = self._lines[-1].rstrip('\n')
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
273
        self._should_strip_eol = False
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.
274
275
    def text(self):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
276
        lines = self._lines
277
        if self._should_strip_eol:
278
            lines = lines[:]
279
            lines[-1] = lines[-1].rstrip('\n')
280
        return lines
281
282
283
class _KnitFactory(object):
284
    """Base class for common Factory functions."""
285
286
    def parse_record(self, version_id, record, record_details,
287
                     base_content, copy_base_content=True):
288
        """Parse a record into a full content object.
289
290
        :param version_id: The official version id for this content
291
        :param record: The data returned by read_records_iter()
292
        :param record_details: Details about the record returned by
293
            get_build_details
294
        :param base_content: If get_build_details returns a compression_parent,
295
            you must return a base_content here, else use None
296
        :param copy_base_content: When building from the base_content, decide
297
            you can either copy it and return a new object, or modify it in
298
            place.
299
        :return: (content, delta) A Content object and possibly a line-delta,
300
            delta may be None
301
        """
302
        method, noeol = record_details
303
        if method == 'line-delta':
304
            if copy_base_content:
305
                content = base_content.copy()
306
            else:
307
                content = base_content
308
            delta = self.parse_line_delta(record, version_id)
309
            content.apply_delta(delta, version_id)
310
        else:
311
            content = self.parse_fulltext(record, version_id)
312
            delta = None
313
        content._should_strip_eol = noeol
314
        return (content, delta)
315
316
317
class KnitAnnotateFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
318
    """Factory for creating annotated Content objects."""
319
320
    annotated = True
321
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.
322
    def make(self, lines, version_id):
323
        num_lines = len(lines)
324
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
325
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
326
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
327
        """Convert fulltext to internal representation
328
329
        fulltext content is of the format
330
        revid(utf8) plaintext\n
331
        internal representation is of the format:
332
        (revid, plaintext)
333
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
334
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
335
        #       but the code itself doesn't really depend on that.
336
        #       Figure out a way to not require the overhead of turning the
337
        #       list back into tuples.
338
        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.
339
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
340
341
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
342
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
343
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
344
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
345
        """Convert a line based delta into internal representation.
346
347
        line delta is in the form of:
348
        intstart intend intcount
349
        1..count lines:
350
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
351
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
352
        (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
353
354
        :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
355
            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
356
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
357
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
358
        result = []
359
        lines = iter(lines)
360
        next = lines.next
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
361
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
362
        cache = {}
363
        def cache_and_return(line):
364
            origin, text = line.split(' ', 1)
365
            return cache.setdefault(origin, origin), text
366
1628.1.2 by Robert Collins
More knit micro-optimisations.
367
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
368
        # Note that the plain test is explicitly pulled out of the
369
        # loop to minimise any performance impact
370
        if plain:
371
            for header in lines:
372
                start, end, count = [int(n) for n in header.split(',')]
373
                contents = [next().split(' ', 1)[1] for i in xrange(count)]
374
                result.append((start, end, count, contents))
375
        else:
376
            for header in lines:
377
                start, end, count = [int(n) for n in header.split(',')]
378
                contents = [tuple(next().split(' ', 1)) for i in xrange(count)]
379
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
380
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
381
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
382
    def get_fulltext_content(self, lines):
383
        """Extract just the content lines from a fulltext."""
384
        return (line.split(' ', 1)[1] for line in lines)
385
386
    def get_linedelta_content(self, lines):
387
        """Extract just the content from a line delta.
388
389
        This doesn't return all of the extra information stored in a delta.
390
        Only the actual content lines.
391
        """
392
        lines = iter(lines)
393
        next = lines.next
394
        for header in lines:
395
            header = header.split(',')
396
            count = int(header[2])
397
            for i in xrange(count):
398
                origin, text = next().split(' ', 1)
399
                yield text
400
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
401
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
402
        """convert a fulltext content record into a serializable form.
403
404
        see parse_fulltext which this inverts.
405
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
406
        # TODO: jam 20070209 We only do the caching thing to make sure that
407
        #       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.
408
        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.
409
410
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
411
        """convert a delta into a serializable form.
412
1628.1.2 by Robert Collins
More knit micro-optimisations.
413
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
414
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
415
        # TODO: jam 20070209 We only do the caching thing to make sure that
416
        #       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.
417
        out = []
418
        for start, end, c, lines in delta:
419
            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.
420
            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
421
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
422
        return out
423
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
424
    def annotate(self, knit, version_id):
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
425
        content = knit._get_content(version_id)
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
426
        return content.annotate()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
427
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
428
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
429
class KnitPlainFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
430
    """Factory for creating plain Content objects."""
431
432
    annotated = False
433
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.
434
    def make(self, lines, version_id):
435
        return PlainKnitContent(lines, version_id)
436
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
437
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
438
        """This parses an unannotated fulltext.
439
440
        Note that this is not a noop - the internal representation
441
        has (versionid, line) - its just a constant versionid.
442
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
443
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
444
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
445
    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
446
        cur = 0
447
        num_lines = len(lines)
448
        while cur < num_lines:
449
            header = lines[cur]
450
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
451
            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.
452
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
453
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
454
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
455
    def parse_line_delta(self, lines, version_id):
456
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
457
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
458
    def get_fulltext_content(self, lines):
459
        """Extract just the content lines from a fulltext."""
460
        return iter(lines)
461
462
    def get_linedelta_content(self, lines):
463
        """Extract just the content from a line delta.
464
465
        This doesn't return all of the extra information stored in a delta.
466
        Only the actual content lines.
467
        """
468
        lines = iter(lines)
469
        next = lines.next
470
        for header in lines:
471
            header = header.split(',')
472
            count = int(header[2])
473
            for i in xrange(count):
474
                yield next()
475
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
476
    def lower_fulltext(self, content):
477
        return content.text()
478
479
    def lower_line_delta(self, delta):
480
        out = []
481
        for start, end, c, lines in delta:
482
            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.
483
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
484
        return out
485
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
486
    def annotate(self, knit, version_id):
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
487
        annotator = _KnitAnnotator(knit)
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
488
        return annotator.annotate(version_id)
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
489
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
490
491
def make_empty_knit(transport, relpath):
492
    """Construct a empty knit at the specified location."""
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
493
    k = make_file_knit(transport, relpath, 'w', KnitPlainFactory)
494
495
496
def make_file_knit(name, transport, file_mode=None, access_mode='w',
497
    factory=None, delta=True, create=False, create_parent_dir=False,
498
    delay_create=False, dir_mode=None, get_scope=None):
499
    """Factory to create a KnitVersionedFile for a .knit/.kndx file pair."""
500
    if factory is None:
501
        factory = KnitAnnotateFactory()
502
    else:
503
        factory = KnitPlainFactory()
504
    if get_scope is None:
505
        get_scope = lambda:None
506
    index = _KnitIndex(transport, name + INDEX_SUFFIX,
507
        access_mode, create=create, file_mode=file_mode,
508
        create_parent_dir=create_parent_dir, delay_create=delay_create,
509
        dir_mode=dir_mode, get_scope=get_scope)
510
    access = _KnitAccess(transport, name + DATA_SUFFIX, file_mode,
511
        dir_mode, ((create and not len(index)) and delay_create),
512
        create_parent_dir)
513
    return KnitVersionedFile(name, transport, factory=factory,
514
        create=create, delay_create=delay_create, index=index,
515
        access_method=access)
516
517
518
def get_suffixes():
519
    """Return the suffixes used by file based knits."""
520
    return [DATA_SUFFIX, INDEX_SUFFIX]
521
make_file_knit.get_suffixes = get_suffixes
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
522
523
524
class KnitVersionedFile(VersionedFile):
525
    """Weave-like structure with faster random access.
526
527
    A knit stores a number of texts and a summary of the relationships
528
    between them.  Texts are identified by a string version-id.  Texts
529
    are normally stored and retrieved as a series of lines, but can
530
    also be passed as single strings.
531
532
    Lines are stored with the trailing newline (if any) included, to
533
    avoid special cases for files with no final newline.  Lines are
534
    composed of 8-bit characters, not unicode.  The combination of
535
    these approaches should mean any 'binary' file can be safely
536
    stored and retrieved.
537
    """
538
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
539
    def __init__(self, relpath, transport, file_mode=None,
2592.3.135 by Robert Collins
Do not create many transient knit objects, saving 4% on commit.
540
        factory=None, delta=True, create=False, create_parent_dir=False,
541
        delay_create=False, dir_mode=None, index=None, access_method=None):
1563.2.25 by Robert Collins
Merge in upstream.
542
        """Construct a knit at location specified by relpath.
543
        
544
        :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
545
        :param create_parent_dir: If True, create the parent directory if 
546
            creating the file fails. (This is used for stores with 
547
            hash-prefixes that may not exist yet)
548
        :param delay_create: The calling code is aware that the knit won't 
549
            actually be created until the first data is stored.
2592.3.1 by Robert Collins
Allow giving KnitVersionedFile an index object to use rather than implicitly creating one.
550
        :param index: An index to use for the knit.
1563.2.25 by Robert Collins
Merge in upstream.
551
        """
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
552
        super(KnitVersionedFile, self).__init__()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
553
        self.transport = transport
554
        self.filename = relpath
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
555
        self.factory = factory or KnitAnnotateFactory()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
556
        self.delta = delta
557
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
558
        self._max_delta_chain = 200
559
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
560
        if None in (access_method, index):
3316.2.15 by Robert Collins
Final review feedback.
561
            raise ValueError("No default access_method or index any more")
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
562
        self._index = index
563
        _access = access_method
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
564
        if create and not len(self) and not delay_create:
565
            _access.create()
566
        self._data = _KnitData(_access)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
567
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
568
    def __repr__(self):
2592.3.159 by Robert Collins
Provide a transport for KnitVersionedFile's __repr__ in pack repositories.
569
        return '%s(%s)' % (self.__class__.__name__,
1704.2.10 by Martin Pool
Add KnitVersionedFile.__repr__ method
570
                           self.transport.abspath(self.filename))
571
    
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
572
    def _check_should_delta(self, first_parents):
573
        """Iterate back through the parent listing, looking for a fulltext.
574
575
        This is used when we want to decide whether to add a delta or a new
576
        fulltext. It searches for _max_delta_chain parents. When it finds a
577
        fulltext parent, it sees if the total size of the deltas leading up to
578
        it is large enough to indicate that we want a new full text anyway.
579
580
        Return True if we should create a new delta, False if we should use a
581
        full text.
582
        """
583
        delta_size = 0
584
        fulltext_size = None
585
        delta_parents = first_parents
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
586
        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
587
            parent = delta_parents[0]
588
            method = self._index.get_method(parent)
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
589
            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
590
            if method == 'fulltext':
591
                fulltext_size = size
592
                break
593
            delta_size += size
3287.5.6 by Robert Collins
Remove _KnitIndex.get_parents.
594
            delta_parents = self._index.get_parent_map([parent])[parent]
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
595
        else:
596
            # 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
597
            return False
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
598
599
        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
600
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
601
    def _check_write_ok(self):
602
        return self._index._check_write_ok()
603
1692.2.1 by Robert Collins
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
604
    def _add_raw_records(self, records, data):
605
        """Add all the records 'records' with data pre-joined in 'data'.
606
607
        :param records: A list of tuples(version_id, options, parents, size).
608
        :param data: The data for the records. When it is written, the records
609
                     are adjusted to have pos pointing into data by the sum of
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
610
                     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.
611
        """
612
        # write all the data
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
613
        raw_record_sizes = [record[3] for record in records]
614
        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
615
        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.
616
        index_entries = []
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
617
        for (version_id, options, parents, size), access_memo in zip(
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
618
            records, positions):
2592.3.68 by Robert Collins
Make knit add_versions calls take access memo tuples rather than just pos and size.
619
            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
620
            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.
621
        self._index.add_versions(index_entries)
622
1563.2.15 by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages.
623
    def copy_to(self, name, transport):
624
        """See VersionedFile.copy_to()."""
625
        # copy the current index to a temp index to avoid racing with local
626
        # writes
1955.3.30 by John Arbash Meinel
fix small bug
627
        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
628
                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.
629
        # 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()
630
        f = self._data._open_file()
631
        try:
1955.3.8 by John Arbash Meinel
avoid some deprecation warnings in other parts of the code
632
            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()
633
        finally:
634
            f.close()
635
        # move the copied index into place
636
        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.
637
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
638
    def get_data_stream(self, required_versions):
639
        """Get a data stream for the specified versions.
640
641
        Versions may be returned in any order, not necessarily the order
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
642
        specified.  They are returned in a partial order by compression
643
        parent, so that the deltas can be applied as the data stream is
644
        inserted; however note that compression parents will not be sent
645
        unless they were specifically requested, as the client may already
646
        have them.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
647
2670.3.7 by Andrew Bennetts
Tweak docstring as requested in review.
648
        :param required_versions: The exact set of versions to be extracted.
649
            Unlike some other knit methods, this is not used to generate a
650
            transitive closure, rather it is used precisely as given.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
651
        
652
        :returns: format_signature, list of (version, options, length, parents),
653
            reader_callable.
654
        """
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
655
        required_version_set = frozenset(required_versions)
656
        version_index = {}
657
        # list of revisions that can just be sent without waiting for their
658
        # compression parent
659
        ready_to_send = []
660
        # map from revision to the children based on it
661
        deferred = {}
662
        # first, read all relevant index data, enough to sort into the right
663
        # order to return
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
664
        for version_id in required_versions:
665
            options = self._index.get_options(version_id)
666
            parents = self._index.get_parents_with_ghosts(version_id)
2535.3.36 by Andrew Bennetts
Merge bzr.dev
667
            index_memo = self._index.get_position(version_id)
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
668
            version_index[version_id] = (index_memo, options, parents)
3034.3.1 by Martin Pool
Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
669
            if ('line-delta' in options
670
                and parents[0] in required_version_set):
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
671
                # must wait until the parent has been sent
672
                deferred.setdefault(parents[0], []). \
673
                    append(version_id)
674
            else:
675
                # either a fulltext, or a delta whose parent the client did
676
                # not ask for and presumably already has
677
                ready_to_send.append(version_id)
678
        # build a list of results to return, plus instructions for data to
679
        # read from the file
680
        copy_queue_records = []
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
681
        temp_version_list = []
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
682
        while ready_to_send:
683
            # XXX: pushing and popping lists may be a bit inefficient
3023.2.3 by Martin Pool
Update tests for new ordering of results from get_data_stream - the order is not defined by the interface, but is stable
684
            version_id = ready_to_send.pop(0)
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
685
            (index_memo, options, parents) = version_index[version_id]
2535.3.36 by Andrew Bennetts
Merge bzr.dev
686
            copy_queue_records.append((version_id, index_memo))
687
            none, data_pos, data_size = index_memo
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
688
            temp_version_list.append((version_id, options, data_size,
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
689
                parents))
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
690
            if version_id in deferred:
691
                # now we can send all the children of this revision - we could
3023.2.3 by Martin Pool
Update tests for new ordering of results from get_data_stream - the order is not defined by the interface, but is stable
692
                # put them in anywhere, but we hope that sending them soon
693
                # after the fulltext will give good locality in the receiver
3023.2.2 by Martin Pool
Fix KnitVersionedFile.get_data_stream to not assume .versions() is sorted. (lp:165106)
694
                ready_to_send[:0] = deferred.pop(version_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
695
        if not (len(deferred) == 0):
696
            raise AssertionError("Still have compressed child versions waiting to be sent")
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
697
        # XXX: The stream format is such that we cannot stream it - we have to
698
        # know the length of all the data a-priori.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
699
        raw_datum = []
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
700
        result_version_list = []
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
701
        for (version_id, raw_data), \
702
            (version_id2, options, _, parents) in \
703
            izip(self._data.read_records_iter_raw(copy_queue_records),
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
704
                 temp_version_list):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
705
            if not (version_id == version_id2):
706
                raise AssertionError('logic error, inconsistent results')
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
707
            raw_datum.append(raw_data)
3015.2.19 by Robert Collins
Don't include the pack container length in the lengths given by get_data_stream.
708
            result_version_list.append(
709
                (version_id, options, len(raw_data), parents))
710
        # provide a callback to get data incrementally.
2535.3.3 by Andrew Bennetts
Add Knit.get_data_stream.
711
        pseudo_file = StringIO(''.join(raw_datum))
712
        def read(length):
713
            if length is None:
714
                return pseudo_file.read()
715
            else:
716
                return pseudo_file.read(length)
717
        return (self.get_format_signature(), result_version_list, read)
718
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
719
    def _extract_blocks(self, version_id, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
720
        if self._index.get_method(version_id) != 'line-delta':
721
            return None
722
        parent, sha1, noeol, delta = self.get_delta(version_id)
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
723
        return KnitContent.get_line_delta_blocks(delta, source, target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
724
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
725
    def get_delta(self, version_id):
726
        """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
727
        self.check_not_reserved_id(version_id)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
728
        parents = self.get_parent_map([version_id])[version_id]
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
729
        if len(parents):
730
            parent = parents[0]
731
        else:
732
            parent = None
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
733
        index_memo = self._index.get_position(version_id)
734
        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.
735
        noeol = 'no-eol' in self._index.get_options(version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
736
        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
737
            new_content = self.factory.parse_fulltext(data, version_id)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
738
            if parent is not None:
739
                reference_content = self._get_content(parent)
740
                old_texts = reference_content.text()
741
            else:
742
                old_texts = []
743
            new_texts = new_content.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
744
            delta_seq = patiencediff.PatienceSequenceMatcher(None, old_texts,
745
                                                             new_texts)
1596.2.37 by Robert Collins
Switch to delta based content copying in the generic versioned file copier.
746
            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.
747
        else:
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
748
            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.
749
            return parent, sha1, noeol, delta
2535.3.1 by Andrew Bennetts
Add get_format_signature to VersionedFile
750
751
    def get_format_signature(self):
752
        """See VersionedFile.get_format_signature()."""
753
        if self.factory.annotated:
754
            annotated_part = "annotated"
755
        else:
756
            annotated_part = "plain"
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
757
        return "knit-%s" % (annotated_part,)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
758
        
3287.6.7 by Robert Collins
* ``VersionedFile.get_graph_with_ghosts`` is deprecated, with no
759
    @deprecated_method(one_four)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
760
    def get_graph_with_ghosts(self):
761
        """See VersionedFile.get_graph_with_ghosts()."""
3287.6.7 by Robert Collins
* ``VersionedFile.get_graph_with_ghosts`` is deprecated, with no
762
        return self.get_parent_map(self.versions())
1594.2.8 by Robert Collins
add ghost aware apis to knits.
763
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
764
    def get_sha1s(self, version_ids):
3316.2.9 by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use
765
        """See VersionedFile.get_sha1s()."""
2520.4.88 by Aaron Bentley
Retrieve all sha1s at once (ftw)
766
        record_map = self._get_record_map(version_ids)
767
        # record entry 2 is the 'digest'.
768
        return [record_map[v][2] for v in version_ids]
1666.1.6 by Robert Collins
Make knit the default format.
769
3287.6.5 by Robert Collins
Deprecate VersionedFile.has_ghost.
770
    @deprecated_method(one_four)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
771
    def has_ghost(self, version_id):
772
        """True if there is a ghost reference in the file to version_id."""
773
        # maybe we have it
774
        if self.has_version(version_id):
775
            return False
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
776
        # optimisable if needed by memoising the _ghosts set.
3287.6.5 by Robert Collins
Deprecate VersionedFile.has_ghost.
777
        items = self.get_parent_map(self.versions())
3287.6.6 by Robert Collins
Unbreak has_ghosts.
778
        for parents in items.itervalues():
1594.2.8 by Robert Collins
add ghost aware apis to knits.
779
            for parent in parents:
3287.6.5 by Robert Collins
Deprecate VersionedFile.has_ghost.
780
                if parent == version_id and parent not in items:
781
                    return True
1594.2.8 by Robert Collins
add ghost aware apis to knits.
782
        return False
783
2535.3.30 by Andrew Bennetts
Delete obsolete comments and other cosmetic changes.
784
    def insert_data_stream(self, (format, data_list, reader_callable)):
2535.3.4 by Andrew Bennetts
Simple implementation of Knit.insert_data_stream.
785
        """Insert knit records from a data stream into this knit.
786
2535.3.5 by Andrew Bennetts
Batch writes as much as possible in insert_data_stream.
787
        If a version in the stream is already present in this knit, it will not
788
        be inserted a second time.  It will be checked for consistency with the
789
        stored version however, and may cause a KnitCorrupt error to be raised
790
        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.
791
        
792
        :seealso: get_data_stream
793
        """
794
        if format != self.get_format_signature():
3172.2.1 by Andrew Bennetts
Enable use of smart revision streaming between repos with compatible models, not just between identical format repos.
795
            if 'knit' in debug.debug_flags:
796
                trace.mutter(
797
                    'incompatible format signature inserting to %r', self)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
798
            source = self._knit_from_datastream(
799
                (format, data_list, reader_callable))
800
            self.join(source)
801
            return
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
802
803
        for version_id, options, length, parents in data_list:
804
            if self.has_version(version_id):
805
                # First check: the list of parents.
806
                my_parents = self.get_parents_with_ghosts(version_id)
3184.5.1 by Lukáš Lalinský
Fix handling of some error cases in insert_data_stream
807
                if tuple(my_parents) != tuple(parents):
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
808
                    # XXX: KnitCorrupt is not quite the right exception here.
809
                    raise KnitCorrupt(
810
                        self.filename,
811
                        'parents list %r from data stream does not match '
812
                        'already recorded parents %r for %s'
813
                        % (parents, my_parents, version_id))
814
815
                # Also check the SHA-1 of the fulltext this content will
816
                # produce.
817
                raw_data = reader_callable(length)
3316.2.9 by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use
818
                my_fulltext_sha1 = self.get_sha1s([version_id])[0]
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
819
                df, rec = self._data._parse_record_header(version_id, raw_data)
820
                stream_fulltext_sha1 = rec[3]
821
                if my_fulltext_sha1 != stream_fulltext_sha1:
822
                    # Actually, we don't know if it's this knit that's corrupt,
823
                    # or the data stream we're trying to insert.
824
                    raise KnitCorrupt(
825
                        self.filename, 'sha-1 does not match %s' % version_id)
826
            else:
2535.3.57 by Andrew Bennetts
Perform some sanity checking of data streams rather than blindly inserting them into our repository.
827
                if 'line-delta' in options:
2535.3.61 by Andrew Bennetts
Clarify sanity checking in insert_data_stream.
828
                    # Make sure that this knit record is actually useful: a
829
                    # line-delta is no use unless we have its parent.
830
                    # Fetching from a broken repository with this problem
831
                    # shouldn't break the target repository.
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
832
                    #
833
                    # See https://bugs.launchpad.net/bzr/+bug/164443
2535.3.61 by Andrew Bennetts
Clarify sanity checking in insert_data_stream.
834
                    if not self._index.has_version(parents[0]):
835
                        raise KnitCorrupt(
836
                            self.filename,
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
837
                            'line-delta from stream '
838
                            'for version %s '
839
                            'references '
840
                            'missing parent %s\n'
3040.2.2 by Martin Pool
Clearer reconcile recommendation message (thanks Matt Nordhoff)
841
                            'Try running "bzr check" '
842
                            'on the source repository, and "bzr reconcile" '
3040.2.1 by Martin Pool
Give a better message when failing to pull because the source needs to be reconciled
843
                            'if necessary.' %
844
                            (version_id, parents[0]))
2535.3.17 by Andrew Bennetts
[broken] Closer to a working Repository.fetch_revisions smart request.
845
                self._add_raw_records(
846
                    [(version_id, options, parents, length)],
847
                    reader_callable(length))
848
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
849
    def _knit_from_datastream(self, (format, data_list, reader_callable)):
850
        """Create a knit object from a data stream.
851
852
        This method exists to allow conversion of data streams that do not
853
        match the signature of this knit. Generally it will be slower and use
854
        more memory to use this method to insert data, but it will work.
855
856
        :seealso: get_data_stream for details on datastreams.
857
        :return: A knit versioned file which can be used to join the datastream
858
            into self.
859
        """
860
        if format == "knit-plain":
861
            factory = KnitPlainFactory()
862
        elif format == "knit-annotated":
863
            factory = KnitAnnotateFactory()
864
        else:
865
            raise errors.KnitDataStreamUnknown(format)
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
866
        index = _StreamIndex(data_list, self._index)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
867
        access = _StreamAccess(reader_callable, index, self, factory)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
868
        return KnitVersionedFile(self.filename, self.transport,
869
            factory=factory, index=index, access_method=access)
870
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
871
    def versions(self):
872
        """See VersionedFile.versions."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
873
        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.
874
            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.
875
        return self._index.get_versions()
876
877
    def has_version(self, version_id):
878
        """See VersionedFile.has_version."""
2745.1.1 by Robert Collins
Add a number of -Devil checkpoints.
879
        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.
880
            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.
881
        return self._index.has_version(version_id)
882
883
    __contains__ = has_version
884
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
885
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
886
                           delta=None, annotated=None,
887
                           left_matching_blocks=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
888
        """Merge annotations for content.  This is done by comparing
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
889
        the annotations based on changed to the text.
890
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
891
        if left_matching_blocks is not None:
892
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
893
        else:
894
            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.
895
        if annotated:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
896
            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.
897
                merge_content = self._get_content(parent_id, parent_texts)
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
898
                if (parent_id == parents[0] and delta_seq is not None):
899
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
900
                else:
901
                    seq = patiencediff.PatienceSequenceMatcher(
902
                        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.
903
                for i, j, n in seq.get_matching_blocks():
904
                    if n == 0:
905
                        continue
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
906
                    # this appears to copy (origin, text) pairs across to the
907
                    # new content for any line that matches the last-checked
908
                    # 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.
909
                    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.
910
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
911
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
912
                reference_content = self._get_content(parents[0], parent_texts)
913
                new_texts = content.text()
914
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
915
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
916
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
917
            return self._make_line_delta(delta_seq, content)
918
919
    def _make_line_delta(self, delta_seq, new_content):
920
        """Generate a line delta from delta_seq and new_content."""
921
        diff_hunks = []
922
        for op in delta_seq.get_opcodes():
923
            if op[0] == 'equal':
924
                continue
925
            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.
926
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
927
1756.3.17 by Aaron Bentley
Combine get_components_positions with get_components_versions
928
    def _get_components_positions(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
929
        """Produce a map of position data for the components of versions.
930
1756.3.22 by Aaron Bentley
Tweaks from review
931
        This data is intended to be used for retrieving the knit records.
1756.3.19 by Aaron Bentley
Documentation and cleanups
932
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
933
        A dict of version_id to (record_details, index_memo, next, parents) is
1756.3.19 by Aaron Bentley
Documentation and cleanups
934
        returned.
935
        method is the way referenced data should be applied.
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
936
        index_memo is the handle to pass to the data access to actually get the
937
            data
1756.3.19 by Aaron Bentley
Documentation and cleanups
938
        next is the build-parent of the version, or None for fulltexts.
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
939
        parents is the version_ids of the parents of this version
1756.3.19 by Aaron Bentley
Documentation and cleanups
940
        """
1756.3.9 by Aaron Bentley
More optimization refactoring
941
        component_data = {}
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
942
        pending_components = version_ids
943
        while pending_components:
944
            build_details = self._index.get_build_details(pending_components)
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
945
            current_components = set(pending_components)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
946
            pending_components = set()
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
947
            for version_id, details in build_details.iteritems():
948
                (index_memo, compression_parent, parents,
949
                 record_details) = details
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
950
                method = record_details[0]
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
951
                if compression_parent is not None:
952
                    pending_components.add(compression_parent)
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
953
                component_data[version_id] = (record_details, index_memo,
3224.1.13 by John Arbash Meinel
Revert the _get_component_positions api
954
                                              compression_parent)
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
955
            missing = current_components.difference(build_details)
956
            if missing:
957
                raise errors.RevisionNotPresent(missing.pop(), self.filename)
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
958
        return component_data
1756.3.18 by Aaron Bentley
More cleanup
959
       
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
960
    def _get_content(self, version_id, parent_texts={}):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
961
        """Returns a content object that makes up the specified
962
        version."""
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
963
        cached_version = parent_texts.get(version_id, None)
964
        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.
965
            if not self.has_version(version_id):
966
                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.
967
            return cached_version
968
1756.3.22 by Aaron Bentley
Tweaks from review
969
        text_map, contents_map = self._get_content_maps([version_id])
970
        return contents_map[version_id]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
971
972
    def _check_versions_present(self, version_ids):
973
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
974
        self._index.check_versions_present(version_ids)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
975
2794.1.1 by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit.
976
    def _add_lines_with_ghosts(self, version_id, parents, lines, parent_texts,
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
977
        nostore_sha, random_id, check_content, left_matching_blocks):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
978
        """See VersionedFile.add_lines_with_ghosts()."""
2805.6.7 by Robert Collins
Review feedback.
979
        self._check_add(version_id, lines, random_id, check_content)
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
980
        return self._add(version_id, lines, parents, self.delta,
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
981
            parent_texts, left_matching_blocks, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
982
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
983
    def _add_lines(self, version_id, parents, lines, parent_texts,
2805.6.7 by Robert Collins
Review feedback.
984
        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.
985
        """See VersionedFile.add_lines."""
2805.6.7 by Robert Collins
Review feedback.
986
        self._check_add(version_id, lines, random_id, check_content)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
987
        self._check_versions_present(parents)
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
988
        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
989
            parent_texts, left_matching_blocks, nostore_sha, random_id)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
990
2805.6.7 by Robert Collins
Review feedback.
991
    def _check_add(self, version_id, lines, random_id, check_content):
1594.2.8 by Robert Collins
add ghost aware apis to knits.
992
        """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.
993
        if contains_whitespace(version_id):
1668.5.1 by Olaf Conradi
Fix bug in knits when raising InvalidRevisionId without the required
994
            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
995
        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.
996
        # Technically this could be avoided if we are happy to allow duplicate
997
        # id insertion when other things than bzr core insert texts, but it
998
        # seems useful for folk using the knit api directly to have some safety
999
        # blanket that we can disable.
1000
        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.
1001
            raise RevisionAlreadyPresent(version_id, self.filename)
2805.6.7 by Robert Collins
Review feedback.
1002
        if check_content:
1003
            self._check_lines_not_unicode(lines)
1004
            self._check_lines_are_lines(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1005
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1006
    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
1007
        left_matching_blocks, nostore_sha, random_id):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1008
        """Add a set of lines on top of version specified by parents.
1009
1010
        If delta is true, compress the text as a line-delta against
1011
        the first parent.
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1012
1013
        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.
1014
        """
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1015
        # first thing, if the content is something we don't need to store, find
1016
        # that out.
1017
        line_bytes = ''.join(lines)
1018
        digest = sha_string(line_bytes)
1019
        if nostore_sha == digest:
1020
            raise errors.ExistingContent
1596.2.28 by Robert Collins
more knit profile based tuning.
1021
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
1022
        present_parents = []
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
1023
        if parent_texts is None:
1024
            parent_texts = {}
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1025
        for parent in parents:
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
1026
            if self.has_version(parent):
1596.2.10 by Robert Collins
Reviewer feedback on knit branches.
1027
                present_parents.append(parent)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1028
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
1029
        # can only compress against the left most present parent.
1030
        if (delta and
1031
            (len(present_parents) == 0 or
1032
             present_parents[0] != parents[0])):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1033
            delta = False
1034
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1035
        text_length = len(line_bytes)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1036
        options = []
1037
        if lines:
1038
            if lines[-1][-1] != '\n':
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
1039
                # copy the contents of lines.
1040
                lines = lines[:]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1041
                options.append('no-eol')
1042
                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)
1043
                line_bytes += '\n'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1044
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
1045
        if delta:
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1046
            # To speed the extract of texts the delta chain is limited
1047
            # to a fixed number of deltas.  This should minimize both
1048
            # 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
1049
            delta = self._check_should_delta(present_parents)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1050
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.
1051
        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.
1052
        if delta or (self.factory.annotated and len(present_parents) > 0):
2805.6.2 by Robert Collins
General cleanup of KnitVersionedFile._add.
1053
            # 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.
1054
            delta_hunks = self._merge_annotations(content, present_parents,
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1055
                parent_texts, delta, self.factory.annotated,
1056
                left_matching_blocks)
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
1057
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1058
        if delta:
1059
            options.append('line-delta')
1060
            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
1061
            size, bytes = self._data._record_to_data(version_id, digest,
1062
                store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1063
        else:
1064
            options.append('fulltext')
2888.1.3 by Robert Collins
Review feedback.
1065
            # 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)
1066
            if self.factory.__class__ == KnitPlainFactory:
2888.1.3 by Robert Collins
Review feedback.
1067
                # Use the already joined bytes saving iteration time in
1068
                # _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)
1069
                size, bytes = self._data._record_to_data(version_id, digest,
1070
                    lines, [line_bytes])
1071
            else:
1072
                # get mixed annotation + content and feed it into the
1073
                # serialiser.
1074
                store_lines = self.factory.lower_fulltext(content)
1075
                size, bytes = self._data._record_to_data(version_id, digest,
1076
                    store_lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1077
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1078
        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
1079
        self._index.add_versions(
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1080
            ((version_id, options, access_memo, parents),),
1081
            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.
1082
        return digest, text_length, content
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1083
1563.2.19 by Robert Collins
stub out a check for knits.
1084
    def check(self, progress_bar=None):
1085
        """See VersionedFile.check()."""
1086
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1087
    def get_lines(self, version_id):
1088
        """See VersionedFile.get_lines()."""
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1089
        return self.get_line_list([version_id])[0]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1090
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1091
    def _get_record_map(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1092
        """Produce a dictionary of knit records.
1093
        
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1094
        :return: {version_id:(record, record_details, digest, next)}
1095
            record
1096
                data returned from read_records
1097
            record_details
1098
                opaque information to pass to parse_record
1099
            digest
1100
                SHA1 digest of the full text after all steps are done
1101
            next
1102
                build-parent of the version, i.e. the leftmost ancestor.
1103
                Will be None if the record is not a delta.
1756.3.19 by Aaron Bentley
Documentation and cleanups
1104
        """
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1105
        position_map = self._get_components_positions(version_ids)
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1106
        # c = component_id, r = record_details, i_m = index_memo, n = next
1107
        records = [(c, i_m) for c, (r, i_m, n)
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
1108
                             in position_map.iteritems()]
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1109
        record_map = {}
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1110
        for component_id, record, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
1111
                self._data.read_records_iter(records):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1112
            (record_details, index_memo, next) = position_map[component_id]
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1113
            record_map[component_id] = record, record_details, digest, next
3224.1.13 by John Arbash Meinel
Revert the _get_component_positions api
1114
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1115
        return record_map
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1116
1756.2.7 by Aaron Bentley
Implement get_text in terms of get_texts
1117
    def get_text(self, version_id):
1118
        """See VersionedFile.get_text"""
1119
        return self.get_texts([version_id])[0]
1120
1756.2.1 by Aaron Bentley
Implement get_texts
1121
    def get_texts(self, version_ids):
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1122
        return [''.join(l) for l in self.get_line_list(version_ids)]
1123
1124
    def get_line_list(self, version_ids):
1756.2.1 by Aaron Bentley
Implement get_texts
1125
        """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
1126
        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
1127
            self.check_not_reserved_id(version_id)
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1128
        text_map, content_map = self._get_content_maps(version_ids)
1129
        return [text_map[v] for v in version_ids]
1130
2520.4.90 by Aaron Bentley
Handle \r terminated lines in Weaves properly
1131
    _get_lf_split_line_list = get_line_list
2520.4.3 by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs
1132
1756.3.13 by Aaron Bentley
Refactor get_line_list into _get_content
1133
    def _get_content_maps(self, version_ids):
1756.3.19 by Aaron Bentley
Documentation and cleanups
1134
        """Produce maps of text and KnitContents
1135
        
1136
        :return: (text_map, content_map) where text_map contains the texts for
1137
        the requested versions and content_map contains the KnitContents.
1756.3.22 by Aaron Bentley
Tweaks from review
1138
        Both dicts take version_ids as their keys.
1756.3.19 by Aaron Bentley
Documentation and cleanups
1139
        """
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1140
        # FUTURE: This function could be improved for the 'extract many' case
1141
        # by tracking each component and only doing the copy when the number of
1142
        # children than need to apply delta's to it is > 1 or it is part of the
1143
        # final output.
1144
        version_ids = list(version_ids)
1145
        multiple_versions = len(version_ids) != 1
1756.3.12 by Aaron Bentley
Stuff all text-building data in record_map
1146
        record_map = self._get_record_map(version_ids)
1756.2.5 by Aaron Bentley
Reduced read_records calls to 1
1147
1756.2.8 by Aaron Bentley
Implement get_line_list, cleanups
1148
        text_map = {}
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1149
        content_map = {}
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1150
        final_content = {}
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1151
        for version_id in version_ids:
1152
            components = []
1153
            cursor = version_id
1154
            while cursor is not None:
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1155
                record, record_details, digest, next = record_map[cursor]
1156
                components.append((cursor, record, record_details, digest))
1756.3.10 by Aaron Bentley
Optimize selection and retrieval of records
1157
                if cursor in content_map:
1158
                    break
1159
                cursor = next
1160
1756.2.1 by Aaron Bentley
Implement get_texts
1161
            content = None
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1162
            for (component_id, record, record_details,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1163
                 digest) in reversed(components):
1756.3.7 by Aaron Bentley
Avoid re-parsing texts version components
1164
                if component_id in content_map:
1165
                    content = content_map[component_id]
1756.3.8 by Aaron Bentley
Avoid unused calls, use generators, sets instead of lists
1166
                else:
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1167
                    content, delta = self.factory.parse_record(version_id,
3224.1.17 by John Arbash Meinel
Clean up some variable ordering to make more sense.
1168
                        record, record_details, content,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1169
                        copy_base_content=multiple_versions)
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
1170
                    if multiple_versions:
1171
                        content_map[component_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1172
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1173
            content.cleanup_eol(copy_on_mutate=multiple_versions)
1756.3.14 by Aaron Bentley
Handle the intermediate and final representations of no-final-eol texts
1174
            final_content[version_id] = content
1756.2.1 by Aaron Bentley
Implement get_texts
1175
1176
            # digest here is the digest from the last applied component.
1756.3.6 by Aaron Bentley
More multi-text extraction
1177
            text = content.text()
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1178
            actual_sha = sha_strings(text)
1179
            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.
1180
                raise KnitCorrupt(self.filename,
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
1181
                    '\n  sha-1 %s'
1182
                    '\n  of reconstructed text does not match'
1183
                    '\n  expected %s'
1184
                    '\n  for version %s' %
1185
                    (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.
1186
            text_map[version_id] = text
1187
        return text_map, final_content
1756.2.1 by Aaron Bentley
Implement get_texts
1188
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1189
    def iter_lines_added_or_present_in_versions(self, version_ids=None, 
1190
                                                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.
1191
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
1192
        if version_ids is None:
1193
            version_ids = self.versions()
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1194
        if pb is None:
1195
            pb = progress.DummyProgress()
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1196
        # 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.
1197
        # but we need to setup a list of records to visit.
1198
        # we need version_id, position, length
1199
        version_id_records = []
2163.1.1 by John Arbash Meinel
Use a set to make iter_lines_added_or_present *much* faster
1200
        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.
1201
        # filter for available versions
2698.2.4 by Robert Collins
Remove full history scan during iter_lines_added_or_present in KnitVersionedFile.
1202
        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.
1203
            if not self.has_version(version_id):
1204
                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.
1205
        # get a in-component-order queue:
1206
        for version_id in self.versions():
1207
            if version_id in requested_versions:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1208
                index_memo = self._index.get_position(version_id)
1209
                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.
1210
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1211
        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.
1212
        for version_idx, (version_id, data, sha_value) in \
1213
            enumerate(self._data.read_records_iter(version_id_records)):
1214
            pb.update('Walking content.', version_idx, total)
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1215
            method = self._index.get_method(version_id)
1216
            if method == 'fulltext':
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1217
                line_iterator = self.factory.get_fulltext_content(data)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1218
            elif method == 'line-delta':
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1219
                line_iterator = self.factory.get_linedelta_content(data)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1220
            else:
1221
                raise ValueError('invalid method %r' % (method,))
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1222
            # XXX: It might be more efficient to yield (version_id,
1223
            # line_iterator) in the future. However for now, this is a simpler
1224
            # change to integrate into the rest of the codebase. RBC 20071110
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1225
            for line in line_iterator:
2975.3.1 by Robert Collins
Change (without backwards compatibility) the
1226
                yield line, version_id
2163.1.7 by John Arbash Meinel
Switch the line iterator as suggested by Aaron Bentley
1227
2039.1.1 by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000)
1228
        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.
1229
        
1563.2.18 by Robert Collins
get knit repositories really using knits for text storage.
1230
    def num_versions(self):
1231
        """See VersionedFile.num_versions()."""
1232
        return self._index.num_versions()
1233
1234
    __len__ = num_versions
1235
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
1236
    def annotate(self, version_id):
1237
        """See VersionedFile.annotate."""
1238
        return self.factory.annotate(self, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1239
3287.5.1 by Robert Collins
Add VersionedFile.get_parent_map.
1240
    def get_parent_map(self, version_ids):
1241
        """See VersionedFile.get_parent_map."""
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1242
        return self._index.get_parent_map(version_ids)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1243
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1244
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1245
        """See VersionedFile.get_ancestry."""
1246
        if isinstance(versions, basestring):
1247
            versions = [versions]
1248
        if not versions:
1249
            return []
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1250
        return self._index.get_ancestry(versions, topo_sorted)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1251
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1252
    def get_ancestry_with_ghosts(self, versions):
1253
        """See VersionedFile.get_ancestry_with_ghosts."""
1254
        if isinstance(versions, basestring):
1255
            versions = [versions]
1256
        if not versions:
1257
            return []
1258
        return self._index.get_ancestry_with_ghosts(versions)
1259
1664.2.3 by Aaron Bentley
Add failing test case
1260
    def plan_merge(self, ver_a, ver_b):
1664.2.11 by Aaron Bentley
Clarifications from merge review
1261
        """See VersionedFile.plan_merge."""
2490.2.33 by Aaron Bentley
Disable topological sorting of get_ancestry where sensible
1262
        ancestors_b = set(self.get_ancestry(ver_b, topo_sorted=False))
1263
        ancestors_a = set(self.get_ancestry(ver_a, topo_sorted=False))
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1264
        annotated_a = self.annotate(ver_a)
1265
        annotated_b = self.annotate(ver_b)
1551.15.46 by Aaron Bentley
Move plan merge to tree
1266
        return merge._plan_annotate_merge(annotated_a, annotated_b,
1267
                                          ancestors_a, ancestors_b)
1664.2.4 by Aaron Bentley
Identify unchanged lines correctly
1268
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1269
1270
class _KnitComponentFile(object):
1271
    """One of the files used to implement a knit database"""
1272
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
1273
    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
1274
                 create_parent_dir=False, dir_mode=None):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1275
        self._transport = transport
1276
        self._filename = filename
1277
        self._mode = mode
1946.2.3 by John Arbash Meinel
Pass around the file mode correctly
1278
        self._file_mode = file_mode
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1279
        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
1280
        self._create_parent_dir = create_parent_dir
1281
        self._need_to_create = False
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1282
2196.2.5 by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it
1283
    def _full_path(self):
1284
        """Return the full path to this file."""
1285
        return self._transport.base + self._filename
1286
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1287
    def check_header(self, fp):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1288
        line = fp.readline()
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1289
        if line == '':
1290
            # An empty file can actually be treated as though the file doesn't
1291
            # 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
1292
            raise errors.NoSuchFile(self._full_path())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1293
        if line != self.HEADER:
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
1294
            raise KnitHeaderError(badline=line,
1295
                              filename=self._transport.abspath(self._filename))
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1296
1297
    def __repr__(self):
1298
        return '%s(%s)' % (self.__class__.__name__, self._filename)
1299
1300
1301
class _KnitIndex(_KnitComponentFile):
1302
    """Manages knit index file.
1303
1304
    The index is already kept in memory and read on startup, to enable
1305
    fast lookups of revision information.  The cursor of the index
1306
    file is always pointing to the end, making it easy to append
1307
    entries.
1308
1309
    _cache is a cache for fast mapping from version id to a Index
1310
    object.
1311
1312
    _history is a cache for fast mapping from indexes to version ids.
1313
1314
    The index data format is dictionary compressed when it comes to
1315
    parent references; a index entry may only have parents that with a
1316
    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.
1317
1318
    Duplicate entries may be written to the index for a single version id
1319
    if this is done then the latter one completely replaces the former:
1320
    this allows updates to correct version and parent information. 
1321
    Note that the two entries may share the delta, and that successive
1322
    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.
1323
1324
    The index file on disc contains a header, followed by one line per knit
1325
    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).
1326
    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.
1327
    
1328
    The format of a single line is
1329
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
1330
    REVISION_ID is a utf8-encoded revision id
1331
    FLAGS is a comma separated list of flags about the record. Values include 
1332
        no-eol, line-delta, fulltext.
1333
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
1334
        that the the compressed data starts at.
1335
    LENGTH is the ascii representation of the length of the data file.
1336
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
1337
        REVISION_ID.
1338
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
1339
        revision id already in the knit that is a parent of REVISION_ID.
1340
    The ' :' marker is the end of record marker.
1341
    
1342
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1343
    when a write is interrupted to the index file, it will result in a line
1344
    that does not end in ' :'. If the ' :' is not present at the end of a line,
1345
    or at the end of the file, then the record that is missing it will be
1346
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1347
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1348
    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.
1349
    to ensure that records always start on new lines even if the last write was
1350
    interrupted. As a result its normal for the last line in the index to be
1351
    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.
1352
    """
1353
1666.1.6 by Robert Collins
Make knit the default format.
1354
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1355
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1356
    # speed of knit parsing went from 280 ms to 280 ms with slots addition.
1357
    # __slots__ = ['_cache', '_history', '_transport', '_filename']
1358
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1359
    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.
1360
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1361
1362
        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.
1363
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
1364
         indexes).
1365
        """
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1366
        # only want the _history index to reference the 1st index entry
1367
        # for version_id
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
1368
        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
1369
            index = len(self._history)
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
1370
            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
1371
        else:
1372
            index = self._cache[version_id][5]
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1373
        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
1374
                                   options,
1375
                                   pos,
1376
                                   size,
1377
                                   parents,
1378
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1379
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1380
    def _check_write_ok(self):
3316.2.5 by Robert Collins
Review feedback.
1381
        if self._get_scope() != self._scope:
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1382
            raise errors.OutSideTransaction()
1383
        if self._mode != 'w':
1384
            raise errors.ReadOnlyObjectDirtiedError(self)
1385
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
1386
    def __init__(self, transport, filename, mode, create=False, file_mode=None,
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1387
        create_parent_dir=False, delay_create=False, dir_mode=None,
1388
        get_scope=None):
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
1389
        _KnitComponentFile.__init__(self, transport, filename, mode,
1390
                                    file_mode=file_mode,
1391
                                    create_parent_dir=create_parent_dir,
1392
                                    dir_mode=dir_mode)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1393
        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.
1394
        # position in _history is the 'official' index for a revision
1395
        # but the values may have come from a newer entry.
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1396
        # 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
1397
        # in the knit.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1398
        self._history = []
1399
        try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1400
            fp = self._transport.get(self._filename)
1594.2.17 by Robert Collins
Better readv coalescing, now with test, and progress during knit index reading.
1401
            try:
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1402
                # _load_data may raise NoSuchFile if the target knit is
1403
                # completely empty.
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1404
                _load_data(self, fp)
2247.2.1 by John Arbash Meinel
Don't create pb for simple knit reading.
1405
            finally:
1406
                fp.close()
1407
        except NoSuchFile:
1408
            if mode != 'w' or not create:
1409
                raise
1410
            elif delay_create:
1411
                self._need_to_create = True
1412
            else:
1413
                self._transport.put_bytes_non_atomic(
1414
                    self._filename, self.HEADER, mode=self._file_mode)
3316.2.5 by Robert Collins
Review feedback.
1415
        self._scope = get_scope()
1416
        self._get_scope = get_scope
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1417
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1418
    def get_ancestry(self, versions, topo_sorted=True):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1419
        """See VersionedFile.get_ancestry."""
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1420
        # get a graph of all the mentioned versions:
1421
        graph = {}
1422
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1423
        cache = self._cache
1424
        while pending:
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1425
            version = pending.pop()
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1426
            # trim ghosts
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1427
            try:
1428
                parents = [p for p in cache[version][4] if p in cache]
1429
            except KeyError:
1430
                raise RevisionNotPresent(version, self._filename)
1431
            # if not completed and not a ghost
1432
            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.
1433
            graph[version] = parents
2530.1.1 by Aaron Bentley
Make topological sorting optional for get_ancestry
1434
        if not topo_sorted:
1435
            return graph.keys()
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
1436
        return topo_sort(graph.items())
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1437
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1438
    def get_ancestry_with_ghosts(self, versions):
1439
        """See VersionedFile.get_ancestry_with_ghosts."""
1440
        # get a graph of all the mentioned versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1441
        self.check_versions_present(versions)
1442
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1443
        graph = {}
1444
        pending = set(versions)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1445
        while pending:
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1446
            version = pending.pop()
1447
            try:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1448
                parents = cache[version][4]
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1449
            except KeyError:
1450
                # ghost, fake it
1451
                graph[version] = []
1452
            else:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1453
                # if not completed
1454
                pending.update([p for p in parents if p not in graph])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1455
                graph[version] = parents
1456
        return topo_sort(graph.items())
1457
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1458
    def get_build_details(self, version_ids):
1459
        """Get the method, index_memo and compression parent for version_ids.
1460
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1461
        Ghosts are omitted from the result.
1462
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1463
        :param version_ids: An iterable of version_ids.
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1464
        :return: A dict of version_id:(index_memo, compression_parent,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1465
                                       parents, record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1466
            index_memo
1467
                opaque structure to pass to read_records to extract the raw
1468
                data
1469
            compression_parent
1470
                Content that this record is built upon, may be None
1471
            parents
1472
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1473
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1474
                extra information about the content which needs to be passed to
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
1475
                Factory.parse_record
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1476
        """
1477
        result = {}
1478
        for version_id in version_ids:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1479
            if version_id not in self._cache:
1480
                # ghosts are omitted
1481
                continue
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1482
            method = self.get_method(version_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
1483
            parents = self.get_parents_with_ghosts(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1484
            if method == 'fulltext':
1485
                compression_parent = None
1486
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
1487
                compression_parent = parents[0]
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
1488
            noeol = 'no-eol' in self.get_options(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1489
            index_memo = self.get_position(version_id)
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1490
            result[version_id] = (index_memo, compression_parent,
1491
                                  parents, (method, noeol))
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1492
        return result
1493
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1494
    def num_versions(self):
1495
        return len(self._history)
1496
1497
    __len__ = num_versions
1498
1499
    def get_versions(self):
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1500
        """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.
1501
        return self._history
1502
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1503
    def _version_list_to_index(self, versions):
1504
        result_list = []
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1505
        cache = self._cache
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1506
        for version in versions:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1507
            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
1508
                # -- inlined lookup() --
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1509
                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
1510
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1511
            else:
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
1512
                result_list.append('.' + version)
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1513
        return ' '.join(result_list)
1514
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1515
    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.
1516
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1517
        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.
1518
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1519
    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.
1520
        """Add multiple versions to the index.
1521
        
1522
        :param versions: a list of tuples:
1523
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1524
        :param random_id: If True the ids being added were randomly generated
1525
            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.
1526
        """
1527
        lines = []
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1528
        orig_history = self._history[:]
1529
        orig_cache = self._cache.copy()
1530
1531
        try:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1532
            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.
1533
                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
1534
                                               ','.join(options),
1535
                                               pos,
1536
                                               size,
1537
                                               self._version_list_to_index(parents))
1538
                lines.append(line)
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1539
                self._cache_version(version_id, options, pos, size, tuple(parents))
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1540
            if not self._need_to_create:
1541
                self._transport.append_bytes(self._filename, ''.join(lines))
1542
            else:
1543
                sio = StringIO()
1544
                sio.write(self.HEADER)
1545
                sio.writelines(lines)
1546
                sio.seek(0)
1547
                self._transport.put_file_non_atomic(self._filename, sio,
1548
                                    create_parent_dir=self._create_parent_dir,
1549
                                    mode=self._file_mode,
1550
                                    dir_mode=self._dir_mode)
1551
                self._need_to_create = False
1552
        except:
1553
            # If any problems happen, restore the original values and re-raise
1554
            self._history = orig_history
1555
            self._cache = orig_cache
1556
            raise
1557
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1558
    def has_version(self, version_id):
1559
        """True if the version is in the index."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1560
        return version_id in self._cache
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1561
1562
    def get_position(self, version_id):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1563
        """Return details needed to access the version.
1564
        
1565
        .kndx indices do not support split-out data, so return None for the 
1566
        index field.
1567
1568
        :return: a tuple (None, data position, size) to hand to the access
1569
            logic to get the record.
1570
        """
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1571
        entry = self._cache[version_id]
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1572
        return None, entry[2], entry[3]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1573
1574
    def get_method(self, version_id):
1575
        """Return compression method of specified version."""
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1576
        try:
1577
            options = self._cache[version_id][1]
1578
        except KeyError:
1579
            raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1580
        if 'fulltext' in options:
1581
            return 'fulltext'
1582
        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
1583
            if 'line-delta' not in options:
1584
                raise errors.KnitIndexUnknownMethod(self._full_path(), options)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1585
            return 'line-delta'
1586
1587
    def get_options(self, version_id):
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
1588
        """Return a list representing options.
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1589
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1590
        e.g. ['foo', 'bar']
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1591
        """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1592
        return self._cache[version_id][1]
1593
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1594
    def get_parent_map(self, version_ids):
1595
        """Passed through to by KnitVersionedFile.get_parent_map."""
1596
        result = {}
1597
        for version_id in version_ids:
1598
            try:
1599
                result[version_id] = tuple(self._cache[version_id][4])
1600
            except KeyError:
1601
                pass
1602
        return result
1603
1594.2.8 by Robert Collins
add ghost aware apis to knits.
1604
    def get_parents_with_ghosts(self, version_id):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1605
        """Return parents of specified version with ghosts."""
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1606
        try:
1607
            return self.get_parent_map([version_id])[version_id]
1608
        except KeyError:
1609
            raise RevisionNotPresent(version_id, self)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1610
1611
    def check_versions_present(self, version_ids):
1612
        """Check that all specified versions are present."""
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1613
        cache = self._cache
1614
        for version_id in version_ids:
1615
            if version_id not in cache:
1616
                raise RevisionNotPresent(version_id, self._filename)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1617
1618
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1619
class KnitGraphIndex(object):
1620
    """A knit index that builds on GraphIndex."""
1621
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1622
    def __init__(self, graph_index, deltas=False, parents=True, add_callback=None):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1623
        """Construct a KnitGraphIndex on a graph_index.
1624
1625
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1626
        :param deltas: Allow delta-compressed records.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1627
        :param add_callback: If not None, allow additions to the index and call
1628
            this callback with a list of added GraphIndex nodes:
2592.3.33 by Robert Collins
Change the order of index refs and values to make the no-graph knit index easier.
1629
            [(node, value, node_refs), ...]
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1630
        :param parents: If True, record knits parents, if not do not record 
1631
            parents.
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1632
        """
1633
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
1634
        self._deltas = deltas
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1635
        self._add_callback = add_callback
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1636
        self._parents = parents
1637
        if deltas and not parents:
1638
            raise KnitCorrupt(self, "Cannot do delta compression without "
1639
                "parent tracking.")
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1640
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
1641
    def _check_write_ok(self):
1642
        pass
1643
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1644
    def _get_entries(self, keys, check_present=False):
1645
        """Get the entries for keys.
1646
        
1647
        :param keys: An iterable of index keys, - 1-tuples.
1648
        """
1649
        keys = set(keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1650
        found_keys = set()
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1651
        if self._parents:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1652
            for node in self._graph_index.iter_entries(keys):
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1653
                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.
1654
                found_keys.add(node[1])
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1655
        else:
1656
            # 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.
1657
            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.
1658
                yield node[0], node[1], node[2], ()
1659
                found_keys.add(node[1])
2592.3.43 by Robert Collins
A knit iter_parents API.
1660
        if check_present:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1661
            missing_keys = keys.difference(found_keys)
2592.3.43 by Robert Collins
A knit iter_parents API.
1662
            if missing_keys:
1663
                raise RevisionNotPresent(missing_keys.pop(), self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1664
1665
    def _present_keys(self, version_ids):
1666
        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.
1667
            node[1] for node in self._get_entries(version_ids)])
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1668
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1669
    def _parentless_ancestry(self, versions):
1670
        """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.
1671
        wanted_keys = self._version_ids_to_keys(versions)
1672
        present_keys = self._present_keys(wanted_keys)
1673
        missing = set(wanted_keys).difference(present_keys)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1674
        if missing:
1675
            raise RevisionNotPresent(missing.pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1676
        return list(self._keys_to_version_ids(present_keys))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1677
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1678
    def get_ancestry(self, versions, topo_sorted=True):
1679
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1680
        if not self._parents:
1681
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1682
        # XXX: This will do len(history) index calls - perhaps
1683
        # it should be altered to be a index core feature?
1684
        # get a graph of all the mentioned versions:
1685
        graph = {}
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1686
        ghosts = set()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1687
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1688
        pending = set(versions)
1689
        while pending:
1690
            # get all pending nodes
1691
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1692
            new_nodes = self._get_entries(this_iteration)
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1693
            found = set()
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1694
            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.
1695
            for (index, key, value, node_refs) in new_nodes:
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1696
                # dont ask for ghosties - otherwise
1697
                # we we can end up looping with pending
1698
                # being entirely ghosted.
1699
                graph[key] = [parent for parent in node_refs[0]
1700
                    if parent not in ghosts]
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1701
                # queue parents
1702
                for parent in graph[key]:
1703
                    # dont examine known nodes again
1704
                    if parent in graph:
1705
                        continue
1706
                    pending.add(parent)
1707
                found.add(key)
1708
            ghosts.update(this_iteration.difference(found))
2592.3.30 by Robert Collins
Make GraphKnitIndex get_ancestry the same as regular knits.
1709
        if versions.difference(graph):
1710
            raise RevisionNotPresent(versions.difference(graph).pop(), self)
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1711
        if topo_sorted:
1712
            result_keys = topo_sort(graph.items())
1713
        else:
1714
            result_keys = graph.iterkeys()
1715
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1716
1717
    def get_ancestry_with_ghosts(self, versions):
1718
        """See VersionedFile.get_ancestry."""
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1719
        if not self._parents:
1720
            return self._parentless_ancestry(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1721
        # XXX: This will do len(history) index calls - perhaps
1722
        # it should be altered to be a index core feature?
1723
        # get a graph of all the mentioned versions:
1724
        graph = {}
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1725
        versions = self._version_ids_to_keys(versions)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1726
        pending = set(versions)
1727
        while pending:
1728
            # get all pending nodes
1729
            this_iteration = pending
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1730
            new_nodes = self._get_entries(this_iteration)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1731
            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.
1732
            for (index, key, value, node_refs) in new_nodes:
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1733
                graph[key] = node_refs[0]
1734
                # queue parents 
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1735
                for parent in graph[key]:
1736
                    # dont examine known nodes again
1737
                    if parent in graph:
1738
                        continue
1739
                    pending.add(parent)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1740
            missing_versions = this_iteration.difference(graph)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1741
            missing_needed = versions.intersection(missing_versions)
1742
            if missing_needed:
1743
                raise RevisionNotPresent(missing_needed.pop(), self)
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1744
            for missing_version in missing_versions:
1745
                # add a key, no parents
1746
                graph[missing_version] = []
2592.3.53 by Robert Collins
Remove usage of difference_update in knit.py.
1747
                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.
1748
        result_keys = topo_sort(graph.items())
1749
        return [key[0] for key in result_keys]
2592.3.4 by Robert Collins
Implement get_ancestry/get_ancestry_with_ghosts for KnitGraphIndex.
1750
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1751
    def get_build_details(self, version_ids):
1752
        """Get the method, index_memo and compression parent for version_ids.
1753
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
1754
        Ghosts are omitted from the result.
1755
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1756
        :param version_ids: An iterable of version_ids.
3224.1.18 by John Arbash Meinel
Cleanup documentation
1757
        :return: A dict of version_id:(index_memo, compression_parent,
1758
                                       parents, record_details).
1759
            index_memo
1760
                opaque structure to pass to read_records to extract the raw
1761
                data
1762
            compression_parent
1763
                Content that this record is built upon, may be None
1764
            parents
1765
                Logical parents of this node
1766
            record_details
1767
                extra information about the content which needs to be passed to
1768
                Factory.parse_record
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1769
        """
1770
        result = {}
1771
        entries = self._get_entries(self._version_ids_to_keys(version_ids), True)
1772
        for entry in entries:
1773
            version_id = self._keys_to_version_ids((entry[1],))[0]
3224.1.27 by John Arbash Meinel
Handle when the knit index doesn't track parents.
1774
            if not self._parents:
1775
                parents = ()
1776
            else:
1777
                parents = self._keys_to_version_ids(entry[3][0])
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1778
            if not self._deltas:
1779
                compression_parent = None
1780
            else:
1781
                compression_parent_key = self._compression_parent(entry)
1782
                if compression_parent_key:
1783
                    compression_parent = self._keys_to_version_ids(
1784
                    (compression_parent_key,))[0]
1785
                else:
1786
                    compression_parent = None
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
1787
            noeol = (entry[2][0] == 'N')
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1788
            if compression_parent:
1789
                method = 'line-delta'
1790
            else:
1791
                method = 'fulltext'
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
1792
            result[version_id] = (self._node_to_position(entry),
1793
                                  compression_parent, parents,
1794
                                  (method, noeol))
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1795
        return result
1796
1797
    def _compression_parent(self, an_entry):
1798
        # return the key that an_entry is compressed against, or None
1799
        # Grab the second parent list (as deltas implies parents currently)
1800
        compression_parents = an_entry[3][1]
1801
        if not compression_parents:
1802
            return None
1803
        return compression_parents[0]
1804
1805
    def _get_method(self, node):
1806
        if not self._deltas:
1807
            return 'fulltext'
1808
        if self._compression_parent(node):
1809
            return 'line-delta'
1810
        else:
1811
            return 'fulltext'
1812
2592.3.5 by Robert Collins
Implement KnitGraphIndex.num_versions.
1813
    def num_versions(self):
1814
        return len(list(self._graph_index.iter_all_entries()))
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
1815
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1816
    __len__ = num_versions
1817
1818
    def get_versions(self):
1819
        """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.
1820
        return [node[1][0] for node in self._graph_index.iter_all_entries()]
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1821
    
2592.3.9 by Robert Collins
Implement KnitGraphIndex.has_version.
1822
    def has_version(self, version_id):
1823
        """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.
1824
        return len(self._present_keys(self._version_ids_to_keys([version_id]))) == 1
1825
1826
    def _keys_to_version_ids(self, keys):
1827
        return tuple(key[0] for key in keys)
2592.3.6 by Robert Collins
Implement KnitGraphIndex.get_versions.
1828
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1829
    def get_position(self, version_id):
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1830
        """Return details needed to access the version.
1831
        
1832
        :return: a tuple (index, data position, size) to hand to the access
1833
            logic to get the record.
1834
        """
1835
        node = self._get_node(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1836
        return self._node_to_position(node)
1837
1838
    def _node_to_position(self, node):
1839
        """Convert an index value to position details."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1840
        bits = node[2][1:].split(' ')
1841
        return node[0], int(bits[0]), int(bits[1])
2592.3.10 by Robert Collins
Implement KnitGraphIndex.get_position.
1842
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1843
    def get_method(self, version_id):
1844
        """Return compression method of specified version."""
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1845
        return self._get_method(self._get_node(version_id))
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1846
1847
    def _get_node(self, version_id):
2592.3.97 by Robert Collins
Merge more bzr.dev, addressing some bugs. [still broken]
1848
        try:
1849
            return list(self._get_entries(self._version_ids_to_keys([version_id])))[0]
1850
        except IndexError:
1851
            raise RevisionNotPresent(version_id, self)
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1852
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1853
    def get_options(self, version_id):
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1854
        """Return a list representing options.
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1855
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1856
        e.g. ['foo', 'bar']
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1857
        """
1858
        node = self._get_node(version_id)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
1859
        options = [self._get_method(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.
1860
        if node[2][0] == 'N':
2592.3.14 by Robert Collins
Implement KnitGraphIndex.get_options.
1861
            options.append('no-eol')
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
1862
        return options
2592.3.11 by Robert Collins
Implement KnitGraphIndex.get_method.
1863
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1864
    def get_parent_map(self, version_ids):
1865
        """Passed through to by KnitVersionedFile.get_parent_map."""
1866
        nodes = self._get_entries(self._version_ids_to_keys(version_ids))
1867
        result = {}
1868
        if self._parents:
1869
            for node in nodes:
1870
                result[node[1][0]] = self._keys_to_version_ids(node[3][0])
1871
        else:
1872
            for node in nodes:
1873
                result[node[1][0]] = ()
1874
        return result
1875
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1876
    def get_parents_with_ghosts(self, version_id):
1877
        """Return parents of specified version with ghosts."""
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
1878
        try:
1879
            return self.get_parent_map([version_id])[version_id]
1880
        except KeyError:
1881
            raise RevisionNotPresent(version_id, self)
2592.3.15 by Robert Collins
Implement KnitGraphIndex.get_parents/get_parents_with_ghosts.
1882
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1883
    def check_versions_present(self, version_ids):
1884
        """Check that all specified versions are present."""
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1885
        keys = self._version_ids_to_keys(version_ids)
1886
        present = self._present_keys(keys)
1887
        missing = keys.difference(present)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1888
        if missing:
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1889
            raise RevisionNotPresent(missing.pop(), self)
2592.3.16 by Robert Collins
Implement KnitGraphIndex.check_versions_present.
1890
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1891
    def add_version(self, version_id, options, access_memo, parents):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1892
        """Add a version record to the index."""
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1893
        return self.add_versions(((version_id, options, access_memo, parents),))
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1894
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1895
    def add_versions(self, versions, random_id=False):
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1896
        """Add multiple versions to the index.
1897
        
1898
        This function does not insert data into the Immutable GraphIndex
1899
        backing the KnitGraphIndex, instead it prepares data for insertion by
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1900
        the caller and checks that it is safe to insert then calls
1901
        self._add_callback with the prepared GraphIndex nodes.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1902
1903
        :param versions: a list of tuples:
1904
                         (version_id, options, pos, size, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1905
        :param random_id: If True the ids being added were randomly generated
1906
            and no check for existence will be performed.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1907
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1908
        if not self._add_callback:
1909
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1910
        # we hope there are no repositories with inconsistent parentage
1911
        # anymore.
1912
        # check for dups
1913
1914
        keys = {}
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
1915
        for (version_id, options, access_memo, parents) in versions:
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1916
            index, pos, size = access_memo
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1917
            key = (version_id, )
1918
            parents = tuple((parent, ) for parent in parents)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1919
            if 'no-eol' in options:
1920
                value = 'N'
1921
            else:
1922
                value = ' '
1923
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1924
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1925
                if 'line-delta' in options:
1926
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1927
            if self._parents:
1928
                if self._deltas:
1929
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1930
                        node_refs = (parents, (parents[0],))
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1931
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1932
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1933
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1934
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1935
            else:
1936
                if parents:
1937
                    raise KnitCorrupt(self, "attempt to add node with parents "
1938
                        "in parentless index.")
1939
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1940
            keys[key] = (value, node_refs)
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
1941
        if not random_id:
1942
            present_nodes = self._get_entries(keys)
1943
            for (index, key, value, node_refs) in present_nodes:
1944
                if (value, node_refs) != keys[key]:
1945
                    raise KnitCorrupt(self, "inconsistent details in add_versions"
1946
                        ": %s %s" % ((value, node_refs), keys[key]))
1947
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1948
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
1949
        if self._parents:
1950
            for key, (value, node_refs) in keys.iteritems():
1951
                result.append((key, value, node_refs))
1952
        else:
1953
            for key, (value, node_refs) in keys.iteritems():
1954
                result.append((key, value))
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
1955
        self._add_callback(result)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
1956
        
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
1957
    def _version_ids_to_keys(self, version_ids):
1958
        return set((version_id, ) for version_id in version_ids)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1959
1960
1961
class _KnitAccess(object):
1962
    """Access to knit records in a .knit file."""
1963
1964
    def __init__(self, transport, filename, _file_mode, _dir_mode,
1965
        _need_to_create, _create_parent_dir):
1966
        """Create a _KnitAccess for accessing and inserting data.
1967
1968
        :param transport: The transport the .knit is located on.
1969
        :param filename: The filename of the .knit.
1970
        """
1971
        self._transport = transport
1972
        self._filename = filename
1973
        self._file_mode = _file_mode
1974
        self._dir_mode = _dir_mode
1975
        self._need_to_create = _need_to_create
1976
        self._create_parent_dir = _create_parent_dir
1977
1978
    def add_raw_records(self, sizes, raw_data):
1979
        """Add raw knit bytes to a storage area.
1980
1981
        The data is spooled to whereever the access method is storing data.
1982
1983
        :param sizes: An iterable containing the size of each raw data segment.
1984
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1985
        :return: A list of memos to retrieve the record later. Each memo is a
1986
            tuple - (index, pos, length), where the index field is always None
1987
            for the .knit access method.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
1988
        """
1989
        if not self._need_to_create:
1990
            base = self._transport.append_bytes(self._filename, raw_data)
1991
        else:
1992
            self._transport.put_bytes_non_atomic(self._filename, raw_data,
1993
                                   create_parent_dir=self._create_parent_dir,
1994
                                   mode=self._file_mode,
1995
                                   dir_mode=self._dir_mode)
1996
            self._need_to_create = False
1997
            base = 0
1998
        result = []
1999
        for size in sizes:
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2000
            result.append((None, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2001
            base += size
2002
        return result
2003
2004
    def create(self):
2005
        """IFF this data access has its own storage area, initialise it.
2006
2007
        :return: None.
2008
        """
2009
        self._transport.put_bytes_non_atomic(self._filename, '',
2010
                                             mode=self._file_mode)
2011
2012
    def open_file(self):
2013
        """IFF this data access can be represented as a single file, open it.
2014
2015
        For knits that are not mapped to a single file on disk this will
2016
        always return None.
2017
2018
        :return: None or a file handle.
2019
        """
2020
        try:
2021
            return self._transport.get(self._filename)
2022
        except NoSuchFile:
2023
            pass
2024
        return None
2025
2026
    def get_raw_records(self, memos_for_retrieval):
2027
        """Get the raw bytes for a records.
2028
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2029
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2030
            length) memo for retrieving the bytes. The .knit method ignores
2031
            the index as there is always only a single file.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2032
        :return: An iterator over the bytes of the records.
2033
        """
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2034
        read_vector = [(pos, size) for (index, pos, size) in memos_for_retrieval]
2035
        for pos, data in self._transport.readv(self._filename, read_vector):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2036
            yield data
2037
2038
2039
class _PackAccess(object):
2040
    """Access to knit records via a collection of packs."""
2041
2042
    def __init__(self, index_to_packs, writer=None):
2043
        """Create a _PackAccess object.
2044
2045
        :param index_to_packs: A dict mapping index objects to the transport
2046
            and file names for obtaining data.
2047
        :param writer: A tuple (pack.ContainerWriter, write_index) which
2670.2.3 by Robert Collins
Review feedback.
2048
            contains the pack to write, and the index that reads from it will
2049
            be associated with.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2050
        """
2051
        if writer:
2052
            self.container_writer = writer[0]
2053
            self.write_index = writer[1]
2054
        else:
2055
            self.container_writer = None
2056
            self.write_index = None
2057
        self.indices = index_to_packs
2058
2059
    def add_raw_records(self, sizes, raw_data):
2060
        """Add raw knit bytes to a storage area.
2061
2670.2.3 by Robert Collins
Review feedback.
2062
        The data is spooled to the container writer in one bytes-record per
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2063
        raw data item.
2064
2065
        :param sizes: An iterable containing the size of each raw data segment.
2066
        :param raw_data: A bytestring containing the data.
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2067
        :return: A list of memos to retrieve the record later. Each memo is a
2068
            tuple - (index, pos, length), where the index field is the 
2069
            write_index object supplied to the PackAccess object.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2070
        """
2071
        result = []
2072
        offset = 0
2073
        for size in sizes:
2074
            p_offset, p_length = self.container_writer.add_bytes_record(
2075
                raw_data[offset:offset+size], [])
2076
            offset += size
2077
            result.append((self.write_index, p_offset, p_length))
2078
        return result
2079
2080
    def create(self):
2081
        """Pack based knits do not get individually created."""
2082
2083
    def get_raw_records(self, memos_for_retrieval):
2084
        """Get the raw bytes for a records.
2085
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2086
        :param memos_for_retrieval: An iterable containing the (index, pos, 
2087
            length) memo for retrieving the bytes. The Pack access method
2088
            looks up the pack to use for a given record in its index_to_pack
2089
            map.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2090
        :return: An iterator over the bytes of the records.
2091
        """
2092
        # first pass, group into same-index requests
2093
        request_lists = []
2094
        current_index = None
2095
        for (index, offset, length) in memos_for_retrieval:
2096
            if current_index == index:
2097
                current_list.append((offset, length))
2098
            else:
2099
                if current_index is not None:
2100
                    request_lists.append((current_index, current_list))
2101
                current_index = index
2102
                current_list = [(offset, length)]
2103
        # handle the last entry
2104
        if current_index is not None:
2105
            request_lists.append((current_index, current_list))
2106
        for index, offsets in request_lists:
2107
            transport, path = self.indices[index]
2108
            reader = pack.make_readv_reader(transport, path, offsets)
2109
            for names, read_func in reader.iter_records():
2110
                yield read_func(None)
2111
2112
    def open_file(self):
2113
        """Pack based knits have no single file."""
2114
        return None
2115
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2116
    def set_writer(self, writer, index, (transport, packname)):
2117
        """Set a writer to use for adding data."""
2592.3.208 by Robert Collins
Start refactoring the knit-pack thunking to be clearer.
2118
        if index is not None:
2119
            self.indices[index] = (transport, packname)
2592.3.70 by Robert Collins
Allow setting a writer after creating a knit._PackAccess object.
2120
        self.container_writer = writer
2121
        self.write_index = index
2122
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2123
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2124
class _StreamAccess(object):
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2125
    """A Knit Access object that provides data from a datastream.
2126
    
2127
    It also provides a fallback to present as unannotated data, annotated data
2128
    from a *backing* access object.
2129
2130
    This is triggered by a index_memo which is pointing to a different index
2131
    than this was constructed with, and is used to allow extracting full
2132
    unannotated texts for insertion into annotated knits.
2133
    """
2134
2135
    def __init__(self, reader_callable, stream_index, backing_knit,
2136
        orig_factory):
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2137
        """Create a _StreamAccess object.
2138
2139
        :param reader_callable: The reader_callable from the datastream.
2140
            This is called to buffer all the data immediately, for 
2141
            random access.
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2142
        :param stream_index: The index the data stream this provides access to
2143
            which will be present in native index_memo's.
2144
        :param backing_knit: The knit object that will provide access to 
2145
            annotated texts which are not available in the stream, so as to
2146
            create unannotated texts.
2147
        :param orig_factory: The original content factory used to generate the
2148
            stream. This is used for checking whether the thunk code for
2149
            supporting _copy_texts will generate the correct form of data.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2150
        """
2151
        self.data = reader_callable(None)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2152
        self.stream_index = stream_index
2153
        self.backing_knit = backing_knit
2154
        self.orig_factory = orig_factory
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2155
2156
    def get_raw_records(self, memos_for_retrieval):
2157
        """Get the raw bytes for a records.
2158
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2159
        :param memos_for_retrieval: An iterable of memos from the
2160
            _StreamIndex object identifying bytes to read; for these classes
2161
            they are (from_backing_knit, index, start, end) and can point to
2162
            either the backing knit or streamed data.
2163
        :return: An iterator yielding a byte string for each record in 
2164
            memos_for_retrieval.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2165
        """
2166
        # use a generator for memory friendliness
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2167
        for from_backing_knit, version_id, start, end in memos_for_retrieval:
2168
            if not from_backing_knit:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2169
                if version_id is not self.stream_index:
2170
                    raise AssertionError()
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2171
                yield self.data[start:end]
2172
                continue
2173
            # we have been asked to thunk. This thunking only occurs when
2174
            # we are obtaining plain texts from an annotated backing knit
2175
            # so that _copy_texts will work.
2176
            # We could improve performance here by scanning for where we need
2177
            # to do this and using get_line_list, then interleaving the output
2178
            # as desired. However, for now, this is sufficient.
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2179
            if self.orig_factory.__class__ != KnitPlainFactory:
2180
                raise errors.KnitCorrupt(
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2181
                    self, 'Bad thunk request %r cannot be backed by %r' %
2182
                        (version_id, self.orig_factory))
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2183
            lines = self.backing_knit.get_lines(version_id)
2184
            line_bytes = ''.join(lines)
2185
            digest = sha_string(line_bytes)
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2186
            # the packed form of the fulltext always has a trailing newline,
2187
            # even if the actual text does not, unless the file is empty.  the
2188
            # record options including the noeol flag are passed through by
2189
            # _StreamIndex, so this is safe.
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2190
            if lines:
2191
                if lines[-1][-1] != '\n':
2192
                    lines[-1] = lines[-1] + '\n'
2193
                    line_bytes += '\n'
2194
            # We want plain data, because we expect to thunk only to allow text
2195
            # extraction.
2196
            size, bytes = self.backing_knit._data._record_to_data(version_id,
2197
                digest, lines, line_bytes)
2198
            yield bytes
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2199
2200
2201
class _StreamIndex(object):
2202
    """A Knit Index object that uses the data map from a datastream."""
2203
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
2204
    def __init__(self, data_list, backing_index):
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2205
        """Create a _StreamIndex object.
2206
2207
        :param data_list: The data_list from the datastream.
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
2208
        :param backing_index: The index which will supply values for nodes
2209
            referenced outside of this stream.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2210
        """
2211
        self.data_list = data_list
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
2212
        self.backing_index = backing_index
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2213
        self._by_version = {}
2214
        pos = 0
2215
        for key, options, length, parents in data_list:
2216
            self._by_version[key] = options, (pos, pos + length), parents
2217
            pos += length
2218
2219
    def get_ancestry(self, versions, topo_sorted):
2220
        """Get an ancestry list for versions."""
2221
        if topo_sorted:
2222
            # Not needed for basic joins
2223
            raise NotImplementedError(self.get_ancestry)
2224
        # get a graph of all the mentioned versions:
2225
        # Little ugly - basically copied from KnitIndex, but don't want to
2226
        # accidentally incorporate too much of that index's code.
3052.2.4 by Andrew Bennetts
Some tweaks suggested by John's review.
2227
        ancestry = set()
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2228
        pending = set(versions)
2229
        cache = self._by_version
2230
        while pending:
2231
            version = pending.pop()
2232
            # trim ghosts
2233
            try:
2234
                parents = [p for p in cache[version][2] if p in cache]
2235
            except KeyError:
2236
                raise RevisionNotPresent(version, self)
2237
            # if not completed and not a ghost
3052.2.4 by Andrew Bennetts
Some tweaks suggested by John's review.
2238
            pending.update([p for p in parents if p not in ancestry])
2239
            ancestry.add(version)
2240
        return list(ancestry)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2241
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2242
    def get_build_details(self, version_ids):
2243
        """Get the method, index_memo and compression parent for version_ids.
2244
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2245
        Ghosts are omitted from the result.
2246
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2247
        :param version_ids: An iterable of version_ids.
3224.1.18 by John Arbash Meinel
Cleanup documentation
2248
        :return: A dict of version_id:(index_memo, compression_parent,
2249
                                       parents, record_details).
2250
            index_memo
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2251
                opaque memo that can be passed to _StreamAccess.read_records
2252
                to extract the raw data; for these classes it is
2253
                (from_backing_knit, index, start, end) 
3224.1.18 by John Arbash Meinel
Cleanup documentation
2254
            compression_parent
2255
                Content that this record is built upon, may be None
2256
            parents
2257
                Logical parents of this node
2258
            record_details
2259
                extra information about the content which needs to be passed to
2260
                Factory.parse_record
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2261
        """
2262
        result = {}
2263
        for version_id in version_ids:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2264
            try:
2265
                method = self.get_method(version_id)
2266
            except errors.RevisionNotPresent:
2267
                # ghosts are omitted
2268
                continue
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2269
            parent_ids = self.get_parents_with_ghosts(version_id)
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
2270
            noeol = ('no-eol' in self.get_options(version_id))
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2271
            index_memo = self.get_position(version_id)
2272
            from_backing_knit = index_memo[0]
2273
            if from_backing_knit:
2274
                # texts retrieved from the backing knit are always full texts
2275
                method = 'fulltext'
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2276
            if method == 'fulltext':
2277
                compression_parent = None
2278
            else:
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2279
                compression_parent = parent_ids[0]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2280
            result[version_id] = (index_memo, compression_parent,
2281
                                  parent_ids, (method, noeol))
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2282
        return result
2283
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2284
    def get_method(self, version_id):
2285
        """Return compression method of specified version."""
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2286
        options = self.get_options(version_id)
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2287
        if 'fulltext' in options:
2288
            return 'fulltext'
2289
        elif 'line-delta' in options:
2290
            return 'line-delta'
2291
        else:
2292
            raise errors.KnitIndexUnknownMethod(self, options)
2293
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2294
    def get_options(self, version_id):
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2295
        """Return a list representing options.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2296
2297
        e.g. ['foo', 'bar']
2298
        """
3224.1.8 by John Arbash Meinel
Add noeol to the return signature of get_build_details.
2299
        try:
2300
            return self._by_version[version_id][0]
2301
        except KeyError:
3287.7.6 by Andrew Bennetts
Tweaks suggested by Robert's review.
2302
            options = list(self.backing_index.get_options(version_id))
2303
            if 'fulltext' in options:
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2304
                pass
3287.7.6 by Andrew Bennetts
Tweaks suggested by Robert's review.
2305
            elif 'line-delta' in options:
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2306
                # Texts from the backing knit are always returned from the stream
2307
                # as full texts
3287.7.6 by Andrew Bennetts
Tweaks suggested by Robert's review.
2308
                options.remove('line-delta')
2309
                options.append('fulltext')
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2310
            else:
2311
                raise errors.KnitIndexUnknownMethod(self, options)
3287.7.6 by Andrew Bennetts
Tweaks suggested by Robert's review.
2312
            return tuple(options)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2313
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
2314
    def get_parent_map(self, version_ids):
2315
        """Passed through to by KnitVersionedFile.get_parent_map."""
2316
        result = {}
2317
        pending_ids = set()
2318
        for version_id in version_ids:
2319
            try:
2320
                result[version_id] = self._by_version[version_id][2]
2321
            except KeyError:
2322
                pending_ids.add(version_id)
2323
        result.update(self.backing_index.get_parent_map(pending_ids))
2324
        return result
2325
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2326
    def get_parents_with_ghosts(self, version_id):
2327
        """Return parents of specified version with ghosts."""
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2328
        try:
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
2329
            return self.get_parent_map([version_id])[version_id]
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2330
        except KeyError:
3287.5.5 by Robert Collins
Refactor internals of knit implementations to implement get_parents_with_ghosts in terms of get_parent_map.
2331
            raise RevisionNotPresent(version_id, self)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2332
2333
    def get_position(self, version_id):
2334
        """Return details needed to access the version.
2335
        
2336
        _StreamAccess has the data as a big array, so we return slice
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2337
        coordinates into that (as index_memo's are opaque outside the
2338
        index and matching access class).
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2339
3287.12.1 by Martin Pool
#2008418: (with spiv) Avoid interpreting fulltexts as line deltas when pulling knits.
2340
        :return: a tuple (from_backing_knit, index, start, end) that can 
2341
            be passed e.g. to get_raw_records.  
2342
            If from_backing_knit is False, index will be self, otherwise it
2343
            will be a version id.
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2344
        """
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2345
        try:
2346
            start, end = self._by_version[version_id][1]
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2347
            return False, self, start, end
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2348
        except KeyError:
2349
            # Signal to the access object to handle this from the backing knit.
3052.2.5 by Andrew Bennetts
Address the rest of the review comments from John and myself.
2350
            return (True, version_id, None, None)
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2351
2352
    def get_versions(self):
2353
        """Get all the versions in the stream."""
2354
        return self._by_version.keys()
2355
2356
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2357
class _KnitData(object):
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2358
    """Manage extraction of data from a KnitAccess, caching and decompressing.
2359
    
2360
    The KnitData class provides the logic for parsing and using knit records,
2361
    making use of an access method for the low level read and write operations.
2362
    """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2363
2364
    def __init__(self, access):
2365
        """Create a KnitData object.
2366
2367
        :param access: The access method to use. Access methods such as
2368
            _KnitAccess manage the insertion of raw records and the subsequent
2369
            retrieval of the same.
2370
        """
2371
        self._access = access
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2372
        self._checked = False
2373
2374
    def _open_file(self):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2375
        return self._access.open_file()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2376
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2377
    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.
2378
        """Convert version_id, digest, lines into a raw data block.
2379
        
2888.1.2 by Robert Collins
Cleanup the dense_lines parameter docstring to be more useful.
2380
        :param dense_lines: The bytes of lines but in a denser form. For
2381
            instance, if lines is a list of 1000 bytestrings each ending in \n,
2382
            dense_lines may be a list with one line in it, containing all the
2383
            1000's lines and their \n's. Using dense_lines if it is already
2384
            known is a win because the string join to create bytes in this
2385
            function spends less time resizing the final string.
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2386
        :return: (len, a StringIO instance with the raw data ready to read.)
2387
        """
2888.1.1 by Robert Collins
(robertc) Use prejoined content for knit storage when performing a full-text store of unannotated content. (Robert Collins)
2388
        # Note: using a string copy here increases memory pressure with e.g.
2389
        # ISO's, but it is about 3 seconds faster on a 1.2Ghz intel machine
2390
        # when doing the initial commit of a mozilla tree. RBC 20070921
2391
        bytes = ''.join(chain(
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
2392
            ["version %s %d %s\n" % (version_id,
1596.2.28 by Robert Collins
more knit profile based tuning.
2393
                                     len(lines),
2394
                                     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)
2395
            dense_lines or lines,
2396
            ["end %s\n" % version_id]))
2817.3.1 by Robert Collins
* New helper ``bzrlib.tuned_gzip.bytes_to_gzip`` which takes a byte string
2397
        compressed_bytes = bytes_to_gzip(bytes)
2398
        return len(compressed_bytes), compressed_bytes
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2399
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2400
    def add_raw_records(self, sizes, raw_data):
1692.4.1 by Robert Collins
Multiple merges:
2401
        """Append a prepared record to the data file.
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2402
        
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2403
        :param sizes: An iterable containing the size of each raw data segment.
2404
        :param raw_data: A bytestring containing the data.
2405
        :return: a list of index data for the way the data was stored.
2406
            See the access method add_raw_records documentation for more
2407
            details.
1692.4.1 by Robert Collins
Multiple merges:
2408
        """
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2409
        return self._access.add_raw_records(sizes, raw_data)
2329.1.2 by John Arbash Meinel
Remove some spurious whitespace changes.
2410
        
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2411
    def _parse_record_header(self, version_id, raw_data):
2412
        """Parse a record header for consistency.
2413
2414
        :return: the header and the decompressor stream.
2415
                 as (stream, header_record)
2416
        """
2417
        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.
2418
        try:
2419
            rec = self._check_header(version_id, df.readline())
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2420
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2421
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2422
                              "While reading {%s} got %s(%s)"
2423
                              % (version_id, e.__class__.__name__, str(e)))
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2424
        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()
2425
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2426
    def _check_header(self, version_id, line):
2427
        rec = line.split()
2428
        if len(rec) != 4:
2429
            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()
2430
                              '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
2431
        if rec[1] != version_id:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2432
            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()
2433
                              'unexpected version, wanted %r, got %r'
2434
                              % (version_id, rec[1]))
2435
        return rec
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2436
2437
    def _parse_record(self, version_id, data):
1628.1.2 by Robert Collins
More knit micro-optimisations.
2438
        # profiling notes:
2439
        # 4168 calls in 2880 217 internal
2440
        # 4168 calls to _parse_record_header in 2121
2441
        # 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()
2442
        df = GzipFile(mode='rb', fileobj=StringIO(data))
2443
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2444
        try:
2445
            record_contents = df.readlines()
2358.3.4 by Martin Pool
Fix mangled knit.py changes
2446
        except Exception, e:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2447
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2448
                              "While reading {%s} got %s(%s)"
2449
                              % (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()
2450
        header = record_contents.pop(0)
2451
        rec = self._check_header(version_id, header)
2452
2453
        last_line = record_contents.pop()
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2454
        if len(record_contents) != int(rec[2]):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2455
            raise KnitCorrupt(self._access,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
2456
                              'incorrect number of lines %s != %s'
2457
                              ' for version {%s}'
2458
                              % (len(record_contents), int(rec[2]),
2459
                                 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()
2460
        if last_line != 'end %s\n' % rec[1]:
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2461
            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()
2462
                              'unexpected version end line %r, wanted %r' 
2463
                              % (last_line, version_id))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2464
        df.close()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2465
        return record_contents, rec[3]
2466
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2467
    def read_records_iter_raw(self, records):
2468
        """Read text records from data file and yield raw data.
2469
2470
        This unpacks enough of the text record to validate the id is
2471
        as expected but thats all.
2472
        """
2473
        # setup an iterator of the external records:
2474
        # uses readv so nice and fast we hope.
1756.3.23 by Aaron Bentley
Remove knit caches
2475
        if len(records):
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2476
            # grab the disk data needed.
3316.2.11 by Robert Collins
* ``VersionedFile.clear_cache`` and ``enable_cache`` are deprecated.
2477
            needed_offsets = [index_memo for version_id, index_memo
2478
                                           in records]
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2479
            raw_records = self._access.get_raw_records(needed_offsets)
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2480
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2481
        for version_id, index_memo in records:
3316.2.11 by Robert Collins
* ``VersionedFile.clear_cache`` and ``enable_cache`` are deprecated.
2482
            data = raw_records.next()
2483
            # validate the header
2484
            df, rec = self._parse_record_header(version_id, data)
2485
            df.close()
1756.3.23 by Aaron Bentley
Remove knit caches
2486
            yield version_id, data
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2487
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2488
    def read_records_iter(self, records):
2489
        """Read text records from data file and yield result.
2490
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2491
        The result will be returned in whatever is the fastest to read.
2492
        Not by the order requested. Also, multiple requests for the same
2493
        record will only yield 1 response.
2494
        :param records: A list of (version_id, pos, len) entries
2495
        :return: Yields (version_id, contents, digest) in the order
2496
                 read, not the order requested
2497
        """
2498
        if not records:
2499
            return
2500
3316.2.11 by Robert Collins
* ``VersionedFile.clear_cache`` and ``enable_cache`` are deprecated.
2501
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2502
        if not needed_records:
2503
            return
2504
2505
        # The transport optimizes the fetching as well 
2506
        # (ie, reads continuous ranges.)
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2507
        raw_data = self._access.get_raw_records(
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2508
            [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.
2509
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2510
        for (version_id, index_memo), data in \
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
2511
                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.
2512
            content, digest = self._parse_record(version_id, data)
1756.3.23 by Aaron Bentley
Remove knit caches
2513
            yield version_id, content, digest
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2514
2515
    def read_records(self, records):
2516
        """Read records into a dictionary."""
2517
        components = {}
1863.1.5 by John Arbash Meinel
Add a read_records_iter_unsorted, which can return records in any order.
2518
        for record_id, content, digest in \
1863.1.9 by John Arbash Meinel
Switching to have 'read_records_iter' return in random order.
2519
                self.read_records_iter(records):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2520
            components[record_id] = (content, digest)
2521
        return components
2522
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2523
2524
class InterKnit(InterVersionedFile):
2525
    """Optimised code paths for knit to knit operations."""
2526
    
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2527
    _matching_file_from_factory = staticmethod(make_file_knit)
2528
    _matching_file_to_factory = staticmethod(make_file_knit)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2529
    
2530
    @staticmethod
2531
    def is_compatible(source, target):
2532
        """Be compatible with knits.  """
2533
        try:
2534
            return (isinstance(source, KnitVersionedFile) and
2535
                    isinstance(target, KnitVersionedFile))
2536
        except AttributeError:
2537
            return False
2538
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2539
    def _copy_texts(self, pb, msg, version_ids, ignore_missing=False):
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2540
        """Copy texts to the target by extracting and adding them one by one.
2541
2542
        see join() for the parameter definitions.
2543
        """
2544
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
2545
        # --- the below is factorable out with VersionedFile.join, but wait for
2546
        # VersionedFiles, it may all be simpler then.
2547
        graph = Graph(self.source)
2548
        search = graph._make_breadth_first_searcher(version_ids)
2549
        transitive_ids = set()
2550
        map(transitive_ids.update, list(search))
2551
        parent_map = self.source.get_parent_map(transitive_ids)
2552
        order = topo_sort(parent_map.items())
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2553
2554
        def size_of_content(content):
2555
            return sum(len(line) for line in content.text())
2556
        # Cache at most 10MB of parent texts
2557
        parent_cache = lru_cache.LRUSizeCache(max_size=10*1024*1024,
2558
                                              compute_size=size_of_content)
2559
        # TODO: jam 20071116 It would be nice to have a streaming interface to
2560
        #       get multiple texts from a source. The source could be smarter
2561
        #       about how it handled intermediate stages.
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2562
        #       get_line_list() or make_mpdiffs() seem like a possibility, but
2563
        #       at the moment they extract all full texts into memory, which
2564
        #       causes us to store more than our 3x fulltext goal.
2565
        #       Repository.iter_files_bytes() may be another possibility
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2566
        to_process = [version for version in order
2567
                               if version not in self.target]
2568
        total = len(to_process)
2569
        pb = ui.ui_factory.nested_progress_bar()
2570
        try:
2571
            for index, version in enumerate(to_process):
2572
                pb.update('Converting versioned data', index, total)
2573
                sha1, num_bytes, parent_text = self.target.add_lines(version,
3052.2.3 by Robert Collins
Handle insert_data_stream of an unannotated stream into an annotated knit.
2574
                    self.source.get_parents_with_ghosts(version),
2998.2.2 by John Arbash Meinel
implement a faster path for copying from packs back to knits.
2575
                    self.source.get_lines(version),
2576
                    parent_texts=parent_cache)
2577
                parent_cache[version] = parent_text
2578
        finally:
2579
            pb.finished()
2580
        return total
2581
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
2582
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2583
        """See InterVersionedFile.join."""
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
2584
        # If the source and target are mismatched w.r.t. annotations vs
2585
        # plain, the data needs to be converted accordingly
2586
        if self.source.factory.annotated == self.target.factory.annotated:
2587
            converter = None
2588
        elif self.source.factory.annotated:
2589
            converter = self._anno_to_plain_converter
2590
        else:
2998.2.3 by John Arbash Meinel
Respond to Aaron's requests
2591
            # We're converting from a plain to an annotated knit. Copy them
2592
            # across by full texts.
2593
            return self._copy_texts(pb, msg, version_ids, ignore_missing)
2851.4.3 by Ian Clatworthy
fix up plain-to-annotated knit conversion
2594
1684.3.2 by Robert Collins
Factor out version_ids-to-join selection in InterVersionedfile.
2595
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2596
        if not version_ids:
2597
            return 0
2598
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2599
        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.
2600
        try:
2601
            version_ids = list(version_ids)
2602
            if None in version_ids:
2603
                version_ids.remove(None)
2604
    
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
2605
            self.source_ancestry = set(self.source.get_ancestry(version_ids,
2606
                topo_sorted=False))
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2607
            this_versions = set(self.target._index.get_versions())
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2608
            # XXX: For efficiency we should not look at the whole index,
2609
            #      we only need to consider the referenced revisions - they
2610
            #      must all be present, or the method must be full-text.
2611
            #      TODO, RBC 20070919
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2612
            needed_versions = self.source_ancestry - this_versions
2613
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2614
            if not needed_versions:
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2615
                return 0
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
2616
            full_list = topo_sort(
2617
                self.source.get_parent_map(self.source.versions()))
1910.2.65 by Aaron Bentley
Remove the check-parent patch
2618
    
2619
            version_list = [i for i in full_list if (not self.target.has_version(i)
2620
                            and i in needed_versions)]
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2621
    
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2622
            # plan the join:
2623
            copy_queue = []
2624
            copy_queue_records = []
2625
            copy_set = set()
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2626
            for version_id in version_list:
2627
                options = self.source._index.get_options(version_id)
2628
                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.
2629
                # 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.
2630
                for parent in parents:
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2631
                    # if source has the parent, we must :
2632
                    # * already have it or
2633
                    # * have it scheduled already
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2634
                    # otherwise we don't care
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2635
                    if not (self.target.has_version(parent) or
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2636
                            parent in copy_set or
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2637
                            not self.source.has_version(parent)):
2638
                        raise AssertionError("problem joining parent %r "
2639
                            "from %r to %r"
2640
                            % (parent, self.source, self.target))
2592.3.71 by Robert Collins
Basic version of knit-based repository operating, many tests failing.
2641
                index_memo = self.source._index.get_position(version_id)
2642
                copy_queue_records.append((version_id, index_memo))
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2643
                copy_queue.append((version_id, options, parents))
2644
                copy_set.add(version_id)
2645
2646
            # data suck the join:
2647
            count = 0
2648
            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.
2649
            raw_datum = []
2650
            raw_records = []
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2651
            for (version_id, raw_data), \
2652
                (version_id2, options, parents) in \
2653
                izip(self.source._data.read_records_iter_raw(copy_queue_records),
2654
                     copy_queue):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2655
                if not (version_id == version_id2):
2656
                    raise AssertionError('logic error, inconsistent results')
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
2657
                count = count + 1
1596.2.8 by Robert Collins
Join knits with the original gzipped data avoiding recompression.
2658
                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
2659
                if converter:
2660
                    size, raw_data = converter(raw_data, version_id, options,
2661
                        parents)
2851.4.1 by Ian Clatworthy
Support joining plain knits to annotated knits and vice versa
2662
                else:
2663
                    size = len(raw_data)
2664
                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.
2665
                raw_datum.append(raw_data)
2666
            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.
2667
            return count
2668
        finally:
2669
            pb.finished()
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2670
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
2671
    def _anno_to_plain_converter(self, raw_data, version_id, options,
2672
                                 parents):
2673
        """Convert annotated content to plain content."""
2674
        data, digest = self.source._data._parse_record(version_id, raw_data)
2675
        if 'fulltext' in options:
2676
            content = self.source.factory.parse_fulltext(data, version_id)
2677
            lines = self.target.factory.lower_fulltext(content)
2678
        else:
2679
            delta = self.source.factory.parse_line_delta(data, version_id,
2680
                plain=True)
2681
            lines = self.target.factory.lower_line_delta(delta)
2682
        return self.target._data._record_to_data(version_id, digest, lines)
2683
1563.2.13 by Robert Collins
InterVersionedFile implemented.
2684
2685
InterVersionedFile.register_optimiser(InterKnit)
1596.2.24 by Robert Collins
Gzipfile was slightly slower than ideal.
2686
2687
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2688
class WeaveToKnit(InterVersionedFile):
2689
    """Optimised code paths for weave to knit operations."""
2690
    
2691
    _matching_file_from_factory = bzrlib.weave.WeaveFile
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2692
    _matching_file_to_factory = staticmethod(make_file_knit)
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2693
    
2694
    @staticmethod
2695
    def is_compatible(source, target):
2696
        """Be compatible with weaves to knits."""
2697
        try:
2698
            return (isinstance(source, bzrlib.weave.Weave) and
2699
                    isinstance(target, KnitVersionedFile))
2700
        except AttributeError:
2701
            return False
2702
2703
    def join(self, pb=None, msg=None, version_ids=None, ignore_missing=False):
2704
        """See InterVersionedFile.join."""
2705
        version_ids = self._get_source_version_ids(version_ids, ignore_missing)
2706
2707
        if not version_ids:
2708
            return 0
2709
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2710
        pb = ui.ui_factory.nested_progress_bar()
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2711
        try:
2712
            version_ids = list(version_ids)
2713
    
2714
            self.source_ancestry = set(self.source.get_ancestry(version_ids))
2715
            this_versions = set(self.target._index.get_versions())
2716
            needed_versions = self.source_ancestry - this_versions
2717
    
2825.4.1 by Robert Collins
* ``pull``, ``merge`` and ``push`` will no longer silently correct some
2718
            if not needed_versions:
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2719
                return 0
3287.6.1 by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method.
2720
            full_list = topo_sort(
2721
                self.source.get_parent_map(self.source.versions()))
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2722
    
2723
            version_list = [i for i in full_list if (not self.target.has_version(i)
2724
                            and i in needed_versions)]
2725
    
2726
            # do the join:
2727
            count = 0
2728
            total = len(version_list)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
2729
            parent_map = self.source.get_parent_map(version_list)
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2730
            for version_id in version_list:
2731
                pb.update("Converting to knit", count, total)
3287.5.2 by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.
2732
                parents = parent_map[version_id]
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2733
                # check that its will be a consistent copy:
2734
                for parent in parents:
2735
                    # if source has the parent, we must already have it
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2736
                    if not self.target.has_version(parent):
2737
                        raise AssertionError("%r does not have parent %r"
2738
                            % (self.target, parent))
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
2739
                self.target.add_lines(
2740
                    version_id, parents, self.source.get_lines(version_id))
2741
                count = count + 1
2742
            return count
2743
        finally:
2744
            pb.finished()
2745
2746
2747
InterVersionedFile.register_optimiser(WeaveToKnit)
2748
2749
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
2750
# Deprecated, use PatienceSequenceMatcher instead
2751
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
2752
2753
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
2754
def annotate_knit(knit, revision_id):
2755
    """Annotate a knit with no cached annotations.
2756
2757
    This implementation is for knits with no cached annotations.
2758
    It will work for knits with cached annotations, but this is not
2759
    recommended.
2760
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2761
    annotator = _KnitAnnotator(knit)
3224.1.25 by John Arbash Meinel
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
2762
    return iter(annotator.annotate(revision_id))
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
2763
2764
2765
class _KnitAnnotator(object):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
2766
    """Build up the annotations for a text."""
2767
2768
    def __init__(self, knit):
2769
        self._knit = knit
2770
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2771
        # Content objects, differs from fulltexts because of how final newlines
2772
        # are treated by knits. the content objects here will always have a
2773
        # final newline
2774
        self._fulltext_contents = {}
2775
2776
        # Annotated lines of specific revisions
2777
        self._annotated_lines = {}
2778
2779
        # Track the raw data for nodes that we could not process yet.
2780
        # This maps the revision_id of the base to a list of children that will
2781
        # annotated from it.
2782
        self._pending_children = {}
2783
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2784
        # Nodes which cannot be extracted
2785
        self._ghosts = set()
2786
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2787
        # Track how many children this node has, so we know if we need to keep
2788
        # it
2789
        self._annotate_children = {}
2790
        self._compression_children = {}
2791
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2792
        self._all_build_details = {}
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2793
        # The children => parent revision_id graph
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2794
        self._revision_id_graph = {}
2795
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2796
        self._heads_provider = None
2797
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2798
        self._nodes_to_keep_annotations = set()
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2799
        self._generations_until_keep = 100
2800
2801
    def set_generations_until_keep(self, value):
2802
        """Set the number of generations before caching a node.
2803
2804
        Setting this to -1 will cache every merge node, setting this higher
2805
        will cache fewer nodes.
2806
        """
2807
        self._generations_until_keep = value
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2808
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2809
    def _add_fulltext_content(self, revision_id, content_obj):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2810
        self._fulltext_contents[revision_id] = content_obj
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2811
        # TODO: jam 20080305 It might be good to check the sha1digest here
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2812
        return content_obj.text()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2813
2814
    def _check_parents(self, child, nodes_to_annotate):
2815
        """Check if all parents have been processed.
2816
2817
        :param child: A tuple of (rev_id, parents, raw_content)
2818
        :param nodes_to_annotate: If child is ready, add it to
2819
            nodes_to_annotate, otherwise put it back in self._pending_children
2820
        """
2821
        for parent_id in child[1]:
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2822
            if (parent_id not in self._annotated_lines):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2823
                # This parent is present, but another parent is missing
2824
                self._pending_children.setdefault(parent_id,
2825
                                                  []).append(child)
2826
                break
2827
        else:
2828
            # This one is ready to be processed
2829
            nodes_to_annotate.append(child)
2830
2831
    def _add_annotation(self, revision_id, fulltext, parent_ids,
2832
                        left_matching_blocks=None):
2833
        """Add an annotation entry.
2834
2835
        All parents should already have been annotated.
2836
        :return: A list of children that now have their parents satisfied.
2837
        """
2838
        a = self._annotated_lines
2839
        annotated_parent_lines = [a[p] for p in parent_ids]
2840
        annotated_lines = list(annotate.reannotate(annotated_parent_lines,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2841
            fulltext, revision_id, left_matching_blocks,
2842
            heads_provider=self._get_heads_provider()))
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2843
        self._annotated_lines[revision_id] = annotated_lines
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2844
        for p in parent_ids:
2845
            ann_children = self._annotate_children[p]
2846
            ann_children.remove(revision_id)
2847
            if (not ann_children
2848
                and p not in self._nodes_to_keep_annotations):
2849
                del self._annotated_lines[p]
2850
                del self._all_build_details[p]
2851
                if p in self._fulltext_contents:
2852
                    del self._fulltext_contents[p]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2853
        # Now that we've added this one, see if there are any pending
2854
        # deltas to be done, certainly this parent is finished
2855
        nodes_to_annotate = []
2856
        for child in self._pending_children.pop(revision_id, []):
2857
            self._check_parents(child, nodes_to_annotate)
2858
        return nodes_to_annotate
2859
2860
    def _get_build_graph(self, revision_id):
2861
        """Get the graphs for building texts and annotations.
2862
2863
        The data you need for creating a full text may be different than the
2864
        data you need to annotate that text. (At a minimum, you need both
2865
        parents to create an annotation, but only need 1 parent to generate the
2866
        fulltext.)
2867
2868
        :return: A list of (revision_id, index_memo) records, suitable for
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2869
            passing to read_records_iter to start reading in the raw data fro/
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2870
            the pack file.
2871
        """
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
2872
        if revision_id in self._annotated_lines:
2873
            # Nothing to do
2874
            return []
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2875
        pending = set([revision_id])
2876
        records = []
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2877
        generation = 0
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2878
        kept_generation = 0
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2879
        while pending:
2880
            # get all pending nodes
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2881
            generation += 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2882
            this_iteration = pending
2883
            build_details = self._knit._index.get_build_details(this_iteration)
2884
            self._all_build_details.update(build_details)
2885
            # new_nodes = self._knit._index._get_entries(this_iteration)
2886
            pending = set()
2887
            for rev_id, details in build_details.iteritems():
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2888
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2889
                 record_details) = details
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2890
                self._revision_id_graph[rev_id] = parents
2891
                records.append((rev_id, index_memo))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2892
                # Do we actually need to check _annotated_lines?
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2893
                pending.update(p for p in parents
2894
                                 if p not in self._all_build_details)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2895
                if compression_parent:
2896
                    self._compression_children.setdefault(compression_parent,
2897
                        []).append(rev_id)
2898
                if parents:
2899
                    for parent in parents:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2900
                        self._annotate_children.setdefault(parent,
2901
                            []).append(rev_id)
2902
                    num_gens = generation - kept_generation
2903
                    if ((num_gens >= self._generations_until_keep)
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2904
                        and len(parents) > 1):
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2905
                        kept_generation = generation
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2906
                        self._nodes_to_keep_annotations.add(rev_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2907
2908
            missing_versions = this_iteration.difference(build_details.keys())
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2909
            self._ghosts.update(missing_versions)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2910
            for missing_version in missing_versions:
2911
                # add a key, no parents
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2912
                self._revision_id_graph[missing_version] = ()
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2913
                pending.discard(missing_version) # don't look for it
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2914
        if self._ghosts.intersection(self._compression_children):
2915
            raise KnitCorrupt(
2916
                "We cannot have nodes which have a ghost compression parent:\n"
2917
                "ghosts: %r\n"
2918
                "compression children: %r"
2919
                % (self._ghosts, self._compression_children))
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2920
        # Cleanout anything that depends on a ghost so that we don't wait for
2921
        # the ghost to show up
2922
        for node in self._ghosts:
2923
            if node in self._annotate_children:
2924
                # We won't be building this node
2925
                del self._annotate_children[node]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2926
        # Generally we will want to read the records in reverse order, because
2927
        # we find the parent nodes after the children
2928
        records.reverse()
2929
        return records
2930
2931
    def _annotate_records(self, records):
2932
        """Build the annotations for the listed records."""
2933
        # We iterate in the order read, rather than a strict order requested
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2934
        # However, process what we can, and put off to the side things that
2935
        # still need parents, cleaning them up when those parents are
2936
        # processed.
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2937
        for (rev_id, record,
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2938
             digest) in self._knit._data.read_records_iter(records):
2939
            if rev_id in self._annotated_lines:
2940
                continue
2941
            parent_ids = self._revision_id_graph[rev_id]
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2942
            parent_ids = [p for p in parent_ids if p not in self._ghosts]
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2943
            details = self._all_build_details[rev_id]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2944
            (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2945
             record_details) = details
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2946
            nodes_to_annotate = []
2947
            # TODO: Remove the punning between compression parents, and
2948
            #       parent_ids, we should be able to do this without assuming
2949
            #       the build order
2950
            if len(parent_ids) == 0:
2951
                # There are no parents for this node, so just add it
2952
                # TODO: This probably needs to be decoupled
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2953
                fulltext_content, delta = self._knit.factory.parse_record(
2954
                    rev_id, record, record_details, None)
2955
                fulltext = self._add_fulltext_content(rev_id, fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2956
                nodes_to_annotate.extend(self._add_annotation(rev_id, fulltext,
2957
                    parent_ids, left_matching_blocks=None))
2958
            else:
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2959
                child = (rev_id, parent_ids, record)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2960
                # Check if all the parents are present
2961
                self._check_parents(child, nodes_to_annotate)
2962
            while nodes_to_annotate:
2963
                # Should we use a queue here instead of a stack?
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2964
                (rev_id, parent_ids, record) = nodes_to_annotate.pop()
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2965
                (index_memo, compression_parent, parents,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2966
                 record_details) = self._all_build_details[rev_id]
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2967
                if compression_parent is not None:
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2968
                    comp_children = self._compression_children[compression_parent]
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2969
                    if rev_id not in comp_children:
2970
                        raise AssertionError("%r not in compression children %r"
2971
                            % (rev_id, comp_children))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2972
                    # If there is only 1 child, it is safe to reuse this
2973
                    # content
2974
                    reuse_content = (len(comp_children) == 1
2975
                        and compression_parent not in
2976
                            self._nodes_to_keep_annotations)
2977
                    if reuse_content:
2978
                        # Remove it from the cache since it will be changing
2979
                        parent_fulltext_content = self._fulltext_contents.pop(compression_parent)
2980
                        # Make sure to copy the fulltext since it might be
2981
                        # modified
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2982
                        parent_fulltext = list(parent_fulltext_content.text())
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2983
                    else:
2984
                        parent_fulltext_content = self._fulltext_contents[compression_parent]
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2985
                        parent_fulltext = parent_fulltext_content.text()
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2986
                    comp_children.remove(rev_id)
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2987
                    fulltext_content, delta = self._knit.factory.parse_record(
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2988
                        rev_id, record, record_details,
2989
                        parent_fulltext_content,
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
2990
                        copy_base_content=(not reuse_content))
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
2991
                    fulltext = self._add_fulltext_content(rev_id,
2992
                                                          fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2993
                    blocks = KnitContent.get_line_delta_blocks(delta,
2994
                            parent_fulltext, fulltext)
2995
                else:
2996
                    fulltext_content = self._knit.factory.parse_fulltext(
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2997
                        record, rev_id)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2998
                    fulltext = self._add_fulltext_content(rev_id,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2999
                        fulltext_content)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3000
                    blocks = None
3001
                nodes_to_annotate.extend(
3002
                    self._add_annotation(rev_id, fulltext, parent_ids,
3003
                                     left_matching_blocks=blocks))
3004
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
3005
    def _get_heads_provider(self):
3006
        """Create a heads provider for resolving ancestry issues."""
3007
        if self._heads_provider is not None:
3008
            return self._heads_provider
3009
        parent_provider = _mod_graph.DictParentsProvider(
3010
            self._revision_id_graph)
3011
        graph_obj = _mod_graph.Graph(parent_provider)
3224.1.20 by John Arbash Meinel
Reduce the number of cache misses by caching known heads answers
3012
        head_cache = _mod_graph.FrozenHeadsCache(graph_obj)
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
3013
        self._heads_provider = head_cache
3014
        return head_cache
3015
3224.1.25 by John Arbash Meinel
Quick change to the _KnitAnnotator api to use .annotate() instead of get_annotated_lines()
3016
    def annotate(self, revision_id):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
3017
        """Return the annotated fulltext at the given revision.
3018
3019
        :param revision_id: The revision id for this file
3020
        """
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3021
        records = self._get_build_graph(revision_id)
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
3022
        if revision_id in self._ghosts:
3023
            raise errors.RevisionNotPresent(revision_id, self._knit)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3024
        self._annotate_records(records)
3025
        return self._annotated_lines[revision_id]
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
3026
3027
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
3028
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
3029
    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.
3030
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
3031
    from bzrlib._knit_load_data_py import _load_data_py as _load_data