1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
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.
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.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Tests for Knit data structure"""
19
from cStringIO import StringIO
32
from bzrlib.errors import (
33
RevisionAlreadyPresent,
38
from bzrlib.index import *
39
from bzrlib.knit import (
45
_VFContentMapGenerator,
52
from bzrlib.repofmt import pack_repo
53
from bzrlib.tests import (
57
TestCaseWithMemoryTransport,
58
TestCaseWithTransport,
61
from bzrlib.transport import get_transport
62
from bzrlib.transport.memory import MemoryTransport
63
from bzrlib.tuned_gzip import GzipFile
64
from bzrlib.versionedfile import (
67
network_bytes_to_kind_and_offset,
68
RecordingVersionedFilesDecorator,
72
class _CompiledKnitFeature(Feature):
76
import bzrlib._knit_load_data_c
81
def feature_name(self):
82
return 'bzrlib._knit_load_data_c'
84
CompiledKnitFeature = _CompiledKnitFeature()
87
class KnitContentTestsMixin(object):
89
def test_constructor(self):
90
content = self._make_content([])
93
content = self._make_content([])
94
self.assertEqual(content.text(), [])
96
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
97
self.assertEqual(content.text(), ["text1", "text2"])
100
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
101
copy = content.copy()
102
self.assertIsInstance(copy, content.__class__)
103
self.assertEqual(copy.annotate(), content.annotate())
105
def assertDerivedBlocksEqual(self, source, target, noeol=False):
106
"""Assert that the derived matching blocks match real output"""
107
source_lines = source.splitlines(True)
108
target_lines = target.splitlines(True)
110
if noeol and not line.endswith('\n'):
114
source_content = self._make_content([(None, nl(l)) for l in source_lines])
115
target_content = self._make_content([(None, nl(l)) for l in target_lines])
116
line_delta = source_content.line_delta(target_content)
117
delta_blocks = list(KnitContent.get_line_delta_blocks(line_delta,
118
source_lines, target_lines))
119
matcher = KnitSequenceMatcher(None, source_lines, target_lines)
120
matcher_blocks = list(list(matcher.get_matching_blocks()))
121
self.assertEqual(matcher_blocks, delta_blocks)
123
def test_get_line_delta_blocks(self):
124
self.assertDerivedBlocksEqual('a\nb\nc\n', 'q\nc\n')
125
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1)
126
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1A)
127
self.assertDerivedBlocksEqual(TEXT_1, TEXT_1B)
128
self.assertDerivedBlocksEqual(TEXT_1B, TEXT_1A)
129
self.assertDerivedBlocksEqual(TEXT_1A, TEXT_1B)
130
self.assertDerivedBlocksEqual(TEXT_1A, '')
131
self.assertDerivedBlocksEqual('', TEXT_1A)
132
self.assertDerivedBlocksEqual('', '')
133
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd')
135
def test_get_line_delta_blocks_noeol(self):
136
"""Handle historical knit deltas safely
138
Some existing knit deltas don't consider the last line to differ
139
when the only difference whether it has a final newline.
141
New knit deltas appear to always consider the last line to differ
144
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\nd\n', noeol=True)
145
self.assertDerivedBlocksEqual('a\nb\nc\nd\n', 'a\nb\nc', noeol=True)
146
self.assertDerivedBlocksEqual('a\nb\nc\n', 'a\nb\nc', noeol=True)
147
self.assertDerivedBlocksEqual('a\nb\nc', 'a\nb\nc\n', noeol=True)
159
Banana cup cake recipe
169
Banana cup cake recipe
171
- bananas (do not use plantains!!!)
178
Banana cup cake recipe
195
class TestPlainKnitContent(TestCase, KnitContentTestsMixin):
197
def _make_content(self, lines):
198
annotated_content = AnnotatedKnitContent(lines)
199
return PlainKnitContent(annotated_content.text(), 'bogus')
201
def test_annotate(self):
202
content = self._make_content([])
203
self.assertEqual(content.annotate(), [])
205
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
206
self.assertEqual(content.annotate(),
207
[("bogus", "text1"), ("bogus", "text2")])
209
def test_line_delta(self):
210
content1 = self._make_content([("", "a"), ("", "b")])
211
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
212
self.assertEqual(content1.line_delta(content2),
213
[(1, 2, 2, ["a", "c"])])
215
def test_line_delta_iter(self):
216
content1 = self._make_content([("", "a"), ("", "b")])
217
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
218
it = content1.line_delta_iter(content2)
219
self.assertEqual(it.next(), (1, 2, 2, ["a", "c"]))
220
self.assertRaises(StopIteration, it.next)
223
class TestAnnotatedKnitContent(TestCase, KnitContentTestsMixin):
225
def _make_content(self, lines):
226
return AnnotatedKnitContent(lines)
228
def test_annotate(self):
229
content = self._make_content([])
230
self.assertEqual(content.annotate(), [])
232
content = self._make_content([("origin1", "text1"), ("origin2", "text2")])
233
self.assertEqual(content.annotate(),
234
[("origin1", "text1"), ("origin2", "text2")])
236
def test_line_delta(self):
237
content1 = self._make_content([("", "a"), ("", "b")])
238
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
239
self.assertEqual(content1.line_delta(content2),
240
[(1, 2, 2, [("", "a"), ("", "c")])])
242
def test_line_delta_iter(self):
243
content1 = self._make_content([("", "a"), ("", "b")])
244
content2 = self._make_content([("", "a"), ("", "a"), ("", "c")])
245
it = content1.line_delta_iter(content2)
246
self.assertEqual(it.next(), (1, 2, 2, [("", "a"), ("", "c")]))
247
self.assertRaises(StopIteration, it.next)
250
class MockTransport(object):
252
def __init__(self, file_lines=None):
253
self.file_lines = file_lines
255
# We have no base directory for the MockTransport
258
def get(self, filename):
259
if self.file_lines is None:
260
raise NoSuchFile(filename)
262
return StringIO("\n".join(self.file_lines))
264
def readv(self, relpath, offsets):
265
fp = self.get(relpath)
266
for offset, size in offsets:
268
yield offset, fp.read(size)
270
def __getattr__(self, name):
271
def queue_call(*args, **kwargs):
272
self.calls.append((name, args, kwargs))
276
class MockReadvFailingTransport(MockTransport):
277
"""Fail in the middle of a readv() result.
279
This Transport will successfully yield the first two requested hunks, but
280
raise NoSuchFile for the rest.
283
def readv(self, relpath, offsets):
285
for result in MockTransport.readv(self, relpath, offsets):
287
# we use 2 because the first offset is the pack header, the second
288
# is the first actual content requset
290
raise errors.NoSuchFile(relpath)
294
class KnitRecordAccessTestsMixin(object):
295
"""Tests for getting and putting knit records."""
297
def test_add_raw_records(self):
298
"""Add_raw_records adds records retrievable later."""
299
access = self.get_access()
300
memos = access.add_raw_records([('key', 10)], '1234567890')
301
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
303
def test_add_several_raw_records(self):
304
"""add_raw_records with many records and read some back."""
305
access = self.get_access()
306
memos = access.add_raw_records([('key', 10), ('key2', 2), ('key3', 5)],
308
self.assertEqual(['1234567890', '12', '34567'],
309
list(access.get_raw_records(memos)))
310
self.assertEqual(['1234567890'],
311
list(access.get_raw_records(memos[0:1])))
312
self.assertEqual(['12'],
313
list(access.get_raw_records(memos[1:2])))
314
self.assertEqual(['34567'],
315
list(access.get_raw_records(memos[2:3])))
316
self.assertEqual(['1234567890', '34567'],
317
list(access.get_raw_records(memos[0:1] + memos[2:3])))
320
class TestKnitKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
321
"""Tests for the .kndx implementation."""
323
def get_access(self):
324
"""Get a .knit style access instance."""
325
mapper = ConstantMapper("foo")
326
access = _KnitKeyAccess(self.get_transport(), mapper)
330
class _TestException(Exception):
331
"""Just an exception for local tests to use."""
334
class TestPackKnitAccess(TestCaseWithMemoryTransport, KnitRecordAccessTestsMixin):
335
"""Tests for the pack based access."""
337
def get_access(self):
338
return self._get_access()[0]
340
def _get_access(self, packname='packfile', index='FOO'):
341
transport = self.get_transport()
342
def write_data(bytes):
343
transport.append_bytes(packname, bytes)
344
writer = pack.ContainerWriter(write_data)
346
access = _DirectPackAccess({})
347
access.set_writer(writer, index, (transport, packname))
348
return access, writer
350
def make_pack_file(self):
351
"""Create a pack file with 2 records."""
352
access, writer = self._get_access(packname='packname', index='foo')
354
memos.extend(access.add_raw_records([('key1', 10)], '1234567890'))
355
memos.extend(access.add_raw_records([('key2', 5)], '12345'))
359
def make_vf_for_retrying(self):
360
"""Create 3 packs and a reload function.
362
Originally, 2 pack files will have the data, but one will be missing.
363
And then the third will be used in place of the first two if reload()
366
:return: (versioned_file, reload_counter)
367
versioned_file a KnitVersionedFiles using the packs for access
369
tree = self.make_branch_and_memory_tree('tree')
371
self.addCleanup(tree.branch.repository.unlock)
372
tree.add([''], ['root-id'])
373
tree.commit('one', rev_id='rev-1')
374
tree.commit('two', rev_id='rev-2')
375
tree.commit('three', rev_id='rev-3')
376
# Pack these three revisions into another pack file, but don't remove
378
repo = tree.branch.repository
379
collection = repo._pack_collection
380
collection.ensure_loaded()
381
orig_packs = collection.packs
382
packer = pack_repo.Packer(collection, orig_packs, '.testpack')
383
new_pack = packer.pack()
384
# forget about the new pack
387
vf = tree.branch.repository.revisions
389
# Set up a reload() function that switches to using the new pack file
390
new_index = new_pack.revision_index
391
access_tuple = new_pack.access_tuple()
392
reload_counter = [0, 0, 0]
394
reload_counter[0] += 1
395
if reload_counter[1] > 0:
396
# We already reloaded, nothing more to do
397
reload_counter[2] += 1
399
reload_counter[1] += 1
400
vf._index._graph_index._indices[:] = [new_index]
401
vf._access._indices.clear()
402
vf._access._indices[new_index] = access_tuple
404
# Delete one of the pack files so the data will need to be reloaded. We
405
# will delete the file with 'rev-2' in it
406
trans, name = orig_packs[1].access_tuple()
408
# We don't have the index trigger reloading because we want to test
409
# that we reload when the .pack disappears
410
vf._access._reload_func = reload
411
return vf, reload_counter
413
def make_reload_func(self, return_val=True):
416
reload_called[0] += 1
418
return reload_called, reload
420
def make_retry_exception(self):
421
# We raise a real exception so that sys.exc_info() is properly
424
raise _TestException('foobar')
425
except _TestException, e:
426
retry_exc = errors.RetryWithNewPacks(None, reload_occurred=False,
427
exc_info=sys.exc_info())
430
def test_read_from_several_packs(self):
431
access, writer = self._get_access()
433
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
435
access, writer = self._get_access('pack2', 'FOOBAR')
436
memos.extend(access.add_raw_records([('key', 5)], '12345'))
438
access, writer = self._get_access('pack3', 'BAZ')
439
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
441
transport = self.get_transport()
442
access = _DirectPackAccess({"FOO":(transport, 'packfile'),
443
"FOOBAR":(transport, 'pack2'),
444
"BAZ":(transport, 'pack3')})
445
self.assertEqual(['1234567890', '12345', 'alpha'],
446
list(access.get_raw_records(memos)))
447
self.assertEqual(['1234567890'],
448
list(access.get_raw_records(memos[0:1])))
449
self.assertEqual(['12345'],
450
list(access.get_raw_records(memos[1:2])))
451
self.assertEqual(['alpha'],
452
list(access.get_raw_records(memos[2:3])))
453
self.assertEqual(['1234567890', 'alpha'],
454
list(access.get_raw_records(memos[0:1] + memos[2:3])))
456
def test_set_writer(self):
457
"""The writer should be settable post construction."""
458
access = _DirectPackAccess({})
459
transport = self.get_transport()
460
packname = 'packfile'
462
def write_data(bytes):
463
transport.append_bytes(packname, bytes)
464
writer = pack.ContainerWriter(write_data)
466
access.set_writer(writer, index, (transport, packname))
467
memos = access.add_raw_records([('key', 10)], '1234567890')
469
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
471
def test_missing_index_raises_retry(self):
472
memos = self.make_pack_file()
473
transport = self.get_transport()
474
reload_called, reload_func = self.make_reload_func()
475
# Note that the index key has changed from 'foo' to 'bar'
476
access = _DirectPackAccess({'bar':(transport, 'packname')},
477
reload_func=reload_func)
478
e = self.assertListRaises(errors.RetryWithNewPacks,
479
access.get_raw_records, memos)
480
# Because a key was passed in which does not match our index list, we
481
# assume that the listing was already reloaded
482
self.assertTrue(e.reload_occurred)
483
self.assertIsInstance(e.exc_info, tuple)
484
self.assertIs(e.exc_info[0], KeyError)
485
self.assertIsInstance(e.exc_info[1], KeyError)
487
def test_missing_index_raises_key_error_with_no_reload(self):
488
memos = self.make_pack_file()
489
transport = self.get_transport()
490
# Note that the index key has changed from 'foo' to 'bar'
491
access = _DirectPackAccess({'bar':(transport, 'packname')})
492
e = self.assertListRaises(KeyError, access.get_raw_records, memos)
494
def test_missing_file_raises_retry(self):
495
memos = self.make_pack_file()
496
transport = self.get_transport()
497
reload_called, reload_func = self.make_reload_func()
498
# Note that the 'filename' has been changed to 'different-packname'
499
access = _DirectPackAccess({'foo':(transport, 'different-packname')},
500
reload_func=reload_func)
501
e = self.assertListRaises(errors.RetryWithNewPacks,
502
access.get_raw_records, memos)
503
# The file has gone missing, so we assume we need to reload
504
self.assertFalse(e.reload_occurred)
505
self.assertIsInstance(e.exc_info, tuple)
506
self.assertIs(e.exc_info[0], errors.NoSuchFile)
507
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
508
self.assertEqual('different-packname', e.exc_info[1].path)
510
def test_missing_file_raises_no_such_file_with_no_reload(self):
511
memos = self.make_pack_file()
512
transport = self.get_transport()
513
# Note that the 'filename' has been changed to 'different-packname'
514
access = _DirectPackAccess({'foo':(transport, 'different-packname')})
515
e = self.assertListRaises(errors.NoSuchFile,
516
access.get_raw_records, memos)
518
def test_failing_readv_raises_retry(self):
519
memos = self.make_pack_file()
520
transport = self.get_transport()
521
failing_transport = MockReadvFailingTransport(
522
[transport.get_bytes('packname')])
523
reload_called, reload_func = self.make_reload_func()
524
access = _DirectPackAccess({'foo':(failing_transport, 'packname')},
525
reload_func=reload_func)
526
# Asking for a single record will not trigger the Mock failure
527
self.assertEqual(['1234567890'],
528
list(access.get_raw_records(memos[:1])))
529
self.assertEqual(['12345'],
530
list(access.get_raw_records(memos[1:2])))
531
# A multiple offset readv() will fail mid-way through
532
e = self.assertListRaises(errors.RetryWithNewPacks,
533
access.get_raw_records, memos)
534
# The file has gone missing, so we assume we need to reload
535
self.assertFalse(e.reload_occurred)
536
self.assertIsInstance(e.exc_info, tuple)
537
self.assertIs(e.exc_info[0], errors.NoSuchFile)
538
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
539
self.assertEqual('packname', e.exc_info[1].path)
541
def test_failing_readv_raises_no_such_file_with_no_reload(self):
542
memos = self.make_pack_file()
543
transport = self.get_transport()
544
failing_transport = MockReadvFailingTransport(
545
[transport.get_bytes('packname')])
546
reload_called, reload_func = self.make_reload_func()
547
access = _DirectPackAccess({'foo':(failing_transport, 'packname')})
548
# Asking for a single record will not trigger the Mock failure
549
self.assertEqual(['1234567890'],
550
list(access.get_raw_records(memos[:1])))
551
self.assertEqual(['12345'],
552
list(access.get_raw_records(memos[1:2])))
553
# A multiple offset readv() will fail mid-way through
554
e = self.assertListRaises(errors.NoSuchFile,
555
access.get_raw_records, memos)
557
def test_reload_or_raise_no_reload(self):
558
access = _DirectPackAccess({}, reload_func=None)
559
retry_exc = self.make_retry_exception()
560
# Without a reload_func, we will just re-raise the original exception
561
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
563
def test_reload_or_raise_reload_changed(self):
564
reload_called, reload_func = self.make_reload_func(return_val=True)
565
access = _DirectPackAccess({}, reload_func=reload_func)
566
retry_exc = self.make_retry_exception()
567
access.reload_or_raise(retry_exc)
568
self.assertEqual([1], reload_called)
569
retry_exc.reload_occurred=True
570
access.reload_or_raise(retry_exc)
571
self.assertEqual([2], reload_called)
573
def test_reload_or_raise_reload_no_change(self):
574
reload_called, reload_func = self.make_reload_func(return_val=False)
575
access = _DirectPackAccess({}, reload_func=reload_func)
576
retry_exc = self.make_retry_exception()
577
# If reload_occurred is False, then we consider it an error to have
578
# reload_func() return False (no changes).
579
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
580
self.assertEqual([1], reload_called)
581
retry_exc.reload_occurred=True
582
# If reload_occurred is True, then we assume nothing changed because
583
# it had changed earlier, but didn't change again
584
access.reload_or_raise(retry_exc)
585
self.assertEqual([2], reload_called)
587
def test_annotate_retries(self):
588
vf, reload_counter = self.make_vf_for_retrying()
589
# It is a little bit bogus to annotate the Revision VF, but it works,
590
# as we have ancestry stored there
592
reload_lines = vf.annotate(key)
593
self.assertEqual([1, 1, 0], reload_counter)
594
plain_lines = vf.annotate(key)
595
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
596
if reload_lines != plain_lines:
597
self.fail('Annotation was not identical with reloading.')
598
# Now delete the packs-in-use, which should trigger another reload, but
599
# this time we just raise an exception because we can't recover
600
for trans, name in vf._access._indices.itervalues():
602
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
603
self.assertEqual([2, 1, 1], reload_counter)
605
def test__get_record_map_retries(self):
606
vf, reload_counter = self.make_vf_for_retrying()
607
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
608
records = vf._get_record_map(keys)
609
self.assertEqual(keys, sorted(records.keys()))
610
self.assertEqual([1, 1, 0], reload_counter)
611
# Now delete the packs-in-use, which should trigger another reload, but
612
# this time we just raise an exception because we can't recover
613
for trans, name in vf._access._indices.itervalues():
615
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
616
self.assertEqual([2, 1, 1], reload_counter)
618
def test_get_record_stream_retries(self):
619
vf, reload_counter = self.make_vf_for_retrying()
620
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
621
record_stream = vf.get_record_stream(keys, 'topological', False)
622
record = record_stream.next()
623
self.assertEqual(('rev-1',), record.key)
624
self.assertEqual([0, 0, 0], reload_counter)
625
record = record_stream.next()
626
self.assertEqual(('rev-2',), record.key)
627
self.assertEqual([1, 1, 0], reload_counter)
628
record = record_stream.next()
629
self.assertEqual(('rev-3',), record.key)
630
self.assertEqual([1, 1, 0], reload_counter)
631
# Now delete all pack files, and see that we raise the right error
632
for trans, name in vf._access._indices.itervalues():
634
self.assertListRaises(errors.NoSuchFile,
635
vf.get_record_stream, keys, 'topological', False)
637
def test_iter_lines_added_or_present_in_keys_retries(self):
638
vf, reload_counter = self.make_vf_for_retrying()
639
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
640
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
641
# result in random order (determined by the iteration order from a
642
# set()), so we don't have any solid way to trigger whether data is
643
# read before or after. However we tried to delete the middle node to
644
# exercise the code well.
645
# What we care about is that all lines are always yielded, but not
648
reload_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
649
self.assertEqual([1, 1, 0], reload_counter)
650
# Now do it again, to make sure the result is equivalent
651
plain_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
652
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
653
self.assertEqual(plain_lines, reload_lines)
654
self.assertEqual(21, len(plain_lines))
655
# Now delete all pack files, and see that we raise the right error
656
for trans, name in vf._access._indices.itervalues():
658
self.assertListRaises(errors.NoSuchFile,
659
vf.iter_lines_added_or_present_in_keys, keys)
660
self.assertEqual([2, 1, 1], reload_counter)
662
def test_get_record_stream_yields_disk_sorted_order(self):
663
# if we get 'unordered' pick a semi-optimal order for reading. The
664
# order should be grouped by pack file, and then by position in file
665
repo = self.make_repository('test', format='pack-0.92')
667
self.addCleanup(repo.unlock)
668
repo.start_write_group()
670
vf.add_lines(('f-id', 'rev-5'), [('f-id', 'rev-4')], ['lines\n'])
671
vf.add_lines(('f-id', 'rev-1'), [], ['lines\n'])
672
vf.add_lines(('f-id', 'rev-2'), [('f-id', 'rev-1')], ['lines\n'])
673
repo.commit_write_group()
674
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
676
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
677
('f-id', 'rev-2')], 'unordered', False)
678
keys = [r.key for r in stream]
679
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
680
('f-id', 'rev-2')], keys)
681
repo.start_write_group()
682
vf.add_lines(('f-id', 'rev-4'), [('f-id', 'rev-3')], ['lines\n'])
683
vf.add_lines(('f-id', 'rev-3'), [('f-id', 'rev-2')], ['lines\n'])
684
vf.add_lines(('f-id', 'rev-6'), [('f-id', 'rev-5')], ['lines\n'])
685
repo.commit_write_group()
686
# Request in random order, to make sure the output order isn't based on
688
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
689
stream = vf.get_record_stream(request_keys, 'unordered', False)
690
keys = [r.key for r in stream]
691
# We want to get the keys back in disk order, but it doesn't matter
692
# which pack we read from first. So this can come back in 2 orders
693
alt1 = [('f-id', 'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
694
alt2 = [('f-id', 'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
695
if keys != alt1 and keys != alt2:
696
self.fail('Returned key order did not match either expected order.'
697
' expected %s or %s, not %s'
698
% (alt1, alt2, keys))
701
class LowLevelKnitDataTests(TestCase):
703
def create_gz_content(self, text):
705
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
708
return sio.getvalue()
710
def make_multiple_records(self):
711
"""Create the content for multiple records."""
712
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
714
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
719
record_1 = (0, len(gz_txt), sha1sum)
720
total_txt.append(gz_txt)
721
sha1sum = osutils.sha('baz\n').hexdigest()
722
gz_txt = self.create_gz_content('version rev-id-2 1 %s\n'
726
record_2 = (record_1[1], len(gz_txt), sha1sum)
727
total_txt.append(gz_txt)
728
return total_txt, record_1, record_2
730
def test_valid_knit_data(self):
731
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
732
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
737
transport = MockTransport([gz_txt])
738
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
739
knit = KnitVersionedFiles(None, access)
740
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
742
contents = list(knit._read_records_iter(records))
743
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'],
744
'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
746
raw_contents = list(knit._read_records_iter_raw(records))
747
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
749
def test_multiple_records_valid(self):
750
total_txt, record_1, record_2 = self.make_multiple_records()
751
transport = MockTransport([''.join(total_txt)])
752
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
753
knit = KnitVersionedFiles(None, access)
754
records = [(('rev-id-1',), (('rev-id-1',), record_1[0], record_1[1])),
755
(('rev-id-2',), (('rev-id-2',), record_2[0], record_2[1]))]
757
contents = list(knit._read_records_iter(records))
758
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'], record_1[2]),
759
(('rev-id-2',), ['baz\n'], record_2[2])],
762
raw_contents = list(knit._read_records_iter_raw(records))
763
self.assertEqual([(('rev-id-1',), total_txt[0], record_1[2]),
764
(('rev-id-2',), total_txt[1], record_2[2])],
767
def test_not_enough_lines(self):
768
sha1sum = osutils.sha('foo\n').hexdigest()
769
# record says 2 lines data says 1
770
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
774
transport = MockTransport([gz_txt])
775
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
776
knit = KnitVersionedFiles(None, access)
777
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
778
self.assertRaises(errors.KnitCorrupt, list,
779
knit._read_records_iter(records))
781
# read_records_iter_raw won't detect that sort of mismatch/corruption
782
raw_contents = list(knit._read_records_iter_raw(records))
783
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
785
def test_too_many_lines(self):
786
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
787
# record says 1 lines data says 2
788
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
793
transport = MockTransport([gz_txt])
794
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
795
knit = KnitVersionedFiles(None, access)
796
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
797
self.assertRaises(errors.KnitCorrupt, list,
798
knit._read_records_iter(records))
800
# read_records_iter_raw won't detect that sort of mismatch/corruption
801
raw_contents = list(knit._read_records_iter_raw(records))
802
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
804
def test_mismatched_version_id(self):
805
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
806
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
811
transport = MockTransport([gz_txt])
812
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
813
knit = KnitVersionedFiles(None, access)
814
# We are asking for rev-id-2, but the data is rev-id-1
815
records = [(('rev-id-2',), (('rev-id-2',), 0, len(gz_txt)))]
816
self.assertRaises(errors.KnitCorrupt, list,
817
knit._read_records_iter(records))
819
# read_records_iter_raw detects mismatches in the header
820
self.assertRaises(errors.KnitCorrupt, list,
821
knit._read_records_iter_raw(records))
823
def test_uncompressed_data(self):
824
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
825
txt = ('version rev-id-1 2 %s\n'
830
transport = MockTransport([txt])
831
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
832
knit = KnitVersionedFiles(None, access)
833
records = [(('rev-id-1',), (('rev-id-1',), 0, len(txt)))]
835
# We don't have valid gzip data ==> corrupt
836
self.assertRaises(errors.KnitCorrupt, list,
837
knit._read_records_iter(records))
839
# read_records_iter_raw will notice the bad data
840
self.assertRaises(errors.KnitCorrupt, list,
841
knit._read_records_iter_raw(records))
843
def test_corrupted_data(self):
844
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
845
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
850
# Change 2 bytes in the middle to \xff
851
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
852
transport = MockTransport([gz_txt])
853
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
854
knit = KnitVersionedFiles(None, access)
855
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
856
self.assertRaises(errors.KnitCorrupt, list,
857
knit._read_records_iter(records))
858
# read_records_iter_raw will barf on bad gz data
859
self.assertRaises(errors.KnitCorrupt, list,
860
knit._read_records_iter_raw(records))
863
class LowLevelKnitIndexTests(TestCase):
865
def get_knit_index(self, transport, name, mode):
866
mapper = ConstantMapper(name)
867
orig = knit._load_data
869
knit._load_data = orig
870
self.addCleanup(reset)
871
from bzrlib._knit_load_data_py import _load_data_py
872
knit._load_data = _load_data_py
873
allow_writes = lambda: 'w' in mode
874
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
876
def test_create_file(self):
877
transport = MockTransport()
878
index = self.get_knit_index(transport, "filename", "w")
880
call = transport.calls.pop(0)
881
# call[1][1] is a StringIO - we can't test it by simple equality.
882
self.assertEqual('put_file_non_atomic', call[0])
883
self.assertEqual('filename.kndx', call[1][0])
884
# With no history, _KndxIndex writes a new index:
885
self.assertEqual(_KndxIndex.HEADER,
886
call[1][1].getvalue())
887
self.assertEqual({'create_parent_dir': True}, call[2])
889
def test_read_utf8_version_id(self):
890
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
891
utf8_revision_id = unicode_revision_id.encode('utf-8')
892
transport = MockTransport([
894
'%s option 0 1 :' % (utf8_revision_id,)
896
index = self.get_knit_index(transport, "filename", "r")
897
# _KndxIndex is a private class, and deals in utf8 revision_ids, not
898
# Unicode revision_ids.
899
self.assertEqual({(utf8_revision_id,):()},
900
index.get_parent_map(index.keys()))
901
self.assertFalse((unicode_revision_id,) in index.keys())
903
def test_read_utf8_parents(self):
904
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
905
utf8_revision_id = unicode_revision_id.encode('utf-8')
906
transport = MockTransport([
908
"version option 0 1 .%s :" % (utf8_revision_id,)
910
index = self.get_knit_index(transport, "filename", "r")
911
self.assertEqual({("version",):((utf8_revision_id,),)},
912
index.get_parent_map(index.keys()))
914
def test_read_ignore_corrupted_lines(self):
915
transport = MockTransport([
918
"corrupted options 0 1 .b .c ",
919
"version options 0 1 :"
921
index = self.get_knit_index(transport, "filename", "r")
922
self.assertEqual(1, len(index.keys()))
923
self.assertEqual(set([("version",)]), index.keys())
925
def test_read_corrupted_header(self):
926
transport = MockTransport(['not a bzr knit index header\n'])
927
index = self.get_knit_index(transport, "filename", "r")
928
self.assertRaises(KnitHeaderError, index.keys)
930
def test_read_duplicate_entries(self):
931
transport = MockTransport([
933
"parent options 0 1 :",
934
"version options1 0 1 0 :",
935
"version options2 1 2 .other :",
936
"version options3 3 4 0 .other :"
938
index = self.get_knit_index(transport, "filename", "r")
939
self.assertEqual(2, len(index.keys()))
940
# check that the index used is the first one written. (Specific
941
# to KnitIndex style indices.
942
self.assertEqual("1", index._dictionary_compress([("version",)]))
943
self.assertEqual((("version",), 3, 4), index.get_position(("version",)))
944
self.assertEqual(["options3"], index.get_options(("version",)))
945
self.assertEqual({("version",):(("parent",), ("other",))},
946
index.get_parent_map([("version",)]))
948
def test_read_compressed_parents(self):
949
transport = MockTransport([
953
"c option 0 1 1 0 :",
955
index = self.get_knit_index(transport, "filename", "r")
956
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
957
index.get_parent_map([("b",), ("c",)]))
959
def test_write_utf8_version_id(self):
960
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
961
utf8_revision_id = unicode_revision_id.encode('utf-8')
962
transport = MockTransport([
965
index = self.get_knit_index(transport, "filename", "r")
967
((utf8_revision_id,), ["option"], ((utf8_revision_id,), 0, 1), [])])
968
call = transport.calls.pop(0)
969
# call[1][1] is a StringIO - we can't test it by simple equality.
970
self.assertEqual('put_file_non_atomic', call[0])
971
self.assertEqual('filename.kndx', call[1][0])
972
# With no history, _KndxIndex writes a new index:
973
self.assertEqual(_KndxIndex.HEADER +
974
"\n%s option 0 1 :" % (utf8_revision_id,),
975
call[1][1].getvalue())
976
self.assertEqual({'create_parent_dir': True}, call[2])
978
def test_write_utf8_parents(self):
979
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
980
utf8_revision_id = unicode_revision_id.encode('utf-8')
981
transport = MockTransport([
984
index = self.get_knit_index(transport, "filename", "r")
986
(("version",), ["option"], (("version",), 0, 1), [(utf8_revision_id,)])])
987
call = transport.calls.pop(0)
988
# call[1][1] is a StringIO - we can't test it by simple equality.
989
self.assertEqual('put_file_non_atomic', call[0])
990
self.assertEqual('filename.kndx', call[1][0])
991
# With no history, _KndxIndex writes a new index:
992
self.assertEqual(_KndxIndex.HEADER +
993
"\nversion option 0 1 .%s :" % (utf8_revision_id,),
994
call[1][1].getvalue())
995
self.assertEqual({'create_parent_dir': True}, call[2])
998
transport = MockTransport([
1001
index = self.get_knit_index(transport, "filename", "r")
1003
self.assertEqual(set(), index.keys())
1005
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1006
self.assertEqual(set([("a",)]), index.keys())
1008
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1009
self.assertEqual(set([("a",)]), index.keys())
1011
index.add_records([(("b",), ["option"], (("b",), 0, 1), [])])
1012
self.assertEqual(set([("a",), ("b",)]), index.keys())
1014
def add_a_b(self, index, random_id=None):
1016
if random_id is not None:
1017
kwargs["random_id"] = random_id
1019
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1020
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1021
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1024
def assertIndexIsAB(self, index):
1029
index.get_parent_map(index.keys()))
1030
self.assertEqual((("a",), 1, 2), index.get_position(("a",)))
1031
self.assertEqual((("b",), 2, 3), index.get_position(("b",)))
1032
self.assertEqual(["opt"], index.get_options(("a",)))
1034
def test_add_versions(self):
1035
transport = MockTransport([
1038
index = self.get_knit_index(transport, "filename", "r")
1041
call = transport.calls.pop(0)
1042
# call[1][1] is a StringIO - we can't test it by simple equality.
1043
self.assertEqual('put_file_non_atomic', call[0])
1044
self.assertEqual('filename.kndx', call[1][0])
1045
# With no history, _KndxIndex writes a new index:
1048
"\na option 0 1 .b :"
1050
"\nb option 2 3 0 :",
1051
call[1][1].getvalue())
1052
self.assertEqual({'create_parent_dir': True}, call[2])
1053
self.assertIndexIsAB(index)
1055
def test_add_versions_random_id_is_accepted(self):
1056
transport = MockTransport([
1059
index = self.get_knit_index(transport, "filename", "r")
1060
self.add_a_b(index, random_id=True)
1062
def test_delay_create_and_add_versions(self):
1063
transport = MockTransport()
1065
index = self.get_knit_index(transport, "filename", "w")
1067
self.assertEqual([], transport.calls)
1070
#[ {"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
1072
# Two calls: one during which we load the existing index (and when its
1073
# missing create it), then a second where we write the contents out.
1074
self.assertEqual(2, len(transport.calls))
1075
call = transport.calls.pop(0)
1076
self.assertEqual('put_file_non_atomic', call[0])
1077
self.assertEqual('filename.kndx', call[1][0])
1078
# With no history, _KndxIndex writes a new index:
1079
self.assertEqual(_KndxIndex.HEADER, call[1][1].getvalue())
1080
self.assertEqual({'create_parent_dir': True}, call[2])
1081
call = transport.calls.pop(0)
1082
# call[1][1] is a StringIO - we can't test it by simple equality.
1083
self.assertEqual('put_file_non_atomic', call[0])
1084
self.assertEqual('filename.kndx', call[1][0])
1085
# With no history, _KndxIndex writes a new index:
1088
"\na option 0 1 .b :"
1090
"\nb option 2 3 0 :",
1091
call[1][1].getvalue())
1092
self.assertEqual({'create_parent_dir': True}, call[2])
1094
def assertTotalBuildSize(self, size, keys, positions):
1095
self.assertEqual(size,
1096
knit._get_total_build_size(None, keys, positions))
1098
def test__get_total_build_size(self):
1100
('a',): (('fulltext', False), (('a',), 0, 100), None),
1101
('b',): (('line-delta', False), (('b',), 100, 21), ('a',)),
1102
('c',): (('line-delta', False), (('c',), 121, 35), ('b',)),
1103
('d',): (('line-delta', False), (('d',), 156, 12), ('b',)),
1105
self.assertTotalBuildSize(100, [('a',)], positions)
1106
self.assertTotalBuildSize(121, [('b',)], positions)
1107
# c needs both a & b
1108
self.assertTotalBuildSize(156, [('c',)], positions)
1109
# we shouldn't count 'b' twice
1110
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1111
self.assertTotalBuildSize(133, [('d',)], positions)
1112
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
1114
def test_get_position(self):
1115
transport = MockTransport([
1120
index = self.get_knit_index(transport, "filename", "r")
1122
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1123
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
1125
def test_get_method(self):
1126
transport = MockTransport([
1128
"a fulltext,unknown 0 1 :",
1129
"b unknown,line-delta 1 2 :",
1132
index = self.get_knit_index(transport, "filename", "r")
1134
self.assertEqual("fulltext", index.get_method("a"))
1135
self.assertEqual("line-delta", index.get_method("b"))
1136
self.assertRaises(errors.KnitIndexUnknownMethod, index.get_method, "c")
1138
def test_get_options(self):
1139
transport = MockTransport([
1144
index = self.get_knit_index(transport, "filename", "r")
1146
self.assertEqual(["opt1"], index.get_options("a"))
1147
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
1149
def test_get_parent_map(self):
1150
transport = MockTransport([
1153
"b option 1 2 0 .c :",
1154
"c option 1 2 1 0 .e :"
1156
index = self.get_knit_index(transport, "filename", "r")
1160
("b",):(("a",), ("c",)),
1161
("c",):(("b",), ("a",), ("e",)),
1162
}, index.get_parent_map(index.keys()))
1164
def test_impossible_parent(self):
1165
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1166
transport = MockTransport([
1169
"b option 0 1 4 :" # We don't have a 4th record
1171
index = self.get_knit_index(transport, 'filename', 'r')
1173
self.assertRaises(errors.KnitCorrupt, index.keys)
1174
except TypeError, e:
1175
if (str(e) == ('exceptions must be strings, classes, or instances,'
1176
' not exceptions.IndexError')
1177
and sys.version_info[0:2] >= (2,5)):
1178
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1179
' raising new style exceptions with python'
1184
def test_corrupted_parent(self):
1185
transport = MockTransport([
1189
"c option 0 1 1v :", # Can't have a parent of '1v'
1191
index = self.get_knit_index(transport, 'filename', 'r')
1193
self.assertRaises(errors.KnitCorrupt, index.keys)
1194
except TypeError, e:
1195
if (str(e) == ('exceptions must be strings, classes, or instances,'
1196
' not exceptions.ValueError')
1197
and sys.version_info[0:2] >= (2,5)):
1198
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1199
' raising new style exceptions with python'
1204
def test_corrupted_parent_in_list(self):
1205
transport = MockTransport([
1209
"c option 0 1 1 v :", # Can't have a parent of 'v'
1211
index = self.get_knit_index(transport, 'filename', 'r')
1213
self.assertRaises(errors.KnitCorrupt, index.keys)
1214
except TypeError, e:
1215
if (str(e) == ('exceptions must be strings, classes, or instances,'
1216
' not exceptions.ValueError')
1217
and sys.version_info[0:2] >= (2,5)):
1218
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1219
' raising new style exceptions with python'
1224
def test_invalid_position(self):
1225
transport = MockTransport([
1229
index = self.get_knit_index(transport, 'filename', 'r')
1231
self.assertRaises(errors.KnitCorrupt, index.keys)
1232
except TypeError, e:
1233
if (str(e) == ('exceptions must be strings, classes, or instances,'
1234
' not exceptions.ValueError')
1235
and sys.version_info[0:2] >= (2,5)):
1236
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1237
' raising new style exceptions with python'
1242
def test_invalid_size(self):
1243
transport = MockTransport([
1247
index = self.get_knit_index(transport, 'filename', 'r')
1249
self.assertRaises(errors.KnitCorrupt, index.keys)
1250
except TypeError, e:
1251
if (str(e) == ('exceptions must be strings, classes, or instances,'
1252
' not exceptions.ValueError')
1253
and sys.version_info[0:2] >= (2,5)):
1254
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1255
' raising new style exceptions with python'
1260
def test_scan_unvalidated_index_not_implemented(self):
1261
transport = MockTransport()
1262
index = self.get_knit_index(transport, 'filename', 'r')
1264
NotImplementedError, index.scan_unvalidated_index,
1265
'dummy graph_index')
1267
NotImplementedError, index.get_missing_compression_parents)
1269
def test_short_line(self):
1270
transport = MockTransport([
1273
"b option 10 10 0", # This line isn't terminated, ignored
1275
index = self.get_knit_index(transport, "filename", "r")
1276
self.assertEqual(set([('a',)]), index.keys())
1278
def test_skip_incomplete_record(self):
1279
# A line with bogus data should just be skipped
1280
transport = MockTransport([
1283
"b option 10 10 0", # This line isn't terminated, ignored
1284
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1286
index = self.get_knit_index(transport, "filename", "r")
1287
self.assertEqual(set([('a',), ('c',)]), index.keys())
1289
def test_trailing_characters(self):
1290
# A line with bogus data should just be skipped
1291
transport = MockTransport([
1294
"b option 10 10 0 :a", # This line has extra trailing characters
1295
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1297
index = self.get_knit_index(transport, "filename", "r")
1298
self.assertEqual(set([('a',), ('c',)]), index.keys())
1301
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1303
_test_needs_features = [CompiledKnitFeature]
1305
def get_knit_index(self, transport, name, mode):
1306
mapper = ConstantMapper(name)
1307
orig = knit._load_data
1309
knit._load_data = orig
1310
self.addCleanup(reset)
1311
from bzrlib._knit_load_data_c import _load_data_c
1312
knit._load_data = _load_data_c
1313
allow_writes = lambda: mode == 'w'
1314
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
1317
class KnitTests(TestCaseWithTransport):
1318
"""Class containing knit test helper routines."""
1320
def make_test_knit(self, annotate=False, name='test'):
1321
mapper = ConstantMapper(name)
1322
return make_file_factory(annotate, mapper)(self.get_transport())
1325
class TestBadShaError(KnitTests):
1326
"""Tests for handling of sha errors."""
1328
def test_sha_exception_has_text(self):
1329
# having the failed text included in the error allows for recovery.
1330
source = self.make_test_knit()
1331
target = self.make_test_knit(name="target")
1332
if not source._max_delta_chain:
1333
raise TestNotApplicable(
1334
"cannot get delta-caused sha failures without deltas.")
1337
broken = ('broken',)
1338
source.add_lines(basis, (), ['foo\n'])
1339
source.add_lines(broken, (basis,), ['foo\n', 'bar\n'])
1340
# Seed target with a bad basis text
1341
target.add_lines(basis, (), ['gam\n'])
1342
target.insert_record_stream(
1343
source.get_record_stream([broken], 'unordered', False))
1344
err = self.assertRaises(errors.KnitCorrupt,
1345
target.get_record_stream([broken], 'unordered', True
1346
).next().get_bytes_as, 'chunked')
1347
self.assertEqual(['gam\n', 'bar\n'], err.content)
1348
# Test for formatting with live data
1349
self.assertStartsWith(str(err), "Knit ")
1352
class TestKnitIndex(KnitTests):
1354
def test_add_versions_dictionary_compresses(self):
1355
"""Adding versions to the index should update the lookup dict"""
1356
knit = self.make_test_knit()
1358
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1359
self.check_file_contents('test.kndx',
1360
'# bzr knit index 8\n'
1362
'a-1 fulltext 0 0 :'
1365
(('a-2',), ['fulltext'], (('a-2',), 0, 0), [('a-1',)]),
1366
(('a-3',), ['fulltext'], (('a-3',), 0, 0), [('a-2',)]),
1368
self.check_file_contents('test.kndx',
1369
'# bzr knit index 8\n'
1371
'a-1 fulltext 0 0 :\n'
1372
'a-2 fulltext 0 0 0 :\n'
1373
'a-3 fulltext 0 0 1 :'
1375
self.assertEqual(set([('a-3',), ('a-1',), ('a-2',)]), idx.keys())
1377
('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False)),
1378
('a-2',): ((('a-2',), 0, 0), None, (('a-1',),), ('fulltext', False)),
1379
('a-3',): ((('a-3',), 0, 0), None, (('a-2',),), ('fulltext', False)),
1380
}, idx.get_build_details(idx.keys()))
1381
self.assertEqual({('a-1',):(),
1382
('a-2',):(('a-1',),),
1383
('a-3',):(('a-2',),),},
1384
idx.get_parent_map(idx.keys()))
1386
def test_add_versions_fails_clean(self):
1387
"""If add_versions fails in the middle, it restores a pristine state.
1389
Any modifications that are made to the index are reset if all versions
1392
# This cheats a little bit by passing in a generator which will
1393
# raise an exception before the processing finishes
1394
# Other possibilities would be to have an version with the wrong number
1395
# of entries, or to make the backing transport unable to write any
1398
knit = self.make_test_knit()
1400
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1402
class StopEarly(Exception):
1405
def generate_failure():
1406
"""Add some entries and then raise an exception"""
1407
yield (('a-2',), ['fulltext'], (None, 0, 0), ('a-1',))
1408
yield (('a-3',), ['fulltext'], (None, 0, 0), ('a-2',))
1411
# Assert the pre-condition
1413
self.assertEqual(set([('a-1',)]), set(idx.keys()))
1415
{('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False))},
1416
idx.get_build_details([('a-1',)]))
1417
self.assertEqual({('a-1',):()}, idx.get_parent_map(idx.keys()))
1420
self.assertRaises(StopEarly, idx.add_records, generate_failure())
1421
# And it shouldn't be modified
1424
def test_knit_index_ignores_empty_files(self):
1425
# There was a race condition in older bzr, where a ^C at the right time
1426
# could leave an empty .kndx file, which bzr would later claim was a
1427
# corrupted file since the header was not present. In reality, the file
1428
# just wasn't created, so it should be ignored.
1429
t = get_transport('.')
1430
t.put_bytes('test.kndx', '')
1432
knit = self.make_test_knit()
1434
def test_knit_index_checks_header(self):
1435
t = get_transport('.')
1436
t.put_bytes('test.kndx', '# not really a knit header\n\n')
1437
k = self.make_test_knit()
1438
self.assertRaises(KnitHeaderError, k.keys)
1441
class TestGraphIndexKnit(KnitTests):
1442
"""Tests for knits using a GraphIndex rather than a KnitIndex."""
1444
def make_g_index(self, name, ref_lists=0, nodes=[]):
1445
builder = GraphIndexBuilder(ref_lists)
1446
for node, references, value in nodes:
1447
builder.add_node(node, references, value)
1448
stream = builder.finish()
1449
trans = self.get_transport()
1450
size = trans.put_file(name, stream)
1451
return GraphIndex(trans, name, size)
1453
def two_graph_index(self, deltas=False, catch_adds=False):
1454
"""Build a two-graph index.
1456
:param deltas: If true, use underlying indices with two node-ref
1457
lists and 'parent' set to a delta-compressed against tail.
1459
# build a complex graph across several indices.
1461
# delta compression inn the index
1462
index1 = self.make_g_index('1', 2, [
1463
(('tip', ), 'N0 100', ([('parent', )], [], )),
1464
(('tail', ), '', ([], []))])
1465
index2 = self.make_g_index('2', 2, [
1466
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1467
(('separate', ), '', ([], []))])
1469
# just blob location and graph in the index.
1470
index1 = self.make_g_index('1', 1, [
1471
(('tip', ), 'N0 100', ([('parent', )], )),
1472
(('tail', ), '', ([], ))])
1473
index2 = self.make_g_index('2', 1, [
1474
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1475
(('separate', ), '', ([], ))])
1476
combined_index = CombinedGraphIndex([index1, index2])
1478
self.combined_index = combined_index
1479
self.caught_entries = []
1480
add_callback = self.catch_add
1483
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
1484
add_callback=add_callback)
1486
def test_keys(self):
1487
index = self.two_graph_index()
1488
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1491
def test_get_position(self):
1492
index = self.two_graph_index()
1493
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position(('tip',)))
1494
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position(('parent',)))
1496
def test_get_method_deltas(self):
1497
index = self.two_graph_index(deltas=True)
1498
self.assertEqual('fulltext', index.get_method(('tip',)))
1499
self.assertEqual('line-delta', index.get_method(('parent',)))
1501
def test_get_method_no_deltas(self):
1502
# check that the parent-history lookup is ignored with deltas=False.
1503
index = self.two_graph_index(deltas=False)
1504
self.assertEqual('fulltext', index.get_method(('tip',)))
1505
self.assertEqual('fulltext', index.get_method(('parent',)))
1507
def test_get_options_deltas(self):
1508
index = self.two_graph_index(deltas=True)
1509
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1510
self.assertEqual(['line-delta'], index.get_options(('parent',)))
1512
def test_get_options_no_deltas(self):
1513
# check that the parent-history lookup is ignored with deltas=False.
1514
index = self.two_graph_index(deltas=False)
1515
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1516
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1518
def test_get_parent_map(self):
1519
index = self.two_graph_index()
1520
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1521
index.get_parent_map([('parent',), ('ghost',)]))
1523
def catch_add(self, entries):
1524
self.caught_entries.append(entries)
1526
def test_add_no_callback_errors(self):
1527
index = self.two_graph_index()
1528
self.assertRaises(errors.ReadOnlyError, index.add_records,
1529
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1531
def test_add_version_smoke(self):
1532
index = self.two_graph_index(catch_adds=True)
1533
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1535
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1536
self.caught_entries)
1538
def test_add_version_delta_not_delta_index(self):
1539
index = self.two_graph_index(catch_adds=True)
1540
self.assertRaises(errors.KnitCorrupt, index.add_records,
1541
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1542
self.assertEqual([], self.caught_entries)
1544
def test_add_version_same_dup(self):
1545
index = self.two_graph_index(catch_adds=True)
1546
# options can be spelt two different ways
1547
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1548
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1549
# position/length are ignored (because each pack could have fulltext or
1550
# delta, and be at a different position.
1551
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1553
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1555
# but neither should have added data:
1556
self.assertEqual([[], [], [], []], self.caught_entries)
1558
def test_add_version_different_dup(self):
1559
index = self.two_graph_index(deltas=True, catch_adds=True)
1561
self.assertRaises(errors.KnitCorrupt, index.add_records,
1562
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1563
self.assertRaises(errors.KnitCorrupt, index.add_records,
1564
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1566
self.assertRaises(errors.KnitCorrupt, index.add_records,
1567
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1568
self.assertEqual([], self.caught_entries)
1570
def test_add_versions_nodeltas(self):
1571
index = self.two_graph_index(catch_adds=True)
1573
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1574
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1576
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1577
(('new2', ), ' 0 6', ((('new',),),))],
1578
sorted(self.caught_entries[0]))
1579
self.assertEqual(1, len(self.caught_entries))
1581
def test_add_versions_deltas(self):
1582
index = self.two_graph_index(deltas=True, catch_adds=True)
1584
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1585
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1587
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1588
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1589
sorted(self.caught_entries[0]))
1590
self.assertEqual(1, len(self.caught_entries))
1592
def test_add_versions_delta_not_delta_index(self):
1593
index = self.two_graph_index(catch_adds=True)
1594
self.assertRaises(errors.KnitCorrupt, index.add_records,
1595
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1596
self.assertEqual([], self.caught_entries)
1598
def test_add_versions_random_id_accepted(self):
1599
index = self.two_graph_index(catch_adds=True)
1600
index.add_records([], random_id=True)
1602
def test_add_versions_same_dup(self):
1603
index = self.two_graph_index(catch_adds=True)
1604
# options can be spelt two different ways
1605
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100),
1607
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100),
1609
# position/length are ignored (because each pack could have fulltext or
1610
# delta, and be at a different position.
1611
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1613
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1615
# but neither should have added data.
1616
self.assertEqual([[], [], [], []], self.caught_entries)
1618
def test_add_versions_different_dup(self):
1619
index = self.two_graph_index(deltas=True, catch_adds=True)
1621
self.assertRaises(errors.KnitCorrupt, index.add_records,
1622
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1623
self.assertRaises(errors.KnitCorrupt, index.add_records,
1624
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
1626
self.assertRaises(errors.KnitCorrupt, index.add_records,
1627
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1628
# change options in the second record
1629
self.assertRaises(errors.KnitCorrupt, index.add_records,
1630
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1631
(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1632
self.assertEqual([], self.caught_entries)
1634
def make_g_index_missing_compression_parent(self):
1635
graph_index = self.make_g_index('missing_comp', 2,
1636
[(('tip', ), ' 100 78',
1637
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1640
def make_g_index_missing_parent(self):
1641
graph_index = self.make_g_index('missing_parent', 2,
1642
[(('parent', ), ' 100 78', ([], [])),
1643
(('tip', ), ' 100 78',
1644
([('parent', ), ('missing-parent', )], [('parent', )])),
1648
def make_g_index_no_external_refs(self):
1649
graph_index = self.make_g_index('no_external_refs', 2,
1650
[(('rev', ), ' 100 78',
1651
([('parent', ), ('ghost', )], []))])
1654
def test_add_good_unvalidated_index(self):
1655
unvalidated = self.make_g_index_no_external_refs()
1656
combined = CombinedGraphIndex([unvalidated])
1657
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1658
index.scan_unvalidated_index(unvalidated)
1659
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1661
def test_add_missing_compression_parent_unvalidated_index(self):
1662
unvalidated = self.make_g_index_missing_compression_parent()
1663
combined = CombinedGraphIndex([unvalidated])
1664
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1665
index.scan_unvalidated_index(unvalidated)
1666
# This also checks that its only the compression parent that is
1667
# examined, otherwise 'ghost' would also be reported as a missing
1670
frozenset([('missing-parent',)]),
1671
index.get_missing_compression_parents())
1673
def test_add_missing_noncompression_parent_unvalidated_index(self):
1674
unvalidated = self.make_g_index_missing_parent()
1675
combined = CombinedGraphIndex([unvalidated])
1676
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1677
track_external_parent_refs=True)
1678
index.scan_unvalidated_index(unvalidated)
1680
frozenset([('missing-parent',)]), index.get_missing_parents())
1682
def test_track_external_parent_refs(self):
1683
g_index = self.make_g_index('empty', 2, [])
1684
combined = CombinedGraphIndex([g_index])
1685
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1686
add_callback=self.catch_add, track_external_parent_refs=True)
1687
self.caught_entries = []
1689
(('new-key',), 'fulltext,no-eol', (None, 50, 60),
1690
[('parent-1',), ('parent-2',)])])
1692
frozenset([('parent-1',), ('parent-2',)]),
1693
index.get_missing_parents())
1695
def test_add_unvalidated_index_with_present_external_references(self):
1696
index = self.two_graph_index(deltas=True)
1697
# Ugly hack to get at one of the underlying GraphIndex objects that
1698
# two_graph_index built.
1699
unvalidated = index._graph_index._indices[1]
1700
# 'parent' is an external ref of _indices[1] (unvalidated), but is
1701
# present in _indices[0].
1702
index.scan_unvalidated_index(unvalidated)
1703
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1705
def make_new_missing_parent_g_index(self, name):
1706
missing_parent = name + '-missing-parent'
1707
graph_index = self.make_g_index(name, 2,
1708
[((name + 'tip', ), ' 100 78',
1709
([(missing_parent, ), ('ghost', )], [(missing_parent, )]))])
1712
def test_add_mulitiple_unvalidated_indices_with_missing_parents(self):
1713
g_index_1 = self.make_new_missing_parent_g_index('one')
1714
g_index_2 = self.make_new_missing_parent_g_index('two')
1715
combined = CombinedGraphIndex([g_index_1, g_index_2])
1716
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1717
index.scan_unvalidated_index(g_index_1)
1718
index.scan_unvalidated_index(g_index_2)
1720
frozenset([('one-missing-parent',), ('two-missing-parent',)]),
1721
index.get_missing_compression_parents())
1723
def test_add_mulitiple_unvalidated_indices_with_mutual_dependencies(self):
1724
graph_index_a = self.make_g_index('one', 2,
1725
[(('parent-one', ), ' 100 78', ([('non-compression-parent',)], [])),
1726
(('child-of-two', ), ' 100 78',
1727
([('parent-two',)], [('parent-two',)]))])
1728
graph_index_b = self.make_g_index('two', 2,
1729
[(('parent-two', ), ' 100 78', ([('non-compression-parent',)], [])),
1730
(('child-of-one', ), ' 100 78',
1731
([('parent-one',)], [('parent-one',)]))])
1732
combined = CombinedGraphIndex([graph_index_a, graph_index_b])
1733
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1734
index.scan_unvalidated_index(graph_index_a)
1735
index.scan_unvalidated_index(graph_index_b)
1737
frozenset([]), index.get_missing_compression_parents())
1740
class TestNoParentsGraphIndexKnit(KnitTests):
1741
"""Tests for knits using _KnitGraphIndex with no parents."""
1743
def make_g_index(self, name, ref_lists=0, nodes=[]):
1744
builder = GraphIndexBuilder(ref_lists)
1745
for node, references in nodes:
1746
builder.add_node(node, references)
1747
stream = builder.finish()
1748
trans = self.get_transport()
1749
size = trans.put_file(name, stream)
1750
return GraphIndex(trans, name, size)
1752
def test_add_good_unvalidated_index(self):
1753
unvalidated = self.make_g_index('unvalidated')
1754
combined = CombinedGraphIndex([unvalidated])
1755
index = _KnitGraphIndex(combined, lambda: True, parents=False)
1756
index.scan_unvalidated_index(unvalidated)
1757
self.assertEqual(frozenset(),
1758
index.get_missing_compression_parents())
1760
def test_parents_deltas_incompatible(self):
1761
index = CombinedGraphIndex([])
1762
self.assertRaises(errors.KnitError, _KnitGraphIndex, lambda:True,
1763
index, deltas=True, parents=False)
1765
def two_graph_index(self, catch_adds=False):
1766
"""Build a two-graph index.
1768
:param deltas: If true, use underlying indices with two node-ref
1769
lists and 'parent' set to a delta-compressed against tail.
1771
# put several versions in the index.
1772
index1 = self.make_g_index('1', 0, [
1773
(('tip', ), 'N0 100'),
1775
index2 = self.make_g_index('2', 0, [
1776
(('parent', ), ' 100 78'),
1777
(('separate', ), '')])
1778
combined_index = CombinedGraphIndex([index1, index2])
1780
self.combined_index = combined_index
1781
self.caught_entries = []
1782
add_callback = self.catch_add
1785
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
1786
add_callback=add_callback)
1788
def test_keys(self):
1789
index = self.two_graph_index()
1790
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1793
def test_get_position(self):
1794
index = self.two_graph_index()
1795
self.assertEqual((index._graph_index._indices[0], 0, 100),
1796
index.get_position(('tip',)))
1797
self.assertEqual((index._graph_index._indices[1], 100, 78),
1798
index.get_position(('parent',)))
1800
def test_get_method(self):
1801
index = self.two_graph_index()
1802
self.assertEqual('fulltext', index.get_method(('tip',)))
1803
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1805
def test_get_options(self):
1806
index = self.two_graph_index()
1807
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1808
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1810
def test_get_parent_map(self):
1811
index = self.two_graph_index()
1812
self.assertEqual({('parent',):None},
1813
index.get_parent_map([('parent',), ('ghost',)]))
1815
def catch_add(self, entries):
1816
self.caught_entries.append(entries)
1818
def test_add_no_callback_errors(self):
1819
index = self.two_graph_index()
1820
self.assertRaises(errors.ReadOnlyError, index.add_records,
1821
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
1823
def test_add_version_smoke(self):
1824
index = self.two_graph_index(catch_adds=True)
1825
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1826
self.assertEqual([[(('new', ), 'N50 60')]],
1827
self.caught_entries)
1829
def test_add_version_delta_not_delta_index(self):
1830
index = self.two_graph_index(catch_adds=True)
1831
self.assertRaises(errors.KnitCorrupt, index.add_records,
1832
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
1833
self.assertEqual([], self.caught_entries)
1835
def test_add_version_same_dup(self):
1836
index = self.two_graph_index(catch_adds=True)
1837
# options can be spelt two different ways
1838
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1839
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
1840
# position/length are ignored (because each pack could have fulltext or
1841
# delta, and be at a different position.
1842
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1843
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
1844
# but neither should have added data.
1845
self.assertEqual([[], [], [], []], self.caught_entries)
1847
def test_add_version_different_dup(self):
1848
index = self.two_graph_index(catch_adds=True)
1850
self.assertRaises(errors.KnitCorrupt, index.add_records,
1851
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1852
self.assertRaises(errors.KnitCorrupt, index.add_records,
1853
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
1854
self.assertRaises(errors.KnitCorrupt, index.add_records,
1855
[(('tip',), 'fulltext', (None, 0, 100), [])])
1857
self.assertRaises(errors.KnitCorrupt, index.add_records,
1858
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1859
self.assertEqual([], self.caught_entries)
1861
def test_add_versions(self):
1862
index = self.two_graph_index(catch_adds=True)
1864
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
1865
(('new2',), 'fulltext', (None, 0, 6), []),
1867
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
1868
sorted(self.caught_entries[0]))
1869
self.assertEqual(1, len(self.caught_entries))
1871
def test_add_versions_delta_not_delta_index(self):
1872
index = self.two_graph_index(catch_adds=True)
1873
self.assertRaises(errors.KnitCorrupt, index.add_records,
1874
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1875
self.assertEqual([], self.caught_entries)
1877
def test_add_versions_parents_not_parents_index(self):
1878
index = self.two_graph_index(catch_adds=True)
1879
self.assertRaises(errors.KnitCorrupt, index.add_records,
1880
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1881
self.assertEqual([], self.caught_entries)
1883
def test_add_versions_random_id_accepted(self):
1884
index = self.two_graph_index(catch_adds=True)
1885
index.add_records([], random_id=True)
1887
def test_add_versions_same_dup(self):
1888
index = self.two_graph_index(catch_adds=True)
1889
# options can be spelt two different ways
1890
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1891
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
1892
# position/length are ignored (because each pack could have fulltext or
1893
# delta, and be at a different position.
1894
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1895
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
1896
# but neither should have added data.
1897
self.assertEqual([[], [], [], []], self.caught_entries)
1899
def test_add_versions_different_dup(self):
1900
index = self.two_graph_index(catch_adds=True)
1902
self.assertRaises(errors.KnitCorrupt, index.add_records,
1903
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1904
self.assertRaises(errors.KnitCorrupt, index.add_records,
1905
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
1906
self.assertRaises(errors.KnitCorrupt, index.add_records,
1907
[(('tip',), 'fulltext', (None, 0, 100), [])])
1909
self.assertRaises(errors.KnitCorrupt, index.add_records,
1910
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1911
# change options in the second record
1912
self.assertRaises(errors.KnitCorrupt, index.add_records,
1913
[(('tip',), 'fulltext,no-eol', (None, 0, 100), []),
1914
(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
1915
self.assertEqual([], self.caught_entries)
1918
class TestKnitVersionedFiles(KnitTests):
1920
def assertGroupKeysForIo(self, exp_groups, keys, non_local_keys,
1921
positions, _min_buffer_size=None):
1922
kvf = self.make_test_knit()
1923
if _min_buffer_size is None:
1924
_min_buffer_size = knit._STREAM_MIN_BUFFER_SIZE
1925
self.assertEqual(exp_groups, kvf._group_keys_for_io(keys,
1926
non_local_keys, positions,
1927
_min_buffer_size=_min_buffer_size))
1929
def assertSplitByPrefix(self, expected_map, expected_prefix_order,
1931
split, prefix_order = KnitVersionedFiles._split_by_prefix(keys)
1932
self.assertEqual(expected_map, split)
1933
self.assertEqual(expected_prefix_order, prefix_order)
1935
def test__group_keys_for_io(self):
1936
ft_detail = ('fulltext', False)
1937
ld_detail = ('line-delta', False)
1945
f_a: (ft_detail, (f_a, 0, 100), None),
1946
f_b: (ld_detail, (f_b, 100, 21), f_a),
1947
f_c: (ld_detail, (f_c, 180, 15), f_b),
1948
g_a: (ft_detail, (g_a, 121, 35), None),
1949
g_b: (ld_detail, (g_b, 156, 12), g_a),
1950
g_c: (ld_detail, (g_c, 195, 13), g_a),
1952
self.assertGroupKeysForIo([([f_a], set())],
1953
[f_a], [], positions)
1954
self.assertGroupKeysForIo([([f_a], set([f_a]))],
1955
[f_a], [f_a], positions)
1956
self.assertGroupKeysForIo([([f_a, f_b], set([]))],
1957
[f_a, f_b], [], positions)
1958
self.assertGroupKeysForIo([([f_a, f_b], set([f_b]))],
1959
[f_a, f_b], [f_b], positions)
1960
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
1961
[f_a, g_a, f_b, g_b], [], positions)
1962
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
1963
[f_a, g_a, f_b, g_b], [], positions,
1964
_min_buffer_size=150)
1965
self.assertGroupKeysForIo([([f_a, f_b], set()), ([g_a, g_b], set())],
1966
[f_a, g_a, f_b, g_b], [], positions,
1967
_min_buffer_size=100)
1968
self.assertGroupKeysForIo([([f_c], set()), ([g_b], set())],
1969
[f_c, g_b], [], positions,
1970
_min_buffer_size=125)
1971
self.assertGroupKeysForIo([([g_b, f_c], set())],
1972
[g_b, f_c], [], positions,
1973
_min_buffer_size=125)
1975
def test__split_by_prefix(self):
1976
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1977
'g': [('g', 'b'), ('g', 'a')],
1979
[('f', 'a'), ('g', 'b'),
1980
('g', 'a'), ('f', 'b')])
1982
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1983
'g': [('g', 'b'), ('g', 'a')],
1985
[('f', 'a'), ('f', 'b'),
1986
('g', 'b'), ('g', 'a')])
1988
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1989
'g': [('g', 'b'), ('g', 'a')],
1991
[('f', 'a'), ('f', 'b'),
1992
('g', 'b'), ('g', 'a')])
1994
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
1995
'g': [('g', 'b'), ('g', 'a')],
1996
'': [('a',), ('b',)]
1998
[('f', 'a'), ('g', 'b'),
2000
('g', 'a'), ('f', 'b')])
2003
class TestStacking(KnitTests):
2005
def get_basis_and_test_knit(self):
2006
basis = self.make_test_knit(name='basis')
2007
basis = RecordingVersionedFilesDecorator(basis)
2008
test = self.make_test_knit(name='test')
2009
test.add_fallback_versioned_files(basis)
2012
def test_add_fallback_versioned_files(self):
2013
basis = self.make_test_knit(name='basis')
2014
test = self.make_test_knit(name='test')
2015
# It must not error; other tests test that the fallback is referred to
2016
# when accessing data.
2017
test.add_fallback_versioned_files(basis)
2019
def test_add_lines(self):
2020
# lines added to the test are not added to the basis
2021
basis, test = self.get_basis_and_test_knit()
2023
key_basis = ('bar',)
2024
key_cross_border = ('quux',)
2025
key_delta = ('zaphod',)
2026
test.add_lines(key, (), ['foo\n'])
2027
self.assertEqual({}, basis.get_parent_map([key]))
2028
# lines added to the test that reference across the stack do a
2030
basis.add_lines(key_basis, (), ['foo\n'])
2032
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2033
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2034
# we don't even need to look at the basis to see that this should be
2035
# stored as a fulltext
2036
self.assertEqual([], basis.calls)
2037
# Subsequent adds do delta.
2039
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2040
self.assertEqual('line-delta', test._index.get_method(key_delta))
2041
self.assertEqual([], basis.calls)
2043
def test_annotate(self):
2044
# annotations from the test knit are answered without asking the basis
2045
basis, test = self.get_basis_and_test_knit()
2047
key_basis = ('bar',)
2048
key_missing = ('missing',)
2049
test.add_lines(key, (), ['foo\n'])
2050
details = test.annotate(key)
2051
self.assertEqual([(key, 'foo\n')], details)
2052
self.assertEqual([], basis.calls)
2053
# But texts that are not in the test knit are looked for in the basis
2055
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2057
details = test.annotate(key_basis)
2058
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2059
# Not optimised to date:
2060
# self.assertEqual([("annotate", key_basis)], basis.calls)
2061
self.assertEqual([('get_parent_map', set([key_basis])),
2062
('get_parent_map', set([key_basis])),
2063
('get_parent_map', set([key_basis])),
2064
('get_record_stream', [key_basis], 'unordered', True)],
2067
def test_check(self):
2068
# At the moment checking a stacked knit does implicitly check the
2070
basis, test = self.get_basis_and_test_knit()
2073
def test_get_parent_map(self):
2074
# parents in the test knit are answered without asking the basis
2075
basis, test = self.get_basis_and_test_knit()
2077
key_basis = ('bar',)
2078
key_missing = ('missing',)
2079
test.add_lines(key, (), [])
2080
parent_map = test.get_parent_map([key])
2081
self.assertEqual({key: ()}, parent_map)
2082
self.assertEqual([], basis.calls)
2083
# But parents that are not in the test knit are looked for in the basis
2084
basis.add_lines(key_basis, (), [])
2086
parent_map = test.get_parent_map([key, key_basis, key_missing])
2087
self.assertEqual({key: (),
2088
key_basis: ()}, parent_map)
2089
self.assertEqual([("get_parent_map", set([key_basis, key_missing]))],
2092
def test_get_record_stream_unordered_fulltexts(self):
2093
# records from the test knit are answered without asking the basis:
2094
basis, test = self.get_basis_and_test_knit()
2096
key_basis = ('bar',)
2097
key_missing = ('missing',)
2098
test.add_lines(key, (), ['foo\n'])
2099
records = list(test.get_record_stream([key], 'unordered', True))
2100
self.assertEqual(1, len(records))
2101
self.assertEqual([], basis.calls)
2102
# Missing (from test knit) objects are retrieved from the basis:
2103
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2105
records = list(test.get_record_stream([key_basis, key_missing],
2107
self.assertEqual(2, len(records))
2108
calls = list(basis.calls)
2109
for record in records:
2110
self.assertSubset([record.key], (key_basis, key_missing))
2111
if record.key == key_missing:
2112
self.assertIsInstance(record, AbsentContentFactory)
2114
reference = list(basis.get_record_stream([key_basis],
2115
'unordered', True))[0]
2116
self.assertEqual(reference.key, record.key)
2117
self.assertEqual(reference.sha1, record.sha1)
2118
self.assertEqual(reference.storage_kind, record.storage_kind)
2119
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2120
record.get_bytes_as(record.storage_kind))
2121
self.assertEqual(reference.get_bytes_as('fulltext'),
2122
record.get_bytes_as('fulltext'))
2123
# It's not strictly minimal, but it seems reasonable for now for it to
2124
# ask which fallbacks have which parents.
2126
("get_parent_map", set([key_basis, key_missing])),
2127
("get_record_stream", [key_basis], 'unordered', True)],
2130
def test_get_record_stream_ordered_fulltexts(self):
2131
# ordering is preserved down into the fallback store.
2132
basis, test = self.get_basis_and_test_knit()
2134
key_basis = ('bar',)
2135
key_basis_2 = ('quux',)
2136
key_missing = ('missing',)
2137
test.add_lines(key, (key_basis,), ['foo\n'])
2138
# Missing (from test knit) objects are retrieved from the basis:
2139
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2140
basis.add_lines(key_basis_2, (), ['quux\n'])
2142
# ask for in non-topological order
2143
records = list(test.get_record_stream(
2144
[key, key_basis, key_missing, key_basis_2], 'topological', True))
2145
self.assertEqual(4, len(records))
2147
for record in records:
2148
self.assertSubset([record.key],
2149
(key_basis, key_missing, key_basis_2, key))
2150
if record.key == key_missing:
2151
self.assertIsInstance(record, AbsentContentFactory)
2153
results.append((record.key, record.sha1, record.storage_kind,
2154
record.get_bytes_as('fulltext')))
2155
calls = list(basis.calls)
2156
order = [record[0] for record in results]
2157
self.assertEqual([key_basis_2, key_basis, key], order)
2158
for result in results:
2159
if result[0] == key:
2163
record = source.get_record_stream([result[0]], 'unordered',
2165
self.assertEqual(record.key, result[0])
2166
self.assertEqual(record.sha1, result[1])
2167
# We used to check that the storage kind matched, but actually it
2168
# depends on whether it was sourced from the basis, or in a single
2169
# group, because asking for full texts returns proxy objects to a
2170
# _ContentMapGenerator object; so checking the kind is unneeded.
2171
self.assertEqual(record.get_bytes_as('fulltext'), result[3])
2172
# It's not strictly minimal, but it seems reasonable for now for it to
2173
# ask which fallbacks have which parents.
2175
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2176
# unordered is asked for by the underlying worker as it still
2177
# buffers everything while answering - which is a problem!
2178
("get_record_stream", [key_basis_2, key_basis], 'unordered', True)],
2181
def test_get_record_stream_unordered_deltas(self):
2182
# records from the test knit are answered without asking the basis:
2183
basis, test = self.get_basis_and_test_knit()
2185
key_basis = ('bar',)
2186
key_missing = ('missing',)
2187
test.add_lines(key, (), ['foo\n'])
2188
records = list(test.get_record_stream([key], 'unordered', False))
2189
self.assertEqual(1, len(records))
2190
self.assertEqual([], basis.calls)
2191
# Missing (from test knit) objects are retrieved from the basis:
2192
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2194
records = list(test.get_record_stream([key_basis, key_missing],
2195
'unordered', False))
2196
self.assertEqual(2, len(records))
2197
calls = list(basis.calls)
2198
for record in records:
2199
self.assertSubset([record.key], (key_basis, key_missing))
2200
if record.key == key_missing:
2201
self.assertIsInstance(record, AbsentContentFactory)
2203
reference = list(basis.get_record_stream([key_basis],
2204
'unordered', False))[0]
2205
self.assertEqual(reference.key, record.key)
2206
self.assertEqual(reference.sha1, record.sha1)
2207
self.assertEqual(reference.storage_kind, record.storage_kind)
2208
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2209
record.get_bytes_as(record.storage_kind))
2210
# It's not strictly minimal, but it seems reasonable for now for it to
2211
# ask which fallbacks have which parents.
2213
("get_parent_map", set([key_basis, key_missing])),
2214
("get_record_stream", [key_basis], 'unordered', False)],
2217
def test_get_record_stream_ordered_deltas(self):
2218
# ordering is preserved down into the fallback store.
2219
basis, test = self.get_basis_and_test_knit()
2221
key_basis = ('bar',)
2222
key_basis_2 = ('quux',)
2223
key_missing = ('missing',)
2224
test.add_lines(key, (key_basis,), ['foo\n'])
2225
# Missing (from test knit) objects are retrieved from the basis:
2226
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2227
basis.add_lines(key_basis_2, (), ['quux\n'])
2229
# ask for in non-topological order
2230
records = list(test.get_record_stream(
2231
[key, key_basis, key_missing, key_basis_2], 'topological', False))
2232
self.assertEqual(4, len(records))
2234
for record in records:
2235
self.assertSubset([record.key],
2236
(key_basis, key_missing, key_basis_2, key))
2237
if record.key == key_missing:
2238
self.assertIsInstance(record, AbsentContentFactory)
2240
results.append((record.key, record.sha1, record.storage_kind,
2241
record.get_bytes_as(record.storage_kind)))
2242
calls = list(basis.calls)
2243
order = [record[0] for record in results]
2244
self.assertEqual([key_basis_2, key_basis, key], order)
2245
for result in results:
2246
if result[0] == key:
2250
record = source.get_record_stream([result[0]], 'unordered',
2252
self.assertEqual(record.key, result[0])
2253
self.assertEqual(record.sha1, result[1])
2254
self.assertEqual(record.storage_kind, result[2])
2255
self.assertEqual(record.get_bytes_as(record.storage_kind), result[3])
2256
# It's not strictly minimal, but it seems reasonable for now for it to
2257
# ask which fallbacks have which parents.
2259
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2260
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2263
def test_get_sha1s(self):
2264
# sha1's in the test knit are answered without asking the basis
2265
basis, test = self.get_basis_and_test_knit()
2267
key_basis = ('bar',)
2268
key_missing = ('missing',)
2269
test.add_lines(key, (), ['foo\n'])
2270
key_sha1sum = osutils.sha('foo\n').hexdigest()
2271
sha1s = test.get_sha1s([key])
2272
self.assertEqual({key: key_sha1sum}, sha1s)
2273
self.assertEqual([], basis.calls)
2274
# But texts that are not in the test knit are looked for in the basis
2275
# directly (rather than via text reconstruction) so that remote servers
2276
# etc don't have to answer with full content.
2277
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2278
basis_sha1sum = osutils.sha('foo\nbar\n').hexdigest()
2280
sha1s = test.get_sha1s([key, key_missing, key_basis])
2281
self.assertEqual({key: key_sha1sum,
2282
key_basis: basis_sha1sum}, sha1s)
2283
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2286
def test_insert_record_stream(self):
2287
# records are inserted as normal; insert_record_stream builds on
2288
# add_lines, so a smoke test should be all that's needed:
2290
key_basis = ('bar',)
2291
key_delta = ('zaphod',)
2292
basis, test = self.get_basis_and_test_knit()
2293
source = self.make_test_knit(name='source')
2294
basis.add_lines(key_basis, (), ['foo\n'])
2296
source.add_lines(key_basis, (), ['foo\n'])
2297
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2298
stream = source.get_record_stream([key_delta], 'unordered', False)
2299
test.insert_record_stream(stream)
2300
# XXX: this does somewhat too many calls in making sure of whether it
2301
# has to recreate the full text.
2302
self.assertEqual([("get_parent_map", set([key_basis])),
2303
('get_parent_map', set([key_basis])),
2304
('get_record_stream', [key_basis], 'unordered', True)],
2306
self.assertEqual({key_delta:(key_basis,)},
2307
test.get_parent_map([key_delta]))
2308
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2309
'unordered', True).next().get_bytes_as('fulltext'))
2311
def test_iter_lines_added_or_present_in_keys(self):
2312
# Lines from the basis are returned, and lines for a given key are only
2316
# all sources are asked for keys:
2317
basis, test = self.get_basis_and_test_knit()
2318
basis.add_lines(key1, (), ["foo"])
2320
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2321
self.assertEqual([("foo\n", key1)], lines)
2322
self.assertEqual([("iter_lines_added_or_present_in_keys", set([key1]))],
2324
# keys in both are not duplicated:
2325
test.add_lines(key2, (), ["bar\n"])
2326
basis.add_lines(key2, (), ["bar\n"])
2328
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2329
self.assertEqual([("bar\n", key2)], lines)
2330
self.assertEqual([], basis.calls)
2332
def test_keys(self):
2335
# all sources are asked for keys:
2336
basis, test = self.get_basis_and_test_knit()
2338
self.assertEqual(set(), set(keys))
2339
self.assertEqual([("keys",)], basis.calls)
2340
# keys from a basis are returned:
2341
basis.add_lines(key1, (), [])
2344
self.assertEqual(set([key1]), set(keys))
2345
self.assertEqual([("keys",)], basis.calls)
2346
# keys in both are not duplicated:
2347
test.add_lines(key2, (), [])
2348
basis.add_lines(key2, (), [])
2351
self.assertEqual(2, len(keys))
2352
self.assertEqual(set([key1, key2]), set(keys))
2353
self.assertEqual([("keys",)], basis.calls)
2355
def test_add_mpdiffs(self):
2356
# records are inserted as normal; add_mpdiff builds on
2357
# add_lines, so a smoke test should be all that's needed:
2359
key_basis = ('bar',)
2360
key_delta = ('zaphod',)
2361
basis, test = self.get_basis_and_test_knit()
2362
source = self.make_test_knit(name='source')
2363
basis.add_lines(key_basis, (), ['foo\n'])
2365
source.add_lines(key_basis, (), ['foo\n'])
2366
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2367
diffs = source.make_mpdiffs([key_delta])
2368
test.add_mpdiffs([(key_delta, (key_basis,),
2369
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2370
self.assertEqual([("get_parent_map", set([key_basis])),
2371
('get_record_stream', [key_basis], 'unordered', True),],
2373
self.assertEqual({key_delta:(key_basis,)},
2374
test.get_parent_map([key_delta]))
2375
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2376
'unordered', True).next().get_bytes_as('fulltext'))
2378
def test_make_mpdiffs(self):
2379
# Generating an mpdiff across a stacking boundary should detect parent
2383
key_right = ('zaphod',)
2384
basis, test = self.get_basis_and_test_knit()
2385
basis.add_lines(key_left, (), ['bar\n'])
2386
basis.add_lines(key_right, (), ['zaphod\n'])
2388
test.add_lines(key, (key_left, key_right),
2389
['bar\n', 'foo\n', 'zaphod\n'])
2390
diffs = test.make_mpdiffs([key])
2392
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2393
multiparent.NewText(['foo\n']),
2394
multiparent.ParentText(1, 0, 2, 1)])],
2396
self.assertEqual(3, len(basis.calls))
2398
("get_parent_map", set([key_left, key_right])),
2399
("get_parent_map", set([key_left, key_right])),
2402
last_call = basis.calls[-1]
2403
self.assertEqual('get_record_stream', last_call[0])
2404
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2405
self.assertEqual('unordered', last_call[2])
2406
self.assertEqual(True, last_call[3])
2409
class TestNetworkBehaviour(KnitTests):
2410
"""Tests for getting data out of/into knits over the network."""
2412
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2413
vf = self.make_test_knit(name='test')
2414
# put in three texts, giving ft, delta, delta
2415
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2416
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2417
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2418
# But heuristics could interfere, so check what happened:
2419
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2420
[record.storage_kind for record in
2421
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2422
'topological', False)])
2423
# generate a stream of just the deltas include_delta_closure=True,
2424
# serialise to the network, and check that we get a delta closure on the wire.
2425
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2426
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2427
# The first bytes should be a memo from _ContentMapGenerator, and the
2428
# second bytes should be empty (because its a API proxy not something
2429
# for wire serialisation.
2430
self.assertEqual('', netb[1])
2432
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2433
self.assertEqual('knit-delta-closure', kind)
2436
class TestContentMapGenerator(KnitTests):
2437
"""Tests for ContentMapGenerator"""
2439
def test_get_record_stream_gives_records(self):
2440
vf = self.make_test_knit(name='test')
2441
# put in three texts, giving ft, delta, delta
2442
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2443
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2444
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2445
keys = [('d1',), ('d2',)]
2446
generator = _VFContentMapGenerator(vf, keys,
2447
global_map=vf.get_parent_map(keys))
2448
for record in generator.get_record_stream():
2449
if record.key == ('d1',):
2450
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2452
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2454
def test_get_record_stream_kinds_are_raw(self):
2455
vf = self.make_test_knit(name='test')
2456
# put in three texts, giving ft, delta, delta
2457
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2458
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2459
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2460
keys = [('base',), ('d1',), ('d2',)]
2461
generator = _VFContentMapGenerator(vf, keys,
2462
global_map=vf.get_parent_map(keys))
2463
kinds = {('base',): 'knit-delta-closure',
2464
('d1',): 'knit-delta-closure-ref',
2465
('d2',): 'knit-delta-closure-ref',
2467
for record in generator.get_record_stream():
2468
self.assertEqual(kinds[record.key], record.storage_kind)
added
removed
bzrlib/tests/test_knit.py
