/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
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
"""Tests for Knit data structure"""
18
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
19
from cStringIO import StringIO
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
20
import difflib
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
21
import gzip
22
import sha
2484.1.17 by John Arbash Meinel
Workaround for Pyrex <0.9.5 and python >=2.5 incompatibilities.
23
import sys
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
24
2196.2.5 by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it
25
from bzrlib import (
26
    errors,
2484.1.5 by John Arbash Meinel
Simplistic implementations of custom parsers for options and parents
27
    generate_ids,
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
28
    knit,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
29
    pack,
2196.2.5 by John Arbash Meinel
Add an exception class when the knit index storage method is unknown, and properly test for it
30
    )
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
31
from bzrlib.errors import (
32
    RevisionAlreadyPresent,
33
    KnitHeaderError,
34
    RevisionNotPresent,
35
    NoSuchFile,
36
    )
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
37
from bzrlib.index import *
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
38
from bzrlib.knit import (
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.
39
    AnnotatedKnitContent,
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
40
    KnitContent,
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
41
    KnitGraphIndex,
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
42
    KnitVersionedFile,
43
    KnitPlainFactory,
44
    KnitAnnotateFactory,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
45
    _KnitAccess,
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
46
    _KnitData,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
47
    _KnitIndex,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
48
    _PackAccess,
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.
49
    PlainKnitContent,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
50
    WeaveToKnit,
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
51
    KnitSequenceMatcher,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
52
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
53
from bzrlib.osutils import split_lines
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
54
from bzrlib.tests import (
55
    Feature,
56
    TestCase,
57
    TestCaseWithMemoryTransport,
58
    TestCaseWithTransport,
59
    )
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
60
from bzrlib.transport import TransportLogger, get_transport
1563.2.13 by Robert Collins
InterVersionedFile implemented.
61
from bzrlib.transport.memory import MemoryTransport
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
62
from bzrlib.util import bencode
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
63
from bzrlib.weave import Weave
64
65
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
66
class _CompiledKnitFeature(Feature):
67
68
    def _probe(self):
69
        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
70
            import bzrlib._knit_load_data_c
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
71
        except ImportError:
72
            return False
73
        return True
74
75
    def feature_name(self):
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
76
        return 'bzrlib._knit_load_data_c'
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
77
78
CompiledKnitFeature = _CompiledKnitFeature()
79
80
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.
81
class KnitContentTestsMixin(object):
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
82
83
    def test_constructor(self):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
84
        content = self._make_content([])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
85
86
    def test_text(self):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
87
        content = self._make_content([])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
88
        self.assertEqual(content.text(), [])
89
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.
90
        content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
91
        self.assertEqual(content.text(), ["text1", "text2"])
92
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.
93
    def test_copy(self):
94
        content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
95
        copy = content.copy()
96
        self.assertIsInstance(copy, content.__class__)
97
        self.assertEqual(copy.annotate(), content.annotate())
98
99
    def assertDerivedBlocksEqual(self, source, target, noeol=False):
100
        """Assert that the derived matching blocks match real output"""
101
        source_lines = source.splitlines(True)
102
        target_lines = target.splitlines(True)
103
        def nl(line):
104
            if noeol and not line.endswith('\n'):
105
                return line + '\n'
106
            else:
107
                return line
108
        source_content = self._make_content([(None, nl(l)) for l in source_lines])
109
        target_content = self._make_content([(None, nl(l)) for l in target_lines])
110
        line_delta = source_content.line_delta(target_content)
111
        delta_blocks = list(KnitContent.get_line_delta_blocks(line_delta,
112
            source_lines, target_lines))
113
        matcher = KnitSequenceMatcher(None, source_lines, target_lines)
114
        matcher_blocks = list(list(matcher.get_matching_blocks()))
115
        self.assertEqual(matcher_blocks, delta_blocks)
116
117
    def test_get_line_delta_blocks(self):
118
        self.assertDerivedBlocksEqual('a\nb\nc\n', 'q\nc\n')
119
        self.assertDerivedBlocksEqual(TEXT_1, TEXT_1)
120
        self.assertDerivedBlocksEqual(TEXT_1, TEXT_1A)
121
        self.assertDerivedBlocksEqual(TEXT_1, TEXT_1B)
122
        self.assertDerivedBlocksEqual(TEXT_1B, TEXT_1A)
123
        self.assertDerivedBlocksEqual(TEXT_1A, TEXT_1B)
124
        self.assertDerivedBlocksEqual(TEXT_1A, '')
125
        self.assertDerivedBlocksEqual('', TEXT_1A)
126
        self.assertDerivedBlocksEqual('', '')
127
        self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd')
128
129
    def test_get_line_delta_blocks_noeol(self):
130
        """Handle historical knit deltas safely
131
132
        Some existing knit deltas don't consider the last line to differ
133
        when the only difference whether it has a final newline.
134
135
        New knit deltas appear to always consider the last line to differ
136
        in this case.
137
        """
138
        self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd\n', noeol=True)
139
        self.assertDerivedBlocksEqual('a\nb\nc\nd\n', 'a\nb\nc', noeol=True)
140
        self.assertDerivedBlocksEqual('a\nb\nc\n', 'a\nb\nc', noeol=True)
141
        self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\n', noeol=True)
142
143
144
class TestPlainKnitContent(TestCase, KnitContentTestsMixin):
145
146
    def _make_content(self, lines):
147
        annotated_content = AnnotatedKnitContent(lines)
148
        return PlainKnitContent(annotated_content.text(), 'bogus')
149
150
    def test_annotate(self):
151
        content = self._make_content([])
152
        self.assertEqual(content.annotate(), [])
153
154
        content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
155
        self.assertEqual(content.annotate(),
156
            [("bogus", "text1"), ("bogus", "text2")])
157
158
    def test_annotate_iter(self):
159
        content = self._make_content([])
160
        it = content.annotate_iter()
161
        self.assertRaises(StopIteration, it.next)
162
163
        content = self._make_content([("bogus", "text1"), ("bogus", "text2")])
164
        it = content.annotate_iter()
165
        self.assertEqual(it.next(), ("bogus", "text1"))
166
        self.assertEqual(it.next(), ("bogus", "text2"))
167
        self.assertRaises(StopIteration, it.next)
168
169
    def test_line_delta(self):
170
        content1 = self._make_content([("", "a"), ("", "b")])
171
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
172
        self.assertEqual(content1.line_delta(content2),
173
            [(1, 2, 2, ["a", "c"])])
174
175
    def test_line_delta_iter(self):
176
        content1 = self._make_content([("", "a"), ("", "b")])
177
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
178
        it = content1.line_delta_iter(content2)
179
        self.assertEqual(it.next(), (1, 2, 2, ["a", "c"]))
180
        self.assertRaises(StopIteration, it.next)
181
182
183
class TestAnnotatedKnitContent(TestCase, KnitContentTestsMixin):
184
185
    def _make_content(self, lines):
186
        return AnnotatedKnitContent(lines)
187
188
    def test_annotate(self):
189
        content = self._make_content([])
190
        self.assertEqual(content.annotate(), [])
191
192
        content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
193
        self.assertEqual(content.annotate(),
194
            [("origin1", "text1"), ("origin2", "text2")])
195
196
    def test_annotate_iter(self):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
197
        content = self._make_content([])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
198
        it = content.annotate_iter()
199
        self.assertRaises(StopIteration, it.next)
200
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.
201
        content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
202
        it = content.annotate_iter()
203
        self.assertEqual(it.next(), ("origin1", "text1"))
204
        self.assertEqual(it.next(), ("origin2", "text2"))
205
        self.assertRaises(StopIteration, it.next)
206
207
    def test_line_delta(self):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
208
        content1 = self._make_content([("", "a"), ("", "b")])
209
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
210
        self.assertEqual(content1.line_delta(content2),
211
            [(1, 2, 2, [("", "a"), ("", "c")])])
212
213
    def test_line_delta_iter(self):
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
214
        content1 = self._make_content([("", "a"), ("", "b")])
215
        content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
216
        it = content1.line_delta_iter(content2)
217
        self.assertEqual(it.next(), (1, 2, 2, [("", "a"), ("", "c")]))
218
        self.assertRaises(StopIteration, it.next)
219
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
220
221
class MockTransport(object):
222
223
    def __init__(self, file_lines=None):
224
        self.file_lines = file_lines
225
        self.calls = []
2196.2.3 by John Arbash Meinel
Update tests and code to pass after merging bzr.dev
226
        # We have no base directory for the MockTransport
227
        self.base = ''
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
228
229
    def get(self, filename):
230
        if self.file_lines is None:
231
            raise NoSuchFile(filename)
232
        else:
233
            return StringIO("\n".join(self.file_lines))
234
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
235
    def readv(self, relpath, offsets):
236
        fp = self.get(relpath)
237
        for offset, size in offsets:
238
            fp.seek(offset)
239
            yield offset, fp.read(size)
240
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
241
    def __getattr__(self, name):
242
        def queue_call(*args, **kwargs):
243
            self.calls.append((name, args, kwargs))
244
        return queue_call
245
246
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
247
class KnitRecordAccessTestsMixin(object):
248
    """Tests for getting and putting knit records."""
249
250
    def assertAccessExists(self, access):
251
        """Ensure the data area for access has been initialised/exists."""
252
        raise NotImplementedError(self.assertAccessExists)
253
254
    def test_add_raw_records(self):
255
        """Add_raw_records adds records retrievable later."""
256
        access = self.get_access()
257
        memos = access.add_raw_records([10], '1234567890')
258
        self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
259
 
260
    def test_add_several_raw_records(self):
261
        """add_raw_records with many records and read some back."""
262
        access = self.get_access()
263
        memos = access.add_raw_records([10, 2, 5], '12345678901234567')
264
        self.assertEqual(['1234567890', '12', '34567'],
265
            list(access.get_raw_records(memos)))
266
        self.assertEqual(['1234567890'],
267
            list(access.get_raw_records(memos[0:1])))
268
        self.assertEqual(['12'],
269
            list(access.get_raw_records(memos[1:2])))
270
        self.assertEqual(['34567'],
271
            list(access.get_raw_records(memos[2:3])))
272
        self.assertEqual(['1234567890', '34567'],
273
            list(access.get_raw_records(memos[0:1] + memos[2:3])))
274
275
    def test_create(self):
276
        """create() should make a file on disk."""
277
        access = self.get_access()
278
        access.create()
279
        self.assertAccessExists(access)
280
281
    def test_open_file(self):
282
        """open_file never errors."""
283
        access = self.get_access()
284
        access.open_file()
285
286
287
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
288
    """Tests for the .kndx implementation."""
289
290
    def assertAccessExists(self, access):
291
        self.assertNotEqual(None, access.open_file())
292
293
    def get_access(self):
294
        """Get a .knit style access instance."""
295
        access = _KnitAccess(self.get_transport(), "foo.knit", None, None,
296
            False, False)
297
        return access
298
    
299
300
class TestPackKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
301
    """Tests for the pack based access."""
302
303
    def assertAccessExists(self, access):
304
        # as pack based access has no backing unless an index maps data, this
305
        # is a no-op.
306
        pass
307
308
    def get_access(self):
309
        return self._get_access()[0]
310
311
    def _get_access(self, packname='packfile', index='FOO'):
312
        transport = self.get_transport()
313
        def write_data(bytes):
314
            transport.append_bytes(packname, bytes)
315
        writer = pack.ContainerWriter(write_data)
316
        writer.begin()
317
        indices = {index:(transport, packname)}
318
        access = _PackAccess(indices, writer=(writer, index))
319
        return access, writer
320
321
    def test_read_from_several_packs(self):
322
        access, writer = self._get_access()
323
        memos = []
324
        memos.extend(access.add_raw_records([10], '1234567890'))
325
        writer.end()
326
        access, writer = self._get_access('pack2', 'FOOBAR')
327
        memos.extend(access.add_raw_records([5], '12345'))
328
        writer.end()
329
        access, writer = self._get_access('pack3', 'BAZ')
330
        memos.extend(access.add_raw_records([5], 'alpha'))
331
        writer.end()
332
        transport = self.get_transport()
333
        access = _PackAccess({"FOO":(transport, 'packfile'),
334
            "FOOBAR":(transport, 'pack2'),
335
            "BAZ":(transport, 'pack3')})
336
        self.assertEqual(['1234567890', '12345', 'alpha'],
337
            list(access.get_raw_records(memos)))
338
        self.assertEqual(['1234567890'],
339
            list(access.get_raw_records(memos[0:1])))
340
        self.assertEqual(['12345'],
341
            list(access.get_raw_records(memos[1:2])))
342
        self.assertEqual(['alpha'],
343
            list(access.get_raw_records(memos[2:3])))
344
        self.assertEqual(['1234567890', 'alpha'],
345
            list(access.get_raw_records(memos[0:1] + memos[2:3])))
346
347
    def test_set_writer(self):
348
        """The writer should be settable post construction."""
349
        access = _PackAccess({})
350
        transport = self.get_transport()
351
        packname = 'packfile'
352
        index = 'foo'
353
        def write_data(bytes):
354
            transport.append_bytes(packname, bytes)
355
        writer = pack.ContainerWriter(write_data)
356
        writer.begin()
357
        access.set_writer(writer, index, (transport, packname))
358
        memos = access.add_raw_records([10], '1234567890')
359
        writer.end()
360
        self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
361
362
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
363
class LowLevelKnitDataTests(TestCase):
364
365
    def create_gz_content(self, text):
366
        sio = StringIO()
367
        gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
368
        gz_file.write(text)
369
        gz_file.close()
370
        return sio.getvalue()
371
372
    def test_valid_knit_data(self):
373
        sha1sum = sha.new('foo\nbar\n').hexdigest()
374
        gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
375
                                        'foo\n'
376
                                        'bar\n'
377
                                        'end rev-id-1\n'
378
                                        % (sha1sum,))
379
        transport = MockTransport([gz_txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
380
        access = _KnitAccess(transport, 'filename', None, None, False, False)
381
        data = _KnitData(access=access)
382
        records = [('rev-id-1', (None, 0, len(gz_txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
383
384
        contents = data.read_records(records)
385
        self.assertEqual({'rev-id-1':(['foo\n', 'bar\n'], sha1sum)}, contents)
386
387
        raw_contents = list(data.read_records_iter_raw(records))
388
        self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
389
390
    def test_not_enough_lines(self):
391
        sha1sum = sha.new('foo\n').hexdigest()
392
        # record says 2 lines data says 1
393
        gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
394
                                        'foo\n'
395
                                        'end rev-id-1\n'
396
                                        % (sha1sum,))
397
        transport = MockTransport([gz_txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
398
        access = _KnitAccess(transport, 'filename', None, None, False, False)
399
        data = _KnitData(access=access)
400
        records = [('rev-id-1', (None, 0, len(gz_txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
401
        self.assertRaises(errors.KnitCorrupt, data.read_records, records)
402
403
        # read_records_iter_raw won't detect that sort of mismatch/corruption
404
        raw_contents = list(data.read_records_iter_raw(records))
405
        self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
406
407
    def test_too_many_lines(self):
408
        sha1sum = sha.new('foo\nbar\n').hexdigest()
409
        # record says 1 lines data says 2
410
        gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
411
                                        'foo\n'
412
                                        'bar\n'
413
                                        'end rev-id-1\n'
414
                                        % (sha1sum,))
415
        transport = MockTransport([gz_txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
416
        access = _KnitAccess(transport, 'filename', None, None, False, False)
417
        data = _KnitData(access=access)
418
        records = [('rev-id-1', (None, 0, len(gz_txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
419
        self.assertRaises(errors.KnitCorrupt, data.read_records, records)
420
421
        # read_records_iter_raw won't detect that sort of mismatch/corruption
422
        raw_contents = list(data.read_records_iter_raw(records))
423
        self.assertEqual([('rev-id-1', gz_txt)], raw_contents)
424
425
    def test_mismatched_version_id(self):
426
        sha1sum = sha.new('foo\nbar\n').hexdigest()
427
        gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
428
                                        'foo\n'
429
                                        'bar\n'
430
                                        'end rev-id-1\n'
431
                                        % (sha1sum,))
432
        transport = MockTransport([gz_txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
433
        access = _KnitAccess(transport, 'filename', None, None, False, False)
434
        data = _KnitData(access=access)
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
435
        # We are asking for rev-id-2, but the data is rev-id-1
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
436
        records = [('rev-id-2', (None, 0, len(gz_txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
437
        self.assertRaises(errors.KnitCorrupt, data.read_records, records)
438
439
        # read_records_iter_raw will notice if we request the wrong version.
440
        self.assertRaises(errors.KnitCorrupt, list,
441
                          data.read_records_iter_raw(records))
442
443
    def test_uncompressed_data(self):
444
        sha1sum = sha.new('foo\nbar\n').hexdigest()
445
        txt = ('version rev-id-1 2 %s\n'
446
               'foo\n'
447
               'bar\n'
448
               'end rev-id-1\n'
449
               % (sha1sum,))
450
        transport = MockTransport([txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
451
        access = _KnitAccess(transport, 'filename', None, None, False, False)
452
        data = _KnitData(access=access)
453
        records = [('rev-id-1', (None, 0, len(txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
454
455
        # We don't have valid gzip data ==> corrupt
456
        self.assertRaises(errors.KnitCorrupt, data.read_records, records)
457
458
        # read_records_iter_raw will notice the bad data
459
        self.assertRaises(errors.KnitCorrupt, list,
460
                          data.read_records_iter_raw(records))
461
462
    def test_corrupted_data(self):
463
        sha1sum = sha.new('foo\nbar\n').hexdigest()
464
        gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
465
                                        'foo\n'
466
                                        'bar\n'
467
                                        'end rev-id-1\n'
468
                                        % (sha1sum,))
469
        # Change 2 bytes in the middle to \xff
470
        gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
471
        transport = MockTransport([gz_txt])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
472
        access = _KnitAccess(transport, 'filename', None, None, False, False)
473
        data = _KnitData(access=access)
474
        records = [('rev-id-1', (None, 0, len(gz_txt)))]
2329.1.1 by John Arbash Meinel
Update _KnitData parser to raise more helpful errors when it detects corruption.
475
476
        self.assertRaises(errors.KnitCorrupt, data.read_records, records)
477
478
        # read_records_iter_raw will notice if we request the wrong version.
479
        self.assertRaises(errors.KnitCorrupt, list,
480
                          data.read_records_iter_raw(records))
481
482
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
483
class LowLevelKnitIndexTests(TestCase):
484
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
485
    def get_knit_index(self, *args, **kwargs):
486
        orig = knit._load_data
487
        def reset():
488
            knit._load_data = orig
489
        self.addCleanup(reset)
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
490
        from bzrlib._knit_load_data_py import _load_data_py
491
        knit._load_data = _load_data_py
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
492
        return _KnitIndex(*args, **kwargs)
493
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
494
    def test_no_such_file(self):
495
        transport = MockTransport()
496
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
497
        self.assertRaises(NoSuchFile, self.get_knit_index,
498
                          transport, "filename", "r")
499
        self.assertRaises(NoSuchFile, self.get_knit_index,
500
                          transport, "filename", "w", create=False)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
501
502
    def test_create_file(self):
503
        transport = MockTransport()
504
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
505
        index = self.get_knit_index(transport, "filename", "w",
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
506
            file_mode="wb", create=True)
507
        self.assertEqual(
508
                ("put_bytes_non_atomic",
509
                    ("filename", index.HEADER), {"mode": "wb"}),
510
                transport.calls.pop(0))
511
512
    def test_delay_create_file(self):
513
        transport = MockTransport()
514
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
515
        index = self.get_knit_index(transport, "filename", "w",
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
516
            create=True, file_mode="wb", create_parent_dir=True,
517
            delay_create=True, dir_mode=0777)
518
        self.assertEqual([], transport.calls)
519
520
        index.add_versions([])
521
        name, (filename, f), kwargs = transport.calls.pop(0)
522
        self.assertEqual("put_file_non_atomic", name)
523
        self.assertEqual(
524
            {"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
525
            kwargs)
526
        self.assertEqual("filename", filename)
527
        self.assertEqual(index.HEADER, f.read())
528
529
        index.add_versions([])
530
        self.assertEqual(("append_bytes", ("filename", ""), {}),
531
            transport.calls.pop(0))
532
533
    def test_read_utf8_version_id(self):
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
534
        unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
535
        utf8_revision_id = unicode_revision_id.encode('utf-8')
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
536
        transport = MockTransport([
537
            _KnitIndex.HEADER,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
538
            '%s option 0 1 :' % (utf8_revision_id,)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
539
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
540
        index = self.get_knit_index(transport, "filename", "r")
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
541
        # _KnitIndex is a private class, and deals in utf8 revision_ids, not
542
        # Unicode revision_ids.
543
        self.assertTrue(index.has_version(utf8_revision_id))
544
        self.assertFalse(index.has_version(unicode_revision_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
545
546
    def test_read_utf8_parents(self):
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
547
        unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
548
        utf8_revision_id = unicode_revision_id.encode('utf-8')
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
549
        transport = MockTransport([
550
            _KnitIndex.HEADER,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
551
            "version option 0 1 .%s :" % (utf8_revision_id,)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
552
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
553
        index = self.get_knit_index(transport, "filename", "r")
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
554
        self.assertEqual([utf8_revision_id],
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
555
            index.get_parents_with_ghosts("version"))
556
557
    def test_read_ignore_corrupted_lines(self):
558
        transport = MockTransport([
559
            _KnitIndex.HEADER,
560
            "corrupted",
561
            "corrupted options 0 1 .b .c ",
562
            "version options 0 1 :"
563
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
564
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
565
        self.assertEqual(1, index.num_versions())
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
566
        self.assertTrue(index.has_version("version"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
567
568
    def test_read_corrupted_header(self):
2196.2.3 by John Arbash Meinel
Update tests and code to pass after merging bzr.dev
569
        transport = MockTransport(['not a bzr knit index header\n'])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
570
        self.assertRaises(KnitHeaderError,
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
571
            self.get_knit_index, transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
572
573
    def test_read_duplicate_entries(self):
574
        transport = MockTransport([
575
            _KnitIndex.HEADER,
576
            "parent options 0 1 :",
577
            "version options1 0 1 0 :",
578
            "version options2 1 2 .other :",
579
            "version options3 3 4 0 .other :"
580
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
581
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
582
        self.assertEqual(2, index.num_versions())
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
583
        # check that the index used is the first one written. (Specific
584
        # to KnitIndex style indices.
585
        self.assertEqual("1", index._version_list_to_index(["version"]))
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
586
        self.assertEqual((None, 3, 4), index.get_position("version"))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
587
        self.assertEqual(["options3"], index.get_options("version"))
588
        self.assertEqual(["parent", "other"],
589
            index.get_parents_with_ghosts("version"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
590
591
    def test_read_compressed_parents(self):
592
        transport = MockTransport([
593
            _KnitIndex.HEADER,
594
            "a option 0 1 :",
595
            "b option 0 1 0 :",
596
            "c option 0 1 1 0 :",
597
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
598
        index = self.get_knit_index(transport, "filename", "r")
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
599
        self.assertEqual(["a"], index.get_parents("b"))
600
        self.assertEqual(["b", "a"], index.get_parents("c"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
601
602
    def test_write_utf8_version_id(self):
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
603
        unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
604
        utf8_revision_id = unicode_revision_id.encode('utf-8')
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
605
        transport = MockTransport([
606
            _KnitIndex.HEADER
607
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
608
        index = self.get_knit_index(transport, "filename", "r")
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
609
        index.add_version(utf8_revision_id, ["option"], (None, 0, 1), [])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
610
        self.assertEqual(("append_bytes", ("filename",
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
611
            "\n%s option 0 1  :" % (utf8_revision_id,)),
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
612
            {}),
613
            transport.calls.pop(0))
614
615
    def test_write_utf8_parents(self):
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
616
        unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
617
        utf8_revision_id = unicode_revision_id.encode('utf-8')
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
618
        transport = MockTransport([
619
            _KnitIndex.HEADER
620
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
621
        index = self.get_knit_index(transport, "filename", "r")
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
622
        index.add_version("version", ["option"], (None, 0, 1), [utf8_revision_id])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
623
        self.assertEqual(("append_bytes", ("filename",
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
624
            "\nversion option 0 1 .%s :" % (utf8_revision_id,)),
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
625
            {}),
626
            transport.calls.pop(0))
627
628
    def test_get_graph(self):
629
        transport = MockTransport()
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
630
        index = self.get_knit_index(transport, "filename", "w", create=True)
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
631
        self.assertEqual([], index.get_graph())
632
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
633
        index.add_version("a", ["option"], (None, 0, 1), ["b"])
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
634
        self.assertEqual([("a", ["b"])], index.get_graph())
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
635
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
636
        index.add_version("c", ["option"], (None, 0, 1), ["d"])
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
637
        self.assertEqual([("a", ["b"]), ("c", ["d"])],
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
638
            sorted(index.get_graph()))
639
640
    def test_get_ancestry(self):
641
        transport = MockTransport([
642
            _KnitIndex.HEADER,
643
            "a option 0 1 :",
644
            "b option 0 1 0 .e :",
645
            "c option 0 1 1 0 :",
646
            "d option 0 1 2 .f :"
647
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
648
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
649
650
        self.assertEqual([], index.get_ancestry([]))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
651
        self.assertEqual(["a"], index.get_ancestry(["a"]))
652
        self.assertEqual(["a", "b"], index.get_ancestry(["b"]))
653
        self.assertEqual(["a", "b", "c"], index.get_ancestry(["c"]))
654
        self.assertEqual(["a", "b", "c", "d"], index.get_ancestry(["d"]))
655
        self.assertEqual(["a", "b"], index.get_ancestry(["a", "b"]))
656
        self.assertEqual(["a", "b", "c"], index.get_ancestry(["a", "c"]))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
657
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
658
        self.assertRaises(RevisionNotPresent, index.get_ancestry, ["e"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
659
660
    def test_get_ancestry_with_ghosts(self):
661
        transport = MockTransport([
662
            _KnitIndex.HEADER,
663
            "a option 0 1 :",
664
            "b option 0 1 0 .e :",
665
            "c option 0 1 0 .f .g :",
666
            "d option 0 1 2 .h .j .k :"
667
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
668
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
669
670
        self.assertEqual([], index.get_ancestry_with_ghosts([]))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
671
        self.assertEqual(["a"], index.get_ancestry_with_ghosts(["a"]))
672
        self.assertEqual(["a", "e", "b"],
673
            index.get_ancestry_with_ghosts(["b"]))
674
        self.assertEqual(["a", "g", "f", "c"],
675
            index.get_ancestry_with_ghosts(["c"]))
676
        self.assertEqual(["a", "g", "f", "c", "k", "j", "h", "d"],
677
            index.get_ancestry_with_ghosts(["d"]))
678
        self.assertEqual(["a", "e", "b"],
679
            index.get_ancestry_with_ghosts(["a", "b"]))
680
        self.assertEqual(["a", "g", "f", "c"],
681
            index.get_ancestry_with_ghosts(["a", "c"]))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
682
        self.assertEqual(
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
683
            ["a", "g", "f", "c", "e", "b", "k", "j", "h", "d"],
684
            index.get_ancestry_with_ghosts(["b", "d"]))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
685
686
        self.assertRaises(RevisionNotPresent,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
687
            index.get_ancestry_with_ghosts, ["e"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
688
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
689
    def test_iter_parents(self):
690
        transport = MockTransport()
691
        index = self.get_knit_index(transport, "filename", "w", create=True)
692
        # no parents
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
693
        index.add_version('r0', ['option'], (None, 0, 1), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
694
        # 1 parent
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
695
        index.add_version('r1', ['option'], (None, 0, 1), ['r0'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
696
        # 2 parents
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
697
        index.add_version('r2', ['option'], (None, 0, 1), ['r1', 'r0'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
698
        # XXX TODO a ghost
699
        # cases: each sample data individually:
700
        self.assertEqual(set([('r0', ())]),
701
            set(index.iter_parents(['r0'])))
702
        self.assertEqual(set([('r1', ('r0', ))]),
703
            set(index.iter_parents(['r1'])))
704
        self.assertEqual(set([('r2', ('r1', 'r0'))]),
705
            set(index.iter_parents(['r2'])))
706
        # no nodes returned for a missing node
707
        self.assertEqual(set(),
708
            set(index.iter_parents(['missing'])))
709
        # 1 node returned with missing nodes skipped
710
        self.assertEqual(set([('r1', ('r0', ))]),
711
            set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
712
        # 2 nodes returned
713
        self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
714
            set(index.iter_parents(['r0', 'r1'])))
715
        # 2 nodes returned, missing skipped
716
        self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
717
            set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
718
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
719
    def test_num_versions(self):
720
        transport = MockTransport([
721
            _KnitIndex.HEADER
722
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
723
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
724
725
        self.assertEqual(0, index.num_versions())
726
        self.assertEqual(0, len(index))
727
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
728
        index.add_version("a", ["option"], (None, 0, 1), [])
729
        self.assertEqual(1, index.num_versions())
730
        self.assertEqual(1, len(index))
731
732
        index.add_version("a", ["option2"], (None, 1, 2), [])
733
        self.assertEqual(1, index.num_versions())
734
        self.assertEqual(1, len(index))
735
736
        index.add_version("b", ["option"], (None, 0, 1), [])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
737
        self.assertEqual(2, index.num_versions())
738
        self.assertEqual(2, len(index))
739
740
    def test_get_versions(self):
741
        transport = MockTransport([
742
            _KnitIndex.HEADER
743
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
744
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
745
746
        self.assertEqual([], index.get_versions())
747
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
748
        index.add_version("a", ["option"], (None, 0, 1), [])
749
        self.assertEqual(["a"], index.get_versions())
750
751
        index.add_version("a", ["option"], (None, 0, 1), [])
752
        self.assertEqual(["a"], index.get_versions())
753
754
        index.add_version("b", ["option"], (None, 0, 1), [])
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
755
        self.assertEqual(["a", "b"], index.get_versions())
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
756
757
    def test_add_version(self):
758
        transport = MockTransport([
759
            _KnitIndex.HEADER
760
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
761
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
762
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
763
        index.add_version("a", ["option"], (None, 0, 1), ["b"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
764
        self.assertEqual(("append_bytes",
765
            ("filename", "\na option 0 1 .b :"),
766
            {}), transport.calls.pop(0))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
767
        self.assertTrue(index.has_version("a"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
768
        self.assertEqual(1, index.num_versions())
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
769
        self.assertEqual((None, 0, 1), index.get_position("a"))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
770
        self.assertEqual(["option"], index.get_options("a"))
771
        self.assertEqual(["b"], index.get_parents_with_ghosts("a"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
772
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
773
        index.add_version("a", ["opt"], (None, 1, 2), ["c"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
774
        self.assertEqual(("append_bytes",
775
            ("filename", "\na opt 1 2 .c :"),
776
            {}), transport.calls.pop(0))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
777
        self.assertTrue(index.has_version("a"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
778
        self.assertEqual(1, index.num_versions())
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
779
        self.assertEqual((None, 1, 2), index.get_position("a"))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
780
        self.assertEqual(["opt"], index.get_options("a"))
781
        self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
782
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
783
        index.add_version("b", ["option"], (None, 2, 3), ["a"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
784
        self.assertEqual(("append_bytes",
785
            ("filename", "\nb option 2 3 0 :"),
786
            {}), transport.calls.pop(0))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
787
        self.assertTrue(index.has_version("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
788
        self.assertEqual(2, index.num_versions())
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
789
        self.assertEqual((None, 2, 3), index.get_position("b"))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
790
        self.assertEqual(["option"], index.get_options("b"))
791
        self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
792
793
    def test_add_versions(self):
794
        transport = MockTransport([
795
            _KnitIndex.HEADER
796
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
797
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
798
799
        index.add_versions([
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
800
            ("a", ["option"], (None, 0, 1), ["b"]),
801
            ("a", ["opt"], (None, 1, 2), ["c"]),
802
            ("b", ["option"], (None, 2, 3), ["a"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
803
            ])
804
        self.assertEqual(("append_bytes", ("filename",
805
            "\na option 0 1 .b :"
806
            "\na opt 1 2 .c :"
807
            "\nb option 2 3 0 :"
808
            ), {}), transport.calls.pop(0))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
809
        self.assertTrue(index.has_version("a"))
810
        self.assertTrue(index.has_version("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
811
        self.assertEqual(2, index.num_versions())
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
812
        self.assertEqual((None, 1, 2), index.get_position("a"))
813
        self.assertEqual((None, 2, 3), index.get_position("b"))
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
814
        self.assertEqual(["opt"], index.get_options("a"))
815
        self.assertEqual(["option"], index.get_options("b"))
816
        self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
817
        self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
818
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
819
    def test_add_versions_random_id_is_accepted(self):
820
        transport = MockTransport([
821
            _KnitIndex.HEADER
822
            ])
823
        index = self.get_knit_index(transport, "filename", "r")
824
825
        index.add_versions([
826
            ("a", ["option"], (None, 0, 1), ["b"]),
827
            ("a", ["opt"], (None, 1, 2), ["c"]),
828
            ("b", ["option"], (None, 2, 3), ["a"])
829
            ], random_id=True)
830
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
831
    def test_delay_create_and_add_versions(self):
832
        transport = MockTransport()
833
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
834
        index = self.get_knit_index(transport, "filename", "w",
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
835
            create=True, file_mode="wb", create_parent_dir=True,
836
            delay_create=True, dir_mode=0777)
837
        self.assertEqual([], transport.calls)
838
839
        index.add_versions([
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
840
            ("a", ["option"], (None, 0, 1), ["b"]),
841
            ("a", ["opt"], (None, 1, 2), ["c"]),
842
            ("b", ["option"], (None, 2, 3), ["a"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
843
            ])
844
        name, (filename, f), kwargs = transport.calls.pop(0)
845
        self.assertEqual("put_file_non_atomic", name)
846
        self.assertEqual(
847
            {"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
848
            kwargs)
849
        self.assertEqual("filename", filename)
850
        self.assertEqual(
851
            index.HEADER +
852
            "\na option 0 1 .b :"
853
            "\na opt 1 2 .c :"
854
            "\nb option 2 3 0 :",
855
            f.read())
856
857
    def test_has_version(self):
858
        transport = MockTransport([
859
            _KnitIndex.HEADER,
860
            "a option 0 1 :"
861
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
862
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
863
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
864
        self.assertTrue(index.has_version("a"))
865
        self.assertFalse(index.has_version("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
866
867
    def test_get_position(self):
868
        transport = MockTransport([
869
            _KnitIndex.HEADER,
870
            "a option 0 1 :",
871
            "b option 1 2 :"
872
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
873
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
874
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
875
        self.assertEqual((None, 0, 1), index.get_position("a"))
876
        self.assertEqual((None, 1, 2), index.get_position("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
877
878
    def test_get_method(self):
879
        transport = MockTransport([
880
            _KnitIndex.HEADER,
881
            "a fulltext,unknown 0 1 :",
882
            "b unknown,line-delta 1 2 :",
883
            "c bad 3 4 :"
884
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
885
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
886
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
887
        self.assertEqual("fulltext", index.get_method("a"))
888
        self.assertEqual("line-delta", index.get_method("b"))
889
        self.assertRaises(errors.KnitIndexUnknownMethod, index.get_method, "c")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
890
891
    def test_get_options(self):
892
        transport = MockTransport([
893
            _KnitIndex.HEADER,
894
            "a opt1 0 1 :",
895
            "b opt2,opt3 1 2 :"
896
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
897
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
898
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
899
        self.assertEqual(["opt1"], index.get_options("a"))
900
        self.assertEqual(["opt2", "opt3"], index.get_options("b"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
901
902
    def test_get_parents(self):
903
        transport = MockTransport([
904
            _KnitIndex.HEADER,
905
            "a option 0 1 :",
906
            "b option 1 2 0 .c :",
907
            "c option 1 2 1 0 .e :"
908
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
909
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
910
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
911
        self.assertEqual([], index.get_parents("a"))
912
        self.assertEqual(["a", "c"], index.get_parents("b"))
913
        self.assertEqual(["b", "a"], index.get_parents("c"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
914
915
    def test_get_parents_with_ghosts(self):
916
        transport = MockTransport([
917
            _KnitIndex.HEADER,
918
            "a option 0 1 :",
919
            "b option 1 2 0 .c :",
920
            "c option 1 2 1 0 .e :"
921
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
922
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
923
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
924
        self.assertEqual([], index.get_parents_with_ghosts("a"))
925
        self.assertEqual(["a", "c"], index.get_parents_with_ghosts("b"))
926
        self.assertEqual(["b", "a", "e"],
927
            index.get_parents_with_ghosts("c"))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
928
929
    def test_check_versions_present(self):
930
        transport = MockTransport([
931
            _KnitIndex.HEADER,
932
            "a option 0 1 :",
933
            "b option 0 1 :"
934
            ])
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
935
        index = self.get_knit_index(transport, "filename", "r")
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
936
937
        check = index.check_versions_present
938
939
        check([])
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
940
        check(["a"])
941
        check(["b"])
942
        check(["a", "b"])
943
        self.assertRaises(RevisionNotPresent, check, ["c"])
944
        self.assertRaises(RevisionNotPresent, check, ["a", "b", "c"])
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
945
2484.1.13 by John Arbash Meinel
Add a test that KnitCorrupt is raised when parent strings are invalid.
946
    def test_impossible_parent(self):
947
        """Test we get KnitCorrupt if the parent couldn't possibly exist."""
948
        transport = MockTransport([
949
            _KnitIndex.HEADER,
950
            "a option 0 1 :",
951
            "b option 0 1 4 :"  # We don't have a 4th record
952
            ])
2484.1.17 by John Arbash Meinel
Workaround for Pyrex <0.9.5 and python >=2.5 incompatibilities.
953
        try:
954
            self.assertRaises(errors.KnitCorrupt,
955
                              self.get_knit_index, transport, 'filename', 'r')
956
        except TypeError, e:
957
            if (str(e) == ('exceptions must be strings, classes, or instances,'
958
                           ' not exceptions.IndexError')
959
                and sys.version_info[0:2] >= (2,5)):
960
                self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
961
                                  ' raising new style exceptions with python'
962
                                  ' >=2.5')
2484.1.19 by John Arbash Meinel
Don't suppress the TypeError if it doesn't match our requirements.
963
            else:
964
                raise
2484.1.13 by John Arbash Meinel
Add a test that KnitCorrupt is raised when parent strings are invalid.
965
966
    def test_corrupted_parent(self):
967
        transport = MockTransport([
968
            _KnitIndex.HEADER,
969
            "a option 0 1 :",
970
            "b option 0 1 :",
971
            "c option 0 1 1v :", # Can't have a parent of '1v'
972
            ])
2484.1.17 by John Arbash Meinel
Workaround for Pyrex <0.9.5 and python >=2.5 incompatibilities.
973
        try:
974
            self.assertRaises(errors.KnitCorrupt,
975
                              self.get_knit_index, transport, 'filename', 'r')
976
        except TypeError, e:
977
            if (str(e) == ('exceptions must be strings, classes, or instances,'
978
                           ' not exceptions.ValueError')
979
                and sys.version_info[0:2] >= (2,5)):
980
                self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
981
                                  ' raising new style exceptions with python'
982
                                  ' >=2.5')
2484.1.19 by John Arbash Meinel
Don't suppress the TypeError if it doesn't match our requirements.
983
            else:
984
                raise
2484.1.13 by John Arbash Meinel
Add a test that KnitCorrupt is raised when parent strings are invalid.
985
986
    def test_corrupted_parent_in_list(self):
987
        transport = MockTransport([
988
            _KnitIndex.HEADER,
989
            "a option 0 1 :",
990
            "b option 0 1 :",
2484.1.17 by John Arbash Meinel
Workaround for Pyrex <0.9.5 and python >=2.5 incompatibilities.
991
            "c option 0 1 1 v :", # Can't have a parent of 'v'
2484.1.13 by John Arbash Meinel
Add a test that KnitCorrupt is raised when parent strings are invalid.
992
            ])
2484.1.17 by John Arbash Meinel
Workaround for Pyrex <0.9.5 and python >=2.5 incompatibilities.
993
        try:
994
            self.assertRaises(errors.KnitCorrupt,
995
                              self.get_knit_index, transport, 'filename', 'r')
996
        except TypeError, e:
997
            if (str(e) == ('exceptions must be strings, classes, or instances,'
998
                           ' not exceptions.ValueError')
999
                and sys.version_info[0:2] >= (2,5)):
1000
                self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1001
                                  ' raising new style exceptions with python'
1002
                                  ' >=2.5')
2484.1.19 by John Arbash Meinel
Don't suppress the TypeError if it doesn't match our requirements.
1003
            else:
1004
                raise
2484.1.13 by John Arbash Meinel
Add a test that KnitCorrupt is raised when parent strings are invalid.
1005
2484.1.18 by John Arbash Meinel
Test that we properly verify the size and position strings.
1006
    def test_invalid_position(self):
1007
        transport = MockTransport([
1008
            _KnitIndex.HEADER,
1009
            "a option 1v 1 :",
1010
            ])
1011
        try:
1012
            self.assertRaises(errors.KnitCorrupt,
1013
                              self.get_knit_index, transport, 'filename', 'r')
1014
        except TypeError, e:
1015
            if (str(e) == ('exceptions must be strings, classes, or instances,'
1016
                           ' not exceptions.ValueError')
1017
                and sys.version_info[0:2] >= (2,5)):
1018
                self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1019
                                  ' raising new style exceptions with python'
1020
                                  ' >=2.5')
2484.1.19 by John Arbash Meinel
Don't suppress the TypeError if it doesn't match our requirements.
1021
            else:
1022
                raise
2484.1.18 by John Arbash Meinel
Test that we properly verify the size and position strings.
1023
1024
    def test_invalid_size(self):
1025
        transport = MockTransport([
1026
            _KnitIndex.HEADER,
1027
            "a option 1 1v :",
1028
            ])
1029
        try:
1030
            self.assertRaises(errors.KnitCorrupt,
1031
                              self.get_knit_index, transport, 'filename', 'r')
1032
        except TypeError, e:
1033
            if (str(e) == ('exceptions must be strings, classes, or instances,'
1034
                           ' not exceptions.ValueError')
1035
                and sys.version_info[0:2] >= (2,5)):
1036
                self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1037
                                  ' raising new style exceptions with python'
1038
                                  ' >=2.5')
2484.1.19 by John Arbash Meinel
Don't suppress the TypeError if it doesn't match our requirements.
1039
            else:
1040
                raise
2484.1.18 by John Arbash Meinel
Test that we properly verify the size and position strings.
1041
2484.1.24 by John Arbash Meinel
Add direct tests of how we handle incomplete/'broken' lines
1042
    def test_short_line(self):
1043
        transport = MockTransport([
1044
            _KnitIndex.HEADER,
1045
            "a option 0 10  :",
1046
            "b option 10 10 0", # This line isn't terminated, ignored
1047
            ])
1048
        index = self.get_knit_index(transport, "filename", "r")
1049
        self.assertEqual(['a'], index.get_versions())
1050
1051
    def test_skip_incomplete_record(self):
1052
        # A line with bogus data should just be skipped
1053
        transport = MockTransport([
1054
            _KnitIndex.HEADER,
1055
            "a option 0 10  :",
1056
            "b option 10 10 0", # This line isn't terminated, ignored
1057
            "c option 20 10 0 :", # Properly terminated, and starts with '\n'
1058
            ])
1059
        index = self.get_knit_index(transport, "filename", "r")
1060
        self.assertEqual(['a', 'c'], index.get_versions())
1061
1062
    def test_trailing_characters(self):
1063
        # A line with bogus data should just be skipped
1064
        transport = MockTransport([
1065
            _KnitIndex.HEADER,
1066
            "a option 0 10  :",
1067
            "b option 10 10 0 :a", # This line has extra trailing characters
1068
            "c option 20 10 0 :", # Properly terminated, and starts with '\n'
1069
            ])
1070
        index = self.get_knit_index(transport, "filename", "r")
1071
        self.assertEqual(['a', 'c'], index.get_versions())
1072
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
1073
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1074
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1075
1076
    _test_needs_features = [CompiledKnitFeature]
1077
1078
    def get_knit_index(self, *args, **kwargs):
1079
        orig = knit._load_data
1080
        def reset():
1081
            knit._load_data = orig
1082
        self.addCleanup(reset)
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
1083
        from bzrlib._knit_load_data_c import _load_data_c
1084
        knit._load_data = _load_data_c
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
1085
        return _KnitIndex(*args, **kwargs)
1086
1087
1088
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1089
class KnitTests(TestCaseWithTransport):
1090
    """Class containing knit test helper routines."""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1091
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1092
    def make_test_knit(self, annotate=False, delay_create=False, index=None,
1093
                       name='test'):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1094
        if not annotate:
1095
            factory = KnitPlainFactory()
1096
        else:
1097
            factory = None
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1098
        return KnitVersionedFile(name, get_transport('.'), access_mode='w',
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
1099
                                 factory=factory, create=True,
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1100
                                 delay_create=delay_create, index=index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1101
2670.3.5 by Andrew Bennetts
Remove get_stream_as_bytes from KnitVersionedFile's API, make it a function in knitrepo.py instead.
1102
    def assertRecordContentEqual(self, knit, version_id, candidate_content):
1103
        """Assert that some raw record content matches the raw record content
1104
        for a particular version_id in the given knit.
1105
        """
1106
        index_memo = knit._index.get_position(version_id)
1107
        record = (version_id, index_memo)
1108
        [(_, expected_content)] = list(knit._data.read_records_iter_raw([record]))
1109
        self.assertEqual(expected_content, candidate_content)
1110
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1111
1112
class BasicKnitTests(KnitTests):
1113
1114
    def add_stock_one_and_one_a(self, k):
1115
        k.add_lines('text-1', [], split_lines(TEXT_1))
1116
        k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
1117
1118
    def test_knit_constructor(self):
1119
        """Construct empty k"""
1120
        self.make_test_knit()
1121
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1122
    def test_make_explicit_index(self):
1123
        """We can supply an index to use."""
1124
        knit = KnitVersionedFile('test', get_transport('.'),
1125
            index='strangelove')
1126
        self.assertEqual(knit._index, 'strangelove')
1127
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1128
    def test_knit_add(self):
1129
        """Store one text in knit and retrieve"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1130
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1131
        k.add_lines('text-1', [], split_lines(TEXT_1))
1132
        self.assertTrue(k.has_version('text-1'))
1133
        self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1134
1135
    def test_knit_reload(self):
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1136
        # test that the content in a reloaded knit is correct
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1137
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1138
        k.add_lines('text-1', [], split_lines(TEXT_1))
1139
        del k
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1140
        k2 = KnitVersionedFile('test', get_transport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1141
        self.assertTrue(k2.has_version('text-1'))
1142
        self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
1143
1144
    def test_knit_several(self):
1145
        """Store several texts in a knit"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1146
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1147
        k.add_lines('text-1', [], split_lines(TEXT_1))
1148
        k.add_lines('text-2', [], split_lines(TEXT_2))
1149
        self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1150
        self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
1151
        
1152
    def test_repeated_add(self):
1153
        """Knit traps attempt to replace existing version"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1154
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1155
        k.add_lines('text-1', [], split_lines(TEXT_1))
1156
        self.assertRaises(RevisionAlreadyPresent, 
1157
                k.add_lines,
1158
                'text-1', [], split_lines(TEXT_1))
1159
1160
    def test_empty(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1161
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1162
        k.add_lines('text-1', [], [])
1163
        self.assertEquals(k.get_lines('text-1'), [])
1164
1165
    def test_incomplete(self):
1166
        """Test if texts without a ending line-end can be inserted and
1167
        extracted."""
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1168
        k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1169
        k.add_lines('text-1', [], ['a\n',    'b'  ])
1170
        k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
1666.1.6 by Robert Collins
Make knit the default format.
1171
        # reopening ensures maximum room for confusion
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1172
        k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1173
        self.assertEquals(k.get_lines('text-1'), ['a\n',    'b'  ])
1174
        self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
1175
1176
    def test_delta(self):
1177
        """Expression of knit delta as lines"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1178
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1179
        td = list(line_delta(TEXT_1.splitlines(True),
1180
                             TEXT_1A.splitlines(True)))
1181
        self.assertEqualDiff(''.join(td), delta_1_1a)
1182
        out = apply_line_delta(TEXT_1.splitlines(True), td)
1183
        self.assertEqualDiff(''.join(out), TEXT_1A)
1184
1185
    def test_add_with_parents(self):
1186
        """Store in knit with parents"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1187
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1188
        self.add_stock_one_and_one_a(k)
1189
        self.assertEquals(k.get_parents('text-1'), [])
1190
        self.assertEquals(k.get_parents('text-1a'), ['text-1'])
1191
1192
    def test_ancestry(self):
1193
        """Store in knit with parents"""
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1194
        k = self.make_test_knit()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1195
        self.add_stock_one_and_one_a(k)
1196
        self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
1197
1198
    def test_add_delta(self):
1199
        """Store in knit with parents"""
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1200
        k = KnitVersionedFile('test', get_transport('.'), factory=KnitPlainFactory(),
1563.2.25 by Robert Collins
Merge in upstream.
1201
            delta=True, create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1202
        self.add_stock_one_and_one_a(k)
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
1203
        k.clear_cache()
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1204
        self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1205
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1206
    def test_add_delta_knit_graph_index(self):
1207
        """Does adding work with a KnitGraphIndex."""
1208
        index = InMemoryGraphIndex(2)
1209
        knit_index = KnitGraphIndex(index, add_callback=index.add_nodes,
1210
            deltas=True)
1211
        k = KnitVersionedFile('test', get_transport('.'),
1212
            delta=True, create=True, index=knit_index)
1213
        self.add_stock_one_and_one_a(k)
1214
        k.clear_cache()
1215
        self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1216
        # check the index had the right data added.
1217
        self.assertEqual(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.
1218
            (index, ('text-1', ), ' 0 127', ((), ())),
1219
            (index, ('text-1a', ), ' 127 140', ((('text-1', ),), (('text-1', ),))),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
1220
            ]), set(index.iter_all_entries()))
1221
        # we should not have a .kndx file
1222
        self.assertFalse(get_transport('.').has('test.kndx'))
1223
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1224
    def test_annotate(self):
1225
        """Annotations"""
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1226
        k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1563.2.25 by Robert Collins
Merge in upstream.
1227
            delta=True, create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1228
        self.insert_and_test_small_annotate(k)
1229
1230
    def insert_and_test_small_annotate(self, k):
1231
        """test annotation with k works correctly."""
1232
        k.add_lines('text-1', [], ['a\n', 'b\n'])
1233
        k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
1234
1235
        origins = k.annotate('text-2')
1236
        self.assertEquals(origins[0], ('text-1', 'a\n'))
1237
        self.assertEquals(origins[1], ('text-2', 'c\n'))
1238
1239
    def test_annotate_fulltext(self):
1240
        """Annotations"""
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1241
        k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1563.2.25 by Robert Collins
Merge in upstream.
1242
            delta=False, create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1243
        self.insert_and_test_small_annotate(k)
1244
1245
    def test_annotate_merge_1(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1246
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1247
        k.add_lines('text-a1', [], ['a\n', 'b\n'])
1248
        k.add_lines('text-a2', [], ['d\n', 'c\n'])
1249
        k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
1250
        origins = k.annotate('text-am')
1251
        self.assertEquals(origins[0], ('text-a2', 'd\n'))
1252
        self.assertEquals(origins[1], ('text-a1', 'b\n'))
1253
1254
    def test_annotate_merge_2(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1255
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1256
        k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1257
        k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1258
        k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
1259
        origins = k.annotate('text-am')
1260
        self.assertEquals(origins[0], ('text-a1', 'a\n'))
1261
        self.assertEquals(origins[1], ('text-a2', 'y\n'))
1262
        self.assertEquals(origins[2], ('text-a1', 'c\n'))
1263
1264
    def test_annotate_merge_9(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1265
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1266
        k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1267
        k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1268
        k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
1269
        origins = k.annotate('text-am')
1270
        self.assertEquals(origins[0], ('text-am', 'k\n'))
1271
        self.assertEquals(origins[1], ('text-a2', 'y\n'))
1272
        self.assertEquals(origins[2], ('text-a1', 'c\n'))
1273
1274
    def test_annotate_merge_3(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1275
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1276
        k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1277
        k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
1278
        k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
1279
        origins = k.annotate('text-am')
1280
        self.assertEquals(origins[0], ('text-am', 'k\n'))
1281
        self.assertEquals(origins[1], ('text-a2', 'y\n'))
1282
        self.assertEquals(origins[2], ('text-a2', 'z\n'))
1283
1284
    def test_annotate_merge_4(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1285
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1286
        k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1287
        k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1288
        k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
1289
        k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
1290
        origins = k.annotate('text-am')
1291
        self.assertEquals(origins[0], ('text-a1', 'a\n'))
1292
        self.assertEquals(origins[1], ('text-a1', 'b\n'))
1293
        self.assertEquals(origins[2], ('text-a2', 'z\n'))
1294
1295
    def test_annotate_merge_5(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1296
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1297
        k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1298
        k.add_lines('text-a2', [], ['d\n', 'e\n', 'f\n'])
1299
        k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
1300
        k.add_lines('text-am',
1301
                    ['text-a1', 'text-a2', 'text-a3'],
1302
                    ['a\n', 'e\n', 'z\n'])
1303
        origins = k.annotate('text-am')
1304
        self.assertEquals(origins[0], ('text-a1', 'a\n'))
1305
        self.assertEquals(origins[1], ('text-a2', 'e\n'))
1306
        self.assertEquals(origins[2], ('text-a3', 'z\n'))
1307
1308
    def test_annotate_file_cherry_pick(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1309
        k = self.make_test_knit(True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1310
        k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
1311
        k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
1312
        k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
1313
        origins = k.annotate('text-3')
1314
        self.assertEquals(origins[0], ('text-1', 'a\n'))
1315
        self.assertEquals(origins[1], ('text-1', 'b\n'))
1316
        self.assertEquals(origins[2], ('text-1', 'c\n'))
1317
1318
    def test_knit_join(self):
1319
        """Store in knit with parents"""
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1320
        k1 = KnitVersionedFile('test1', get_transport('.'), factory=KnitPlainFactory(), create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1321
        k1.add_lines('text-a', [], split_lines(TEXT_1))
1322
        k1.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1323
1324
        k1.add_lines('text-c', [], split_lines(TEXT_1))
1325
        k1.add_lines('text-d', ['text-c'], split_lines(TEXT_1))
1326
1327
        k1.add_lines('text-m', ['text-b', 'text-d'], split_lines(TEXT_1))
1328
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1329
        k2 = KnitVersionedFile('test2', get_transport('.'), factory=KnitPlainFactory(), create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1330
        count = k2.join(k1, version_ids=['text-m'])
1331
        self.assertEquals(count, 5)
1332
        self.assertTrue(k2.has_version('text-a'))
1333
        self.assertTrue(k2.has_version('text-c'))
1334
1335
    def test_reannotate(self):
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1336
        k1 = KnitVersionedFile('knit1', get_transport('.'),
1563.2.25 by Robert Collins
Merge in upstream.
1337
                               factory=KnitAnnotateFactory(), create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1338
        # 0
1339
        k1.add_lines('text-a', [], ['a\n', 'b\n'])
1340
        # 1
1341
        k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
1342
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1343
        k2 = KnitVersionedFile('test2', get_transport('.'),
1563.2.25 by Robert Collins
Merge in upstream.
1344
                               factory=KnitAnnotateFactory(), create=True)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1345
        k2.join(k1, version_ids=['text-b'])
1346
1347
        # 2
1348
        k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
1349
        # 2
1350
        k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
1351
        # 3
1352
        k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
1353
1354
        # test-c will have index 3
1355
        k1.join(k2, version_ids=['text-c'])
1356
1357
        lines = k1.get_lines('text-c')
1358
        self.assertEquals(lines, ['z\n', 'c\n'])
1359
1360
        origins = k1.annotate('text-c')
1594.2.24 by Robert Collins
Make use of the transaction finalisation warning support to implement in-knit caching.
1361
        self.assertEquals(origins[0], ('text-c', 'z\n'))
1362
        self.assertEquals(origins[1], ('text-b', 'c\n'))
1363
1756.3.4 by Aaron Bentley
Fix bug getting texts when line deltas were reused
1364
    def test_get_line_delta_texts(self):
1365
        """Make sure we can call get_texts on text with reused line deltas"""
1366
        k1 = KnitVersionedFile('test1', get_transport('.'), 
1367
                               factory=KnitPlainFactory(), create=True)
1368
        for t in range(3):
1369
            if t == 0:
1370
                parents = []
1371
            else:
1372
                parents = ['%d' % (t-1)]
1373
            k1.add_lines('%d' % t, parents, ['hello\n'] * t)
1374
        k1.get_texts(('%d' % t) for t in range(3))
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.
1375
        
1376
    def test_iter_lines_reads_in_order(self):
1377
        t = MemoryTransport()
1378
        instrumented_t = TransportLogger(t)
1379
        k1 = KnitVersionedFile('id', instrumented_t, create=True, delta=True)
1380
        self.assertEqual([('id.kndx',)], instrumented_t._calls)
1381
        # add texts with no required ordering
1382
        k1.add_lines('base', [], ['text\n'])
1383
        k1.add_lines('base2', [], ['text2\n'])
1384
        k1.clear_cache()
1385
        instrumented_t._calls = []
1386
        # request a last-first iteration
1387
        results = list(k1.iter_lines_added_or_present_in_versions(['base2', 'base']))
1628.1.2 by Robert Collins
More knit micro-optimisations.
1388
        self.assertEqual([('id.knit', [(0, 87), (87, 89)])], instrumented_t._calls)
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.
1389
        self.assertEqual(['text\n', 'text2\n'], results)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1390
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1391
    def test_create_empty_annotated(self):
1563.2.16 by Robert Collins
Change WeaveStore into VersionedFileStore and make its versoined file class parameterisable.
1392
        k1 = self.make_test_knit(True)
1563.2.13 by Robert Collins
InterVersionedFile implemented.
1393
        # 0
1394
        k1.add_lines('text-a', [], ['a\n', 'b\n'])
1395
        k2 = k1.create_empty('t', MemoryTransport())
1396
        self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
1397
        self.assertEqual(k1.delta, k2.delta)
1398
        # the generic test checks for empty content and file class
1399
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1400
    def test_knit_format(self):
1401
        # this tests that a new knit index file has the expected content
1402
        # and that is writes the data we expect as records are added.
1403
        knit = self.make_test_knit(True)
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
1404
        # Now knit files are not created until we first add data to them
1666.1.6 by Robert Collins
Make knit the default format.
1405
        self.assertFileEqual("# bzr knit index 8\n", 'test.kndx')
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1406
        knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1407
        self.assertFileEqual(
1666.1.6 by Robert Collins
Make knit the default format.
1408
            "# bzr knit index 8\n"
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1409
            "\n"
1410
            "revid fulltext 0 84 .a_ghost :",
1411
            'test.kndx')
1412
        knit.add_lines_with_ghosts('revid2', ['revid'], ['a\n'])
1413
        self.assertFileEqual(
1666.1.6 by Robert Collins
Make knit the default format.
1414
            "# bzr knit index 8\n"
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1415
            "\nrevid fulltext 0 84 .a_ghost :"
1416
            "\nrevid2 line-delta 84 82 0 :",
1417
            'test.kndx')
1418
        # we should be able to load this file again
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1419
        knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1420
        self.assertEqual(['revid', 'revid2'], knit.versions())
1421
        # write a short write to the file and ensure that its ignored
2484.1.23 by John Arbash Meinel
When we append a new line, don't use text mode
1422
        indexfile = file('test.kndx', 'ab')
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1423
        indexfile.write('\nrevid3 line-delta 166 82 1 2 3 4 5 .phwoar:demo ')
1424
        indexfile.close()
1425
        # we should be able to load this file again
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1426
        knit = KnitVersionedFile('test', get_transport('.'), access_mode='w')
1654.1.5 by Robert Collins
Merge partial index write support for knits, adding a test case per review comments.
1427
        self.assertEqual(['revid', 'revid2'], knit.versions())
1428
        # and add a revision with the same id the failed write had
1429
        knit.add_lines('revid3', ['revid2'], ['a\n'])
1430
        # and when reading it revid3 should now appear.
1685.1.39 by John Arbash Meinel
Updating test_knit to not instantiate a LocalTransport directly.
1431
        knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1654.1.5 by Robert Collins
Merge partial index write support for knits, adding a test case per review comments.
1432
        self.assertEqual(['revid', 'revid2', 'revid3'], knit.versions())
1433
        self.assertEqual(['revid2'], knit.get_parents('revid3'))
1434
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
1435
    def test_delay_create(self):
1436
        """Test that passing delay_create=True creates files late"""
1437
        knit = self.make_test_knit(annotate=True, delay_create=True)
1438
        self.failIfExists('test.knit')
1439
        self.failIfExists('test.kndx')
1440
        knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1441
        self.failUnlessExists('test.knit')
1442
        self.assertFileEqual(
1443
            "# bzr knit index 8\n"
1444
            "\n"
1445
            "revid fulltext 0 84 .a_ghost :",
1446
            'test.kndx')
1447
1946.2.2 by John Arbash Meinel
test delay_create does the right thing
1448
    def test_create_parent_dir(self):
1449
        """create_parent_dir can create knits in nonexistant dirs"""
1450
        # Has no effect if we don't set 'delay_create'
1451
        trans = get_transport('.')
1452
        self.assertRaises(NoSuchFile, KnitVersionedFile, 'dir/test',
1453
                          trans, access_mode='w', factory=None,
1454
                          create=True, create_parent_dir=True)
1455
        # Nothing should have changed yet
1456
        knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1457
                                 factory=None, create=True,
1458
                                 create_parent_dir=True,
1459
                                 delay_create=True)
1460
        self.failIfExists('dir/test.knit')
1461
        self.failIfExists('dir/test.kndx')
1462
        self.failIfExists('dir')
1463
        knit.add_lines('revid', [], ['a\n'])
1464
        self.failUnlessExists('dir')
1465
        self.failUnlessExists('dir/test.knit')
1466
        self.assertFileEqual(
1467
            "# bzr knit index 8\n"
1468
            "\n"
1469
            "revid fulltext 0 84  :",
1470
            'dir/test.kndx')
1471
1946.2.13 by John Arbash Meinel
Test that passing modes does the right thing for knits.
1472
    def test_create_mode_700(self):
1473
        trans = get_transport('.')
1474
        if not trans._can_roundtrip_unix_modebits():
1475
            # Can't roundtrip, so no need to run this test
1476
            return
1477
        knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1478
                                 factory=None, create=True,
1479
                                 create_parent_dir=True,
1480
                                 delay_create=True,
1481
                                 file_mode=0600,
1482
                                 dir_mode=0700)
1483
        knit.add_lines('revid', [], ['a\n'])
1484
        self.assertTransportMode(trans, 'dir', 0700)
1485
        self.assertTransportMode(trans, 'dir/test.knit', 0600)
1486
        self.assertTransportMode(trans, 'dir/test.kndx', 0600)
1487
1488
    def test_create_mode_770(self):
1489
        trans = get_transport('.')
1490
        if not trans._can_roundtrip_unix_modebits():
1491
            # Can't roundtrip, so no need to run this test
1492
            return
1493
        knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1494
                                 factory=None, create=True,
1495
                                 create_parent_dir=True,
1496
                                 delay_create=True,
1497
                                 file_mode=0660,
1498
                                 dir_mode=0770)
1499
        knit.add_lines('revid', [], ['a\n'])
1500
        self.assertTransportMode(trans, 'dir', 0770)
1501
        self.assertTransportMode(trans, 'dir/test.knit', 0660)
1502
        self.assertTransportMode(trans, 'dir/test.kndx', 0660)
1503
1504
    def test_create_mode_777(self):
1505
        trans = get_transport('.')
1506
        if not trans._can_roundtrip_unix_modebits():
1507
            # Can't roundtrip, so no need to run this test
1508
            return
1509
        knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1510
                                 factory=None, create=True,
1511
                                 create_parent_dir=True,
1512
                                 delay_create=True,
1513
                                 file_mode=0666,
1514
                                 dir_mode=0777)
1515
        knit.add_lines('revid', [], ['a\n'])
1516
        self.assertTransportMode(trans, 'dir', 0777)
1517
        self.assertTransportMode(trans, 'dir/test.knit', 0666)
1518
        self.assertTransportMode(trans, 'dir/test.kndx', 0666)
1519
1664.2.1 by Aaron Bentley
Start work on plan_merge test
1520
    def test_plan_merge(self):
1521
        my_knit = self.make_test_knit(annotate=True)
1522
        my_knit.add_lines('text1', [], split_lines(TEXT_1))
1523
        my_knit.add_lines('text1a', ['text1'], split_lines(TEXT_1A))
1524
        my_knit.add_lines('text1b', ['text1'], split_lines(TEXT_1B))
1664.2.3 by Aaron Bentley
Add failing test case
1525
        plan = list(my_knit.plan_merge('text1a', 'text1b'))
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
1526
        for plan_line, expected_line in zip(plan, AB_MERGE):
1527
            self.assertEqual(plan_line, expected_line)
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
1528
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1529
    def test_get_stream_empty(self):
1530
        """Get a data stream for an empty knit file."""
1531
        k1 = self.make_test_knit()
1532
        format, data_list, reader_callable = k1.get_data_stream([])
1533
        self.assertEqual('knit-plain', format)
1534
        self.assertEqual([], data_list)
1535
        content = reader_callable(None)
1536
        self.assertEqual('', content)
1537
        self.assertIsInstance(content, str)
1538
1539
    def test_get_stream_one_version(self):
1540
        """Get a data stream for a single record out of a knit containing just
1541
        one record.
1542
        """
1543
        k1 = self.make_test_knit()
1544
        test_data = [
1545
            ('text-a', [], TEXT_1),
1546
            ]
1547
        expected_data_list = [
1548
            # version, options, length, parents
1549
            ('text-a', ['fulltext'], 122, []),
1550
           ]
1551
        for version_id, parents, lines in test_data:
1552
            k1.add_lines(version_id, parents, split_lines(lines))
1553
1554
        format, data_list, reader_callable = k1.get_data_stream(['text-a'])
1555
        self.assertEqual('knit-plain', format)
1556
        self.assertEqual(expected_data_list, data_list)
1557
        # There's only one record in the knit, so the content should be the
1558
        # entire knit data file's contents.
2670.3.2 by Andrew Bennetts
Merge from bzr.dev.
1559
        self.assertEqual(k1.transport.get_bytes(k1._data._access._filename),
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1560
                         reader_callable(None))
1561
        
1562
    def test_get_stream_get_one_version_of_many(self):
1563
        """Get a data stream for just one version out of a knit containing many
1564
        versions.
1565
        """
1566
        k1 = self.make_test_knit()
1567
        # Insert the same data as test_knit_join, as they seem to cover a range
1568
        # of cases (no parents, one parent, multiple parents).
1569
        test_data = [
1570
            ('text-a', [], TEXT_1),
1571
            ('text-b', ['text-a'], TEXT_1),
1572
            ('text-c', [], TEXT_1),
1573
            ('text-d', ['text-c'], TEXT_1),
1574
            ('text-m', ['text-b', 'text-d'], TEXT_1),
1575
            ]
1576
        expected_data_list = [
1577
            # version, options, length, parents
1578
            ('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1579
            ]
1580
        for version_id, parents, lines in test_data:
1581
            k1.add_lines(version_id, parents, split_lines(lines))
1582
1583
        format, data_list, reader_callable = k1.get_data_stream(['text-m'])
1584
        self.assertEqual('knit-plain', format)
1585
        self.assertEqual(expected_data_list, data_list)
1586
        self.assertRecordContentEqual(k1, 'text-m', reader_callable(None))
1587
        
1588
    def test_get_stream_ghost_parent(self):
1589
        """Get a data stream for a version with a ghost parent."""
1590
        k1 = self.make_test_knit()
1591
        # Test data
1592
        k1.add_lines('text-a', [], split_lines(TEXT_1))
1593
        k1.add_lines_with_ghosts('text-b', ['text-a', 'text-ghost'],
1594
                                 split_lines(TEXT_1))
1595
        # Expected data
1596
        expected_data_list = [
1597
            # version, options, length, parents
1598
            ('text-b', ['line-delta'], 84, ['text-a', 'text-ghost']),
1599
            ]
1600
        
1601
        format, data_list, reader_callable = k1.get_data_stream(['text-b'])
1602
        self.assertEqual('knit-plain', format)
1603
        self.assertEqual(expected_data_list, data_list)
1604
        self.assertRecordContentEqual(k1, 'text-b', reader_callable(None))
1605
    
1606
    def test_get_stream_get_multiple_records(self):
1607
        """Get a stream for multiple records of a knit."""
1608
        k1 = self.make_test_knit()
1609
        # Insert the same data as test_knit_join, as they seem to cover a range
1610
        # of cases (no parents, one parent, multiple parents).
1611
        test_data = [
1612
            ('text-a', [], TEXT_1),
1613
            ('text-b', ['text-a'], TEXT_1),
1614
            ('text-c', [], TEXT_1),
1615
            ('text-d', ['text-c'], TEXT_1),
1616
            ('text-m', ['text-b', 'text-d'], TEXT_1),
1617
            ]
1618
        expected_data_list = [
1619
            # version, options, length, parents
1620
            ('text-b', ['line-delta'], 84, ['text-a']),
1621
            ('text-d', ['line-delta'], 84, ['text-c']),
1622
            ]
1623
        for version_id, parents, lines in test_data:
1624
            k1.add_lines(version_id, parents, split_lines(lines))
1625
1626
        # Note that even though we request the revision IDs in a particular
1627
        # order, the data stream may return them in any order it likes.  In this
1628
        # case, they'll be in the order they were inserted into the knit.
1629
        format, data_list, reader_callable = k1.get_data_stream(
1630
            ['text-d', 'text-b'])
1631
        self.assertEqual('knit-plain', format)
1632
        self.assertEqual(expected_data_list, data_list)
1633
        self.assertRecordContentEqual(k1, 'text-b', reader_callable(84))
1634
        self.assertRecordContentEqual(k1, 'text-d', reader_callable(84))
1635
        self.assertEqual('', reader_callable(None),
1636
                         "There should be no more bytes left to read.")
1637
1638
    def test_get_stream_all(self):
1639
        """Get a data stream for all the records in a knit.
1640
1641
        This exercises fulltext records, line-delta records, records with
1642
        various numbers of parents, and reading multiple records out of the
1643
        callable.  These cases ought to all be exercised individually by the
1644
        other test_get_stream_* tests; this test is basically just paranoia.
1645
        """
1646
        k1 = self.make_test_knit()
1647
        # Insert the same data as test_knit_join, as they seem to cover a range
1648
        # of cases (no parents, one parent, multiple parents).
1649
        test_data = [
1650
            ('text-a', [], TEXT_1),
1651
            ('text-b', ['text-a'], TEXT_1),
1652
            ('text-c', [], TEXT_1),
1653
            ('text-d', ['text-c'], TEXT_1),
1654
            ('text-m', ['text-b', 'text-d'], TEXT_1),
1655
           ]
1656
        expected_data_list = [
1657
            # version, options, length, parents
1658
            ('text-a', ['fulltext'], 122, []),
1659
            ('text-b', ['line-delta'], 84, ['text-a']),
1660
            ('text-c', ['fulltext'], 121, []),
1661
            ('text-d', ['line-delta'], 84, ['text-c']),
1662
            ('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1663
            ]
1664
        for version_id, parents, lines in test_data:
1665
            k1.add_lines(version_id, parents, split_lines(lines))
1666
1667
        format, data_list, reader_callable = k1.get_data_stream(
1668
            ['text-a', 'text-b', 'text-c', 'text-d', 'text-m'])
1669
        self.assertEqual('knit-plain', format)
1670
        self.assertEqual(expected_data_list, data_list)
1671
        for version_id, options, length, parents in expected_data_list:
1672
            bytes = reader_callable(length)
1673
            self.assertRecordContentEqual(k1, version_id, bytes)
1674
1675
    def assertKnitFilesEqual(self, knit1, knit2):
1676
        """Assert that the contents of the index and data files of two knits are
1677
        equal.
1678
        """
1679
        self.assertEqual(
2670.3.2 by Andrew Bennetts
Merge from bzr.dev.
1680
            knit1.transport.get_bytes(knit1._data._access._filename),
1681
            knit2.transport.get_bytes(knit2._data._access._filename))
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1682
        self.assertEqual(
1683
            knit1.transport.get_bytes(knit1._index._filename),
1684
            knit2.transport.get_bytes(knit2._index._filename))
1685
1686
    def test_insert_data_stream_empty(self):
1687
        """Inserting a data stream with no records should not put any data into
1688
        the knit.
1689
        """
1690
        k1 = self.make_test_knit()
1691
        k1.insert_data_stream(
1692
            (k1.get_format_signature(), [], lambda ignored: ''))
2670.3.2 by Andrew Bennetts
Merge from bzr.dev.
1693
        self.assertEqual('', k1.transport.get_bytes(k1._data._access._filename),
2670.3.1 by Andrew Bennetts
Add get_data_stream/insert_data_stream to KnitVersionedFile.
1694
                         "The .knit should be completely empty.")
1695
        self.assertEqual(k1._index.HEADER,
1696
                         k1.transport.get_bytes(k1._index._filename),
1697
                         "The .kndx should have nothing apart from the header.")
1698
1699
    def test_insert_data_stream_one_record(self):
1700
        """Inserting a data stream with one record from a knit with one record
1701
        results in byte-identical files.
1702
        """
1703
        source = self.make_test_knit(name='source')
1704
        source.add_lines('text-a', [], split_lines(TEXT_1))
1705
        data_stream = source.get_data_stream(['text-a'])
1706
        
1707
        target = self.make_test_knit(name='target')
1708
        target.insert_data_stream(data_stream)
1709
        
1710
        self.assertKnitFilesEqual(source, target)
1711
1712
    def test_insert_data_stream_records_already_present(self):
1713
        """Insert a data stream where some records are alreday present in the
1714
        target, and some not.  Only the new records are inserted.
1715
        """
1716
        source = self.make_test_knit(name='source')
1717
        target = self.make_test_knit(name='target')
1718
        # Insert 'text-a' into both source and target
1719
        source.add_lines('text-a', [], split_lines(TEXT_1))
1720
        target.insert_data_stream(source.get_data_stream(['text-a']))
1721
        # Insert 'text-b' into just the source.
1722
        source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1723
        # Get a data stream of both text-a and text-b, and insert it.
1724
        data_stream = source.get_data_stream(['text-a', 'text-b'])
1725
        target.insert_data_stream(data_stream)
1726
        # The source and target will now be identical.  This means the text-a
1727
        # record was not added a second time.
1728
        self.assertKnitFilesEqual(source, target)
1729
1730
    def test_insert_data_stream_multiple_records(self):
1731
        """Inserting a data stream of all records from a knit with multiple
1732
        records results in byte-identical files.
1733
        """
1734
        source = self.make_test_knit(name='source')
1735
        source.add_lines('text-a', [], split_lines(TEXT_1))
1736
        source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1737
        source.add_lines('text-c', [], split_lines(TEXT_1))
1738
        data_stream = source.get_data_stream(['text-a', 'text-b', 'text-c'])
1739
        
1740
        target = self.make_test_knit(name='target')
1741
        target.insert_data_stream(data_stream)
1742
        
1743
        self.assertKnitFilesEqual(source, target)
1744
1745
    def test_insert_data_stream_ghost_parent(self):
1746
        """Insert a data stream with a record that has a ghost parent."""
1747
        # Make a knit with a record, text-a, that has a ghost parent.
1748
        source = self.make_test_knit(name='source')
1749
        source.add_lines_with_ghosts('text-a', ['text-ghost'],
1750
                                     split_lines(TEXT_1))
1751
        data_stream = source.get_data_stream(['text-a'])
1752
1753
        target = self.make_test_knit(name='target')
1754
        target.insert_data_stream(data_stream)
1755
1756
        self.assertKnitFilesEqual(source, target)
1757
1758
        # The target knit object is in a consistent state, i.e. the record we
1759
        # just added is immediately visible.
1760
        self.assertTrue(target.has_version('text-a'))
1761
        self.assertTrue(target.has_ghost('text-ghost'))
1762
        self.assertEqual(split_lines(TEXT_1), target.get_lines('text-a'))
1763
1764
    def test_insert_data_stream_inconsistent_version_lines(self):
1765
        """Inserting a data stream which has different content for a version_id
1766
        than already exists in the knit will raise KnitCorrupt.
1767
        """
1768
        source = self.make_test_knit(name='source')
1769
        target = self.make_test_knit(name='target')
1770
        # Insert a different 'text-a' into both source and target
1771
        source.add_lines('text-a', [], split_lines(TEXT_1))
1772
        target.add_lines('text-a', [], split_lines(TEXT_2))
1773
        # Insert a data stream with conflicting content into the target
1774
        data_stream = source.get_data_stream(['text-a'])
1775
        self.assertRaises(
1776
            errors.KnitCorrupt, target.insert_data_stream, data_stream)
1777
1778
    def test_insert_data_stream_inconsistent_version_parents(self):
1779
        """Inserting a data stream which has different parents for a version_id
1780
        than already exists in the knit will raise KnitCorrupt.
1781
        """
1782
        source = self.make_test_knit(name='source')
1783
        target = self.make_test_knit(name='target')
1784
        # Insert a different 'text-a' into both source and target.  They differ
1785
        # only by the parents list, the content is the same.
1786
        source.add_lines_with_ghosts('text-a', [], split_lines(TEXT_1))
1787
        target.add_lines_with_ghosts('text-a', ['a-ghost'], split_lines(TEXT_1))
1788
        # Insert a data stream with conflicting content into the target
1789
        data_stream = source.get_data_stream(['text-a'])
1790
        self.assertRaises(
1791
            errors.KnitCorrupt, target.insert_data_stream, data_stream)
1792
1793
    def test_insert_data_stream_incompatible_format(self):
1794
        """A data stream in a different format to the target knit cannot be
1795
        inserted.
1796
1797
        It will raise KnitDataStreamIncompatible.
1798
        """
1799
        data_stream = ('fake-format-signature', [], lambda _: '')
1800
        target = self.make_test_knit(name='target')
1801
        self.assertRaises(
1802
            errors.KnitDataStreamIncompatible,
1803
            target.insert_data_stream, data_stream)
1804
1805
    #  * test that a stream of "already present version, then new version"
1806
    #    inserts correctly.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1807
1808
TEXT_1 = """\
1809
Banana cup cakes:
1810
1811
- bananas
1812
- eggs
1813
- broken tea cups
1814
"""
1815
1816
TEXT_1A = """\
1817
Banana cup cake recipe
1818
(serves 6)
1819
1820
- bananas
1821
- eggs
1822
- broken tea cups
1823
- self-raising flour
1824
"""
1825
1664.2.1 by Aaron Bentley
Start work on plan_merge test
1826
TEXT_1B = """\
1827
Banana cup cake recipe
1828
1829
- bananas (do not use plantains!!!)
1830
- broken tea cups
1831
- flour
1832
"""
1833
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1834
delta_1_1a = """\
1835
0,1,2
1836
Banana cup cake recipe
1837
(serves 6)
1838
5,5,1
1839
- self-raising flour
1840
"""
1841
1842
TEXT_2 = """\
1843
Boeuf bourguignon
1844
1845
- beef
1846
- red wine
1847
- small onions
1848
- carrot
1849
- mushrooms
1850
"""
1851
1664.2.3 by Aaron Bentley
Add failing test case
1852
AB_MERGE_TEXT="""unchanged|Banana cup cake recipe
1853
new-a|(serves 6)
1854
unchanged|
1855
killed-b|- bananas
1856
killed-b|- eggs
1857
new-b|- bananas (do not use plantains!!!)
1858
unchanged|- broken tea cups
1859
new-a|- self-raising flour
1664.2.6 by Aaron Bentley
Got plan-merge passing tests
1860
new-b|- flour
1861
"""
1664.2.3 by Aaron Bentley
Add failing test case
1862
AB_MERGE=[tuple(l.split('|')) for l in AB_MERGE_TEXT.splitlines(True)]
1863
1864
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1865
def line_delta(from_lines, to_lines):
1866
    """Generate line-based delta from one text to another"""
1867
    s = difflib.SequenceMatcher(None, from_lines, to_lines)
1868
    for op in s.get_opcodes():
1869
        if op[0] == 'equal':
1870
            continue
1871
        yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
1872
        for i in range(op[3], op[4]):
1873
            yield to_lines[i]
1874
1875
1876
def apply_line_delta(basis_lines, delta_lines):
1877
    """Apply a line-based perfect diff
1878
    
1879
    basis_lines -- text to apply the patch to
1880
    delta_lines -- diff instructions and content
1881
    """
1882
    out = basis_lines[:]
1883
    i = 0
1884
    offset = 0
1885
    while i < len(delta_lines):
1886
        l = delta_lines[i]
1887
        a, b, c = map(long, l.split(','))
1888
        i = i + 1
1889
        out[offset+a:offset+b] = delta_lines[i:i+c]
1890
        i = i + c
1891
        offset = offset + (b - a) + c
1892
    return out
1684.3.3 by Robert Collins
Add a special cased weaves to knit converter.
1893
1894
1895
class TestWeaveToKnit(KnitTests):
1896
1897
    def test_weave_to_knit_matches(self):
1898
        # check that the WeaveToKnit is_compatible function
1899
        # registers True for a Weave to a Knit.
1900
        w = Weave()
1901
        k = self.make_test_knit()
1902
        self.failUnless(WeaveToKnit.is_compatible(w, k))
1903
        self.failIf(WeaveToKnit.is_compatible(k, w))
1904
        self.failIf(WeaveToKnit.is_compatible(w, w))
1905
        self.failIf(WeaveToKnit.is_compatible(k, k))
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1906
1907
1908
class TestKnitCaching(KnitTests):
1909
    
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
1910
    def create_knit(self):
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1911
        k = self.make_test_knit(True)
1912
        k.add_lines('text-1', [], split_lines(TEXT_1))
1913
        k.add_lines('text-2', [], split_lines(TEXT_2))
1914
        return k
1915
1916
    def test_no_caching(self):
1917
        k = self.create_knit()
1918
        # Nothing should be cached without setting 'enable_cache'
1919
        self.assertEqual({}, k._data._cache)
1920
1921
    def test_cache_data_read_raw(self):
1922
        k = self.create_knit()
1923
1924
        # Now cache and read
1925
        k.enable_cache()
1926
1927
        def read_one_raw(version):
1928
            pos_map = k._get_components_positions([version])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1929
            method, index_memo, next = pos_map[version]
1930
            lst = list(k._data.read_records_iter_raw([(version, index_memo)]))
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1931
            self.assertEqual(1, len(lst))
1932
            return lst[0]
1933
1934
        val = read_one_raw('text-1')
1863.1.8 by John Arbash Meinel
Removing disk-backed-cache
1935
        self.assertEqual({'text-1':val[1]}, k._data._cache)
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1936
1937
        k.clear_cache()
1938
        # After clear, new reads are not cached
1939
        self.assertEqual({}, k._data._cache)
1940
1941
        val2 = read_one_raw('text-1')
1942
        self.assertEqual(val, val2)
1943
        self.assertEqual({}, k._data._cache)
1944
1945
    def test_cache_data_read(self):
1946
        k = self.create_knit()
1947
1948
        def read_one(version):
1949
            pos_map = k._get_components_positions([version])
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1950
            method, index_memo, next = pos_map[version]
1951
            lst = list(k._data.read_records_iter([(version, index_memo)]))
1863.1.1 by John Arbash Meinel
Allow Versioned files to do caching if explicitly asked, and implement for Knit
1952
            self.assertEqual(1, len(lst))
1953
            return lst[0]
1954
1955
        # Now cache and read
1956
        k.enable_cache()
1957
1958
        val = read_one('text-2')
1959
        self.assertEqual(['text-2'], k._data._cache.keys())
1960
        self.assertEqual('text-2', val[0])
1961
        content, digest = k._data._parse_record('text-2',
1962
                                                k._data._cache['text-2'])
1963
        self.assertEqual(content, val[1])
1964
        self.assertEqual(digest, val[2])
1965
1966
        k.clear_cache()
1967
        self.assertEqual({}, k._data._cache)
1968
1969
        val2 = read_one('text-2')
1970
        self.assertEqual(val, val2)
1971
        self.assertEqual({}, k._data._cache)
1972
1973
    def test_cache_read(self):
1974
        k = self.create_knit()
1975
        k.enable_cache()
1976
1977
        text = k.get_text('text-1')
1978
        self.assertEqual(TEXT_1, text)
1979
        self.assertEqual(['text-1'], k._data._cache.keys())
1980
1981
        k.clear_cache()
1982
        self.assertEqual({}, k._data._cache)
1983
1984
        text = k.get_text('text-1')
1985
        self.assertEqual(TEXT_1, text)
1986
        self.assertEqual({}, k._data._cache)
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1987
1988
1989
class TestKnitIndex(KnitTests):
1990
1991
    def test_add_versions_dictionary_compresses(self):
1992
        """Adding versions to the index should update the lookup dict"""
1993
        knit = self.make_test_knit()
1994
        idx = knit._index
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
1995
        idx.add_version('a-1', ['fulltext'], (None, 0, 0), [])
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
1996
        self.check_file_contents('test.kndx',
1997
            '# bzr knit index 8\n'
1998
            '\n'
1999
            'a-1 fulltext 0 0  :'
2000
            )
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2001
        idx.add_versions([('a-2', ['fulltext'], (None, 0, 0), ['a-1']),
2002
                          ('a-3', ['fulltext'], (None, 0, 0), ['a-2']),
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
2003
                         ])
2004
        self.check_file_contents('test.kndx',
2005
            '# bzr knit index 8\n'
2006
            '\n'
2007
            'a-1 fulltext 0 0  :\n'
2008
            'a-2 fulltext 0 0 0 :\n'
2009
            'a-3 fulltext 0 0 1 :'
2010
            )
2011
        self.assertEqual(['a-1', 'a-2', 'a-3'], idx._history)
2012
        self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0),
2013
                          'a-2':('a-2', ['fulltext'], 0, 0, ['a-1'], 1),
2014
                          'a-3':('a-3', ['fulltext'], 0, 0, ['a-2'], 2),
2015
                         }, idx._cache)
2016
2017
    def test_add_versions_fails_clean(self):
2018
        """If add_versions fails in the middle, it restores a pristine state.
2019
2020
        Any modifications that are made to the index are reset if all versions
2021
        cannot be added.
2022
        """
2023
        # This cheats a little bit by passing in a generator which will
2024
        # raise an exception before the processing finishes
2025
        # Other possibilities would be to have an version with the wrong number
2026
        # of entries, or to make the backing transport unable to write any
2027
        # files.
2028
2029
        knit = self.make_test_knit()
2030
        idx = knit._index
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2031
        idx.add_version('a-1', ['fulltext'], (None, 0, 0), [])
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
2032
2033
        class StopEarly(Exception):
2034
            pass
2035
2036
        def generate_failure():
2037
            """Add some entries and then raise an exception"""
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2038
            yield ('a-2', ['fulltext'], (None, 0, 0), ['a-1'])
2039
            yield ('a-3', ['fulltext'], (None, 0, 0), ['a-2'])
2102.2.1 by John Arbash Meinel
Fix bug #64789 _KnitIndex.add_versions() should dict compress new revisions
2040
            raise StopEarly()
2041
2042
        # Assert the pre-condition
2043
        self.assertEqual(['a-1'], idx._history)
2044
        self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0)}, idx._cache)
2045
2046
        self.assertRaises(StopEarly, idx.add_versions, generate_failure())
2047
2048
        # And it shouldn't be modified
2049
        self.assertEqual(['a-1'], idx._history)
2050
        self.assertEqual({'a-1':('a-1', ['fulltext'], 0, 0, [], 0)}, idx._cache)
2171.1.1 by John Arbash Meinel
Knit index files should ignore empty indexes rather than consider them corrupt.
2051
2052
    def test_knit_index_ignores_empty_files(self):
2053
        # There was a race condition in older bzr, where a ^C at the right time
2054
        # could leave an empty .kndx file, which bzr would later claim was a
2055
        # corrupted file since the header was not present. In reality, the file
2056
        # just wasn't created, so it should be ignored.
2057
        t = get_transport('.')
2058
        t.put_bytes('test.kndx', '')
2059
2060
        knit = self.make_test_knit()
2061
2062
    def test_knit_index_checks_header(self):
2063
        t = get_transport('.')
2064
        t.put_bytes('test.kndx', '# not really a knit header\n\n')
2065
2196.2.1 by John Arbash Meinel
Merge Dmitry's optimizations and minimize the actual diff.
2066
        self.assertRaises(KnitHeaderError, self.make_test_knit)
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2067
2068
2069
class TestGraphIndexKnit(KnitTests):
2070
    """Tests for knits using a GraphIndex rather than a KnitIndex."""
2071
2072
    def make_g_index(self, name, ref_lists=0, nodes=[]):
2073
        builder = GraphIndexBuilder(ref_lists)
2074
        for node, references, value in nodes:
2075
            builder.add_node(node, references, value)
2076
        stream = builder.finish()
2077
        trans = self.get_transport()
2078
        trans.put_file(name, stream)
2079
        return GraphIndex(trans, name)
2080
2081
    def two_graph_index(self, deltas=False, catch_adds=False):
2082
        """Build a two-graph index.
2083
2084
        :param deltas: If true, use underlying indices with two node-ref
2085
            lists and 'parent' set to a delta-compressed against tail.
2086
        """
2087
        # build a complex graph across several indices.
2088
        if deltas:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2089
            # delta compression inn the index
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2090
            index1 = self.make_g_index('1', 2, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2091
                (('tip', ), 'N0 100', ([('parent', )], [], )),
2092
                (('tail', ), '', ([], []))])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2093
            index2 = self.make_g_index('2', 2, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2094
                (('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
2095
                (('separate', ), '', ([], []))])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2096
        else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2097
            # just blob location and graph in the index.
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2098
            index1 = self.make_g_index('1', 1, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2099
                (('tip', ), 'N0 100', ([('parent', )], )),
2100
                (('tail', ), '', ([], ))])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2101
            index2 = self.make_g_index('2', 1, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2102
                (('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
2103
                (('separate', ), '', ([], ))])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2104
        combined_index = CombinedGraphIndex([index1, index2])
2105
        if catch_adds:
2106
            self.combined_index = combined_index
2107
            self.caught_entries = []
2108
            add_callback = self.catch_add
2109
        else:
2110
            add_callback = None
2111
        return KnitGraphIndex(combined_index, deltas=deltas,
2112
            add_callback=add_callback)
2113
2114
    def test_get_graph(self):
2115
        index = self.two_graph_index()
2116
        self.assertEqual(set([
2117
            ('tip', ('parent', )),
2118
            ('tail', ()),
2119
            ('parent', ('tail', 'ghost')),
2120
            ('separate', ()),
2121
            ]), set(index.get_graph()))
2122
2123
    def test_get_ancestry(self):
2124
        # get_ancestry is defined as eliding ghosts, not erroring.
2125
        index = self.two_graph_index()
2126
        self.assertEqual([], index.get_ancestry([]))
2127
        self.assertEqual(['separate'], index.get_ancestry(['separate']))
2128
        self.assertEqual(['tail'], index.get_ancestry(['tail']))
2129
        self.assertEqual(['tail', 'parent'], index.get_ancestry(['parent']))
2130
        self.assertEqual(['tail', 'parent', 'tip'], index.get_ancestry(['tip']))
2131
        self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2132
            (['tail', 'parent', 'tip', 'separate'],
2133
             ['separate', 'tail', 'parent', 'tip'],
2134
            ))
2135
        # and without topo_sort
2136
        self.assertEqual(set(['separate']),
2137
            set(index.get_ancestry(['separate'], topo_sorted=False)))
2138
        self.assertEqual(set(['tail']),
2139
            set(index.get_ancestry(['tail'], topo_sorted=False)))
2140
        self.assertEqual(set(['tail', 'parent']),
2141
            set(index.get_ancestry(['parent'], topo_sorted=False)))
2142
        self.assertEqual(set(['tail', 'parent', 'tip']),
2143
            set(index.get_ancestry(['tip'], topo_sorted=False)))
2144
        self.assertEqual(set(['separate', 'tail', 'parent', 'tip']),
2145
            set(index.get_ancestry(['tip', 'separate'])))
2146
        # asking for a ghost makes it go boom.
2147
        self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2148
2149
    def test_get_ancestry_with_ghosts(self):
2150
        index = self.two_graph_index()
2151
        self.assertEqual([], index.get_ancestry_with_ghosts([]))
2152
        self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2153
        self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2154
        self.assertTrue(index.get_ancestry_with_ghosts(['parent']) in
2155
            (['tail', 'ghost', 'parent'],
2156
             ['ghost', 'tail', 'parent'],
2157
            ))
2158
        self.assertTrue(index.get_ancestry_with_ghosts(['tip']) in
2159
            (['tail', 'ghost', 'parent', 'tip'],
2160
             ['ghost', 'tail', 'parent', 'tip'],
2161
            ))
2162
        self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2163
            (['tail', 'ghost', 'parent', 'tip', 'separate'],
2164
             ['ghost', 'tail', 'parent', 'tip', 'separate'],
2165
             ['separate', 'tail', 'ghost', 'parent', 'tip'],
2166
             ['separate', 'ghost', 'tail', 'parent', 'tip'],
2167
            ))
2168
        # asking for a ghost makes it go boom.
2169
        self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2170
2171
    def test_num_versions(self):
2172
        index = self.two_graph_index()
2173
        self.assertEqual(4, index.num_versions())
2174
2175
    def test_get_versions(self):
2176
        index = self.two_graph_index()
2177
        self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2178
            set(index.get_versions()))
2179
2180
    def test_has_version(self):
2181
        index = self.two_graph_index()
2182
        self.assertTrue(index.has_version('tail'))
2183
        self.assertFalse(index.has_version('ghost'))
2184
2185
    def test_get_position(self):
2186
        index = self.two_graph_index()
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2187
        self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2188
        self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2189
2190
    def test_get_method_deltas(self):
2191
        index = self.two_graph_index(deltas=True)
2192
        self.assertEqual('fulltext', index.get_method('tip'))
2193
        self.assertEqual('line-delta', index.get_method('parent'))
2194
2195
    def test_get_method_no_deltas(self):
2196
        # check that the parent-history lookup is ignored with deltas=False.
2197
        index = self.two_graph_index(deltas=False)
2198
        self.assertEqual('fulltext', index.get_method('tip'))
2199
        self.assertEqual('fulltext', index.get_method('parent'))
2200
2201
    def test_get_options_deltas(self):
2202
        index = self.two_graph_index(deltas=True)
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
2203
        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2204
        self.assertEqual(['line-delta'], index.get_options('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2205
2206
    def test_get_options_no_deltas(self):
2207
        # check that the parent-history lookup is ignored with deltas=False.
2208
        index = self.two_graph_index(deltas=False)
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
2209
        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2210
        self.assertEqual(['fulltext'], index.get_options('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2211
2212
    def test_get_parents(self):
2213
        # get_parents ignores ghosts
2214
        index = self.two_graph_index()
2215
        self.assertEqual(('tail', ), index.get_parents('parent'))
2216
        # and errors on ghosts.
2217
        self.assertRaises(errors.RevisionNotPresent,
2218
            index.get_parents, 'ghost')
2219
2220
    def test_get_parents_with_ghosts(self):
2221
        index = self.two_graph_index()
2222
        self.assertEqual(('tail', 'ghost'), index.get_parents_with_ghosts('parent'))
2223
        # and errors on ghosts.
2224
        self.assertRaises(errors.RevisionNotPresent,
2225
            index.get_parents_with_ghosts, 'ghost')
2226
2227
    def test_check_versions_present(self):
2228
        # ghosts should not be considered present
2229
        index = self.two_graph_index()
2230
        self.assertRaises(RevisionNotPresent, index.check_versions_present,
2231
            ['ghost'])
2232
        self.assertRaises(RevisionNotPresent, index.check_versions_present,
2233
            ['tail', 'ghost'])
2234
        index.check_versions_present(['tail', 'separate'])
2235
2236
    def catch_add(self, entries):
2237
        self.caught_entries.append(entries)
2238
2239
    def test_add_no_callback_errors(self):
2240
        index = self.two_graph_index()
2241
        self.assertRaises(errors.ReadOnlyError, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2242
            'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2243
2244
    def test_add_version_smoke(self):
2245
        index = self.two_graph_index(catch_adds=True)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2246
        index.add_version('new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2247
        self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2248
            self.caught_entries)
2249
2250
    def test_add_version_delta_not_delta_index(self):
2251
        index = self.two_graph_index(catch_adds=True)
2252
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2253
            'new', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2254
        self.assertEqual([], self.caught_entries)
2255
2256
    def test_add_version_same_dup(self):
2257
        index = self.two_graph_index(catch_adds=True)
2258
        # options can be spelt two different ways
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2259
        index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2260
        index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2261
        # but neither should have added data.
2262
        self.assertEqual([[], []], self.caught_entries)
2263
        
2264
    def test_add_version_different_dup(self):
2265
        index = self.two_graph_index(deltas=True, catch_adds=True)
2266
        # change options
2267
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2268
            'tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2269
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2270
            'tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])
2271
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2272
            'tip', 'fulltext', (None, 0, 100), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2273
        # position/length
2274
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2275
            'tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2276
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2277
            'tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2278
        # parents
2279
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2280
            'tip', 'fulltext,no-eol', (None, 0, 100), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2281
        self.assertEqual([], self.caught_entries)
2282
        
2283
    def test_add_versions_nodeltas(self):
2284
        index = self.two_graph_index(catch_adds=True)
2285
        index.add_versions([
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2286
                ('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2287
                ('new2', 'fulltext', (None, 0, 6), ['new']),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2288
                ])
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2289
        self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
2290
            (('new2', ), ' 0 6', ((('new',),),))],
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2291
            sorted(self.caught_entries[0]))
2292
        self.assertEqual(1, len(self.caught_entries))
2293
2294
    def test_add_versions_deltas(self):
2295
        index = self.two_graph_index(deltas=True, catch_adds=True)
2296
        index.add_versions([
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2297
                ('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2298
                ('new2', 'line-delta', (None, 0, 6), ['new']),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2299
                ])
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2300
        self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
2301
            (('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2302
            sorted(self.caught_entries[0]))
2303
        self.assertEqual(1, len(self.caught_entries))
2304
2305
    def test_add_versions_delta_not_delta_index(self):
2306
        index = self.two_graph_index(catch_adds=True)
2307
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2308
            [('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2309
        self.assertEqual([], self.caught_entries)
2310
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2311
    def test_add_versions_random_id_accepted(self):
2312
        index = self.two_graph_index(catch_adds=True)
2313
        index.add_versions([], random_id=True)
2314
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2315
    def test_add_versions_same_dup(self):
2316
        index = self.two_graph_index(catch_adds=True)
2317
        # options can be spelt two different ways
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2318
        index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2319
        index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2320
        # but neither should have added data.
2321
        self.assertEqual([[], []], self.caught_entries)
2322
        
2323
    def test_add_versions_different_dup(self):
2324
        index = self.two_graph_index(deltas=True, catch_adds=True)
2325
        # change options
2326
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2327
            [('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2328
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2329
            [('tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])])
2330
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2331
            [('tip', 'fulltext', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2332
        # position/length
2333
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2334
            [('tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2335
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2336
            [('tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2337
        # parents
2338
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2339
            [('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2340
        # change options in the second record
2341
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2342
            [('tip', 'fulltext,no-eol', (None, 0, 100), ['parent']),
2343
             ('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2344
        self.assertEqual([], self.caught_entries)
2345
2346
    def test_iter_parents(self):
2347
        index1 = self.make_g_index('1', 1, [
2348
        # no parents
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2349
            (('r0', ), 'N0 100', ([], )),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2350
        # 1 parent
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2351
            (('r1', ), '', ([('r0', )], ))])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2352
        index2 = self.make_g_index('2', 1, [
2353
        # 2 parents
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2354
            (('r2', ), 'N0 100', ([('r1', ), ('r0', )], )),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2355
            ])
2356
        combined_index = CombinedGraphIndex([index1, index2])
2357
        index = KnitGraphIndex(combined_index)
2358
        # XXX TODO a ghost
2359
        # cases: each sample data individually:
2360
        self.assertEqual(set([('r0', ())]),
2361
            set(index.iter_parents(['r0'])))
2362
        self.assertEqual(set([('r1', ('r0', ))]),
2363
            set(index.iter_parents(['r1'])))
2364
        self.assertEqual(set([('r2', ('r1', 'r0'))]),
2365
            set(index.iter_parents(['r2'])))
2366
        # no nodes returned for a missing node
2367
        self.assertEqual(set(),
2368
            set(index.iter_parents(['missing'])))
2369
        # 1 node returned with missing nodes skipped
2370
        self.assertEqual(set([('r1', ('r0', ))]),
2371
            set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
2372
        # 2 nodes returned
2373
        self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2374
            set(index.iter_parents(['r0', 'r1'])))
2375
        # 2 nodes returned, missing skipped
2376
        self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2377
            set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
2378
2379
2380
class TestNoParentsGraphIndexKnit(KnitTests):
2381
    """Tests for knits using KnitGraphIndex with no parents."""
2382
2383
    def make_g_index(self, name, ref_lists=0, nodes=[]):
2384
        builder = GraphIndexBuilder(ref_lists)
2385
        for node, references in nodes:
2386
            builder.add_node(node, references)
2387
        stream = builder.finish()
2388
        trans = self.get_transport()
2389
        trans.put_file(name, stream)
2390
        return GraphIndex(trans, name)
2391
2392
    def test_parents_deltas_incompatible(self):
2393
        index = CombinedGraphIndex([])
2394
        self.assertRaises(errors.KnitError, KnitGraphIndex, index,
2395
            deltas=True, parents=False)
2396
2397
    def two_graph_index(self, catch_adds=False):
2398
        """Build a two-graph index.
2399
2400
        :param deltas: If true, use underlying indices with two node-ref
2401
            lists and 'parent' set to a delta-compressed against tail.
2402
        """
2403
        # put several versions in the index.
2404
        index1 = self.make_g_index('1', 0, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2405
            (('tip', ), 'N0 100'),
2406
            (('tail', ), '')])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2407
        index2 = self.make_g_index('2', 0, [
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2408
            (('parent', ), ' 100 78'),
2409
            (('separate', ), '')])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2410
        combined_index = CombinedGraphIndex([index1, index2])
2411
        if catch_adds:
2412
            self.combined_index = combined_index
2413
            self.caught_entries = []
2414
            add_callback = self.catch_add
2415
        else:
2416
            add_callback = None
2417
        return KnitGraphIndex(combined_index, parents=False,
2418
            add_callback=add_callback)
2419
2420
    def test_get_graph(self):
2421
        index = self.two_graph_index()
2422
        self.assertEqual(set([
2423
            ('tip', ()),
2424
            ('tail', ()),
2425
            ('parent', ()),
2426
            ('separate', ()),
2427
            ]), set(index.get_graph()))
2428
2429
    def test_get_ancestry(self):
2430
        # with no parents, ancestry is always just the key.
2431
        index = self.two_graph_index()
2432
        self.assertEqual([], index.get_ancestry([]))
2433
        self.assertEqual(['separate'], index.get_ancestry(['separate']))
2434
        self.assertEqual(['tail'], index.get_ancestry(['tail']))
2435
        self.assertEqual(['parent'], index.get_ancestry(['parent']))
2436
        self.assertEqual(['tip'], index.get_ancestry(['tip']))
2437
        self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2438
            (['tip', 'separate'],
2439
             ['separate', 'tip'],
2440
            ))
2441
        # asking for a ghost makes it go boom.
2442
        self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2443
2444
    def test_get_ancestry_with_ghosts(self):
2445
        index = self.two_graph_index()
2446
        self.assertEqual([], index.get_ancestry_with_ghosts([]))
2447
        self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2448
        self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2449
        self.assertEqual(['parent'], index.get_ancestry_with_ghosts(['parent']))
2450
        self.assertEqual(['tip'], index.get_ancestry_with_ghosts(['tip']))
2451
        self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2452
            (['tip', 'separate'],
2453
             ['separate', 'tip'],
2454
            ))
2455
        # asking for a ghost makes it go boom.
2456
        self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2457
2458
    def test_num_versions(self):
2459
        index = self.two_graph_index()
2460
        self.assertEqual(4, index.num_versions())
2461
2462
    def test_get_versions(self):
2463
        index = self.two_graph_index()
2464
        self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2465
            set(index.get_versions()))
2466
2467
    def test_has_version(self):
2468
        index = self.two_graph_index()
2469
        self.assertTrue(index.has_version('tail'))
2470
        self.assertFalse(index.has_version('ghost'))
2471
2472
    def test_get_position(self):
2473
        index = self.two_graph_index()
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2474
        self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2475
        self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2476
2477
    def test_get_method(self):
2478
        index = self.two_graph_index()
2479
        self.assertEqual('fulltext', index.get_method('tip'))
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
2480
        self.assertEqual(['fulltext'], index.get_options('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2481
2482
    def test_get_options(self):
2483
        index = self.two_graph_index()
2658.2.1 by Robert Collins
Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
2484
        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2485
        self.assertEqual(['fulltext'], index.get_options('parent'))
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2486
2487
    def test_get_parents(self):
2488
        index = self.two_graph_index()
2489
        self.assertEqual((), index.get_parents('parent'))
2490
        # and errors on ghosts.
2491
        self.assertRaises(errors.RevisionNotPresent,
2492
            index.get_parents, 'ghost')
2493
2494
    def test_get_parents_with_ghosts(self):
2495
        index = self.two_graph_index()
2496
        self.assertEqual((), index.get_parents_with_ghosts('parent'))
2497
        # and errors on ghosts.
2498
        self.assertRaises(errors.RevisionNotPresent,
2499
            index.get_parents_with_ghosts, 'ghost')
2500
2501
    def test_check_versions_present(self):
2502
        index = self.two_graph_index()
2503
        self.assertRaises(RevisionNotPresent, index.check_versions_present,
2504
            ['missing'])
2505
        self.assertRaises(RevisionNotPresent, index.check_versions_present,
2506
            ['tail', 'missing'])
2507
        index.check_versions_present(['tail', 'separate'])
2508
2509
    def catch_add(self, entries):
2510
        self.caught_entries.append(entries)
2511
2512
    def test_add_no_callback_errors(self):
2513
        index = self.two_graph_index()
2514
        self.assertRaises(errors.ReadOnlyError, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2515
            'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2516
2517
    def test_add_version_smoke(self):
2518
        index = self.two_graph_index(catch_adds=True)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2519
        index.add_version('new', 'fulltext,no-eol', (None, 50, 60), [])
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2520
        self.assertEqual([[(('new', ), 'N50 60')]],
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2521
            self.caught_entries)
2522
2523
    def test_add_version_delta_not_delta_index(self):
2524
        index = self.two_graph_index(catch_adds=True)
2525
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2526
            'new', 'no-eol,line-delta', (None, 0, 100), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2527
        self.assertEqual([], self.caught_entries)
2528
2529
    def test_add_version_same_dup(self):
2530
        index = self.two_graph_index(catch_adds=True)
2531
        # options can be spelt two different ways
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2532
        index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), [])
2533
        index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2534
        # but neither should have added data.
2535
        self.assertEqual([[], []], self.caught_entries)
2536
        
2537
    def test_add_version_different_dup(self):
2538
        index = self.two_graph_index(catch_adds=True)
2539
        # change options
2540
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2541
            'tip', 'no-eol,line-delta', (None, 0, 100), [])
2542
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2543
            'tip', 'line-delta,no-eol', (None, 0, 100), [])
2544
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2545
            'tip', 'fulltext', (None, 0, 100), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2546
        # position/length
2547
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2548
            'tip', 'fulltext,no-eol', (None, 50, 100), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2549
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2550
            'tip', 'fulltext,no-eol', (None, 0, 1000), [])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2551
        # parents
2552
        self.assertRaises(errors.KnitCorrupt, index.add_version,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2553
            'tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2554
        self.assertEqual([], self.caught_entries)
2555
        
2556
    def test_add_versions(self):
2557
        index = self.two_graph_index(catch_adds=True)
2558
        index.add_versions([
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2559
                ('new', 'fulltext,no-eol', (None, 50, 60), []),
2560
                ('new2', 'fulltext', (None, 0, 6), []),
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2561
                ])
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2562
        self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2563
            sorted(self.caught_entries[0]))
2564
        self.assertEqual(1, len(self.caught_entries))
2565
2566
    def test_add_versions_delta_not_delta_index(self):
2567
        index = self.two_graph_index(catch_adds=True)
2568
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2569
            [('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2570
        self.assertEqual([], self.caught_entries)
2571
2572
    def test_add_versions_parents_not_parents_index(self):
2573
        index = self.two_graph_index(catch_adds=True)
2574
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2575
            [('new', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2576
        self.assertEqual([], self.caught_entries)
2577
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2578
    def test_add_versions_random_id_accepted(self):
2579
        index = self.two_graph_index(catch_adds=True)
2580
        index.add_versions([], random_id=True)
2581
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2582
    def test_add_versions_same_dup(self):
2583
        index = self.two_graph_index(catch_adds=True)
2584
        # options can be spelt two different ways
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2585
        index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2586
        index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2587
        # but neither should have added data.
2588
        self.assertEqual([[], []], self.caught_entries)
2589
        
2590
    def test_add_versions_different_dup(self):
2591
        index = self.two_graph_index(catch_adds=True)
2592
        # change options
2593
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2594
            [('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2595
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2596
            [('tip', 'line-delta,no-eol', (None, 0, 100), [])])
2597
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2598
            [('tip', 'fulltext', (None, 0, 100), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2599
        # position/length
2600
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2601
            [('tip', 'fulltext,no-eol', (None, 50, 100), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2602
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2603
            [('tip', 'fulltext,no-eol', (None, 0, 1000), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2604
        # parents
2605
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2606
            [('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2607
        # change options in the second record
2608
        self.assertRaises(errors.KnitCorrupt, index.add_versions,
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2609
            [('tip', 'fulltext,no-eol', (None, 0, 100), []),
2610
             ('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2625.8.1 by Robert Collins
LIBRARY API BREAKS:
2611
        self.assertEqual([], self.caught_entries)
2612
2613
    def test_iter_parents(self):
2614
        index = self.two_graph_index()
2615
        self.assertEqual(set([
2616
            ('tip', ()), ('tail', ()), ('parent', ()), ('separate', ())
2617
            ]),
2618
            set(index.iter_parents(['tip', 'tail', 'ghost', 'parent', 'separate'])))
2619
        self.assertEqual(set([('tip', ())]),
2620
            set(index.iter_parents(['tip'])))
2621
        self.assertEqual(set(),
2622
            set(index.iter_parents([])))