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