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