462
354
writer = pack.ContainerWriter(write_data)
464
356
access.set_writer(writer, index, (transport, packname))
465
memos = access.add_raw_records([('key', 10)], '1234567890')
357
memos = access.add_raw_records([10], '1234567890')
467
359
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
469
def test_missing_index_raises_retry(self):
470
memos = self.make_pack_file()
471
transport = self.get_transport()
472
reload_called, reload_func = self.make_reload_func()
473
# Note that the index key has changed from 'foo' to 'bar'
474
access = _DirectPackAccess({'bar':(transport, 'packname')},
475
reload_func=reload_func)
476
e = self.assertListRaises(errors.RetryWithNewPacks,
477
access.get_raw_records, memos)
478
# Because a key was passed in which does not match our index list, we
479
# assume that the listing was already reloaded
480
self.assertTrue(e.reload_occurred)
481
self.assertIsInstance(e.exc_info, tuple)
482
self.assertIs(e.exc_info[0], KeyError)
483
self.assertIsInstance(e.exc_info[1], KeyError)
485
def test_missing_index_raises_key_error_with_no_reload(self):
486
memos = self.make_pack_file()
487
transport = self.get_transport()
488
# Note that the index key has changed from 'foo' to 'bar'
489
access = _DirectPackAccess({'bar':(transport, 'packname')})
490
e = self.assertListRaises(KeyError, access.get_raw_records, memos)
492
def test_missing_file_raises_retry(self):
493
memos = self.make_pack_file()
494
transport = self.get_transport()
495
reload_called, reload_func = self.make_reload_func()
496
# Note that the 'filename' has been changed to 'different-packname'
497
access = _DirectPackAccess({'foo':(transport, 'different-packname')},
498
reload_func=reload_func)
499
e = self.assertListRaises(errors.RetryWithNewPacks,
500
access.get_raw_records, memos)
501
# The file has gone missing, so we assume we need to reload
502
self.assertFalse(e.reload_occurred)
503
self.assertIsInstance(e.exc_info, tuple)
504
self.assertIs(e.exc_info[0], errors.NoSuchFile)
505
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
506
self.assertEqual('different-packname', e.exc_info[1].path)
508
def test_missing_file_raises_no_such_file_with_no_reload(self):
509
memos = self.make_pack_file()
510
transport = self.get_transport()
511
# Note that the 'filename' has been changed to 'different-packname'
512
access = _DirectPackAccess({'foo':(transport, 'different-packname')})
513
e = self.assertListRaises(errors.NoSuchFile,
514
access.get_raw_records, memos)
516
def test_failing_readv_raises_retry(self):
517
memos = self.make_pack_file()
518
transport = self.get_transport()
519
failing_transport = MockReadvFailingTransport(
520
[transport.get_bytes('packname')])
521
reload_called, reload_func = self.make_reload_func()
522
access = _DirectPackAccess({'foo':(failing_transport, 'packname')},
523
reload_func=reload_func)
524
# Asking for a single record will not trigger the Mock failure
525
self.assertEqual(['1234567890'],
526
list(access.get_raw_records(memos[:1])))
527
self.assertEqual(['12345'],
528
list(access.get_raw_records(memos[1:2])))
529
# A multiple offset readv() will fail mid-way through
530
e = self.assertListRaises(errors.RetryWithNewPacks,
531
access.get_raw_records, memos)
532
# The file has gone missing, so we assume we need to reload
533
self.assertFalse(e.reload_occurred)
534
self.assertIsInstance(e.exc_info, tuple)
535
self.assertIs(e.exc_info[0], errors.NoSuchFile)
536
self.assertIsInstance(e.exc_info[1], errors.NoSuchFile)
537
self.assertEqual('packname', e.exc_info[1].path)
539
def test_failing_readv_raises_no_such_file_with_no_reload(self):
540
memos = self.make_pack_file()
541
transport = self.get_transport()
542
failing_transport = MockReadvFailingTransport(
543
[transport.get_bytes('packname')])
544
reload_called, reload_func = self.make_reload_func()
545
access = _DirectPackAccess({'foo':(failing_transport, 'packname')})
546
# Asking for a single record will not trigger the Mock failure
547
self.assertEqual(['1234567890'],
548
list(access.get_raw_records(memos[:1])))
549
self.assertEqual(['12345'],
550
list(access.get_raw_records(memos[1:2])))
551
# A multiple offset readv() will fail mid-way through
552
e = self.assertListRaises(errors.NoSuchFile,
553
access.get_raw_records, memos)
555
def test_reload_or_raise_no_reload(self):
556
access = _DirectPackAccess({}, reload_func=None)
557
retry_exc = self.make_retry_exception()
558
# Without a reload_func, we will just re-raise the original exception
559
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
561
def test_reload_or_raise_reload_changed(self):
562
reload_called, reload_func = self.make_reload_func(return_val=True)
563
access = _DirectPackAccess({}, reload_func=reload_func)
564
retry_exc = self.make_retry_exception()
565
access.reload_or_raise(retry_exc)
566
self.assertEqual([1], reload_called)
567
retry_exc.reload_occurred=True
568
access.reload_or_raise(retry_exc)
569
self.assertEqual([2], reload_called)
571
def test_reload_or_raise_reload_no_change(self):
572
reload_called, reload_func = self.make_reload_func(return_val=False)
573
access = _DirectPackAccess({}, reload_func=reload_func)
574
retry_exc = self.make_retry_exception()
575
# If reload_occurred is False, then we consider it an error to have
576
# reload_func() return False (no changes).
577
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
578
self.assertEqual([1], reload_called)
579
retry_exc.reload_occurred=True
580
# If reload_occurred is True, then we assume nothing changed because
581
# it had changed earlier, but didn't change again
582
access.reload_or_raise(retry_exc)
583
self.assertEqual([2], reload_called)
585
def test_annotate_retries(self):
586
vf, reload_counter = self.make_vf_for_retrying()
587
# It is a little bit bogus to annotate the Revision VF, but it works,
588
# as we have ancestry stored there
590
reload_lines = vf.annotate(key)
591
self.assertEqual([1, 1, 0], reload_counter)
592
plain_lines = vf.annotate(key)
593
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
594
if reload_lines != plain_lines:
595
self.fail('Annotation was not identical with reloading.')
596
# Now delete the packs-in-use, which should trigger another reload, but
597
# this time we just raise an exception because we can't recover
598
for trans, name in vf._access._indices.itervalues():
600
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
601
self.assertEqual([2, 1, 1], reload_counter)
603
def test__get_record_map_retries(self):
604
vf, reload_counter = self.make_vf_for_retrying()
605
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
606
records = vf._get_record_map(keys)
607
self.assertEqual(keys, sorted(records.keys()))
608
self.assertEqual([1, 1, 0], reload_counter)
609
# Now delete the packs-in-use, which should trigger another reload, but
610
# this time we just raise an exception because we can't recover
611
for trans, name in vf._access._indices.itervalues():
613
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
614
self.assertEqual([2, 1, 1], reload_counter)
616
def test_get_record_stream_retries(self):
617
vf, reload_counter = self.make_vf_for_retrying()
618
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
619
record_stream = vf.get_record_stream(keys, 'topological', False)
620
record = record_stream.next()
621
self.assertEqual(('rev-1',), record.key)
622
self.assertEqual([0, 0, 0], reload_counter)
623
record = record_stream.next()
624
self.assertEqual(('rev-2',), record.key)
625
self.assertEqual([1, 1, 0], reload_counter)
626
record = record_stream.next()
627
self.assertEqual(('rev-3',), record.key)
628
self.assertEqual([1, 1, 0], reload_counter)
629
# Now delete all pack files, and see that we raise the right error
630
for trans, name in vf._access._indices.itervalues():
632
self.assertListRaises(errors.NoSuchFile,
633
vf.get_record_stream, keys, 'topological', False)
635
def test_iter_lines_added_or_present_in_keys_retries(self):
636
vf, reload_counter = self.make_vf_for_retrying()
637
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
638
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
639
# result in random order (determined by the iteration order from a
640
# set()), so we don't have any solid way to trigger whether data is
641
# read before or after. However we tried to delete the middle node to
642
# exercise the code well.
643
# What we care about is that all lines are always yielded, but not
646
reload_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
647
self.assertEqual([1, 1, 0], reload_counter)
648
# Now do it again, to make sure the result is equivalent
649
plain_lines = sorted(vf.iter_lines_added_or_present_in_keys(keys))
650
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
651
self.assertEqual(plain_lines, reload_lines)
652
self.assertEqual(21, len(plain_lines))
653
# Now delete all pack files, and see that we raise the right error
654
for trans, name in vf._access._indices.itervalues():
656
self.assertListRaises(errors.NoSuchFile,
657
vf.iter_lines_added_or_present_in_keys, keys)
658
self.assertEqual([2, 1, 1], reload_counter)
660
def test_get_record_stream_yields_disk_sorted_order(self):
661
# if we get 'unordered' pick a semi-optimal order for reading. The
662
# order should be grouped by pack file, and then by position in file
663
repo = self.make_repository('test', format='pack-0.92')
665
self.addCleanup(repo.unlock)
666
repo.start_write_group()
668
vf.add_lines(('f-id', 'rev-5'), [('f-id', 'rev-4')], ['lines\n'])
669
vf.add_lines(('f-id', 'rev-1'), [], ['lines\n'])
670
vf.add_lines(('f-id', 'rev-2'), [('f-id', 'rev-1')], ['lines\n'])
671
repo.commit_write_group()
672
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
674
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
675
('f-id', 'rev-2')], 'unordered', False)
676
keys = [r.key for r in stream]
677
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
678
('f-id', 'rev-2')], keys)
679
repo.start_write_group()
680
vf.add_lines(('f-id', 'rev-4'), [('f-id', 'rev-3')], ['lines\n'])
681
vf.add_lines(('f-id', 'rev-3'), [('f-id', 'rev-2')], ['lines\n'])
682
vf.add_lines(('f-id', 'rev-6'), [('f-id', 'rev-5')], ['lines\n'])
683
repo.commit_write_group()
684
# Request in random order, to make sure the output order isn't based on
686
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
687
stream = vf.get_record_stream(request_keys, 'unordered', False)
688
keys = [r.key for r in stream]
689
# We want to get the keys back in disk order, but it doesn't matter
690
# which pack we read from first. So this can come back in 2 orders
691
alt1 = [('f-id', 'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
692
alt2 = [('f-id', 'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
693
if keys != alt1 and keys != alt2:
694
self.fail('Returned key order did not match either expected order.'
695
' expected %s or %s, not %s'
696
% (alt1, alt2, keys))
699
362
class LowLevelKnitDataTests(TestCase):
848
468
# Change 2 bytes in the middle to \xff
849
469
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
850
470
transport = MockTransport([gz_txt])
851
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
852
knit = KnitVersionedFiles(None, access)
853
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
854
self.assertRaises(errors.KnitCorrupt, list,
855
knit._read_records_iter(records))
856
# read_records_iter_raw will barf on bad gz data
857
self.assertRaises(errors.KnitCorrupt, list,
858
knit._read_records_iter_raw(records))
471
access = _KnitAccess(transport, 'filename', None, None, False, False)
472
data = _KnitData(access=access)
473
records = [('rev-id-1', (None, 0, len(gz_txt)))]
475
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
477
# read_records_iter_raw will notice if we request the wrong version.
478
self.assertRaises(errors.KnitCorrupt, list,
479
data.read_records_iter_raw(records))
861
482
class LowLevelKnitIndexTests(TestCase):
863
def get_knit_index(self, transport, name, mode):
864
mapper = ConstantMapper(name)
484
def get_knit_index(self, *args, **kwargs):
485
orig = knit._load_data
487
knit._load_data = orig
488
self.addCleanup(reset)
865
489
from bzrlib._knit_load_data_py import _load_data_py
866
self.overrideAttr(knit, '_load_data', _load_data_py)
867
allow_writes = lambda: 'w' in mode
868
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
490
knit._load_data = _load_data_py
491
return _KnitIndex(*args, **kwargs)
493
def test_no_such_file(self):
494
transport = MockTransport()
496
self.assertRaises(NoSuchFile, self.get_knit_index,
497
transport, "filename", "r")
498
self.assertRaises(NoSuchFile, self.get_knit_index,
499
transport, "filename", "w", create=False)
870
501
def test_create_file(self):
871
502
transport = MockTransport()
872
index = self.get_knit_index(transport, "filename", "w")
874
call = transport.calls.pop(0)
875
# call[1][1] is a StringIO - we can't test it by simple equality.
876
self.assertEqual('put_file_non_atomic', call[0])
877
self.assertEqual('filename.kndx', call[1][0])
878
# With no history, _KndxIndex writes a new index:
879
self.assertEqual(_KndxIndex.HEADER,
880
call[1][1].getvalue())
881
self.assertEqual({'create_parent_dir': True}, call[2])
504
index = self.get_knit_index(transport, "filename", "w",
505
file_mode="wb", create=True)
507
("put_bytes_non_atomic",
508
("filename", index.HEADER), {"mode": "wb"}),
509
transport.calls.pop(0))
511
def test_delay_create_file(self):
512
transport = MockTransport()
514
index = self.get_knit_index(transport, "filename", "w",
515
create=True, file_mode="wb", create_parent_dir=True,
516
delay_create=True, dir_mode=0777)
517
self.assertEqual([], transport.calls)
519
index.add_versions([])
520
name, (filename, f), kwargs = transport.calls.pop(0)
521
self.assertEqual("put_file_non_atomic", name)
523
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
525
self.assertEqual("filename", filename)
526
self.assertEqual(index.HEADER, f.read())
528
index.add_versions([])
529
self.assertEqual(("append_bytes", ("filename", ""), {}),
530
transport.calls.pop(0))
883
532
def test_read_utf8_version_id(self):
884
533
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
885
534
utf8_revision_id = unicode_revision_id.encode('utf-8')
886
535
transport = MockTransport([
888
537
'%s option 0 1 :' % (utf8_revision_id,)
890
539
index = self.get_knit_index(transport, "filename", "r")
891
# _KndxIndex is a private class, and deals in utf8 revision_ids, not
540
# _KnitIndex is a private class, and deals in utf8 revision_ids, not
892
541
# Unicode revision_ids.
893
self.assertEqual({(utf8_revision_id,):()},
894
index.get_parent_map(index.keys()))
895
self.assertFalse((unicode_revision_id,) in index.keys())
542
self.assertTrue(index.has_version(utf8_revision_id))
543
self.assertFalse(index.has_version(unicode_revision_id))
897
545
def test_read_utf8_parents(self):
898
546
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
899
547
utf8_revision_id = unicode_revision_id.encode('utf-8')
900
548
transport = MockTransport([
902
550
"version option 0 1 .%s :" % (utf8_revision_id,)
904
552
index = self.get_knit_index(transport, "filename", "r")
905
self.assertEqual({("version",):((utf8_revision_id,),)},
906
index.get_parent_map(index.keys()))
553
self.assertEqual([utf8_revision_id],
554
index.get_parents_with_ghosts("version"))
908
556
def test_read_ignore_corrupted_lines(self):
909
557
transport = MockTransport([
912
560
"corrupted options 0 1 .b .c ",
913
561
"version options 0 1 :"
915
563
index = self.get_knit_index(transport, "filename", "r")
916
self.assertEqual(1, len(index.keys()))
917
self.assertEqual(set([("version",)]), index.keys())
564
self.assertEqual(1, index.num_versions())
565
self.assertTrue(index.has_version("version"))
919
567
def test_read_corrupted_header(self):
920
568
transport = MockTransport(['not a bzr knit index header\n'])
921
index = self.get_knit_index(transport, "filename", "r")
922
self.assertRaises(KnitHeaderError, index.keys)
569
self.assertRaises(KnitHeaderError,
570
self.get_knit_index, transport, "filename", "r")
924
572
def test_read_duplicate_entries(self):
925
573
transport = MockTransport([
927
575
"parent options 0 1 :",
928
576
"version options1 0 1 0 :",
929
577
"version options2 1 2 .other :",
930
578
"version options3 3 4 0 .other :"
932
580
index = self.get_knit_index(transport, "filename", "r")
933
self.assertEqual(2, len(index.keys()))
581
self.assertEqual(2, index.num_versions())
934
582
# check that the index used is the first one written. (Specific
935
583
# to KnitIndex style indices.
936
self.assertEqual("1", index._dictionary_compress([("version",)]))
937
self.assertEqual((("version",), 3, 4), index.get_position(("version",)))
938
self.assertEqual(["options3"], index.get_options(("version",)))
939
self.assertEqual({("version",):(("parent",), ("other",))},
940
index.get_parent_map([("version",)]))
584
self.assertEqual("1", index._version_list_to_index(["version"]))
585
self.assertEqual((None, 3, 4), index.get_position("version"))
586
self.assertEqual(["options3"], index.get_options("version"))
587
self.assertEqual(["parent", "other"],
588
index.get_parents_with_ghosts("version"))
942
590
def test_read_compressed_parents(self):
943
591
transport = MockTransport([
945
593
"a option 0 1 :",
946
594
"b option 0 1 0 :",
947
595
"c option 0 1 1 0 :",
949
597
index = self.get_knit_index(transport, "filename", "r")
950
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
951
index.get_parent_map([("b",), ("c",)]))
598
self.assertEqual(["a"], index.get_parents("b"))
599
self.assertEqual(["b", "a"], index.get_parents("c"))
953
601
def test_write_utf8_version_id(self):
954
602
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
955
603
utf8_revision_id = unicode_revision_id.encode('utf-8')
956
604
transport = MockTransport([
959
607
index = self.get_knit_index(transport, "filename", "r")
961
((utf8_revision_id,), ["option"], ((utf8_revision_id,), 0, 1), [])])
962
call = transport.calls.pop(0)
963
# call[1][1] is a StringIO - we can't test it by simple equality.
964
self.assertEqual('put_file_non_atomic', call[0])
965
self.assertEqual('filename.kndx', call[1][0])
966
# With no history, _KndxIndex writes a new index:
967
self.assertEqual(_KndxIndex.HEADER +
968
"\n%s option 0 1 :" % (utf8_revision_id,),
969
call[1][1].getvalue())
970
self.assertEqual({'create_parent_dir': True}, call[2])
608
index.add_version(utf8_revision_id, ["option"], (None, 0, 1), [])
609
self.assertEqual(("append_bytes", ("filename",
610
"\n%s option 0 1 :" % (utf8_revision_id,)),
612
transport.calls.pop(0))
972
614
def test_write_utf8_parents(self):
973
615
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
974
616
utf8_revision_id = unicode_revision_id.encode('utf-8')
975
617
transport = MockTransport([
978
index = self.get_knit_index(transport, "filename", "r")
980
(("version",), ["option"], (("version",), 0, 1), [(utf8_revision_id,)])])
981
call = transport.calls.pop(0)
982
# call[1][1] is a StringIO - we can't test it by simple equality.
983
self.assertEqual('put_file_non_atomic', call[0])
984
self.assertEqual('filename.kndx', call[1][0])
985
# With no history, _KndxIndex writes a new index:
986
self.assertEqual(_KndxIndex.HEADER +
987
"\nversion option 0 1 .%s :" % (utf8_revision_id,),
988
call[1][1].getvalue())
989
self.assertEqual({'create_parent_dir': True}, call[2])
992
transport = MockTransport([
995
index = self.get_knit_index(transport, "filename", "r")
997
self.assertEqual(set(), index.keys())
999
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1000
self.assertEqual(set([("a",)]), index.keys())
1002
index.add_records([(("a",), ["option"], (("a",), 0, 1), [])])
1003
self.assertEqual(set([("a",)]), index.keys())
1005
index.add_records([(("b",), ["option"], (("b",), 0, 1), [])])
1006
self.assertEqual(set([("a",), ("b",)]), index.keys())
1008
def add_a_b(self, index, random_id=None):
1010
if random_id is not None:
1011
kwargs["random_id"] = random_id
1013
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1014
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1015
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1018
def assertIndexIsAB(self, index):
1023
index.get_parent_map(index.keys()))
1024
self.assertEqual((("a",), 1, 2), index.get_position(("a",)))
1025
self.assertEqual((("b",), 2, 3), index.get_position(("b",)))
1026
self.assertEqual(["opt"], index.get_options(("a",)))
620
index = self.get_knit_index(transport, "filename", "r")
621
index.add_version("version", ["option"], (None, 0, 1), [utf8_revision_id])
622
self.assertEqual(("append_bytes", ("filename",
623
"\nversion option 0 1 .%s :" % (utf8_revision_id,)),
625
transport.calls.pop(0))
627
def test_get_graph(self):
628
transport = MockTransport()
629
index = self.get_knit_index(transport, "filename", "w", create=True)
630
self.assertEqual([], index.get_graph())
632
index.add_version("a", ["option"], (None, 0, 1), ["b"])
633
self.assertEqual([("a", ["b"])], index.get_graph())
635
index.add_version("c", ["option"], (None, 0, 1), ["d"])
636
self.assertEqual([("a", ["b"]), ("c", ["d"])],
637
sorted(index.get_graph()))
639
def test_get_ancestry(self):
640
transport = MockTransport([
643
"b option 0 1 0 .e :",
644
"c option 0 1 1 0 :",
645
"d option 0 1 2 .f :"
647
index = self.get_knit_index(transport, "filename", "r")
649
self.assertEqual([], index.get_ancestry([]))
650
self.assertEqual(["a"], index.get_ancestry(["a"]))
651
self.assertEqual(["a", "b"], index.get_ancestry(["b"]))
652
self.assertEqual(["a", "b", "c"], index.get_ancestry(["c"]))
653
self.assertEqual(["a", "b", "c", "d"], index.get_ancestry(["d"]))
654
self.assertEqual(["a", "b"], index.get_ancestry(["a", "b"]))
655
self.assertEqual(["a", "b", "c"], index.get_ancestry(["a", "c"]))
657
self.assertRaises(RevisionNotPresent, index.get_ancestry, ["e"])
659
def test_get_ancestry_with_ghosts(self):
660
transport = MockTransport([
663
"b option 0 1 0 .e :",
664
"c option 0 1 0 .f .g :",
665
"d option 0 1 2 .h .j .k :"
667
index = self.get_knit_index(transport, "filename", "r")
669
self.assertEqual([], index.get_ancestry_with_ghosts([]))
670
self.assertEqual(["a"], index.get_ancestry_with_ghosts(["a"]))
671
self.assertEqual(["a", "e", "b"],
672
index.get_ancestry_with_ghosts(["b"]))
673
self.assertEqual(["a", "g", "f", "c"],
674
index.get_ancestry_with_ghosts(["c"]))
675
self.assertEqual(["a", "g", "f", "c", "k", "j", "h", "d"],
676
index.get_ancestry_with_ghosts(["d"]))
677
self.assertEqual(["a", "e", "b"],
678
index.get_ancestry_with_ghosts(["a", "b"]))
679
self.assertEqual(["a", "g", "f", "c"],
680
index.get_ancestry_with_ghosts(["a", "c"]))
682
["a", "g", "f", "c", "e", "b", "k", "j", "h", "d"],
683
index.get_ancestry_with_ghosts(["b", "d"]))
685
self.assertRaises(RevisionNotPresent,
686
index.get_ancestry_with_ghosts, ["e"])
688
def test_iter_parents(self):
689
transport = MockTransport()
690
index = self.get_knit_index(transport, "filename", "w", create=True)
692
index.add_version('r0', ['option'], (None, 0, 1), [])
694
index.add_version('r1', ['option'], (None, 0, 1), ['r0'])
696
index.add_version('r2', ['option'], (None, 0, 1), ['r1', 'r0'])
698
# cases: each sample data individually:
699
self.assertEqual(set([('r0', ())]),
700
set(index.iter_parents(['r0'])))
701
self.assertEqual(set([('r1', ('r0', ))]),
702
set(index.iter_parents(['r1'])))
703
self.assertEqual(set([('r2', ('r1', 'r0'))]),
704
set(index.iter_parents(['r2'])))
705
# no nodes returned for a missing node
706
self.assertEqual(set(),
707
set(index.iter_parents(['missing'])))
708
# 1 node returned with missing nodes skipped
709
self.assertEqual(set([('r1', ('r0', ))]),
710
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
712
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
713
set(index.iter_parents(['r0', 'r1'])))
714
# 2 nodes returned, missing skipped
715
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
716
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
718
def test_num_versions(self):
719
transport = MockTransport([
722
index = self.get_knit_index(transport, "filename", "r")
724
self.assertEqual(0, index.num_versions())
725
self.assertEqual(0, len(index))
727
index.add_version("a", ["option"], (None, 0, 1), [])
728
self.assertEqual(1, index.num_versions())
729
self.assertEqual(1, len(index))
731
index.add_version("a", ["option2"], (None, 1, 2), [])
732
self.assertEqual(1, index.num_versions())
733
self.assertEqual(1, len(index))
735
index.add_version("b", ["option"], (None, 0, 1), [])
736
self.assertEqual(2, index.num_versions())
737
self.assertEqual(2, len(index))
739
def test_get_versions(self):
740
transport = MockTransport([
743
index = self.get_knit_index(transport, "filename", "r")
745
self.assertEqual([], index.get_versions())
747
index.add_version("a", ["option"], (None, 0, 1), [])
748
self.assertEqual(["a"], index.get_versions())
750
index.add_version("a", ["option"], (None, 0, 1), [])
751
self.assertEqual(["a"], index.get_versions())
753
index.add_version("b", ["option"], (None, 0, 1), [])
754
self.assertEqual(["a", "b"], index.get_versions())
756
def test_add_version(self):
757
transport = MockTransport([
760
index = self.get_knit_index(transport, "filename", "r")
762
index.add_version("a", ["option"], (None, 0, 1), ["b"])
763
self.assertEqual(("append_bytes",
764
("filename", "\na option 0 1 .b :"),
765
{}), transport.calls.pop(0))
766
self.assertTrue(index.has_version("a"))
767
self.assertEqual(1, index.num_versions())
768
self.assertEqual((None, 0, 1), index.get_position("a"))
769
self.assertEqual(["option"], index.get_options("a"))
770
self.assertEqual(["b"], index.get_parents_with_ghosts("a"))
772
index.add_version("a", ["opt"], (None, 1, 2), ["c"])
773
self.assertEqual(("append_bytes",
774
("filename", "\na opt 1 2 .c :"),
775
{}), transport.calls.pop(0))
776
self.assertTrue(index.has_version("a"))
777
self.assertEqual(1, index.num_versions())
778
self.assertEqual((None, 1, 2), index.get_position("a"))
779
self.assertEqual(["opt"], index.get_options("a"))
780
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
782
index.add_version("b", ["option"], (None, 2, 3), ["a"])
783
self.assertEqual(("append_bytes",
784
("filename", "\nb option 2 3 0 :"),
785
{}), transport.calls.pop(0))
786
self.assertTrue(index.has_version("b"))
787
self.assertEqual(2, index.num_versions())
788
self.assertEqual((None, 2, 3), index.get_position("b"))
789
self.assertEqual(["option"], index.get_options("b"))
790
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
1028
792
def test_add_versions(self):
1029
793
transport = MockTransport([
1032
796
index = self.get_knit_index(transport, "filename", "r")
1035
call = transport.calls.pop(0)
1036
# call[1][1] is a StringIO - we can't test it by simple equality.
1037
self.assertEqual('put_file_non_atomic', call[0])
1038
self.assertEqual('filename.kndx', call[1][0])
1039
# With no history, _KndxIndex writes a new index:
799
("a", ["option"], (None, 0, 1), ["b"]),
800
("a", ["opt"], (None, 1, 2), ["c"]),
801
("b", ["option"], (None, 2, 3), ["a"])
803
self.assertEqual(("append_bytes", ("filename",
1042
804
"\na option 0 1 .b :"
1043
805
"\na opt 1 2 .c :"
1044
"\nb option 2 3 0 :",
1045
call[1][1].getvalue())
1046
self.assertEqual({'create_parent_dir': True}, call[2])
1047
self.assertIndexIsAB(index)
807
), {}), transport.calls.pop(0))
808
self.assertTrue(index.has_version("a"))
809
self.assertTrue(index.has_version("b"))
810
self.assertEqual(2, index.num_versions())
811
self.assertEqual((None, 1, 2), index.get_position("a"))
812
self.assertEqual((None, 2, 3), index.get_position("b"))
813
self.assertEqual(["opt"], index.get_options("a"))
814
self.assertEqual(["option"], index.get_options("b"))
815
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
816
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
1049
818
def test_add_versions_random_id_is_accepted(self):
1050
819
transport = MockTransport([
1053
822
index = self.get_knit_index(transport, "filename", "r")
1054
self.add_a_b(index, random_id=True)
825
("a", ["option"], (None, 0, 1), ["b"]),
826
("a", ["opt"], (None, 1, 2), ["c"]),
827
("b", ["option"], (None, 2, 3), ["a"])
1056
830
def test_delay_create_and_add_versions(self):
1057
831
transport = MockTransport()
1059
index = self.get_knit_index(transport, "filename", "w")
833
index = self.get_knit_index(transport, "filename", "w",
834
create=True, file_mode="wb", create_parent_dir=True,
835
delay_create=True, dir_mode=0777)
1061
836
self.assertEqual([], transport.calls)
1064
#[ {"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
1066
# Two calls: one during which we load the existing index (and when its
1067
# missing create it), then a second where we write the contents out.
1068
self.assertEqual(2, len(transport.calls))
1069
call = transport.calls.pop(0)
1070
self.assertEqual('put_file_non_atomic', call[0])
1071
self.assertEqual('filename.kndx', call[1][0])
1072
# With no history, _KndxIndex writes a new index:
1073
self.assertEqual(_KndxIndex.HEADER, call[1][1].getvalue())
1074
self.assertEqual({'create_parent_dir': True}, call[2])
1075
call = transport.calls.pop(0)
1076
# call[1][1] is a StringIO - we can't test it by simple equality.
1077
self.assertEqual('put_file_non_atomic', call[0])
1078
self.assertEqual('filename.kndx', call[1][0])
1079
# With no history, _KndxIndex writes a new index:
839
("a", ["option"], (None, 0, 1), ["b"]),
840
("a", ["opt"], (None, 1, 2), ["c"]),
841
("b", ["option"], (None, 2, 3), ["a"])
843
name, (filename, f), kwargs = transport.calls.pop(0)
844
self.assertEqual("put_file_non_atomic", name)
846
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
848
self.assertEqual("filename", filename)
1082
851
"\na option 0 1 .b :"
1083
852
"\na opt 1 2 .c :"
1084
853
"\nb option 2 3 0 :",
1085
call[1][1].getvalue())
1086
self.assertEqual({'create_parent_dir': True}, call[2])
1088
def assertTotalBuildSize(self, size, keys, positions):
1089
self.assertEqual(size,
1090
knit._get_total_build_size(None, keys, positions))
1092
def test__get_total_build_size(self):
1094
('a',): (('fulltext', False), (('a',), 0, 100), None),
1095
('b',): (('line-delta', False), (('b',), 100, 21), ('a',)),
1096
('c',): (('line-delta', False), (('c',), 121, 35), ('b',)),
1097
('d',): (('line-delta', False), (('d',), 156, 12), ('b',)),
1099
self.assertTotalBuildSize(100, [('a',)], positions)
1100
self.assertTotalBuildSize(121, [('b',)], positions)
1101
# c needs both a & b
1102
self.assertTotalBuildSize(156, [('c',)], positions)
1103
# we shouldn't count 'b' twice
1104
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1105
self.assertTotalBuildSize(133, [('d',)], positions)
1106
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
856
def test_has_version(self):
857
transport = MockTransport([
861
index = self.get_knit_index(transport, "filename", "r")
863
self.assertTrue(index.has_version("a"))
864
self.assertFalse(index.has_version("b"))
1108
866
def test_get_position(self):
1109
867
transport = MockTransport([
1111
869
"a option 0 1 :",
1112
870
"b option 1 2 :"
1114
872
index = self.get_knit_index(transport, "filename", "r")
1116
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1117
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
874
self.assertEqual((None, 0, 1), index.get_position("a"))
875
self.assertEqual((None, 1, 2), index.get_position("b"))
1119
877
def test_get_method(self):
1120
878
transport = MockTransport([
1122
880
"a fulltext,unknown 0 1 :",
1123
881
"b unknown,line-delta 1 2 :",
1254
def test_scan_unvalidated_index_not_implemented(self):
1255
transport = MockTransport()
1256
index = self.get_knit_index(transport, 'filename', 'r')
1258
NotImplementedError, index.scan_unvalidated_index,
1259
'dummy graph_index')
1261
NotImplementedError, index.get_missing_compression_parents)
1263
1041
def test_short_line(self):
1264
1042
transport = MockTransport([
1266
1044
"a option 0 10 :",
1267
1045
"b option 10 10 0", # This line isn't terminated, ignored
1269
1047
index = self.get_knit_index(transport, "filename", "r")
1270
self.assertEqual(set([('a',)]), index.keys())
1048
self.assertEqual(['a'], index.get_versions())
1272
1050
def test_skip_incomplete_record(self):
1273
1051
# A line with bogus data should just be skipped
1274
1052
transport = MockTransport([
1276
1054
"a option 0 10 :",
1277
1055
"b option 10 10 0", # This line isn't terminated, ignored
1278
1056
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1280
1058
index = self.get_knit_index(transport, "filename", "r")
1281
self.assertEqual(set([('a',), ('c',)]), index.keys())
1059
self.assertEqual(['a', 'c'], index.get_versions())
1283
1061
def test_trailing_characters(self):
1284
1062
# A line with bogus data should just be skipped
1285
1063
transport = MockTransport([
1287
1065
"a option 0 10 :",
1288
1066
"b option 10 10 0 :a", # This line has extra trailing characters
1289
1067
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1291
1069
index = self.get_knit_index(transport, "filename", "r")
1292
self.assertEqual(set([('a',), ('c',)]), index.keys())
1070
self.assertEqual(['a', 'c'], index.get_versions())
1295
1073
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1297
_test_needs_features = [compiled_knit_feature]
1299
def get_knit_index(self, transport, name, mode):
1300
mapper = ConstantMapper(name)
1301
from bzrlib._knit_load_data_pyx import _load_data_c
1302
self.overrideAttr(knit, '_load_data', _load_data_c)
1303
allow_writes = lambda: mode == 'w'
1304
return _KndxIndex(transport, mapper, lambda:None,
1305
allow_writes, lambda:True)
1308
class Test_KnitAnnotator(TestCaseWithMemoryTransport):
1310
def make_annotator(self):
1311
factory = knit.make_pack_factory(True, True, 1)
1312
vf = factory(self.get_transport())
1313
return knit._KnitAnnotator(vf)
1315
def test__expand_fulltext(self):
1316
ann = self.make_annotator()
1317
rev_key = ('rev-id',)
1318
ann._num_compression_children[rev_key] = 1
1319
res = ann._expand_record(rev_key, (('parent-id',),), None,
1320
['line1\n', 'line2\n'], ('fulltext', True))
1321
# The content object and text lines should be cached appropriately
1322
self.assertEqual(['line1\n', 'line2'], res)
1323
content_obj = ann._content_objects[rev_key]
1324
self.assertEqual(['line1\n', 'line2\n'], content_obj._lines)
1325
self.assertEqual(res, content_obj.text())
1326
self.assertEqual(res, ann._text_cache[rev_key])
1328
def test__expand_delta_comp_parent_not_available(self):
1329
# Parent isn't available yet, so we return nothing, but queue up this
1330
# node for later processing
1331
ann = self.make_annotator()
1332
rev_key = ('rev-id',)
1333
parent_key = ('parent-id',)
1334
record = ['0,1,1\n', 'new-line\n']
1335
details = ('line-delta', False)
1336
res = ann._expand_record(rev_key, (parent_key,), parent_key,
1338
self.assertEqual(None, res)
1339
self.assertTrue(parent_key in ann._pending_deltas)
1340
pending = ann._pending_deltas[parent_key]
1341
self.assertEqual(1, len(pending))
1342
self.assertEqual((rev_key, (parent_key,), record, details), pending[0])
1344
def test__expand_record_tracks_num_children(self):
1345
ann = self.make_annotator()
1346
rev_key = ('rev-id',)
1347
rev2_key = ('rev2-id',)
1348
parent_key = ('parent-id',)
1349
record = ['0,1,1\n', 'new-line\n']
1350
details = ('line-delta', False)
1351
ann._num_compression_children[parent_key] = 2
1352
ann._expand_record(parent_key, (), None, ['line1\n', 'line2\n'],
1353
('fulltext', False))
1354
res = ann._expand_record(rev_key, (parent_key,), parent_key,
1356
self.assertEqual({parent_key: 1}, ann._num_compression_children)
1357
# Expanding the second child should remove the content object, and the
1358
# num_compression_children entry
1359
res = ann._expand_record(rev2_key, (parent_key,), parent_key,
1361
self.assertFalse(parent_key in ann._content_objects)
1362
self.assertEqual({}, ann._num_compression_children)
1363
# We should not cache the content_objects for rev2 and rev, because
1364
# they do not have compression children of their own.
1365
self.assertEqual({}, ann._content_objects)
1367
def test__expand_delta_records_blocks(self):
1368
ann = self.make_annotator()
1369
rev_key = ('rev-id',)
1370
parent_key = ('parent-id',)
1371
record = ['0,1,1\n', 'new-line\n']
1372
details = ('line-delta', True)
1373
ann._num_compression_children[parent_key] = 2
1374
ann._expand_record(parent_key, (), None,
1375
['line1\n', 'line2\n', 'line3\n'],
1376
('fulltext', False))
1377
ann._expand_record(rev_key, (parent_key,), parent_key, record, details)
1378
self.assertEqual({(rev_key, parent_key): [(1, 1, 1), (3, 3, 0)]},
1379
ann._matching_blocks)
1380
rev2_key = ('rev2-id',)
1381
record = ['0,1,1\n', 'new-line\n']
1382
details = ('line-delta', False)
1383
ann._expand_record(rev2_key, (parent_key,), parent_key, record, details)
1384
self.assertEqual([(1, 1, 2), (3, 3, 0)],
1385
ann._matching_blocks[(rev2_key, parent_key)])
1387
def test__get_parent_ann_uses_matching_blocks(self):
1388
ann = self.make_annotator()
1389
rev_key = ('rev-id',)
1390
parent_key = ('parent-id',)
1391
parent_ann = [(parent_key,)]*3
1392
block_key = (rev_key, parent_key)
1393
ann._annotations_cache[parent_key] = parent_ann
1394
ann._matching_blocks[block_key] = [(0, 1, 1), (3, 3, 0)]
1395
# We should not try to access any parent_lines content, because we know
1396
# we already have the matching blocks
1397
par_ann, blocks = ann._get_parent_annotations_and_matches(rev_key,
1398
['1\n', '2\n', '3\n'], parent_key)
1399
self.assertEqual(parent_ann, par_ann)
1400
self.assertEqual([(0, 1, 1), (3, 3, 0)], blocks)
1401
self.assertEqual({}, ann._matching_blocks)
1403
def test__process_pending(self):
1404
ann = self.make_annotator()
1405
rev_key = ('rev-id',)
1408
record = ['0,1,1\n', 'new-line\n']
1409
details = ('line-delta', False)
1410
p1_record = ['line1\n', 'line2\n']
1411
ann._num_compression_children[p1_key] = 1
1412
res = ann._expand_record(rev_key, (p1_key,p2_key), p1_key,
1414
self.assertEqual(None, res)
1415
# self.assertTrue(p1_key in ann._pending_deltas)
1416
self.assertEqual({}, ann._pending_annotation)
1417
# Now insert p1, and we should be able to expand the delta
1418
res = ann._expand_record(p1_key, (), None, p1_record,
1419
('fulltext', False))
1420
self.assertEqual(p1_record, res)
1421
ann._annotations_cache[p1_key] = [(p1_key,)]*2
1422
res = ann._process_pending(p1_key)
1423
self.assertEqual([], res)
1424
self.assertFalse(p1_key in ann._pending_deltas)
1425
self.assertTrue(p2_key in ann._pending_annotation)
1426
self.assertEqual({p2_key: [(rev_key, (p1_key, p2_key))]},
1427
ann._pending_annotation)
1428
# Now fill in parent 2, and pending annotation should be satisfied
1429
res = ann._expand_record(p2_key, (), None, [], ('fulltext', False))
1430
ann._annotations_cache[p2_key] = []
1431
res = ann._process_pending(p2_key)
1432
self.assertEqual([rev_key], res)
1433
self.assertEqual({}, ann._pending_annotation)
1434
self.assertEqual({}, ann._pending_deltas)
1436
def test_record_delta_removes_basis(self):
1437
ann = self.make_annotator()
1438
ann._expand_record(('parent-id',), (), None,
1439
['line1\n', 'line2\n'], ('fulltext', False))
1440
ann._num_compression_children['parent-id'] = 2
1442
def test_annotate_special_text(self):
1443
ann = self.make_annotator()
1445
rev1_key = ('rev-1',)
1446
rev2_key = ('rev-2',)
1447
rev3_key = ('rev-3',)
1448
spec_key = ('special:',)
1449
vf.add_lines(rev1_key, [], ['initial content\n'])
1450
vf.add_lines(rev2_key, [rev1_key], ['initial content\n',
1453
vf.add_lines(rev3_key, [rev1_key], ['initial content\n',
1456
spec_text = ('initial content\n'
1460
ann.add_special_text(spec_key, [rev2_key, rev3_key], spec_text)
1461
anns, lines = ann.annotate(spec_key)
1462
self.assertEqual([(rev1_key,),
1463
(rev2_key, rev3_key),
1467
self.assertEqualDiff(spec_text, ''.join(lines))
1075
_test_needs_features = [CompiledKnitFeature]
1077
def get_knit_index(self, *args, **kwargs):
1078
orig = knit._load_data
1080
knit._load_data = orig
1081
self.addCleanup(reset)
1082
from bzrlib._knit_load_data_c import _load_data_c
1083
knit._load_data = _load_data_c
1084
return _KnitIndex(*args, **kwargs)
1470
1088
class KnitTests(TestCaseWithTransport):
1471
1089
"""Class containing knit test helper routines."""
1473
def make_test_knit(self, annotate=False, name='test'):
1474
mapper = ConstantMapper(name)
1475
return make_file_factory(annotate, mapper)(self.get_transport())
1478
class TestBadShaError(KnitTests):
1479
"""Tests for handling of sha errors."""
1481
def test_sha_exception_has_text(self):
1482
# having the failed text included in the error allows for recovery.
1483
source = self.make_test_knit()
1484
target = self.make_test_knit(name="target")
1485
if not source._max_delta_chain:
1486
raise TestNotApplicable(
1487
"cannot get delta-caused sha failures without deltas.")
1490
broken = ('broken',)
1491
source.add_lines(basis, (), ['foo\n'])
1492
source.add_lines(broken, (basis,), ['foo\n', 'bar\n'])
1493
# Seed target with a bad basis text
1494
target.add_lines(basis, (), ['gam\n'])
1495
target.insert_record_stream(
1496
source.get_record_stream([broken], 'unordered', False))
1497
err = self.assertRaises(errors.KnitCorrupt,
1498
target.get_record_stream([broken], 'unordered', True
1499
).next().get_bytes_as, 'chunked')
1500
self.assertEqual(['gam\n', 'bar\n'], err.content)
1501
# Test for formatting with live data
1502
self.assertStartsWith(str(err), "Knit ")
1091
def make_test_knit(self, annotate=False, delay_create=False, index=None,
1094
factory = KnitPlainFactory()
1097
return KnitVersionedFile(name, get_transport('.'), access_mode='w',
1098
factory=factory, create=True,
1099
delay_create=delay_create, index=index)
1101
def assertRecordContentEqual(self, knit, version_id, candidate_content):
1102
"""Assert that some raw record content matches the raw record content
1103
for a particular version_id in the given knit.
1105
index_memo = knit._index.get_position(version_id)
1106
record = (version_id, index_memo)
1107
[(_, expected_content)] = list(knit._data.read_records_iter_raw([record]))
1108
self.assertEqual(expected_content, candidate_content)
1111
class BasicKnitTests(KnitTests):
1113
def add_stock_one_and_one_a(self, k):
1114
k.add_lines('text-1', [], split_lines(TEXT_1))
1115
k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
1117
def test_knit_constructor(self):
1118
"""Construct empty k"""
1119
self.make_test_knit()
1121
def test_make_explicit_index(self):
1122
"""We can supply an index to use."""
1123
knit = KnitVersionedFile('test', get_transport('.'),
1124
index='strangelove')
1125
self.assertEqual(knit._index, 'strangelove')
1127
def test_knit_add(self):
1128
"""Store one text in knit and retrieve"""
1129
k = self.make_test_knit()
1130
k.add_lines('text-1', [], split_lines(TEXT_1))
1131
self.assertTrue(k.has_version('text-1'))
1132
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1134
def test_knit_reload(self):
1135
# test that the content in a reloaded knit is correct
1136
k = self.make_test_knit()
1137
k.add_lines('text-1', [], split_lines(TEXT_1))
1139
k2 = KnitVersionedFile('test', get_transport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
1140
self.assertTrue(k2.has_version('text-1'))
1141
self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
1143
def test_knit_several(self):
1144
"""Store several texts in a knit"""
1145
k = self.make_test_knit()
1146
k.add_lines('text-1', [], split_lines(TEXT_1))
1147
k.add_lines('text-2', [], split_lines(TEXT_2))
1148
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1149
self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
1151
def test_repeated_add(self):
1152
"""Knit traps attempt to replace existing version"""
1153
k = self.make_test_knit()
1154
k.add_lines('text-1', [], split_lines(TEXT_1))
1155
self.assertRaises(RevisionAlreadyPresent,
1157
'text-1', [], split_lines(TEXT_1))
1159
def test_empty(self):
1160
k = self.make_test_knit(True)
1161
k.add_lines('text-1', [], [])
1162
self.assertEquals(k.get_lines('text-1'), [])
1164
def test_incomplete(self):
1165
"""Test if texts without a ending line-end can be inserted and
1167
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1168
k.add_lines('text-1', [], ['a\n', 'b' ])
1169
k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
1170
# reopening ensures maximum room for confusion
1171
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1172
self.assertEquals(k.get_lines('text-1'), ['a\n', 'b' ])
1173
self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
1175
def test_delta(self):
1176
"""Expression of knit delta as lines"""
1177
k = self.make_test_knit()
1178
td = list(line_delta(TEXT_1.splitlines(True),
1179
TEXT_1A.splitlines(True)))
1180
self.assertEqualDiff(''.join(td), delta_1_1a)
1181
out = apply_line_delta(TEXT_1.splitlines(True), td)
1182
self.assertEqualDiff(''.join(out), TEXT_1A)
1184
def test_add_with_parents(self):
1185
"""Store in knit with parents"""
1186
k = self.make_test_knit()
1187
self.add_stock_one_and_one_a(k)
1188
self.assertEquals(k.get_parents('text-1'), [])
1189
self.assertEquals(k.get_parents('text-1a'), ['text-1'])
1191
def test_ancestry(self):
1192
"""Store in knit with parents"""
1193
k = self.make_test_knit()
1194
self.add_stock_one_and_one_a(k)
1195
self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
1197
def test_add_delta(self):
1198
"""Store in knit with parents"""
1199
k = KnitVersionedFile('test', get_transport('.'), factory=KnitPlainFactory(),
1200
delta=True, create=True)
1201
self.add_stock_one_and_one_a(k)
1203
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1205
def test_add_delta_knit_graph_index(self):
1206
"""Does adding work with a KnitGraphIndex."""
1207
index = InMemoryGraphIndex(2)
1208
knit_index = KnitGraphIndex(index, add_callback=index.add_nodes,
1210
k = KnitVersionedFile('test', get_transport('.'),
1211
delta=True, create=True, index=knit_index)
1212
self.add_stock_one_and_one_a(k)
1214
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1215
# check the index had the right data added.
1216
self.assertEqual(set([
1217
(index, ('text-1', ), ' 0 127', ((), ())),
1218
(index, ('text-1a', ), ' 127 140', ((('text-1', ),), (('text-1', ),))),
1219
]), set(index.iter_all_entries()))
1220
# we should not have a .kndx file
1221
self.assertFalse(get_transport('.').has('test.kndx'))
1223
def test_annotate(self):
1225
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1226
delta=True, create=True)
1227
self.insert_and_test_small_annotate(k)
1229
def insert_and_test_small_annotate(self, k):
1230
"""test annotation with k works correctly."""
1231
k.add_lines('text-1', [], ['a\n', 'b\n'])
1232
k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
1234
origins = k.annotate('text-2')
1235
self.assertEquals(origins[0], ('text-1', 'a\n'))
1236
self.assertEquals(origins[1], ('text-2', 'c\n'))
1238
def test_annotate_fulltext(self):
1240
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1241
delta=False, create=True)
1242
self.insert_and_test_small_annotate(k)
1244
def test_annotate_merge_1(self):
1245
k = self.make_test_knit(True)
1246
k.add_lines('text-a1', [], ['a\n', 'b\n'])
1247
k.add_lines('text-a2', [], ['d\n', 'c\n'])
1248
k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
1249
origins = k.annotate('text-am')
1250
self.assertEquals(origins[0], ('text-a2', 'd\n'))
1251
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1253
def test_annotate_merge_2(self):
1254
k = self.make_test_knit(True)
1255
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1256
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1257
k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
1258
origins = k.annotate('text-am')
1259
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1260
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1261
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1263
def test_annotate_merge_9(self):
1264
k = self.make_test_knit(True)
1265
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1266
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1267
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
1268
origins = k.annotate('text-am')
1269
self.assertEquals(origins[0], ('text-am', 'k\n'))
1270
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1271
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1273
def test_annotate_merge_3(self):
1274
k = self.make_test_knit(True)
1275
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1276
k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
1277
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
1278
origins = k.annotate('text-am')
1279
self.assertEquals(origins[0], ('text-am', 'k\n'))
1280
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1281
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1283
def test_annotate_merge_4(self):
1284
k = self.make_test_knit(True)
1285
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1286
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1287
k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
1288
k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
1289
origins = k.annotate('text-am')
1290
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1291
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1292
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1294
def test_annotate_merge_5(self):
1295
k = self.make_test_knit(True)
1296
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1297
k.add_lines('text-a2', [], ['d\n', 'e\n', 'f\n'])
1298
k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
1299
k.add_lines('text-am',
1300
['text-a1', 'text-a2', 'text-a3'],
1301
['a\n', 'e\n', 'z\n'])
1302
origins = k.annotate('text-am')
1303
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1304
self.assertEquals(origins[1], ('text-a2', 'e\n'))
1305
self.assertEquals(origins[2], ('text-a3', 'z\n'))
1307
def test_annotate_file_cherry_pick(self):
1308
k = self.make_test_knit(True)
1309
k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
1310
k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
1311
k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
1312
origins = k.annotate('text-3')
1313
self.assertEquals(origins[0], ('text-1', 'a\n'))
1314
self.assertEquals(origins[1], ('text-1', 'b\n'))
1315
self.assertEquals(origins[2], ('text-1', 'c\n'))
1317
def _test_join_with_factories(self, k1_factory, k2_factory):
1318
k1 = KnitVersionedFile('test1', get_transport('.'), factory=k1_factory, create=True)
1319
k1.add_lines('text-a', [], ['a1\n', 'a2\n', 'a3\n'])
1320
k1.add_lines('text-b', ['text-a'], ['a1\n', 'b2\n', 'a3\n'])
1321
k1.add_lines('text-c', [], ['c1\n', 'c2\n', 'c3\n'])
1322
k1.add_lines('text-d', ['text-c'], ['c1\n', 'd2\n', 'd3\n'])
1323
k1.add_lines('text-m', ['text-b', 'text-d'], ['a1\n', 'b2\n', 'd3\n'])
1324
k2 = KnitVersionedFile('test2', get_transport('.'), factory=k2_factory, create=True)
1325
count = k2.join(k1, version_ids=['text-m'])
1326
self.assertEquals(count, 5)
1327
self.assertTrue(k2.has_version('text-a'))
1328
self.assertTrue(k2.has_version('text-c'))
1329
origins = k2.annotate('text-m')
1330
self.assertEquals(origins[0], ('text-a', 'a1\n'))
1331
self.assertEquals(origins[1], ('text-b', 'b2\n'))
1332
self.assertEquals(origins[2], ('text-d', 'd3\n'))
1334
def test_knit_join_plain_to_plain(self):
1335
"""Test joining a plain knit with a plain knit."""
1336
self._test_join_with_factories(KnitPlainFactory(), KnitPlainFactory())
1338
def test_knit_join_anno_to_anno(self):
1339
"""Test joining an annotated knit with an annotated knit."""
1340
self._test_join_with_factories(None, None)
1342
def test_knit_join_anno_to_plain(self):
1343
"""Test joining an annotated knit with a plain knit."""
1344
self._test_join_with_factories(None, KnitPlainFactory())
1346
def test_knit_join_plain_to_anno(self):
1347
"""Test joining a plain knit with an annotated knit."""
1348
self._test_join_with_factories(KnitPlainFactory(), None)
1350
def test_reannotate(self):
1351
k1 = KnitVersionedFile('knit1', get_transport('.'),
1352
factory=KnitAnnotateFactory(), create=True)
1354
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1356
k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
1358
k2 = KnitVersionedFile('test2', get_transport('.'),
1359
factory=KnitAnnotateFactory(), create=True)
1360
k2.join(k1, version_ids=['text-b'])
1363
k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
1365
k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
1367
k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
1369
# test-c will have index 3
1370
k1.join(k2, version_ids=['text-c'])
1372
lines = k1.get_lines('text-c')
1373
self.assertEquals(lines, ['z\n', 'c\n'])
1375
origins = k1.annotate('text-c')
1376
self.assertEquals(origins[0], ('text-c', 'z\n'))
1377
self.assertEquals(origins[1], ('text-b', 'c\n'))
1379
def test_get_line_delta_texts(self):
1380
"""Make sure we can call get_texts on text with reused line deltas"""
1381
k1 = KnitVersionedFile('test1', get_transport('.'),
1382
factory=KnitPlainFactory(), create=True)
1387
parents = ['%d' % (t-1)]
1388
k1.add_lines('%d' % t, parents, ['hello\n'] * t)
1389
k1.get_texts(('%d' % t) for t in range(3))
1391
def test_iter_lines_reads_in_order(self):
1392
instrumented_t = get_transport('trace+memory:///')
1393
k1 = KnitVersionedFile('id', instrumented_t, create=True, delta=True)
1394
self.assertEqual([('get', 'id.kndx',)], instrumented_t._activity)
1395
# add texts with no required ordering
1396
k1.add_lines('base', [], ['text\n'])
1397
k1.add_lines('base2', [], ['text2\n'])
1399
# clear the logged activity, but preserve the list instance in case of
1400
# clones pointing at it.
1401
del instrumented_t._activity[:]
1402
# request a last-first iteration
1403
results = list(k1.iter_lines_added_or_present_in_versions(
1406
[('readv', 'id.knit', [(0, 87), (87, 89)], False, None)],
1407
instrumented_t._activity)
1408
self.assertEqual([('text\n', 'base'), ('text2\n', 'base2')], results)
1410
def test_create_empty_annotated(self):
1411
k1 = self.make_test_knit(True)
1413
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1414
k2 = k1.create_empty('t', MemoryTransport())
1415
self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
1416
self.assertEqual(k1.delta, k2.delta)
1417
# the generic test checks for empty content and file class
1419
def test_knit_format(self):
1420
# this tests that a new knit index file has the expected content
1421
# and that is writes the data we expect as records are added.
1422
knit = self.make_test_knit(True)
1423
# Now knit files are not created until we first add data to them
1424
self.assertFileEqual("# bzr knit index 8\n", 'test.kndx')
1425
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1426
self.assertFileEqual(
1427
"# bzr knit index 8\n"
1429
"revid fulltext 0 84 .a_ghost :",
1431
knit.add_lines_with_ghosts('revid2', ['revid'], ['a\n'])
1432
self.assertFileEqual(
1433
"# bzr knit index 8\n"
1434
"\nrevid fulltext 0 84 .a_ghost :"
1435
"\nrevid2 line-delta 84 82 0 :",
1437
# we should be able to load this file again
1438
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1439
self.assertEqual(['revid', 'revid2'], knit.versions())
1440
# write a short write to the file and ensure that its ignored
1441
indexfile = file('test.kndx', 'ab')
1442
indexfile.write('\nrevid3 line-delta 166 82 1 2 3 4 5 .phwoar:demo ')
1444
# we should be able to load this file again
1445
knit = KnitVersionedFile('test', get_transport('.'), access_mode='w')
1446
self.assertEqual(['revid', 'revid2'], knit.versions())
1447
# and add a revision with the same id the failed write had
1448
knit.add_lines('revid3', ['revid2'], ['a\n'])
1449
# and when reading it revid3 should now appear.
1450
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1451
self.assertEqual(['revid', 'revid2', 'revid3'], knit.versions())
1452
self.assertEqual(['revid2'], knit.get_parents('revid3'))
1454
def test_delay_create(self):
1455
"""Test that passing delay_create=True creates files late"""
1456
knit = self.make_test_knit(annotate=True, delay_create=True)
1457
self.failIfExists('test.knit')
1458
self.failIfExists('test.kndx')
1459
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1460
self.failUnlessExists('test.knit')
1461
self.assertFileEqual(
1462
"# bzr knit index 8\n"
1464
"revid fulltext 0 84 .a_ghost :",
1467
def test_create_parent_dir(self):
1468
"""create_parent_dir can create knits in nonexistant dirs"""
1469
# Has no effect if we don't set 'delay_create'
1470
trans = get_transport('.')
1471
self.assertRaises(NoSuchFile, KnitVersionedFile, 'dir/test',
1472
trans, access_mode='w', factory=None,
1473
create=True, create_parent_dir=True)
1474
# Nothing should have changed yet
1475
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1476
factory=None, create=True,
1477
create_parent_dir=True,
1479
self.failIfExists('dir/test.knit')
1480
self.failIfExists('dir/test.kndx')
1481
self.failIfExists('dir')
1482
knit.add_lines('revid', [], ['a\n'])
1483
self.failUnlessExists('dir')
1484
self.failUnlessExists('dir/test.knit')
1485
self.assertFileEqual(
1486
"# bzr knit index 8\n"
1488
"revid fulltext 0 84 :",
1491
def test_create_mode_700(self):
1492
trans = get_transport('.')
1493
if not trans._can_roundtrip_unix_modebits():
1494
# Can't roundtrip, so no need to run this test
1496
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1497
factory=None, create=True,
1498
create_parent_dir=True,
1502
knit.add_lines('revid', [], ['a\n'])
1503
self.assertTransportMode(trans, 'dir', 0700)
1504
self.assertTransportMode(trans, 'dir/test.knit', 0600)
1505
self.assertTransportMode(trans, 'dir/test.kndx', 0600)
1507
def test_create_mode_770(self):
1508
trans = get_transport('.')
1509
if not trans._can_roundtrip_unix_modebits():
1510
# Can't roundtrip, so no need to run this test
1512
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1513
factory=None, create=True,
1514
create_parent_dir=True,
1518
knit.add_lines('revid', [], ['a\n'])
1519
self.assertTransportMode(trans, 'dir', 0770)
1520
self.assertTransportMode(trans, 'dir/test.knit', 0660)
1521
self.assertTransportMode(trans, 'dir/test.kndx', 0660)
1523
def test_create_mode_777(self):
1524
trans = get_transport('.')
1525
if not trans._can_roundtrip_unix_modebits():
1526
# Can't roundtrip, so no need to run this test
1528
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1529
factory=None, create=True,
1530
create_parent_dir=True,
1534
knit.add_lines('revid', [], ['a\n'])
1535
self.assertTransportMode(trans, 'dir', 0777)
1536
self.assertTransportMode(trans, 'dir/test.knit', 0666)
1537
self.assertTransportMode(trans, 'dir/test.kndx', 0666)
1539
def test_plan_merge(self):
1540
my_knit = self.make_test_knit(annotate=True)
1541
my_knit.add_lines('text1', [], split_lines(TEXT_1))
1542
my_knit.add_lines('text1a', ['text1'], split_lines(TEXT_1A))
1543
my_knit.add_lines('text1b', ['text1'], split_lines(TEXT_1B))
1544
plan = list(my_knit.plan_merge('text1a', 'text1b'))
1545
for plan_line, expected_line in zip(plan, AB_MERGE):
1546
self.assertEqual(plan_line, expected_line)
1548
def test_get_stream_empty(self):
1549
"""Get a data stream for an empty knit file."""
1550
k1 = self.make_test_knit()
1551
format, data_list, reader_callable = k1.get_data_stream([])
1552
self.assertEqual('knit-plain', format)
1553
self.assertEqual([], data_list)
1554
content = reader_callable(None)
1555
self.assertEqual('', content)
1556
self.assertIsInstance(content, str)
1558
def test_get_stream_one_version(self):
1559
"""Get a data stream for a single record out of a knit containing just
1562
k1 = self.make_test_knit()
1564
('text-a', [], TEXT_1),
1566
expected_data_list = [
1567
# version, options, length, parents
1568
('text-a', ['fulltext'], 122, []),
1570
for version_id, parents, lines in test_data:
1571
k1.add_lines(version_id, parents, split_lines(lines))
1573
format, data_list, reader_callable = k1.get_data_stream(['text-a'])
1574
self.assertEqual('knit-plain', format)
1575
self.assertEqual(expected_data_list, data_list)
1576
# There's only one record in the knit, so the content should be the
1577
# entire knit data file's contents.
1578
self.assertEqual(k1.transport.get_bytes(k1._data._access._filename),
1579
reader_callable(None))
1581
def test_get_stream_get_one_version_of_many(self):
1582
"""Get a data stream for just one version out of a knit containing many
1585
k1 = self.make_test_knit()
1586
# Insert the same data as test_knit_join, as they seem to cover a range
1587
# of cases (no parents, one parent, multiple parents).
1589
('text-a', [], TEXT_1),
1590
('text-b', ['text-a'], TEXT_1),
1591
('text-c', [], TEXT_1),
1592
('text-d', ['text-c'], TEXT_1),
1593
('text-m', ['text-b', 'text-d'], TEXT_1),
1595
expected_data_list = [
1596
# version, options, length, parents
1597
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1599
for version_id, parents, lines in test_data:
1600
k1.add_lines(version_id, parents, split_lines(lines))
1602
format, data_list, reader_callable = k1.get_data_stream(['text-m'])
1603
self.assertEqual('knit-plain', format)
1604
self.assertEqual(expected_data_list, data_list)
1605
self.assertRecordContentEqual(k1, 'text-m', reader_callable(None))
1607
def test_get_stream_ghost_parent(self):
1608
"""Get a data stream for a version with a ghost parent."""
1609
k1 = self.make_test_knit()
1611
k1.add_lines('text-a', [], split_lines(TEXT_1))
1612
k1.add_lines_with_ghosts('text-b', ['text-a', 'text-ghost'],
1613
split_lines(TEXT_1))
1615
expected_data_list = [
1616
# version, options, length, parents
1617
('text-b', ['line-delta'], 84, ['text-a', 'text-ghost']),
1620
format, data_list, reader_callable = k1.get_data_stream(['text-b'])
1621
self.assertEqual('knit-plain', format)
1622
self.assertEqual(expected_data_list, data_list)
1623
self.assertRecordContentEqual(k1, 'text-b', reader_callable(None))
1625
def test_get_stream_get_multiple_records(self):
1626
"""Get a stream for multiple records of a knit."""
1627
k1 = self.make_test_knit()
1628
# Insert the same data as test_knit_join, as they seem to cover a range
1629
# of cases (no parents, one parent, multiple parents).
1631
('text-a', [], TEXT_1),
1632
('text-b', ['text-a'], TEXT_1),
1633
('text-c', [], TEXT_1),
1634
('text-d', ['text-c'], TEXT_1),
1635
('text-m', ['text-b', 'text-d'], TEXT_1),
1637
expected_data_list = [
1638
# version, options, length, parents
1639
('text-b', ['line-delta'], 84, ['text-a']),
1640
('text-d', ['line-delta'], 84, ['text-c']),
1642
for version_id, parents, lines in test_data:
1643
k1.add_lines(version_id, parents, split_lines(lines))
1645
# Note that even though we request the revision IDs in a particular
1646
# order, the data stream may return them in any order it likes. In this
1647
# case, they'll be in the order they were inserted into the knit.
1648
format, data_list, reader_callable = k1.get_data_stream(
1649
['text-d', 'text-b'])
1650
self.assertEqual('knit-plain', format)
1651
self.assertEqual(expected_data_list, data_list)
1652
self.assertRecordContentEqual(k1, 'text-b', reader_callable(84))
1653
self.assertRecordContentEqual(k1, 'text-d', reader_callable(84))
1654
self.assertEqual('', reader_callable(None),
1655
"There should be no more bytes left to read.")
1657
def test_get_stream_all(self):
1658
"""Get a data stream for all the records in a knit.
1660
This exercises fulltext records, line-delta records, records with
1661
various numbers of parents, and reading multiple records out of the
1662
callable. These cases ought to all be exercised individually by the
1663
other test_get_stream_* tests; this test is basically just paranoia.
1665
k1 = self.make_test_knit()
1666
# Insert the same data as test_knit_join, as they seem to cover a range
1667
# of cases (no parents, one parent, multiple parents).
1669
('text-a', [], TEXT_1),
1670
('text-b', ['text-a'], TEXT_1),
1671
('text-c', [], TEXT_1),
1672
('text-d', ['text-c'], TEXT_1),
1673
('text-m', ['text-b', 'text-d'], TEXT_1),
1675
expected_data_list = [
1676
# version, options, length, parents
1677
('text-a', ['fulltext'], 122, []),
1678
('text-b', ['line-delta'], 84, ['text-a']),
1679
('text-c', ['fulltext'], 121, []),
1680
('text-d', ['line-delta'], 84, ['text-c']),
1681
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1683
for version_id, parents, lines in test_data:
1684
k1.add_lines(version_id, parents, split_lines(lines))
1686
format, data_list, reader_callable = k1.get_data_stream(
1687
['text-a', 'text-b', 'text-c', 'text-d', 'text-m'])
1688
self.assertEqual('knit-plain', format)
1689
self.assertEqual(expected_data_list, data_list)
1690
for version_id, options, length, parents in expected_data_list:
1691
bytes = reader_callable(length)
1692
self.assertRecordContentEqual(k1, version_id, bytes)
1694
def assertKnitFilesEqual(self, knit1, knit2):
1695
"""Assert that the contents of the index and data files of two knits are
1699
knit1.transport.get_bytes(knit1._data._access._filename),
1700
knit2.transport.get_bytes(knit2._data._access._filename))
1702
knit1.transport.get_bytes(knit1._index._filename),
1703
knit2.transport.get_bytes(knit2._index._filename))
1705
def test_insert_data_stream_empty(self):
1706
"""Inserting a data stream with no records should not put any data into
1709
k1 = self.make_test_knit()
1710
k1.insert_data_stream(
1711
(k1.get_format_signature(), [], lambda ignored: ''))
1712
self.assertEqual('', k1.transport.get_bytes(k1._data._access._filename),
1713
"The .knit should be completely empty.")
1714
self.assertEqual(k1._index.HEADER,
1715
k1.transport.get_bytes(k1._index._filename),
1716
"The .kndx should have nothing apart from the header.")
1718
def test_insert_data_stream_one_record(self):
1719
"""Inserting a data stream with one record from a knit with one record
1720
results in byte-identical files.
1722
source = self.make_test_knit(name='source')
1723
source.add_lines('text-a', [], split_lines(TEXT_1))
1724
data_stream = source.get_data_stream(['text-a'])
1726
target = self.make_test_knit(name='target')
1727
target.insert_data_stream(data_stream)
1729
self.assertKnitFilesEqual(source, target)
1731
def test_insert_data_stream_records_already_present(self):
1732
"""Insert a data stream where some records are alreday present in the
1733
target, and some not. Only the new records are inserted.
1735
source = self.make_test_knit(name='source')
1736
target = self.make_test_knit(name='target')
1737
# Insert 'text-a' into both source and target
1738
source.add_lines('text-a', [], split_lines(TEXT_1))
1739
target.insert_data_stream(source.get_data_stream(['text-a']))
1740
# Insert 'text-b' into just the source.
1741
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1742
# Get a data stream of both text-a and text-b, and insert it.
1743
data_stream = source.get_data_stream(['text-a', 'text-b'])
1744
target.insert_data_stream(data_stream)
1745
# The source and target will now be identical. This means the text-a
1746
# record was not added a second time.
1747
self.assertKnitFilesEqual(source, target)
1749
def test_insert_data_stream_multiple_records(self):
1750
"""Inserting a data stream of all records from a knit with multiple
1751
records results in byte-identical files.
1753
source = self.make_test_knit(name='source')
1754
source.add_lines('text-a', [], split_lines(TEXT_1))
1755
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1756
source.add_lines('text-c', [], split_lines(TEXT_1))
1757
data_stream = source.get_data_stream(['text-a', 'text-b', 'text-c'])
1759
target = self.make_test_knit(name='target')
1760
target.insert_data_stream(data_stream)
1762
self.assertKnitFilesEqual(source, target)
1764
def test_insert_data_stream_ghost_parent(self):
1765
"""Insert a data stream with a record that has a ghost parent."""
1766
# Make a knit with a record, text-a, that has a ghost parent.
1767
source = self.make_test_knit(name='source')
1768
source.add_lines_with_ghosts('text-a', ['text-ghost'],
1769
split_lines(TEXT_1))
1770
data_stream = source.get_data_stream(['text-a'])
1772
target = self.make_test_knit(name='target')
1773
target.insert_data_stream(data_stream)
1775
self.assertKnitFilesEqual(source, target)
1777
# The target knit object is in a consistent state, i.e. the record we
1778
# just added is immediately visible.
1779
self.assertTrue(target.has_version('text-a'))
1780
self.assertTrue(target.has_ghost('text-ghost'))
1781
self.assertEqual(split_lines(TEXT_1), target.get_lines('text-a'))
1783
def test_insert_data_stream_inconsistent_version_lines(self):
1784
"""Inserting a data stream which has different content for a version_id
1785
than already exists in the knit will raise KnitCorrupt.
1787
source = self.make_test_knit(name='source')
1788
target = self.make_test_knit(name='target')
1789
# Insert a different 'text-a' into both source and target
1790
source.add_lines('text-a', [], split_lines(TEXT_1))
1791
target.add_lines('text-a', [], split_lines(TEXT_2))
1792
# Insert a data stream with conflicting content into the target
1793
data_stream = source.get_data_stream(['text-a'])
1795
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1797
def test_insert_data_stream_inconsistent_version_parents(self):
1798
"""Inserting a data stream which has different parents for a version_id
1799
than already exists in the knit will raise KnitCorrupt.
1801
source = self.make_test_knit(name='source')
1802
target = self.make_test_knit(name='target')
1803
# Insert a different 'text-a' into both source and target. They differ
1804
# only by the parents list, the content is the same.
1805
source.add_lines_with_ghosts('text-a', [], split_lines(TEXT_1))
1806
target.add_lines_with_ghosts('text-a', ['a-ghost'], split_lines(TEXT_1))
1807
# Insert a data stream with conflicting content into the target
1808
data_stream = source.get_data_stream(['text-a'])
1810
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1812
def test_insert_data_stream_incompatible_format(self):
1813
"""A data stream in a different format to the target knit cannot be
1816
It will raise KnitDataStreamIncompatible.
1818
data_stream = ('fake-format-signature', [], lambda _: '')
1819
target = self.make_test_knit(name='target')
1821
errors.KnitDataStreamIncompatible,
1822
target.insert_data_stream, data_stream)
1824
# * test that a stream of "already present version, then new version"
1825
# inserts correctly.
1836
Banana cup cake recipe
1842
- self-raising flour
1846
Banana cup cake recipe
1848
- bananas (do not use plantains!!!)
1855
Banana cup cake recipe
1858
- self-raising flour
1871
AB_MERGE_TEXT="""unchanged|Banana cup cake recipe
1876
new-b|- bananas (do not use plantains!!!)
1877
unchanged|- broken tea cups
1878
new-a|- self-raising flour
1881
AB_MERGE=[tuple(l.split('|')) for l in AB_MERGE_TEXT.splitlines(True)]
1884
def line_delta(from_lines, to_lines):
1885
"""Generate line-based delta from one text to another"""
1886
s = difflib.SequenceMatcher(None, from_lines, to_lines)
1887
for op in s.get_opcodes():
1888
if op[0] == 'equal':
1890
yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
1891
for i in range(op[3], op[4]):
1895
def apply_line_delta(basis_lines, delta_lines):
1896
"""Apply a line-based perfect diff
1898
basis_lines -- text to apply the patch to
1899
delta_lines -- diff instructions and content
1901
out = basis_lines[:]
1904
while i < len(delta_lines):
1906
a, b, c = map(long, l.split(','))
1908
out[offset+a:offset+b] = delta_lines[i:i+c]
1910
offset = offset + (b - a) + c
1914
class TestWeaveToKnit(KnitTests):
1916
def test_weave_to_knit_matches(self):
1917
# check that the WeaveToKnit is_compatible function
1918
# registers True for a Weave to a Knit.
1920
k = self.make_test_knit()
1921
self.failUnless(WeaveToKnit.is_compatible(w, k))
1922
self.failIf(WeaveToKnit.is_compatible(k, w))
1923
self.failIf(WeaveToKnit.is_compatible(w, w))
1924
self.failIf(WeaveToKnit.is_compatible(k, k))
1927
class TestKnitCaching(KnitTests):
1929
def create_knit(self):
1930
k = self.make_test_knit(True)
1931
k.add_lines('text-1', [], split_lines(TEXT_1))
1932
k.add_lines('text-2', [], split_lines(TEXT_2))
1935
def test_no_caching(self):
1936
k = self.create_knit()
1937
# Nothing should be cached without setting 'enable_cache'
1938
self.assertEqual({}, k._data._cache)
1940
def test_cache_data_read_raw(self):
1941
k = self.create_knit()
1943
# Now cache and read
1946
def read_one_raw(version):
1947
pos_map = k._get_components_positions([version])
1948
method, index_memo, next = pos_map[version]
1949
lst = list(k._data.read_records_iter_raw([(version, index_memo)]))
1950
self.assertEqual(1, len(lst))
1953
val = read_one_raw('text-1')
1954
self.assertEqual({'text-1':val[1]}, k._data._cache)
1957
# After clear, new reads are not cached
1958
self.assertEqual({}, k._data._cache)
1960
val2 = read_one_raw('text-1')
1961
self.assertEqual(val, val2)
1962
self.assertEqual({}, k._data._cache)
1964
def test_cache_data_read(self):
1965
k = self.create_knit()
1967
def read_one(version):
1968
pos_map = k._get_components_positions([version])
1969
method, index_memo, next = pos_map[version]
1970
lst = list(k._data.read_records_iter([(version, index_memo)]))
1971
self.assertEqual(1, len(lst))
1974
# Now cache and read
1977
val = read_one('text-2')
1978
self.assertEqual(['text-2'], k._data._cache.keys())
1979
self.assertEqual('text-2', val[0])
1980
content, digest = k._data._parse_record('text-2',
1981
k._data._cache['text-2'])
1982
self.assertEqual(content, val[1])
1983
self.assertEqual(digest, val[2])
1986
self.assertEqual({}, k._data._cache)
1988
val2 = read_one('text-2')
1989
self.assertEqual(val, val2)
1990
self.assertEqual({}, k._data._cache)
1992
def test_cache_read(self):
1993
k = self.create_knit()
1996
text = k.get_text('text-1')
1997
self.assertEqual(TEXT_1, text)
1998
self.assertEqual(['text-1'], k._data._cache.keys())
2001
self.assertEqual({}, k._data._cache)
2003
text = k.get_text('text-1')
2004
self.assertEqual(TEXT_1, text)
2005
self.assertEqual({}, k._data._cache)
1505
2008
class TestKnitIndex(KnitTests):
1633
2127
add_callback = self.catch_add
1635
2129
add_callback = None
1636
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
2130
return KnitGraphIndex(combined_index, deltas=deltas,
1637
2131
add_callback=add_callback)
1639
def test_keys(self):
1640
index = self.two_graph_index()
1641
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
2133
def test_get_graph(self):
2134
index = self.two_graph_index()
2135
self.assertEqual(set([
2136
('tip', ('parent', )),
2138
('parent', ('tail', 'ghost')),
2140
]), set(index.get_graph()))
2142
def test_get_ancestry(self):
2143
# get_ancestry is defined as eliding ghosts, not erroring.
2144
index = self.two_graph_index()
2145
self.assertEqual([], index.get_ancestry([]))
2146
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2147
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2148
self.assertEqual(['tail', 'parent'], index.get_ancestry(['parent']))
2149
self.assertEqual(['tail', 'parent', 'tip'], index.get_ancestry(['tip']))
2150
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2151
(['tail', 'parent', 'tip', 'separate'],
2152
['separate', 'tail', 'parent', 'tip'],
2154
# and without topo_sort
2155
self.assertEqual(set(['separate']),
2156
set(index.get_ancestry(['separate'], topo_sorted=False)))
2157
self.assertEqual(set(['tail']),
2158
set(index.get_ancestry(['tail'], topo_sorted=False)))
2159
self.assertEqual(set(['tail', 'parent']),
2160
set(index.get_ancestry(['parent'], topo_sorted=False)))
2161
self.assertEqual(set(['tail', 'parent', 'tip']),
2162
set(index.get_ancestry(['tip'], topo_sorted=False)))
2163
self.assertEqual(set(['separate', 'tail', 'parent', 'tip']),
2164
set(index.get_ancestry(['tip', 'separate'])))
2165
# asking for a ghost makes it go boom.
2166
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2168
def test_get_ancestry_with_ghosts(self):
2169
index = self.two_graph_index()
2170
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2171
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2172
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2173
self.assertTrue(index.get_ancestry_with_ghosts(['parent']) in
2174
(['tail', 'ghost', 'parent'],
2175
['ghost', 'tail', 'parent'],
2177
self.assertTrue(index.get_ancestry_with_ghosts(['tip']) in
2178
(['tail', 'ghost', 'parent', 'tip'],
2179
['ghost', 'tail', 'parent', 'tip'],
2181
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2182
(['tail', 'ghost', 'parent', 'tip', 'separate'],
2183
['ghost', 'tail', 'parent', 'tip', 'separate'],
2184
['separate', 'tail', 'ghost', 'parent', 'tip'],
2185
['separate', 'ghost', 'tail', 'parent', 'tip'],
2187
# asking for a ghost makes it go boom.
2188
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2190
def test_num_versions(self):
2191
index = self.two_graph_index()
2192
self.assertEqual(4, index.num_versions())
2194
def test_get_versions(self):
2195
index = self.two_graph_index()
2196
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2197
set(index.get_versions()))
2199
def test_has_version(self):
2200
index = self.two_graph_index()
2201
self.assertTrue(index.has_version('tail'))
2202
self.assertFalse(index.has_version('ghost'))
1644
2204
def test_get_position(self):
1645
2205
index = self.two_graph_index()
1646
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position(('tip',)))
1647
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position(('parent',)))
2206
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2207
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
1649
2209
def test_get_method_deltas(self):
1650
2210
index = self.two_graph_index(deltas=True)
1651
self.assertEqual('fulltext', index.get_method(('tip',)))
1652
self.assertEqual('line-delta', index.get_method(('parent',)))
2211
self.assertEqual('fulltext', index.get_method('tip'))
2212
self.assertEqual('line-delta', index.get_method('parent'))
1654
2214
def test_get_method_no_deltas(self):
1655
2215
# check that the parent-history lookup is ignored with deltas=False.
1656
2216
index = self.two_graph_index(deltas=False)
1657
self.assertEqual('fulltext', index.get_method(('tip',)))
1658
self.assertEqual('fulltext', index.get_method(('parent',)))
2217
self.assertEqual('fulltext', index.get_method('tip'))
2218
self.assertEqual('fulltext', index.get_method('parent'))
1660
2220
def test_get_options_deltas(self):
1661
2221
index = self.two_graph_index(deltas=True)
1662
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1663
self.assertEqual(['line-delta'], index.get_options(('parent',)))
2222
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2223
self.assertEqual(['line-delta'], index.get_options('parent'))
1665
2225
def test_get_options_no_deltas(self):
1666
2226
# check that the parent-history lookup is ignored with deltas=False.
1667
2227
index = self.two_graph_index(deltas=False)
1668
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1669
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1671
def test_get_parent_map(self):
1672
index = self.two_graph_index()
1673
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1674
index.get_parent_map([('parent',), ('ghost',)]))
2228
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2229
self.assertEqual(['fulltext'], index.get_options('parent'))
2231
def test_get_parents(self):
2232
# get_parents ignores ghosts
2233
index = self.two_graph_index()
2234
self.assertEqual(('tail', ), index.get_parents('parent'))
2235
# and errors on ghosts.
2236
self.assertRaises(errors.RevisionNotPresent,
2237
index.get_parents, 'ghost')
2239
def test_get_parents_with_ghosts(self):
2240
index = self.two_graph_index()
2241
self.assertEqual(('tail', 'ghost'), index.get_parents_with_ghosts('parent'))
2242
# and errors on ghosts.
2243
self.assertRaises(errors.RevisionNotPresent,
2244
index.get_parents_with_ghosts, 'ghost')
2246
def test_check_versions_present(self):
2247
# ghosts should not be considered present
2248
index = self.two_graph_index()
2249
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2251
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2253
index.check_versions_present(['tail', 'separate'])
1676
2255
def catch_add(self, entries):
1677
2256
self.caught_entries.append(entries)
1679
2258
def test_add_no_callback_errors(self):
1680
2259
index = self.two_graph_index()
1681
self.assertRaises(errors.ReadOnlyError, index.add_records,
1682
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
2260
self.assertRaises(errors.ReadOnlyError, index.add_version,
2261
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1684
2263
def test_add_version_smoke(self):
1685
2264
index = self.two_graph_index(catch_adds=True)
1686
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
2265
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1688
2266
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1689
2267
self.caught_entries)
1691
2269
def test_add_version_delta_not_delta_index(self):
1692
2270
index = self.two_graph_index(catch_adds=True)
1693
self.assertRaises(errors.KnitCorrupt, index.add_records,
1694
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2271
self.assertRaises(errors.KnitCorrupt, index.add_version,
2272
'new', 'no-eol,line-delta', (None, 0, 100), ['parent'])
1695
2273
self.assertEqual([], self.caught_entries)
1697
2275
def test_add_version_same_dup(self):
1698
2276
index = self.two_graph_index(catch_adds=True)
1699
2277
# options can be spelt two different ways
1700
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1701
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1702
# position/length are ignored (because each pack could have fulltext or
1703
# delta, and be at a different position.
1704
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1706
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1708
# but neither should have added data:
1709
self.assertEqual([[], [], [], []], self.caught_entries)
2278
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2279
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])
2280
# but neither should have added data.
2281
self.assertEqual([[], []], self.caught_entries)
1711
2283
def test_add_version_different_dup(self):
1712
2284
index = self.two_graph_index(deltas=True, catch_adds=True)
1713
2285
# change options
1714
self.assertRaises(errors.KnitCorrupt, index.add_records,
1715
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1716
self.assertRaises(errors.KnitCorrupt, index.add_records,
1717
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
2286
self.assertRaises(errors.KnitCorrupt, index.add_version,
2287
'tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2288
self.assertRaises(errors.KnitCorrupt, index.add_version,
2289
'tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])
2290
self.assertRaises(errors.KnitCorrupt, index.add_version,
2291
'tip', 'fulltext', (None, 0, 100), ['parent'])
2293
self.assertRaises(errors.KnitCorrupt, index.add_version,
2294
'tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])
2295
self.assertRaises(errors.KnitCorrupt, index.add_version,
2296
'tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])
1719
self.assertRaises(errors.KnitCorrupt, index.add_records,
1720
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2298
self.assertRaises(errors.KnitCorrupt, index.add_version,
2299
'tip', 'fulltext,no-eol', (None, 0, 100), [])
1721
2300
self.assertEqual([], self.caught_entries)
1723
2302
def test_add_versions_nodeltas(self):
1724
2303
index = self.two_graph_index(catch_adds=True)
1726
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1727
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
2304
index.add_versions([
2305
('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2306
('new2', 'fulltext', (None, 0, 6), ['new']),
1729
2308
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1730
2309
(('new2', ), ' 0 6', ((('new',),),))],
1745
2324
def test_add_versions_delta_not_delta_index(self):
1746
2325
index = self.two_graph_index(catch_adds=True)
1747
self.assertRaises(errors.KnitCorrupt, index.add_records,
1748
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2326
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2327
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
1749
2328
self.assertEqual([], self.caught_entries)
1751
2330
def test_add_versions_random_id_accepted(self):
1752
2331
index = self.two_graph_index(catch_adds=True)
1753
index.add_records([], random_id=True)
2332
index.add_versions([], random_id=True)
1755
2334
def test_add_versions_same_dup(self):
1756
2335
index = self.two_graph_index(catch_adds=True)
1757
2336
# options can be spelt two different ways
1758
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100),
1760
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100),
1762
# position/length are ignored (because each pack could have fulltext or
1763
# delta, and be at a different position.
1764
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1766
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
2337
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2338
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
1768
2339
# but neither should have added data.
1769
self.assertEqual([[], [], [], []], self.caught_entries)
2340
self.assertEqual([[], []], self.caught_entries)
1771
2342
def test_add_versions_different_dup(self):
1772
2343
index = self.two_graph_index(deltas=True, catch_adds=True)
1773
2344
# change options
1774
self.assertRaises(errors.KnitCorrupt, index.add_records,
1775
[(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
1776
self.assertRaises(errors.KnitCorrupt, index.add_records,
1777
[(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
2345
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2346
[('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2347
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2348
[('tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])])
2349
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2350
[('tip', 'fulltext', (None, 0, 100), ['parent'])])
2352
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2353
[('tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])])
2354
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2355
[('tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])])
1779
self.assertRaises(errors.KnitCorrupt, index.add_records,
1780
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2357
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2358
[('tip', 'fulltext,no-eol', (None, 0, 100), [])])
1781
2359
# change options in the second record
1782
self.assertRaises(errors.KnitCorrupt, index.add_records,
1783
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
1784
(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
2360
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2361
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent']),
2362
('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
1785
2363
self.assertEqual([], self.caught_entries)
1787
def make_g_index_missing_compression_parent(self):
1788
graph_index = self.make_g_index('missing_comp', 2,
1789
[(('tip', ), ' 100 78',
1790
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1793
def make_g_index_missing_parent(self):
1794
graph_index = self.make_g_index('missing_parent', 2,
1795
[(('parent', ), ' 100 78', ([], [])),
1796
(('tip', ), ' 100 78',
1797
([('parent', ), ('missing-parent', )], [('parent', )])),
1801
def make_g_index_no_external_refs(self):
1802
graph_index = self.make_g_index('no_external_refs', 2,
1803
[(('rev', ), ' 100 78',
1804
([('parent', ), ('ghost', )], []))])
1807
def test_add_good_unvalidated_index(self):
1808
unvalidated = self.make_g_index_no_external_refs()
1809
combined = CombinedGraphIndex([unvalidated])
1810
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1811
index.scan_unvalidated_index(unvalidated)
1812
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1814
def test_add_missing_compression_parent_unvalidated_index(self):
1815
unvalidated = self.make_g_index_missing_compression_parent()
1816
combined = CombinedGraphIndex([unvalidated])
1817
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1818
index.scan_unvalidated_index(unvalidated)
1819
# This also checks that its only the compression parent that is
1820
# examined, otherwise 'ghost' would also be reported as a missing
1823
frozenset([('missing-parent',)]),
1824
index.get_missing_compression_parents())
1826
def test_add_missing_noncompression_parent_unvalidated_index(self):
1827
unvalidated = self.make_g_index_missing_parent()
1828
combined = CombinedGraphIndex([unvalidated])
1829
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1830
track_external_parent_refs=True)
1831
index.scan_unvalidated_index(unvalidated)
1833
frozenset([('missing-parent',)]), index.get_missing_parents())
1835
def test_track_external_parent_refs(self):
1836
g_index = self.make_g_index('empty', 2, [])
1837
combined = CombinedGraphIndex([g_index])
1838
index = _KnitGraphIndex(combined, lambda: True, deltas=True,
1839
add_callback=self.catch_add, track_external_parent_refs=True)
1840
self.caught_entries = []
1842
(('new-key',), 'fulltext,no-eol', (None, 50, 60),
1843
[('parent-1',), ('parent-2',)])])
1845
frozenset([('parent-1',), ('parent-2',)]),
1846
index.get_missing_parents())
1848
def test_add_unvalidated_index_with_present_external_references(self):
1849
index = self.two_graph_index(deltas=True)
1850
# Ugly hack to get at one of the underlying GraphIndex objects that
1851
# two_graph_index built.
1852
unvalidated = index._graph_index._indices[1]
1853
# 'parent' is an external ref of _indices[1] (unvalidated), but is
1854
# present in _indices[0].
1855
index.scan_unvalidated_index(unvalidated)
1856
self.assertEqual(frozenset(), index.get_missing_compression_parents())
1858
def make_new_missing_parent_g_index(self, name):
1859
missing_parent = name + '-missing-parent'
1860
graph_index = self.make_g_index(name, 2,
1861
[((name + 'tip', ), ' 100 78',
1862
([(missing_parent, ), ('ghost', )], [(missing_parent, )]))])
1865
def test_add_mulitiple_unvalidated_indices_with_missing_parents(self):
1866
g_index_1 = self.make_new_missing_parent_g_index('one')
1867
g_index_2 = self.make_new_missing_parent_g_index('two')
1868
combined = CombinedGraphIndex([g_index_1, g_index_2])
1869
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1870
index.scan_unvalidated_index(g_index_1)
1871
index.scan_unvalidated_index(g_index_2)
1873
frozenset([('one-missing-parent',), ('two-missing-parent',)]),
1874
index.get_missing_compression_parents())
1876
def test_add_mulitiple_unvalidated_indices_with_mutual_dependencies(self):
1877
graph_index_a = self.make_g_index('one', 2,
1878
[(('parent-one', ), ' 100 78', ([('non-compression-parent',)], [])),
1879
(('child-of-two', ), ' 100 78',
1880
([('parent-two',)], [('parent-two',)]))])
1881
graph_index_b = self.make_g_index('two', 2,
1882
[(('parent-two', ), ' 100 78', ([('non-compression-parent',)], [])),
1883
(('child-of-one', ), ' 100 78',
1884
([('parent-one',)], [('parent-one',)]))])
1885
combined = CombinedGraphIndex([graph_index_a, graph_index_b])
1886
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1887
index.scan_unvalidated_index(graph_index_a)
1888
index.scan_unvalidated_index(graph_index_b)
1890
frozenset([]), index.get_missing_compression_parents())
2365
def test_iter_parents(self):
2366
index1 = self.make_g_index('1', 1, [
2368
(('r0', ), 'N0 100', ([], )),
2370
(('r1', ), '', ([('r0', )], ))])
2371
index2 = self.make_g_index('2', 1, [
2373
(('r2', ), 'N0 100', ([('r1', ), ('r0', )], )),
2375
combined_index = CombinedGraphIndex([index1, index2])
2376
index = KnitGraphIndex(combined_index)
2378
# cases: each sample data individually:
2379
self.assertEqual(set([('r0', ())]),
2380
set(index.iter_parents(['r0'])))
2381
self.assertEqual(set([('r1', ('r0', ))]),
2382
set(index.iter_parents(['r1'])))
2383
self.assertEqual(set([('r2', ('r1', 'r0'))]),
2384
set(index.iter_parents(['r2'])))
2385
# no nodes returned for a missing node
2386
self.assertEqual(set(),
2387
set(index.iter_parents(['missing'])))
2388
# 1 node returned with missing nodes skipped
2389
self.assertEqual(set([('r1', ('r0', ))]),
2390
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
2392
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2393
set(index.iter_parents(['r0', 'r1'])))
2394
# 2 nodes returned, missing skipped
2395
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2396
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
1893
2399
class TestNoParentsGraphIndexKnit(KnitTests):
1894
"""Tests for knits using _KnitGraphIndex with no parents."""
2400
"""Tests for knits using KnitGraphIndex with no parents."""
1896
2402
def make_g_index(self, name, ref_lists=0, nodes=[]):
1897
2403
builder = GraphIndexBuilder(ref_lists)
1935
2433
add_callback = self.catch_add
1937
2435
add_callback = None
1938
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
2436
return KnitGraphIndex(combined_index, parents=False,
1939
2437
add_callback=add_callback)
1941
def test_keys(self):
1942
index = self.two_graph_index()
1943
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
2439
def test_get_graph(self):
2440
index = self.two_graph_index()
2441
self.assertEqual(set([
2446
]), set(index.get_graph()))
2448
def test_get_ancestry(self):
2449
# with no parents, ancestry is always just the key.
2450
index = self.two_graph_index()
2451
self.assertEqual([], index.get_ancestry([]))
2452
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2453
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2454
self.assertEqual(['parent'], index.get_ancestry(['parent']))
2455
self.assertEqual(['tip'], index.get_ancestry(['tip']))
2456
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2457
(['tip', 'separate'],
2458
['separate', 'tip'],
2460
# asking for a ghost makes it go boom.
2461
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2463
def test_get_ancestry_with_ghosts(self):
2464
index = self.two_graph_index()
2465
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2466
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2467
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2468
self.assertEqual(['parent'], index.get_ancestry_with_ghosts(['parent']))
2469
self.assertEqual(['tip'], index.get_ancestry_with_ghosts(['tip']))
2470
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2471
(['tip', 'separate'],
2472
['separate', 'tip'],
2474
# asking for a ghost makes it go boom.
2475
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2477
def test_num_versions(self):
2478
index = self.two_graph_index()
2479
self.assertEqual(4, index.num_versions())
2481
def test_get_versions(self):
2482
index = self.two_graph_index()
2483
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2484
set(index.get_versions()))
2486
def test_has_version(self):
2487
index = self.two_graph_index()
2488
self.assertTrue(index.has_version('tail'))
2489
self.assertFalse(index.has_version('ghost'))
1946
2491
def test_get_position(self):
1947
2492
index = self.two_graph_index()
1948
self.assertEqual((index._graph_index._indices[0], 0, 100),
1949
index.get_position(('tip',)))
1950
self.assertEqual((index._graph_index._indices[1], 100, 78),
1951
index.get_position(('parent',)))
2493
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2494
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
1953
2496
def test_get_method(self):
1954
2497
index = self.two_graph_index()
1955
self.assertEqual('fulltext', index.get_method(('tip',)))
1956
self.assertEqual(['fulltext'], index.get_options(('parent',)))
2498
self.assertEqual('fulltext', index.get_method('tip'))
2499
self.assertEqual(['fulltext'], index.get_options('parent'))
1958
2501
def test_get_options(self):
1959
2502
index = self.two_graph_index()
1960
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1961
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1963
def test_get_parent_map(self):
1964
index = self.two_graph_index()
1965
self.assertEqual({('parent',):None},
1966
index.get_parent_map([('parent',), ('ghost',)]))
2503
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2504
self.assertEqual(['fulltext'], index.get_options('parent'))
2506
def test_get_parents(self):
2507
index = self.two_graph_index()
2508
self.assertEqual((), index.get_parents('parent'))
2509
# and errors on ghosts.
2510
self.assertRaises(errors.RevisionNotPresent,
2511
index.get_parents, 'ghost')
2513
def test_get_parents_with_ghosts(self):
2514
index = self.two_graph_index()
2515
self.assertEqual((), index.get_parents_with_ghosts('parent'))
2516
# and errors on ghosts.
2517
self.assertRaises(errors.RevisionNotPresent,
2518
index.get_parents_with_ghosts, 'ghost')
2520
def test_check_versions_present(self):
2521
index = self.two_graph_index()
2522
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2524
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2525
['tail', 'missing'])
2526
index.check_versions_present(['tail', 'separate'])
1968
2528
def catch_add(self, entries):
1969
2529
self.caught_entries.append(entries)
1971
2531
def test_add_no_callback_errors(self):
1972
2532
index = self.two_graph_index()
1973
self.assertRaises(errors.ReadOnlyError, index.add_records,
1974
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
2533
self.assertRaises(errors.ReadOnlyError, index.add_version,
2534
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1976
2536
def test_add_version_smoke(self):
1977
2537
index = self.two_graph_index(catch_adds=True)
1978
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
2538
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), [])
1979
2539
self.assertEqual([[(('new', ), 'N50 60')]],
1980
2540
self.caught_entries)
1982
2542
def test_add_version_delta_not_delta_index(self):
1983
2543
index = self.two_graph_index(catch_adds=True)
1984
self.assertRaises(errors.KnitCorrupt, index.add_records,
1985
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
2544
self.assertRaises(errors.KnitCorrupt, index.add_version,
2545
'new', 'no-eol,line-delta', (None, 0, 100), [])
1986
2546
self.assertEqual([], self.caught_entries)
1988
2548
def test_add_version_same_dup(self):
1989
2549
index = self.two_graph_index(catch_adds=True)
1990
2550
# options can be spelt two different ways
1991
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1992
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
1993
# position/length are ignored (because each pack could have fulltext or
1994
# delta, and be at a different position.
1995
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1996
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2551
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), [])
2552
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), [])
1997
2553
# but neither should have added data.
1998
self.assertEqual([[], [], [], []], self.caught_entries)
2554
self.assertEqual([[], []], self.caught_entries)
2000
2556
def test_add_version_different_dup(self):
2001
2557
index = self.two_graph_index(catch_adds=True)
2002
2558
# change options
2003
self.assertRaises(errors.KnitCorrupt, index.add_records,
2004
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2005
self.assertRaises(errors.KnitCorrupt, index.add_records,
2006
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2007
self.assertRaises(errors.KnitCorrupt, index.add_records,
2008
[(('tip',), 'fulltext', (None, 0, 100), [])])
2559
self.assertRaises(errors.KnitCorrupt, index.add_version,
2560
'tip', 'no-eol,line-delta', (None, 0, 100), [])
2561
self.assertRaises(errors.KnitCorrupt, index.add_version,
2562
'tip', 'line-delta,no-eol', (None, 0, 100), [])
2563
self.assertRaises(errors.KnitCorrupt, index.add_version,
2564
'tip', 'fulltext', (None, 0, 100), [])
2566
self.assertRaises(errors.KnitCorrupt, index.add_version,
2567
'tip', 'fulltext,no-eol', (None, 50, 100), [])
2568
self.assertRaises(errors.KnitCorrupt, index.add_version,
2569
'tip', 'fulltext,no-eol', (None, 0, 1000), [])
2010
self.assertRaises(errors.KnitCorrupt, index.add_records,
2011
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2571
self.assertRaises(errors.KnitCorrupt, index.add_version,
2572
'tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2012
2573
self.assertEqual([], self.caught_entries)
2014
2575
def test_add_versions(self):
2015
2576
index = self.two_graph_index(catch_adds=True)
2017
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2018
(('new2',), 'fulltext', (None, 0, 6), []),
2577
index.add_versions([
2578
('new', 'fulltext,no-eol', (None, 50, 60), []),
2579
('new2', 'fulltext', (None, 0, 6), []),
2020
2581
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2021
2582
sorted(self.caught_entries[0]))
2024
2585
def test_add_versions_delta_not_delta_index(self):
2025
2586
index = self.two_graph_index(catch_adds=True)
2026
self.assertRaises(errors.KnitCorrupt, index.add_records,
2027
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2587
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2588
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2028
2589
self.assertEqual([], self.caught_entries)
2030
2591
def test_add_versions_parents_not_parents_index(self):
2031
2592
index = self.two_graph_index(catch_adds=True)
2032
self.assertRaises(errors.KnitCorrupt, index.add_records,
2033
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
2593
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2594
[('new', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2034
2595
self.assertEqual([], self.caught_entries)
2036
2597
def test_add_versions_random_id_accepted(self):
2037
2598
index = self.two_graph_index(catch_adds=True)
2038
index.add_records([], random_id=True)
2599
index.add_versions([], random_id=True)
2040
2601
def test_add_versions_same_dup(self):
2041
2602
index = self.two_graph_index(catch_adds=True)
2042
2603
# options can be spelt two different ways
2043
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2044
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2045
# position/length are ignored (because each pack could have fulltext or
2046
# delta, and be at a different position.
2047
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
2048
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2604
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2605
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), [])])
2049
2606
# but neither should have added data.
2050
self.assertEqual([[], [], [], []], self.caught_entries)
2607
self.assertEqual([[], []], self.caught_entries)
2052
2609
def test_add_versions_different_dup(self):
2053
2610
index = self.two_graph_index(catch_adds=True)
2054
2611
# change options
2055
self.assertRaises(errors.KnitCorrupt, index.add_records,
2056
[(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2057
self.assertRaises(errors.KnitCorrupt, index.add_records,
2058
[(('tip',), 'line-delta,no-eol', (None, 0, 100), [])])
2059
self.assertRaises(errors.KnitCorrupt, index.add_records,
2060
[(('tip',), 'fulltext', (None, 0, 100), [])])
2612
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2613
[('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2614
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2615
[('tip', 'line-delta,no-eol', (None, 0, 100), [])])
2616
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2617
[('tip', 'fulltext', (None, 0, 100), [])])
2619
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2620
[('tip', 'fulltext,no-eol', (None, 50, 100), [])])
2621
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2622
[('tip', 'fulltext,no-eol', (None, 0, 1000), [])])
2062
self.assertRaises(errors.KnitCorrupt, index.add_records,
2063
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2624
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2625
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2064
2626
# change options in the second record
2065
self.assertRaises(errors.KnitCorrupt, index.add_records,
2066
[(('tip',), 'fulltext,no-eol', (None, 0, 100), []),
2067
(('tip',), 'no-eol,line-delta', (None, 0, 100), [])])
2627
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2628
[('tip', 'fulltext,no-eol', (None, 0, 100), []),
2629
('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2068
2630
self.assertEqual([], self.caught_entries)
2071
class TestKnitVersionedFiles(KnitTests):
2073
def assertGroupKeysForIo(self, exp_groups, keys, non_local_keys,
2074
positions, _min_buffer_size=None):
2075
kvf = self.make_test_knit()
2076
if _min_buffer_size is None:
2077
_min_buffer_size = knit._STREAM_MIN_BUFFER_SIZE
2078
self.assertEqual(exp_groups, kvf._group_keys_for_io(keys,
2079
non_local_keys, positions,
2080
_min_buffer_size=_min_buffer_size))
2082
def assertSplitByPrefix(self, expected_map, expected_prefix_order,
2084
split, prefix_order = KnitVersionedFiles._split_by_prefix(keys)
2085
self.assertEqual(expected_map, split)
2086
self.assertEqual(expected_prefix_order, prefix_order)
2088
def test__group_keys_for_io(self):
2089
ft_detail = ('fulltext', False)
2090
ld_detail = ('line-delta', False)
2098
f_a: (ft_detail, (f_a, 0, 100), None),
2099
f_b: (ld_detail, (f_b, 100, 21), f_a),
2100
f_c: (ld_detail, (f_c, 180, 15), f_b),
2101
g_a: (ft_detail, (g_a, 121, 35), None),
2102
g_b: (ld_detail, (g_b, 156, 12), g_a),
2103
g_c: (ld_detail, (g_c, 195, 13), g_a),
2105
self.assertGroupKeysForIo([([f_a], set())],
2106
[f_a], [], positions)
2107
self.assertGroupKeysForIo([([f_a], set([f_a]))],
2108
[f_a], [f_a], positions)
2109
self.assertGroupKeysForIo([([f_a, f_b], set([]))],
2110
[f_a, f_b], [], positions)
2111
self.assertGroupKeysForIo([([f_a, f_b], set([f_b]))],
2112
[f_a, f_b], [f_b], positions)
2113
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
2114
[f_a, g_a, f_b, g_b], [], positions)
2115
self.assertGroupKeysForIo([([f_a, f_b, g_a, g_b], set())],
2116
[f_a, g_a, f_b, g_b], [], positions,
2117
_min_buffer_size=150)
2118
self.assertGroupKeysForIo([([f_a, f_b], set()), ([g_a, g_b], set())],
2119
[f_a, g_a, f_b, g_b], [], positions,
2120
_min_buffer_size=100)
2121
self.assertGroupKeysForIo([([f_c], set()), ([g_b], set())],
2122
[f_c, g_b], [], positions,
2123
_min_buffer_size=125)
2124
self.assertGroupKeysForIo([([g_b, f_c], set())],
2125
[g_b, f_c], [], positions,
2126
_min_buffer_size=125)
2128
def test__split_by_prefix(self):
2129
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2130
'g': [('g', 'b'), ('g', 'a')],
2132
[('f', 'a'), ('g', 'b'),
2133
('g', 'a'), ('f', 'b')])
2135
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2136
'g': [('g', 'b'), ('g', 'a')],
2138
[('f', 'a'), ('f', 'b'),
2139
('g', 'b'), ('g', 'a')])
2141
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2142
'g': [('g', 'b'), ('g', 'a')],
2144
[('f', 'a'), ('f', 'b'),
2145
('g', 'b'), ('g', 'a')])
2147
self.assertSplitByPrefix({'f': [('f', 'a'), ('f', 'b')],
2148
'g': [('g', 'b'), ('g', 'a')],
2149
'': [('a',), ('b',)]
2151
[('f', 'a'), ('g', 'b'),
2153
('g', 'a'), ('f', 'b')])
2156
class TestStacking(KnitTests):
2158
def get_basis_and_test_knit(self):
2159
basis = self.make_test_knit(name='basis')
2160
basis = RecordingVersionedFilesDecorator(basis)
2161
test = self.make_test_knit(name='test')
2162
test.add_fallback_versioned_files(basis)
2165
def test_add_fallback_versioned_files(self):
2166
basis = self.make_test_knit(name='basis')
2167
test = self.make_test_knit(name='test')
2168
# It must not error; other tests test that the fallback is referred to
2169
# when accessing data.
2170
test.add_fallback_versioned_files(basis)
2172
def test_add_lines(self):
2173
# lines added to the test are not added to the basis
2174
basis, test = self.get_basis_and_test_knit()
2176
key_basis = ('bar',)
2177
key_cross_border = ('quux',)
2178
key_delta = ('zaphod',)
2179
test.add_lines(key, (), ['foo\n'])
2180
self.assertEqual({}, basis.get_parent_map([key]))
2181
# lines added to the test that reference across the stack do a
2183
basis.add_lines(key_basis, (), ['foo\n'])
2185
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2186
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2187
# we don't even need to look at the basis to see that this should be
2188
# stored as a fulltext
2189
self.assertEqual([], basis.calls)
2190
# Subsequent adds do delta.
2192
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2193
self.assertEqual('line-delta', test._index.get_method(key_delta))
2194
self.assertEqual([], basis.calls)
2196
def test_annotate(self):
2197
# annotations from the test knit are answered without asking the basis
2198
basis, test = self.get_basis_and_test_knit()
2200
key_basis = ('bar',)
2201
key_missing = ('missing',)
2202
test.add_lines(key, (), ['foo\n'])
2203
details = test.annotate(key)
2204
self.assertEqual([(key, 'foo\n')], details)
2205
self.assertEqual([], basis.calls)
2206
# But texts that are not in the test knit are looked for in the basis
2208
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2210
details = test.annotate(key_basis)
2211
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2212
# Not optimised to date:
2213
# self.assertEqual([("annotate", key_basis)], basis.calls)
2214
self.assertEqual([('get_parent_map', set([key_basis])),
2215
('get_parent_map', set([key_basis])),
2216
('get_record_stream', [key_basis], 'topological', True)],
2219
def test_check(self):
2220
# At the moment checking a stacked knit does implicitly check the
2222
basis, test = self.get_basis_and_test_knit()
2225
def test_get_parent_map(self):
2226
# parents in the test knit are answered without asking the basis
2227
basis, test = self.get_basis_and_test_knit()
2229
key_basis = ('bar',)
2230
key_missing = ('missing',)
2231
test.add_lines(key, (), [])
2232
parent_map = test.get_parent_map([key])
2233
self.assertEqual({key: ()}, parent_map)
2234
self.assertEqual([], basis.calls)
2235
# But parents that are not in the test knit are looked for in the basis
2236
basis.add_lines(key_basis, (), [])
2238
parent_map = test.get_parent_map([key, key_basis, key_missing])
2239
self.assertEqual({key: (),
2240
key_basis: ()}, parent_map)
2241
self.assertEqual([("get_parent_map", set([key_basis, key_missing]))],
2244
def test_get_record_stream_unordered_fulltexts(self):
2245
# records from the test knit are answered without asking the basis:
2246
basis, test = self.get_basis_and_test_knit()
2248
key_basis = ('bar',)
2249
key_missing = ('missing',)
2250
test.add_lines(key, (), ['foo\n'])
2251
records = list(test.get_record_stream([key], 'unordered', True))
2252
self.assertEqual(1, len(records))
2253
self.assertEqual([], basis.calls)
2254
# Missing (from test knit) objects are retrieved from the basis:
2255
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2257
records = list(test.get_record_stream([key_basis, key_missing],
2259
self.assertEqual(2, len(records))
2260
calls = list(basis.calls)
2261
for record in records:
2262
self.assertSubset([record.key], (key_basis, key_missing))
2263
if record.key == key_missing:
2264
self.assertIsInstance(record, AbsentContentFactory)
2266
reference = list(basis.get_record_stream([key_basis],
2267
'unordered', True))[0]
2268
self.assertEqual(reference.key, record.key)
2269
self.assertEqual(reference.sha1, record.sha1)
2270
self.assertEqual(reference.storage_kind, record.storage_kind)
2271
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2272
record.get_bytes_as(record.storage_kind))
2273
self.assertEqual(reference.get_bytes_as('fulltext'),
2274
record.get_bytes_as('fulltext'))
2275
# It's not strictly minimal, but it seems reasonable for now for it to
2276
# ask which fallbacks have which parents.
2278
("get_parent_map", set([key_basis, key_missing])),
2279
("get_record_stream", [key_basis], 'unordered', True)],
2282
def test_get_record_stream_ordered_fulltexts(self):
2283
# ordering is preserved down into the fallback store.
2284
basis, test = self.get_basis_and_test_knit()
2286
key_basis = ('bar',)
2287
key_basis_2 = ('quux',)
2288
key_missing = ('missing',)
2289
test.add_lines(key, (key_basis,), ['foo\n'])
2290
# Missing (from test knit) objects are retrieved from the basis:
2291
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2292
basis.add_lines(key_basis_2, (), ['quux\n'])
2294
# ask for in non-topological order
2295
records = list(test.get_record_stream(
2296
[key, key_basis, key_missing, key_basis_2], 'topological', True))
2297
self.assertEqual(4, len(records))
2299
for record in records:
2300
self.assertSubset([record.key],
2301
(key_basis, key_missing, key_basis_2, key))
2302
if record.key == key_missing:
2303
self.assertIsInstance(record, AbsentContentFactory)
2305
results.append((record.key, record.sha1, record.storage_kind,
2306
record.get_bytes_as('fulltext')))
2307
calls = list(basis.calls)
2308
order = [record[0] for record in results]
2309
self.assertEqual([key_basis_2, key_basis, key], order)
2310
for result in results:
2311
if result[0] == key:
2315
record = source.get_record_stream([result[0]], 'unordered',
2317
self.assertEqual(record.key, result[0])
2318
self.assertEqual(record.sha1, result[1])
2319
# We used to check that the storage kind matched, but actually it
2320
# depends on whether it was sourced from the basis, or in a single
2321
# group, because asking for full texts returns proxy objects to a
2322
# _ContentMapGenerator object; so checking the kind is unneeded.
2323
self.assertEqual(record.get_bytes_as('fulltext'), result[3])
2324
# It's not strictly minimal, but it seems reasonable for now for it to
2325
# ask which fallbacks have which parents.
2327
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2328
# topological is requested from the fallback, because that is what
2329
# was requested at the top level.
2330
("get_record_stream", [key_basis_2, key_basis], 'topological', True)],
2333
def test_get_record_stream_unordered_deltas(self):
2334
# records from the test knit are answered without asking the basis:
2335
basis, test = self.get_basis_and_test_knit()
2337
key_basis = ('bar',)
2338
key_missing = ('missing',)
2339
test.add_lines(key, (), ['foo\n'])
2340
records = list(test.get_record_stream([key], 'unordered', False))
2341
self.assertEqual(1, len(records))
2342
self.assertEqual([], basis.calls)
2343
# Missing (from test knit) objects are retrieved from the basis:
2344
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2346
records = list(test.get_record_stream([key_basis, key_missing],
2347
'unordered', False))
2348
self.assertEqual(2, len(records))
2349
calls = list(basis.calls)
2350
for record in records:
2351
self.assertSubset([record.key], (key_basis, key_missing))
2352
if record.key == key_missing:
2353
self.assertIsInstance(record, AbsentContentFactory)
2355
reference = list(basis.get_record_stream([key_basis],
2356
'unordered', False))[0]
2357
self.assertEqual(reference.key, record.key)
2358
self.assertEqual(reference.sha1, record.sha1)
2359
self.assertEqual(reference.storage_kind, record.storage_kind)
2360
self.assertEqual(reference.get_bytes_as(reference.storage_kind),
2361
record.get_bytes_as(record.storage_kind))
2362
# It's not strictly minimal, but it seems reasonable for now for it to
2363
# ask which fallbacks have which parents.
2365
("get_parent_map", set([key_basis, key_missing])),
2366
("get_record_stream", [key_basis], 'unordered', False)],
2369
def test_get_record_stream_ordered_deltas(self):
2370
# ordering is preserved down into the fallback store.
2371
basis, test = self.get_basis_and_test_knit()
2373
key_basis = ('bar',)
2374
key_basis_2 = ('quux',)
2375
key_missing = ('missing',)
2376
test.add_lines(key, (key_basis,), ['foo\n'])
2377
# Missing (from test knit) objects are retrieved from the basis:
2378
basis.add_lines(key_basis, (key_basis_2,), ['foo\n', 'bar\n'])
2379
basis.add_lines(key_basis_2, (), ['quux\n'])
2381
# ask for in non-topological order
2382
records = list(test.get_record_stream(
2383
[key, key_basis, key_missing, key_basis_2], 'topological', False))
2384
self.assertEqual(4, len(records))
2386
for record in records:
2387
self.assertSubset([record.key],
2388
(key_basis, key_missing, key_basis_2, key))
2389
if record.key == key_missing:
2390
self.assertIsInstance(record, AbsentContentFactory)
2392
results.append((record.key, record.sha1, record.storage_kind,
2393
record.get_bytes_as(record.storage_kind)))
2394
calls = list(basis.calls)
2395
order = [record[0] for record in results]
2396
self.assertEqual([key_basis_2, key_basis, key], order)
2397
for result in results:
2398
if result[0] == key:
2402
record = source.get_record_stream([result[0]], 'unordered',
2404
self.assertEqual(record.key, result[0])
2405
self.assertEqual(record.sha1, result[1])
2406
self.assertEqual(record.storage_kind, result[2])
2407
self.assertEqual(record.get_bytes_as(record.storage_kind), result[3])
2408
# It's not strictly minimal, but it seems reasonable for now for it to
2409
# ask which fallbacks have which parents.
2411
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2412
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2415
def test_get_sha1s(self):
2416
# sha1's in the test knit are answered without asking the basis
2417
basis, test = self.get_basis_and_test_knit()
2419
key_basis = ('bar',)
2420
key_missing = ('missing',)
2421
test.add_lines(key, (), ['foo\n'])
2422
key_sha1sum = osutils.sha('foo\n').hexdigest()
2423
sha1s = test.get_sha1s([key])
2424
self.assertEqual({key: key_sha1sum}, sha1s)
2425
self.assertEqual([], basis.calls)
2426
# But texts that are not in the test knit are looked for in the basis
2427
# directly (rather than via text reconstruction) so that remote servers
2428
# etc don't have to answer with full content.
2429
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2430
basis_sha1sum = osutils.sha('foo\nbar\n').hexdigest()
2432
sha1s = test.get_sha1s([key, key_missing, key_basis])
2433
self.assertEqual({key: key_sha1sum,
2434
key_basis: basis_sha1sum}, sha1s)
2435
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2438
def test_insert_record_stream(self):
2439
# records are inserted as normal; insert_record_stream builds on
2440
# add_lines, so a smoke test should be all that's needed:
2442
key_basis = ('bar',)
2443
key_delta = ('zaphod',)
2444
basis, test = self.get_basis_and_test_knit()
2445
source = self.make_test_knit(name='source')
2446
basis.add_lines(key_basis, (), ['foo\n'])
2448
source.add_lines(key_basis, (), ['foo\n'])
2449
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2450
stream = source.get_record_stream([key_delta], 'unordered', False)
2451
test.insert_record_stream(stream)
2452
# XXX: this does somewhat too many calls in making sure of whether it
2453
# has to recreate the full text.
2454
self.assertEqual([("get_parent_map", set([key_basis])),
2455
('get_parent_map', set([key_basis])),
2456
('get_record_stream', [key_basis], 'unordered', True)],
2458
self.assertEqual({key_delta:(key_basis,)},
2459
test.get_parent_map([key_delta]))
2460
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2461
'unordered', True).next().get_bytes_as('fulltext'))
2463
def test_iter_lines_added_or_present_in_keys(self):
2464
# Lines from the basis are returned, and lines for a given key are only
2468
# all sources are asked for keys:
2469
basis, test = self.get_basis_and_test_knit()
2470
basis.add_lines(key1, (), ["foo"])
2472
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2473
self.assertEqual([("foo\n", key1)], lines)
2474
self.assertEqual([("iter_lines_added_or_present_in_keys", set([key1]))],
2476
# keys in both are not duplicated:
2477
test.add_lines(key2, (), ["bar\n"])
2478
basis.add_lines(key2, (), ["bar\n"])
2480
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2481
self.assertEqual([("bar\n", key2)], lines)
2482
self.assertEqual([], basis.calls)
2484
def test_keys(self):
2487
# all sources are asked for keys:
2488
basis, test = self.get_basis_and_test_knit()
2490
self.assertEqual(set(), set(keys))
2491
self.assertEqual([("keys",)], basis.calls)
2492
# keys from a basis are returned:
2493
basis.add_lines(key1, (), [])
2496
self.assertEqual(set([key1]), set(keys))
2497
self.assertEqual([("keys",)], basis.calls)
2498
# keys in both are not duplicated:
2499
test.add_lines(key2, (), [])
2500
basis.add_lines(key2, (), [])
2503
self.assertEqual(2, len(keys))
2504
self.assertEqual(set([key1, key2]), set(keys))
2505
self.assertEqual([("keys",)], basis.calls)
2507
def test_add_mpdiffs(self):
2508
# records are inserted as normal; add_mpdiff builds on
2509
# add_lines, so a smoke test should be all that's needed:
2511
key_basis = ('bar',)
2512
key_delta = ('zaphod',)
2513
basis, test = self.get_basis_and_test_knit()
2514
source = self.make_test_knit(name='source')
2515
basis.add_lines(key_basis, (), ['foo\n'])
2517
source.add_lines(key_basis, (), ['foo\n'])
2518
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2519
diffs = source.make_mpdiffs([key_delta])
2520
test.add_mpdiffs([(key_delta, (key_basis,),
2521
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2522
self.assertEqual([("get_parent_map", set([key_basis])),
2523
('get_record_stream', [key_basis], 'unordered', True),],
2525
self.assertEqual({key_delta:(key_basis,)},
2526
test.get_parent_map([key_delta]))
2527
self.assertEqual('bar\n', test.get_record_stream([key_delta],
2528
'unordered', True).next().get_bytes_as('fulltext'))
2530
def test_make_mpdiffs(self):
2531
# Generating an mpdiff across a stacking boundary should detect parent
2535
key_right = ('zaphod',)
2536
basis, test = self.get_basis_and_test_knit()
2537
basis.add_lines(key_left, (), ['bar\n'])
2538
basis.add_lines(key_right, (), ['zaphod\n'])
2540
test.add_lines(key, (key_left, key_right),
2541
['bar\n', 'foo\n', 'zaphod\n'])
2542
diffs = test.make_mpdiffs([key])
2544
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2545
multiparent.NewText(['foo\n']),
2546
multiparent.ParentText(1, 0, 2, 1)])],
2548
self.assertEqual(3, len(basis.calls))
2550
("get_parent_map", set([key_left, key_right])),
2551
("get_parent_map", set([key_left, key_right])),
2554
last_call = basis.calls[-1]
2555
self.assertEqual('get_record_stream', last_call[0])
2556
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2557
self.assertEqual('topological', last_call[2])
2558
self.assertEqual(True, last_call[3])
2561
class TestNetworkBehaviour(KnitTests):
2562
"""Tests for getting data out of/into knits over the network."""
2564
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2565
vf = self.make_test_knit(name='test')
2566
# put in three texts, giving ft, delta, delta
2567
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2568
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2569
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2570
# But heuristics could interfere, so check what happened:
2571
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2572
[record.storage_kind for record in
2573
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2574
'topological', False)])
2575
# generate a stream of just the deltas include_delta_closure=True,
2576
# serialise to the network, and check that we get a delta closure on the wire.
2577
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2578
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2579
# The first bytes should be a memo from _ContentMapGenerator, and the
2580
# second bytes should be empty (because its a API proxy not something
2581
# for wire serialisation.
2582
self.assertEqual('', netb[1])
2584
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2585
self.assertEqual('knit-delta-closure', kind)
2588
class TestContentMapGenerator(KnitTests):
2589
"""Tests for ContentMapGenerator"""
2591
def test_get_record_stream_gives_records(self):
2592
vf = self.make_test_knit(name='test')
2593
# put in three texts, giving ft, delta, delta
2594
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2595
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2596
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2597
keys = [('d1',), ('d2',)]
2598
generator = _VFContentMapGenerator(vf, keys,
2599
global_map=vf.get_parent_map(keys))
2600
for record in generator.get_record_stream():
2601
if record.key == ('d1',):
2602
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2604
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2606
def test_get_record_stream_kinds_are_raw(self):
2607
vf = self.make_test_knit(name='test')
2608
# put in three texts, giving ft, delta, delta
2609
vf.add_lines(('base',), (), ['base\n', 'content\n'])
2610
vf.add_lines(('d1',), (('base',),), ['d1\n'])
2611
vf.add_lines(('d2',), (('d1',),), ['d2\n'])
2612
keys = [('base',), ('d1',), ('d2',)]
2613
generator = _VFContentMapGenerator(vf, keys,
2614
global_map=vf.get_parent_map(keys))
2615
kinds = {('base',): 'knit-delta-closure',
2616
('d1',): 'knit-delta-closure-ref',
2617
('d2',): 'knit-delta-closure-ref',
2619
for record in generator.get_record_stream():
2620
self.assertEqual(kinds[record.key], record.storage_kind)
2632
def test_iter_parents(self):
2633
index = self.two_graph_index()
2634
self.assertEqual(set([
2635
('tip', ()), ('tail', ()), ('parent', ()), ('separate', ())
2637
set(index.iter_parents(['tip', 'tail', 'ghost', 'parent', 'separate'])))
2638
self.assertEqual(set([('tip', ())]),
2639
set(index.iter_parents(['tip'])))
2640
self.assertEqual(set(),
2641
set(index.iter_parents([])))
added
removed
bzrlib/tests/test_knit.py
