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