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