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