462
355
writer = pack.ContainerWriter(write_data)
464
357
access.set_writer(writer, index, (transport, packname))
465
memos = access.add_raw_records([('key', 10)], '1234567890')
358
memos = access.add_raw_records([10], '1234567890')
467
360
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
363
class LowLevelKnitDataTests(TestCase):
848
469
# Change 2 bytes in the middle to \xff
849
470
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
850
471
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))
472
access = _KnitAccess(transport, 'filename', None, None, False, False)
473
data = _KnitData(access=access)
474
records = [('rev-id-1', (None, 0, len(gz_txt)))]
476
self.assertRaises(errors.KnitCorrupt, data.read_records, records)
478
# read_records_iter_raw will notice if we request the wrong version.
479
self.assertRaises(errors.KnitCorrupt, list,
480
data.read_records_iter_raw(records))
861
483
class LowLevelKnitIndexTests(TestCase):
863
def get_knit_index(self, transport, name, mode):
864
mapper = ConstantMapper(name)
485
def get_knit_index(self, *args, **kwargs):
486
orig = knit._load_data
488
knit._load_data = orig
489
self.addCleanup(reset)
865
490
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)
491
knit._load_data = _load_data_py
492
return _KnitIndex(*args, **kwargs)
494
def test_no_such_file(self):
495
transport = MockTransport()
497
self.assertRaises(NoSuchFile, self.get_knit_index,
498
transport, "filename", "r")
499
self.assertRaises(NoSuchFile, self.get_knit_index,
500
transport, "filename", "w", create=False)
870
502
def test_create_file(self):
871
503
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])
505
index = self.get_knit_index(transport, "filename", "w",
506
file_mode="wb", create=True)
508
("put_bytes_non_atomic",
509
("filename", index.HEADER), {"mode": "wb"}),
510
transport.calls.pop(0))
512
def test_delay_create_file(self):
513
transport = MockTransport()
515
index = self.get_knit_index(transport, "filename", "w",
516
create=True, file_mode="wb", create_parent_dir=True,
517
delay_create=True, dir_mode=0777)
518
self.assertEqual([], transport.calls)
520
index.add_versions([])
521
name, (filename, f), kwargs = transport.calls.pop(0)
522
self.assertEqual("put_file_non_atomic", name)
524
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
526
self.assertEqual("filename", filename)
527
self.assertEqual(index.HEADER, f.read())
529
index.add_versions([])
530
self.assertEqual(("append_bytes", ("filename", ""), {}),
531
transport.calls.pop(0))
883
533
def test_read_utf8_version_id(self):
884
534
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
885
535
utf8_revision_id = unicode_revision_id.encode('utf-8')
886
536
transport = MockTransport([
888
538
'%s option 0 1 :' % (utf8_revision_id,)
890
540
index = self.get_knit_index(transport, "filename", "r")
891
# _KndxIndex is a private class, and deals in utf8 revision_ids, not
541
# _KnitIndex is a private class, and deals in utf8 revision_ids, not
892
542
# 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())
543
self.assertTrue(index.has_version(utf8_revision_id))
544
self.assertFalse(index.has_version(unicode_revision_id))
897
546
def test_read_utf8_parents(self):
898
547
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
899
548
utf8_revision_id = unicode_revision_id.encode('utf-8')
900
549
transport = MockTransport([
902
551
"version option 0 1 .%s :" % (utf8_revision_id,)
904
553
index = self.get_knit_index(transport, "filename", "r")
905
self.assertEqual({("version",):((utf8_revision_id,),)},
906
index.get_parent_map(index.keys()))
554
self.assertEqual([utf8_revision_id],
555
index.get_parents_with_ghosts("version"))
908
557
def test_read_ignore_corrupted_lines(self):
909
558
transport = MockTransport([
912
561
"corrupted options 0 1 .b .c ",
913
562
"version options 0 1 :"
915
564
index = self.get_knit_index(transport, "filename", "r")
916
self.assertEqual(1, len(index.keys()))
917
self.assertEqual(set([("version",)]), index.keys())
565
self.assertEqual(1, index.num_versions())
566
self.assertTrue(index.has_version("version"))
919
568
def test_read_corrupted_header(self):
920
569
transport = MockTransport(['not a bzr knit index header\n'])
921
index = self.get_knit_index(transport, "filename", "r")
922
self.assertRaises(KnitHeaderError, index.keys)
570
self.assertRaises(KnitHeaderError,
571
self.get_knit_index, transport, "filename", "r")
924
573
def test_read_duplicate_entries(self):
925
574
transport = MockTransport([
927
576
"parent options 0 1 :",
928
577
"version options1 0 1 0 :",
929
578
"version options2 1 2 .other :",
930
579
"version options3 3 4 0 .other :"
932
581
index = self.get_knit_index(transport, "filename", "r")
933
self.assertEqual(2, len(index.keys()))
582
self.assertEqual(2, index.num_versions())
934
583
# check that the index used is the first one written. (Specific
935
584
# 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",)]))
585
self.assertEqual("1", index._version_list_to_index(["version"]))
586
self.assertEqual((None, 3, 4), index.get_position("version"))
587
self.assertEqual(["options3"], index.get_options("version"))
588
self.assertEqual(["parent", "other"],
589
index.get_parents_with_ghosts("version"))
942
591
def test_read_compressed_parents(self):
943
592
transport = MockTransport([
945
594
"a option 0 1 :",
946
595
"b option 0 1 0 :",
947
596
"c option 0 1 1 0 :",
949
598
index = self.get_knit_index(transport, "filename", "r")
950
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
951
index.get_parent_map([("b",), ("c",)]))
599
self.assertEqual(["a"], index.get_parents("b"))
600
self.assertEqual(["b", "a"], index.get_parents("c"))
953
602
def test_write_utf8_version_id(self):
954
603
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
955
604
utf8_revision_id = unicode_revision_id.encode('utf-8')
956
605
transport = MockTransport([
959
608
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])
609
index.add_version(utf8_revision_id, ["option"], (None, 0, 1), [])
610
self.assertEqual(("append_bytes", ("filename",
611
"\n%s option 0 1 :" % (utf8_revision_id,)),
613
transport.calls.pop(0))
972
615
def test_write_utf8_parents(self):
973
616
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
974
617
utf8_revision_id = unicode_revision_id.encode('utf-8')
975
618
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",)))
621
index = self.get_knit_index(transport, "filename", "r")
622
index.add_version("version", ["option"], (None, 0, 1), [utf8_revision_id])
623
self.assertEqual(("append_bytes", ("filename",
624
"\nversion option 0 1 .%s :" % (utf8_revision_id,)),
626
transport.calls.pop(0))
628
def test_get_graph(self):
629
transport = MockTransport()
630
index = self.get_knit_index(transport, "filename", "w", create=True)
631
self.assertEqual([], index.get_graph())
633
index.add_version("a", ["option"], (None, 0, 1), ["b"])
634
self.assertEqual([("a", ["b"])], index.get_graph())
636
index.add_version("c", ["option"], (None, 0, 1), ["d"])
637
self.assertEqual([("a", ["b"]), ("c", ["d"])],
638
sorted(index.get_graph()))
640
def test_get_ancestry(self):
641
transport = MockTransport([
644
"b option 0 1 0 .e :",
645
"c option 0 1 1 0 :",
646
"d option 0 1 2 .f :"
648
index = self.get_knit_index(transport, "filename", "r")
650
self.assertEqual([], index.get_ancestry([]))
651
self.assertEqual(["a"], index.get_ancestry(["a"]))
652
self.assertEqual(["a", "b"], index.get_ancestry(["b"]))
653
self.assertEqual(["a", "b", "c"], index.get_ancestry(["c"]))
654
self.assertEqual(["a", "b", "c", "d"], index.get_ancestry(["d"]))
655
self.assertEqual(["a", "b"], index.get_ancestry(["a", "b"]))
656
self.assertEqual(["a", "b", "c"], index.get_ancestry(["a", "c"]))
658
self.assertRaises(RevisionNotPresent, index.get_ancestry, ["e"])
660
def test_get_ancestry_with_ghosts(self):
661
transport = MockTransport([
664
"b option 0 1 0 .e :",
665
"c option 0 1 0 .f .g :",
666
"d option 0 1 2 .h .j .k :"
668
index = self.get_knit_index(transport, "filename", "r")
670
self.assertEqual([], index.get_ancestry_with_ghosts([]))
671
self.assertEqual(["a"], index.get_ancestry_with_ghosts(["a"]))
672
self.assertEqual(["a", "e", "b"],
673
index.get_ancestry_with_ghosts(["b"]))
674
self.assertEqual(["a", "g", "f", "c"],
675
index.get_ancestry_with_ghosts(["c"]))
676
self.assertEqual(["a", "g", "f", "c", "k", "j", "h", "d"],
677
index.get_ancestry_with_ghosts(["d"]))
678
self.assertEqual(["a", "e", "b"],
679
index.get_ancestry_with_ghosts(["a", "b"]))
680
self.assertEqual(["a", "g", "f", "c"],
681
index.get_ancestry_with_ghosts(["a", "c"]))
683
["a", "g", "f", "c", "e", "b", "k", "j", "h", "d"],
684
index.get_ancestry_with_ghosts(["b", "d"]))
686
self.assertRaises(RevisionNotPresent,
687
index.get_ancestry_with_ghosts, ["e"])
689
def test_iter_parents(self):
690
transport = MockTransport()
691
index = self.get_knit_index(transport, "filename", "w", create=True)
693
index.add_version('r0', ['option'], (None, 0, 1), [])
695
index.add_version('r1', ['option'], (None, 0, 1), ['r0'])
697
index.add_version('r2', ['option'], (None, 0, 1), ['r1', 'r0'])
699
# cases: each sample data individually:
700
self.assertEqual(set([('r0', ())]),
701
set(index.iter_parents(['r0'])))
702
self.assertEqual(set([('r1', ('r0', ))]),
703
set(index.iter_parents(['r1'])))
704
self.assertEqual(set([('r2', ('r1', 'r0'))]),
705
set(index.iter_parents(['r2'])))
706
# no nodes returned for a missing node
707
self.assertEqual(set(),
708
set(index.iter_parents(['missing'])))
709
# 1 node returned with missing nodes skipped
710
self.assertEqual(set([('r1', ('r0', ))]),
711
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
713
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
714
set(index.iter_parents(['r0', 'r1'])))
715
# 2 nodes returned, missing skipped
716
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
717
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
719
def test_num_versions(self):
720
transport = MockTransport([
723
index = self.get_knit_index(transport, "filename", "r")
725
self.assertEqual(0, index.num_versions())
726
self.assertEqual(0, len(index))
728
index.add_version("a", ["option"], (None, 0, 1), [])
729
self.assertEqual(1, index.num_versions())
730
self.assertEqual(1, len(index))
732
index.add_version("a", ["option2"], (None, 1, 2), [])
733
self.assertEqual(1, index.num_versions())
734
self.assertEqual(1, len(index))
736
index.add_version("b", ["option"], (None, 0, 1), [])
737
self.assertEqual(2, index.num_versions())
738
self.assertEqual(2, len(index))
740
def test_get_versions(self):
741
transport = MockTransport([
744
index = self.get_knit_index(transport, "filename", "r")
746
self.assertEqual([], index.get_versions())
748
index.add_version("a", ["option"], (None, 0, 1), [])
749
self.assertEqual(["a"], index.get_versions())
751
index.add_version("a", ["option"], (None, 0, 1), [])
752
self.assertEqual(["a"], index.get_versions())
754
index.add_version("b", ["option"], (None, 0, 1), [])
755
self.assertEqual(["a", "b"], index.get_versions())
757
def test_add_version(self):
758
transport = MockTransport([
761
index = self.get_knit_index(transport, "filename", "r")
763
index.add_version("a", ["option"], (None, 0, 1), ["b"])
764
self.assertEqual(("append_bytes",
765
("filename", "\na option 0 1 .b :"),
766
{}), transport.calls.pop(0))
767
self.assertTrue(index.has_version("a"))
768
self.assertEqual(1, index.num_versions())
769
self.assertEqual((None, 0, 1), index.get_position("a"))
770
self.assertEqual(["option"], index.get_options("a"))
771
self.assertEqual(["b"], index.get_parents_with_ghosts("a"))
773
index.add_version("a", ["opt"], (None, 1, 2), ["c"])
774
self.assertEqual(("append_bytes",
775
("filename", "\na opt 1 2 .c :"),
776
{}), transport.calls.pop(0))
777
self.assertTrue(index.has_version("a"))
778
self.assertEqual(1, index.num_versions())
779
self.assertEqual((None, 1, 2), index.get_position("a"))
780
self.assertEqual(["opt"], index.get_options("a"))
781
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
783
index.add_version("b", ["option"], (None, 2, 3), ["a"])
784
self.assertEqual(("append_bytes",
785
("filename", "\nb option 2 3 0 :"),
786
{}), transport.calls.pop(0))
787
self.assertTrue(index.has_version("b"))
788
self.assertEqual(2, index.num_versions())
789
self.assertEqual((None, 2, 3), index.get_position("b"))
790
self.assertEqual(["option"], index.get_options("b"))
791
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
1028
793
def test_add_versions(self):
1029
794
transport = MockTransport([
1032
797
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:
800
("a", ["option"], (None, 0, 1), ["b"]),
801
("a", ["opt"], (None, 1, 2), ["c"]),
802
("b", ["option"], (None, 2, 3), ["a"])
804
self.assertEqual(("append_bytes", ("filename",
1042
805
"\na option 0 1 .b :"
1043
806
"\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)
1049
def test_add_versions_random_id_is_accepted(self):
1050
transport = MockTransport([
1053
index = self.get_knit_index(transport, "filename", "r")
1054
self.add_a_b(index, random_id=True)
808
), {}), transport.calls.pop(0))
809
self.assertTrue(index.has_version("a"))
810
self.assertTrue(index.has_version("b"))
811
self.assertEqual(2, index.num_versions())
812
self.assertEqual((None, 1, 2), index.get_position("a"))
813
self.assertEqual((None, 2, 3), index.get_position("b"))
814
self.assertEqual(["opt"], index.get_options("a"))
815
self.assertEqual(["option"], index.get_options("b"))
816
self.assertEqual(["c"], index.get_parents_with_ghosts("a"))
817
self.assertEqual(["a"], index.get_parents_with_ghosts("b"))
1056
819
def test_delay_create_and_add_versions(self):
1057
820
transport = MockTransport()
1059
index = self.get_knit_index(transport, "filename", "w")
822
index = self.get_knit_index(transport, "filename", "w",
823
create=True, file_mode="wb", create_parent_dir=True,
824
delay_create=True, dir_mode=0777)
1061
825
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:
828
("a", ["option"], (None, 0, 1), ["b"]),
829
("a", ["opt"], (None, 1, 2), ["c"]),
830
("b", ["option"], (None, 2, 3), ["a"])
832
name, (filename, f), kwargs = transport.calls.pop(0)
833
self.assertEqual("put_file_non_atomic", name)
835
{"dir_mode": 0777, "create_parent_dir": True, "mode": "wb"},
837
self.assertEqual("filename", filename)
1082
840
"\na option 0 1 .b :"
1083
841
"\na opt 1 2 .c :"
1084
842
"\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)
845
def test_has_version(self):
846
transport = MockTransport([
850
index = self.get_knit_index(transport, "filename", "r")
852
self.assertTrue(index.has_version("a"))
853
self.assertFalse(index.has_version("b"))
1108
855
def test_get_position(self):
1109
856
transport = MockTransport([
1111
858
"a option 0 1 :",
1112
859
"b option 1 2 :"
1114
861
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",)))
863
self.assertEqual((None, 0, 1), index.get_position("a"))
864
self.assertEqual((None, 1, 2), index.get_position("b"))
1119
866
def test_get_method(self):
1120
867
transport = MockTransport([
1122
869
"a fulltext,unknown 0 1 :",
1123
870
"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
1030
def test_short_line(self):
1264
1031
transport = MockTransport([
1266
1033
"a option 0 10 :",
1267
1034
"b option 10 10 0", # This line isn't terminated, ignored
1269
1036
index = self.get_knit_index(transport, "filename", "r")
1270
self.assertEqual(set([('a',)]), index.keys())
1037
self.assertEqual(['a'], index.get_versions())
1272
1039
def test_skip_incomplete_record(self):
1273
1040
# A line with bogus data should just be skipped
1274
1041
transport = MockTransport([
1276
1043
"a option 0 10 :",
1277
1044
"b option 10 10 0", # This line isn't terminated, ignored
1278
1045
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1280
1047
index = self.get_knit_index(transport, "filename", "r")
1281
self.assertEqual(set([('a',), ('c',)]), index.keys())
1048
self.assertEqual(['a', 'c'], index.get_versions())
1283
1050
def test_trailing_characters(self):
1284
1051
# A line with bogus data should just be skipped
1285
1052
transport = MockTransport([
1287
1054
"a option 0 10 :",
1288
1055
"b option 10 10 0 :a", # This line has extra trailing characters
1289
1056
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1291
1058
index = self.get_knit_index(transport, "filename", "r")
1292
self.assertEqual(set([('a',), ('c',)]), index.keys())
1059
self.assertEqual(['a', 'c'], index.get_versions())
1295
1062
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))
1064
_test_needs_features = [CompiledKnitFeature]
1066
def get_knit_index(self, *args, **kwargs):
1067
orig = knit._load_data
1069
knit._load_data = orig
1070
self.addCleanup(reset)
1071
from bzrlib._knit_load_data_c import _load_data_c
1072
knit._load_data = _load_data_c
1073
return _KnitIndex(*args, **kwargs)
1470
1077
class KnitTests(TestCaseWithTransport):
1471
1078
"""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 ")
1080
def make_test_knit(self, annotate=False, delay_create=False, index=None,
1083
factory = KnitPlainFactory()
1086
return KnitVersionedFile(name, get_transport('.'), access_mode='w',
1087
factory=factory, create=True,
1088
delay_create=delay_create, index=index)
1090
def assertRecordContentEqual(self, knit, version_id, candidate_content):
1091
"""Assert that some raw record content matches the raw record content
1092
for a particular version_id in the given knit.
1094
index_memo = knit._index.get_position(version_id)
1095
record = (version_id, index_memo)
1096
[(_, expected_content)] = list(knit._data.read_records_iter_raw([record]))
1097
self.assertEqual(expected_content, candidate_content)
1100
class BasicKnitTests(KnitTests):
1102
def add_stock_one_and_one_a(self, k):
1103
k.add_lines('text-1', [], split_lines(TEXT_1))
1104
k.add_lines('text-1a', ['text-1'], split_lines(TEXT_1A))
1106
def test_knit_constructor(self):
1107
"""Construct empty k"""
1108
self.make_test_knit()
1110
def test_make_explicit_index(self):
1111
"""We can supply an index to use."""
1112
knit = KnitVersionedFile('test', get_transport('.'),
1113
index='strangelove')
1114
self.assertEqual(knit._index, 'strangelove')
1116
def test_knit_add(self):
1117
"""Store one text in knit and retrieve"""
1118
k = self.make_test_knit()
1119
k.add_lines('text-1', [], split_lines(TEXT_1))
1120
self.assertTrue(k.has_version('text-1'))
1121
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1123
def test_knit_reload(self):
1124
# test that the content in a reloaded knit is correct
1125
k = self.make_test_knit()
1126
k.add_lines('text-1', [], split_lines(TEXT_1))
1128
k2 = KnitVersionedFile('test', get_transport('.'), access_mode='r', factory=KnitPlainFactory(), create=True)
1129
self.assertTrue(k2.has_version('text-1'))
1130
self.assertEqualDiff(''.join(k2.get_lines('text-1')), TEXT_1)
1132
def test_knit_several(self):
1133
"""Store several texts in a knit"""
1134
k = self.make_test_knit()
1135
k.add_lines('text-1', [], split_lines(TEXT_1))
1136
k.add_lines('text-2', [], split_lines(TEXT_2))
1137
self.assertEqualDiff(''.join(k.get_lines('text-1')), TEXT_1)
1138
self.assertEqualDiff(''.join(k.get_lines('text-2')), TEXT_2)
1140
def test_repeated_add(self):
1141
"""Knit traps attempt to replace existing version"""
1142
k = self.make_test_knit()
1143
k.add_lines('text-1', [], split_lines(TEXT_1))
1144
self.assertRaises(RevisionAlreadyPresent,
1146
'text-1', [], split_lines(TEXT_1))
1148
def test_empty(self):
1149
k = self.make_test_knit(True)
1150
k.add_lines('text-1', [], [])
1151
self.assertEquals(k.get_lines('text-1'), [])
1153
def test_incomplete(self):
1154
"""Test if texts without a ending line-end can be inserted and
1156
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1157
k.add_lines('text-1', [], ['a\n', 'b' ])
1158
k.add_lines('text-2', ['text-1'], ['a\rb\n', 'b\n'])
1159
# reopening ensures maximum room for confusion
1160
k = KnitVersionedFile('test', get_transport('.'), delta=False, create=True)
1161
self.assertEquals(k.get_lines('text-1'), ['a\n', 'b' ])
1162
self.assertEquals(k.get_lines('text-2'), ['a\rb\n', 'b\n'])
1164
def test_delta(self):
1165
"""Expression of knit delta as lines"""
1166
k = self.make_test_knit()
1167
td = list(line_delta(TEXT_1.splitlines(True),
1168
TEXT_1A.splitlines(True)))
1169
self.assertEqualDiff(''.join(td), delta_1_1a)
1170
out = apply_line_delta(TEXT_1.splitlines(True), td)
1171
self.assertEqualDiff(''.join(out), TEXT_1A)
1173
def test_add_with_parents(self):
1174
"""Store in knit with parents"""
1175
k = self.make_test_knit()
1176
self.add_stock_one_and_one_a(k)
1177
self.assertEquals(k.get_parents('text-1'), [])
1178
self.assertEquals(k.get_parents('text-1a'), ['text-1'])
1180
def test_ancestry(self):
1181
"""Store in knit with parents"""
1182
k = self.make_test_knit()
1183
self.add_stock_one_and_one_a(k)
1184
self.assertEquals(set(k.get_ancestry(['text-1a'])), set(['text-1a', 'text-1']))
1186
def test_add_delta(self):
1187
"""Store in knit with parents"""
1188
k = KnitVersionedFile('test', get_transport('.'), factory=KnitPlainFactory(),
1189
delta=True, create=True)
1190
self.add_stock_one_and_one_a(k)
1192
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1194
def test_add_delta_knit_graph_index(self):
1195
"""Does adding work with a KnitGraphIndex."""
1196
index = InMemoryGraphIndex(2)
1197
knit_index = KnitGraphIndex(index, add_callback=index.add_nodes,
1199
k = KnitVersionedFile('test', get_transport('.'),
1200
delta=True, create=True, index=knit_index)
1201
self.add_stock_one_and_one_a(k)
1203
self.assertEqualDiff(''.join(k.get_lines('text-1a')), TEXT_1A)
1204
# check the index had the right data added.
1205
self.assertEqual(set([
1206
(index, ('text-1', ), ' 0 127', ((), ())),
1207
(index, ('text-1a', ), ' 127 140', ((('text-1', ),), (('text-1', ),))),
1208
]), set(index.iter_all_entries()))
1209
# we should not have a .kndx file
1210
self.assertFalse(get_transport('.').has('test.kndx'))
1212
def test_annotate(self):
1214
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1215
delta=True, create=True)
1216
self.insert_and_test_small_annotate(k)
1218
def insert_and_test_small_annotate(self, k):
1219
"""test annotation with k works correctly."""
1220
k.add_lines('text-1', [], ['a\n', 'b\n'])
1221
k.add_lines('text-2', ['text-1'], ['a\n', 'c\n'])
1223
origins = k.annotate('text-2')
1224
self.assertEquals(origins[0], ('text-1', 'a\n'))
1225
self.assertEquals(origins[1], ('text-2', 'c\n'))
1227
def test_annotate_fulltext(self):
1229
k = KnitVersionedFile('knit', get_transport('.'), factory=KnitAnnotateFactory(),
1230
delta=False, create=True)
1231
self.insert_and_test_small_annotate(k)
1233
def test_annotate_merge_1(self):
1234
k = self.make_test_knit(True)
1235
k.add_lines('text-a1', [], ['a\n', 'b\n'])
1236
k.add_lines('text-a2', [], ['d\n', 'c\n'])
1237
k.add_lines('text-am', ['text-a1', 'text-a2'], ['d\n', 'b\n'])
1238
origins = k.annotate('text-am')
1239
self.assertEquals(origins[0], ('text-a2', 'd\n'))
1240
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1242
def test_annotate_merge_2(self):
1243
k = self.make_test_knit(True)
1244
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1245
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1246
k.add_lines('text-am', ['text-a1', 'text-a2'], ['a\n', 'y\n', 'c\n'])
1247
origins = k.annotate('text-am')
1248
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1249
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1250
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1252
def test_annotate_merge_9(self):
1253
k = self.make_test_knit(True)
1254
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1255
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1256
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'c\n'])
1257
origins = k.annotate('text-am')
1258
self.assertEquals(origins[0], ('text-am', 'k\n'))
1259
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1260
self.assertEquals(origins[2], ('text-a1', 'c\n'))
1262
def test_annotate_merge_3(self):
1263
k = self.make_test_knit(True)
1264
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1265
k.add_lines('text-a2', [] ,['x\n', 'y\n', 'z\n'])
1266
k.add_lines('text-am', ['text-a1', 'text-a2'], ['k\n', 'y\n', 'z\n'])
1267
origins = k.annotate('text-am')
1268
self.assertEquals(origins[0], ('text-am', 'k\n'))
1269
self.assertEquals(origins[1], ('text-a2', 'y\n'))
1270
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1272
def test_annotate_merge_4(self):
1273
k = self.make_test_knit(True)
1274
k.add_lines('text-a1', [], ['a\n', 'b\n', 'c\n'])
1275
k.add_lines('text-a2', [], ['x\n', 'y\n', 'z\n'])
1276
k.add_lines('text-a3', ['text-a1'], ['a\n', 'b\n', 'p\n'])
1277
k.add_lines('text-am', ['text-a2', 'text-a3'], ['a\n', 'b\n', 'z\n'])
1278
origins = k.annotate('text-am')
1279
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1280
self.assertEquals(origins[1], ('text-a1', 'b\n'))
1281
self.assertEquals(origins[2], ('text-a2', 'z\n'))
1283
def test_annotate_merge_5(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', [], ['d\n', 'e\n', 'f\n'])
1287
k.add_lines('text-a3', [], ['x\n', 'y\n', 'z\n'])
1288
k.add_lines('text-am',
1289
['text-a1', 'text-a2', 'text-a3'],
1290
['a\n', 'e\n', 'z\n'])
1291
origins = k.annotate('text-am')
1292
self.assertEquals(origins[0], ('text-a1', 'a\n'))
1293
self.assertEquals(origins[1], ('text-a2', 'e\n'))
1294
self.assertEquals(origins[2], ('text-a3', 'z\n'))
1296
def test_annotate_file_cherry_pick(self):
1297
k = self.make_test_knit(True)
1298
k.add_lines('text-1', [], ['a\n', 'b\n', 'c\n'])
1299
k.add_lines('text-2', ['text-1'], ['d\n', 'e\n', 'f\n'])
1300
k.add_lines('text-3', ['text-2', 'text-1'], ['a\n', 'b\n', 'c\n'])
1301
origins = k.annotate('text-3')
1302
self.assertEquals(origins[0], ('text-1', 'a\n'))
1303
self.assertEquals(origins[1], ('text-1', 'b\n'))
1304
self.assertEquals(origins[2], ('text-1', 'c\n'))
1306
def test_knit_join(self):
1307
"""Store in knit with parents"""
1308
k1 = KnitVersionedFile('test1', get_transport('.'), factory=KnitPlainFactory(), create=True)
1309
k1.add_lines('text-a', [], split_lines(TEXT_1))
1310
k1.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1312
k1.add_lines('text-c', [], split_lines(TEXT_1))
1313
k1.add_lines('text-d', ['text-c'], split_lines(TEXT_1))
1315
k1.add_lines('text-m', ['text-b', 'text-d'], split_lines(TEXT_1))
1317
k2 = KnitVersionedFile('test2', get_transport('.'), factory=KnitPlainFactory(), create=True)
1318
count = k2.join(k1, version_ids=['text-m'])
1319
self.assertEquals(count, 5)
1320
self.assertTrue(k2.has_version('text-a'))
1321
self.assertTrue(k2.has_version('text-c'))
1323
def test_reannotate(self):
1324
k1 = KnitVersionedFile('knit1', get_transport('.'),
1325
factory=KnitAnnotateFactory(), create=True)
1327
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1329
k1.add_lines('text-b', ['text-a'], ['a\n', 'c\n'])
1331
k2 = KnitVersionedFile('test2', get_transport('.'),
1332
factory=KnitAnnotateFactory(), create=True)
1333
k2.join(k1, version_ids=['text-b'])
1336
k1.add_lines('text-X', ['text-b'], ['a\n', 'b\n'])
1338
k2.add_lines('text-c', ['text-b'], ['z\n', 'c\n'])
1340
k2.add_lines('text-Y', ['text-b'], ['b\n', 'c\n'])
1342
# test-c will have index 3
1343
k1.join(k2, version_ids=['text-c'])
1345
lines = k1.get_lines('text-c')
1346
self.assertEquals(lines, ['z\n', 'c\n'])
1348
origins = k1.annotate('text-c')
1349
self.assertEquals(origins[0], ('text-c', 'z\n'))
1350
self.assertEquals(origins[1], ('text-b', 'c\n'))
1352
def test_get_line_delta_texts(self):
1353
"""Make sure we can call get_texts on text with reused line deltas"""
1354
k1 = KnitVersionedFile('test1', get_transport('.'),
1355
factory=KnitPlainFactory(), create=True)
1360
parents = ['%d' % (t-1)]
1361
k1.add_lines('%d' % t, parents, ['hello\n'] * t)
1362
k1.get_texts(('%d' % t) for t in range(3))
1364
def test_iter_lines_reads_in_order(self):
1365
t = MemoryTransport()
1366
instrumented_t = TransportLogger(t)
1367
k1 = KnitVersionedFile('id', instrumented_t, create=True, delta=True)
1368
self.assertEqual([('id.kndx',)], instrumented_t._calls)
1369
# add texts with no required ordering
1370
k1.add_lines('base', [], ['text\n'])
1371
k1.add_lines('base2', [], ['text2\n'])
1373
instrumented_t._calls = []
1374
# request a last-first iteration
1375
results = list(k1.iter_lines_added_or_present_in_versions(['base2', 'base']))
1376
self.assertEqual([('id.knit', [(0, 87), (87, 89)])], instrumented_t._calls)
1377
self.assertEqual(['text\n', 'text2\n'], results)
1379
def test_create_empty_annotated(self):
1380
k1 = self.make_test_knit(True)
1382
k1.add_lines('text-a', [], ['a\n', 'b\n'])
1383
k2 = k1.create_empty('t', MemoryTransport())
1384
self.assertTrue(isinstance(k2.factory, KnitAnnotateFactory))
1385
self.assertEqual(k1.delta, k2.delta)
1386
# the generic test checks for empty content and file class
1388
def test_knit_format(self):
1389
# this tests that a new knit index file has the expected content
1390
# and that is writes the data we expect as records are added.
1391
knit = self.make_test_knit(True)
1392
# Now knit files are not created until we first add data to them
1393
self.assertFileEqual("# bzr knit index 8\n", 'test.kndx')
1394
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1395
self.assertFileEqual(
1396
"# bzr knit index 8\n"
1398
"revid fulltext 0 84 .a_ghost :",
1400
knit.add_lines_with_ghosts('revid2', ['revid'], ['a\n'])
1401
self.assertFileEqual(
1402
"# bzr knit index 8\n"
1403
"\nrevid fulltext 0 84 .a_ghost :"
1404
"\nrevid2 line-delta 84 82 0 :",
1406
# we should be able to load this file again
1407
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1408
self.assertEqual(['revid', 'revid2'], knit.versions())
1409
# write a short write to the file and ensure that its ignored
1410
indexfile = file('test.kndx', 'ab')
1411
indexfile.write('\nrevid3 line-delta 166 82 1 2 3 4 5 .phwoar:demo ')
1413
# we should be able to load this file again
1414
knit = KnitVersionedFile('test', get_transport('.'), access_mode='w')
1415
self.assertEqual(['revid', 'revid2'], knit.versions())
1416
# and add a revision with the same id the failed write had
1417
knit.add_lines('revid3', ['revid2'], ['a\n'])
1418
# and when reading it revid3 should now appear.
1419
knit = KnitVersionedFile('test', get_transport('.'), access_mode='r')
1420
self.assertEqual(['revid', 'revid2', 'revid3'], knit.versions())
1421
self.assertEqual(['revid2'], knit.get_parents('revid3'))
1423
def test_delay_create(self):
1424
"""Test that passing delay_create=True creates files late"""
1425
knit = self.make_test_knit(annotate=True, delay_create=True)
1426
self.failIfExists('test.knit')
1427
self.failIfExists('test.kndx')
1428
knit.add_lines_with_ghosts('revid', ['a_ghost'], ['a\n'])
1429
self.failUnlessExists('test.knit')
1430
self.assertFileEqual(
1431
"# bzr knit index 8\n"
1433
"revid fulltext 0 84 .a_ghost :",
1436
def test_create_parent_dir(self):
1437
"""create_parent_dir can create knits in nonexistant dirs"""
1438
# Has no effect if we don't set 'delay_create'
1439
trans = get_transport('.')
1440
self.assertRaises(NoSuchFile, KnitVersionedFile, 'dir/test',
1441
trans, access_mode='w', factory=None,
1442
create=True, create_parent_dir=True)
1443
# Nothing should have changed yet
1444
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1445
factory=None, create=True,
1446
create_parent_dir=True,
1448
self.failIfExists('dir/test.knit')
1449
self.failIfExists('dir/test.kndx')
1450
self.failIfExists('dir')
1451
knit.add_lines('revid', [], ['a\n'])
1452
self.failUnlessExists('dir')
1453
self.failUnlessExists('dir/test.knit')
1454
self.assertFileEqual(
1455
"# bzr knit index 8\n"
1457
"revid fulltext 0 84 :",
1460
def test_create_mode_700(self):
1461
trans = get_transport('.')
1462
if not trans._can_roundtrip_unix_modebits():
1463
# Can't roundtrip, so no need to run this test
1465
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1466
factory=None, create=True,
1467
create_parent_dir=True,
1471
knit.add_lines('revid', [], ['a\n'])
1472
self.assertTransportMode(trans, 'dir', 0700)
1473
self.assertTransportMode(trans, 'dir/test.knit', 0600)
1474
self.assertTransportMode(trans, 'dir/test.kndx', 0600)
1476
def test_create_mode_770(self):
1477
trans = get_transport('.')
1478
if not trans._can_roundtrip_unix_modebits():
1479
# Can't roundtrip, so no need to run this test
1481
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1482
factory=None, create=True,
1483
create_parent_dir=True,
1487
knit.add_lines('revid', [], ['a\n'])
1488
self.assertTransportMode(trans, 'dir', 0770)
1489
self.assertTransportMode(trans, 'dir/test.knit', 0660)
1490
self.assertTransportMode(trans, 'dir/test.kndx', 0660)
1492
def test_create_mode_777(self):
1493
trans = get_transport('.')
1494
if not trans._can_roundtrip_unix_modebits():
1495
# Can't roundtrip, so no need to run this test
1497
knit = KnitVersionedFile('dir/test', trans, access_mode='w',
1498
factory=None, create=True,
1499
create_parent_dir=True,
1503
knit.add_lines('revid', [], ['a\n'])
1504
self.assertTransportMode(trans, 'dir', 0777)
1505
self.assertTransportMode(trans, 'dir/test.knit', 0666)
1506
self.assertTransportMode(trans, 'dir/test.kndx', 0666)
1508
def test_plan_merge(self):
1509
my_knit = self.make_test_knit(annotate=True)
1510
my_knit.add_lines('text1', [], split_lines(TEXT_1))
1511
my_knit.add_lines('text1a', ['text1'], split_lines(TEXT_1A))
1512
my_knit.add_lines('text1b', ['text1'], split_lines(TEXT_1B))
1513
plan = list(my_knit.plan_merge('text1a', 'text1b'))
1514
for plan_line, expected_line in zip(plan, AB_MERGE):
1515
self.assertEqual(plan_line, expected_line)
1517
def test_get_stream_empty(self):
1518
"""Get a data stream for an empty knit file."""
1519
k1 = self.make_test_knit()
1520
format, data_list, reader_callable = k1.get_data_stream([])
1521
self.assertEqual('knit-plain', format)
1522
self.assertEqual([], data_list)
1523
content = reader_callable(None)
1524
self.assertEqual('', content)
1525
self.assertIsInstance(content, str)
1527
def test_get_stream_one_version(self):
1528
"""Get a data stream for a single record out of a knit containing just
1531
k1 = self.make_test_knit()
1533
('text-a', [], TEXT_1),
1535
expected_data_list = [
1536
# version, options, length, parents
1537
('text-a', ['fulltext'], 122, []),
1539
for version_id, parents, lines in test_data:
1540
k1.add_lines(version_id, parents, split_lines(lines))
1542
format, data_list, reader_callable = k1.get_data_stream(['text-a'])
1543
self.assertEqual('knit-plain', format)
1544
self.assertEqual(expected_data_list, data_list)
1545
# There's only one record in the knit, so the content should be the
1546
# entire knit data file's contents.
1547
self.assertEqual(k1.transport.get_bytes(k1._data._access._filename),
1548
reader_callable(None))
1550
def test_get_stream_get_one_version_of_many(self):
1551
"""Get a data stream for just one version out of a knit containing many
1554
k1 = self.make_test_knit()
1555
# Insert the same data as test_knit_join, as they seem to cover a range
1556
# of cases (no parents, one parent, multiple parents).
1558
('text-a', [], TEXT_1),
1559
('text-b', ['text-a'], TEXT_1),
1560
('text-c', [], TEXT_1),
1561
('text-d', ['text-c'], TEXT_1),
1562
('text-m', ['text-b', 'text-d'], TEXT_1),
1564
expected_data_list = [
1565
# version, options, length, parents
1566
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1568
for version_id, parents, lines in test_data:
1569
k1.add_lines(version_id, parents, split_lines(lines))
1571
format, data_list, reader_callable = k1.get_data_stream(['text-m'])
1572
self.assertEqual('knit-plain', format)
1573
self.assertEqual(expected_data_list, data_list)
1574
self.assertRecordContentEqual(k1, 'text-m', reader_callable(None))
1576
def test_get_stream_ghost_parent(self):
1577
"""Get a data stream for a version with a ghost parent."""
1578
k1 = self.make_test_knit()
1580
k1.add_lines('text-a', [], split_lines(TEXT_1))
1581
k1.add_lines_with_ghosts('text-b', ['text-a', 'text-ghost'],
1582
split_lines(TEXT_1))
1584
expected_data_list = [
1585
# version, options, length, parents
1586
('text-b', ['line-delta'], 84, ['text-a', 'text-ghost']),
1589
format, data_list, reader_callable = k1.get_data_stream(['text-b'])
1590
self.assertEqual('knit-plain', format)
1591
self.assertEqual(expected_data_list, data_list)
1592
self.assertRecordContentEqual(k1, 'text-b', reader_callable(None))
1594
def test_get_stream_get_multiple_records(self):
1595
"""Get a stream for multiple records of a knit."""
1596
k1 = self.make_test_knit()
1597
# Insert the same data as test_knit_join, as they seem to cover a range
1598
# of cases (no parents, one parent, multiple parents).
1600
('text-a', [], TEXT_1),
1601
('text-b', ['text-a'], TEXT_1),
1602
('text-c', [], TEXT_1),
1603
('text-d', ['text-c'], TEXT_1),
1604
('text-m', ['text-b', 'text-d'], TEXT_1),
1606
expected_data_list = [
1607
# version, options, length, parents
1608
('text-b', ['line-delta'], 84, ['text-a']),
1609
('text-d', ['line-delta'], 84, ['text-c']),
1611
for version_id, parents, lines in test_data:
1612
k1.add_lines(version_id, parents, split_lines(lines))
1614
# Note that even though we request the revision IDs in a particular
1615
# order, the data stream may return them in any order it likes. In this
1616
# case, they'll be in the order they were inserted into the knit.
1617
format, data_list, reader_callable = k1.get_data_stream(
1618
['text-d', 'text-b'])
1619
self.assertEqual('knit-plain', format)
1620
self.assertEqual(expected_data_list, data_list)
1621
self.assertRecordContentEqual(k1, 'text-b', reader_callable(84))
1622
self.assertRecordContentEqual(k1, 'text-d', reader_callable(84))
1623
self.assertEqual('', reader_callable(None),
1624
"There should be no more bytes left to read.")
1626
def test_get_stream_all(self):
1627
"""Get a data stream for all the records in a knit.
1629
This exercises fulltext records, line-delta records, records with
1630
various numbers of parents, and reading multiple records out of the
1631
callable. These cases ought to all be exercised individually by the
1632
other test_get_stream_* tests; this test is basically just paranoia.
1634
k1 = self.make_test_knit()
1635
# Insert the same data as test_knit_join, as they seem to cover a range
1636
# of cases (no parents, one parent, multiple parents).
1638
('text-a', [], TEXT_1),
1639
('text-b', ['text-a'], TEXT_1),
1640
('text-c', [], TEXT_1),
1641
('text-d', ['text-c'], TEXT_1),
1642
('text-m', ['text-b', 'text-d'], TEXT_1),
1644
expected_data_list = [
1645
# version, options, length, parents
1646
('text-a', ['fulltext'], 122, []),
1647
('text-b', ['line-delta'], 84, ['text-a']),
1648
('text-c', ['fulltext'], 121, []),
1649
('text-d', ['line-delta'], 84, ['text-c']),
1650
('text-m', ['line-delta'], 84, ['text-b', 'text-d']),
1652
for version_id, parents, lines in test_data:
1653
k1.add_lines(version_id, parents, split_lines(lines))
1655
format, data_list, reader_callable = k1.get_data_stream(
1656
['text-a', 'text-b', 'text-c', 'text-d', 'text-m'])
1657
self.assertEqual('knit-plain', format)
1658
self.assertEqual(expected_data_list, data_list)
1659
for version_id, options, length, parents in expected_data_list:
1660
bytes = reader_callable(length)
1661
self.assertRecordContentEqual(k1, version_id, bytes)
1663
def assertKnitFilesEqual(self, knit1, knit2):
1664
"""Assert that the contents of the index and data files of two knits are
1668
knit1.transport.get_bytes(knit1._data._access._filename),
1669
knit2.transport.get_bytes(knit2._data._access._filename))
1671
knit1.transport.get_bytes(knit1._index._filename),
1672
knit2.transport.get_bytes(knit2._index._filename))
1674
def test_insert_data_stream_empty(self):
1675
"""Inserting a data stream with no records should not put any data into
1678
k1 = self.make_test_knit()
1679
k1.insert_data_stream(
1680
(k1.get_format_signature(), [], lambda ignored: ''))
1681
self.assertEqual('', k1.transport.get_bytes(k1._data._access._filename),
1682
"The .knit should be completely empty.")
1683
self.assertEqual(k1._index.HEADER,
1684
k1.transport.get_bytes(k1._index._filename),
1685
"The .kndx should have nothing apart from the header.")
1687
def test_insert_data_stream_one_record(self):
1688
"""Inserting a data stream with one record from a knit with one record
1689
results in byte-identical files.
1691
source = self.make_test_knit(name='source')
1692
source.add_lines('text-a', [], split_lines(TEXT_1))
1693
data_stream = source.get_data_stream(['text-a'])
1695
target = self.make_test_knit(name='target')
1696
target.insert_data_stream(data_stream)
1698
self.assertKnitFilesEqual(source, target)
1700
def test_insert_data_stream_records_already_present(self):
1701
"""Insert a data stream where some records are alreday present in the
1702
target, and some not. Only the new records are inserted.
1704
source = self.make_test_knit(name='source')
1705
target = self.make_test_knit(name='target')
1706
# Insert 'text-a' into both source and target
1707
source.add_lines('text-a', [], split_lines(TEXT_1))
1708
target.insert_data_stream(source.get_data_stream(['text-a']))
1709
# Insert 'text-b' into just the source.
1710
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1711
# Get a data stream of both text-a and text-b, and insert it.
1712
data_stream = source.get_data_stream(['text-a', 'text-b'])
1713
target.insert_data_stream(data_stream)
1714
# The source and target will now be identical. This means the text-a
1715
# record was not added a second time.
1716
self.assertKnitFilesEqual(source, target)
1718
def test_insert_data_stream_multiple_records(self):
1719
"""Inserting a data stream of all records from a knit with multiple
1720
records results in byte-identical files.
1722
source = self.make_test_knit(name='source')
1723
source.add_lines('text-a', [], split_lines(TEXT_1))
1724
source.add_lines('text-b', ['text-a'], split_lines(TEXT_1))
1725
source.add_lines('text-c', [], split_lines(TEXT_1))
1726
data_stream = source.get_data_stream(['text-a', 'text-b', 'text-c'])
1728
target = self.make_test_knit(name='target')
1729
target.insert_data_stream(data_stream)
1731
self.assertKnitFilesEqual(source, target)
1733
def test_insert_data_stream_ghost_parent(self):
1734
"""Insert a data stream with a record that has a ghost parent."""
1735
# Make a knit with a record, text-a, that has a ghost parent.
1736
source = self.make_test_knit(name='source')
1737
source.add_lines_with_ghosts('text-a', ['text-ghost'],
1738
split_lines(TEXT_1))
1739
data_stream = source.get_data_stream(['text-a'])
1741
target = self.make_test_knit(name='target')
1742
target.insert_data_stream(data_stream)
1744
self.assertKnitFilesEqual(source, target)
1746
# The target knit object is in a consistent state, i.e. the record we
1747
# just added is immediately visible.
1748
self.assertTrue(target.has_version('text-a'))
1749
self.assertTrue(target.has_ghost('text-ghost'))
1750
self.assertEqual(split_lines(TEXT_1), target.get_lines('text-a'))
1752
def test_insert_data_stream_inconsistent_version_lines(self):
1753
"""Inserting a data stream which has different content for a version_id
1754
than already exists in the knit will raise KnitCorrupt.
1756
source = self.make_test_knit(name='source')
1757
target = self.make_test_knit(name='target')
1758
# Insert a different 'text-a' into both source and target
1759
source.add_lines('text-a', [], split_lines(TEXT_1))
1760
target.add_lines('text-a', [], split_lines(TEXT_2))
1761
# Insert a data stream with conflicting content into the target
1762
data_stream = source.get_data_stream(['text-a'])
1764
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1766
def test_insert_data_stream_inconsistent_version_parents(self):
1767
"""Inserting a data stream which has different parents for a version_id
1768
than already exists in the knit will raise KnitCorrupt.
1770
source = self.make_test_knit(name='source')
1771
target = self.make_test_knit(name='target')
1772
# Insert a different 'text-a' into both source and target. They differ
1773
# only by the parents list, the content is the same.
1774
source.add_lines_with_ghosts('text-a', [], split_lines(TEXT_1))
1775
target.add_lines_with_ghosts('text-a', ['a-ghost'], split_lines(TEXT_1))
1776
# Insert a data stream with conflicting content into the target
1777
data_stream = source.get_data_stream(['text-a'])
1779
errors.KnitCorrupt, target.insert_data_stream, data_stream)
1781
def test_insert_data_stream_incompatible_format(self):
1782
"""A data stream in a different format to the target knit cannot be
1785
It will raise KnitDataStreamIncompatible.
1787
data_stream = ('fake-format-signature', [], lambda _: '')
1788
target = self.make_test_knit(name='target')
1790
errors.KnitDataStreamIncompatible,
1791
target.insert_data_stream, data_stream)
1793
# * test that a stream of "already present version, then new version"
1794
# inserts correctly.
1805
Banana cup cake recipe
1811
- self-raising flour
1815
Banana cup cake recipe
1817
- bananas (do not use plantains!!!)
1824
Banana cup cake recipe
1827
- self-raising flour
1840
AB_MERGE_TEXT="""unchanged|Banana cup cake recipe
1845
new-b|- bananas (do not use plantains!!!)
1846
unchanged|- broken tea cups
1847
new-a|- self-raising flour
1850
AB_MERGE=[tuple(l.split('|')) for l in AB_MERGE_TEXT.splitlines(True)]
1853
def line_delta(from_lines, to_lines):
1854
"""Generate line-based delta from one text to another"""
1855
s = difflib.SequenceMatcher(None, from_lines, to_lines)
1856
for op in s.get_opcodes():
1857
if op[0] == 'equal':
1859
yield '%d,%d,%d\n' % (op[1], op[2], op[4]-op[3])
1860
for i in range(op[3], op[4]):
1864
def apply_line_delta(basis_lines, delta_lines):
1865
"""Apply a line-based perfect diff
1867
basis_lines -- text to apply the patch to
1868
delta_lines -- diff instructions and content
1870
out = basis_lines[:]
1873
while i < len(delta_lines):
1875
a, b, c = map(long, l.split(','))
1877
out[offset+a:offset+b] = delta_lines[i:i+c]
1879
offset = offset + (b - a) + c
1883
class TestWeaveToKnit(KnitTests):
1885
def test_weave_to_knit_matches(self):
1886
# check that the WeaveToKnit is_compatible function
1887
# registers True for a Weave to a Knit.
1889
k = self.make_test_knit()
1890
self.failUnless(WeaveToKnit.is_compatible(w, k))
1891
self.failIf(WeaveToKnit.is_compatible(k, w))
1892
self.failIf(WeaveToKnit.is_compatible(w, w))
1893
self.failIf(WeaveToKnit.is_compatible(k, k))
1896
class TestKnitCaching(KnitTests):
1898
def create_knit(self, cache_add=False):
1899
k = self.make_test_knit(True)
1903
k.add_lines('text-1', [], split_lines(TEXT_1))
1904
k.add_lines('text-2', [], split_lines(TEXT_2))
1907
def test_no_caching(self):
1908
k = self.create_knit()
1909
# Nothing should be cached without setting 'enable_cache'
1910
self.assertEqual({}, k._data._cache)
1912
def test_cache_add_and_clear(self):
1913
k = self.create_knit(True)
1915
self.assertEqual(['text-1', 'text-2'], sorted(k._data._cache.keys()))
1918
self.assertEqual({}, k._data._cache)
1920
def test_cache_data_read_raw(self):
1921
k = self.create_knit()
1923
# Now cache and read
1926
def read_one_raw(version):
1927
pos_map = k._get_components_positions([version])
1928
method, index_memo, next = pos_map[version]
1929
lst = list(k._data.read_records_iter_raw([(version, index_memo)]))
1930
self.assertEqual(1, len(lst))
1933
val = read_one_raw('text-1')
1934
self.assertEqual({'text-1':val[1]}, k._data._cache)
1937
# After clear, new reads are not cached
1938
self.assertEqual({}, k._data._cache)
1940
val2 = read_one_raw('text-1')
1941
self.assertEqual(val, val2)
1942
self.assertEqual({}, k._data._cache)
1944
def test_cache_data_read(self):
1945
k = self.create_knit()
1947
def read_one(version):
1948
pos_map = k._get_components_positions([version])
1949
method, index_memo, next = pos_map[version]
1950
lst = list(k._data.read_records_iter([(version, index_memo)]))
1951
self.assertEqual(1, len(lst))
1954
# Now cache and read
1957
val = read_one('text-2')
1958
self.assertEqual(['text-2'], k._data._cache.keys())
1959
self.assertEqual('text-2', val[0])
1960
content, digest = k._data._parse_record('text-2',
1961
k._data._cache['text-2'])
1962
self.assertEqual(content, val[1])
1963
self.assertEqual(digest, val[2])
1966
self.assertEqual({}, k._data._cache)
1968
val2 = read_one('text-2')
1969
self.assertEqual(val, val2)
1970
self.assertEqual({}, k._data._cache)
1972
def test_cache_read(self):
1973
k = self.create_knit()
1976
text = k.get_text('text-1')
1977
self.assertEqual(TEXT_1, text)
1978
self.assertEqual(['text-1'], k._data._cache.keys())
1981
self.assertEqual({}, k._data._cache)
1983
text = k.get_text('text-1')
1984
self.assertEqual(TEXT_1, text)
1985
self.assertEqual({}, k._data._cache)
1505
1988
class TestKnitIndex(KnitTests):
1633
2107
add_callback = self.catch_add
1635
2109
add_callback = None
1636
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
2110
return KnitGraphIndex(combined_index, deltas=deltas,
1637
2111
add_callback=add_callback)
1639
def test_keys(self):
1640
index = self.two_graph_index()
1641
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
2113
def test_get_graph(self):
2114
index = self.two_graph_index()
2115
self.assertEqual(set([
2116
('tip', ('parent', )),
2118
('parent', ('tail', 'ghost')),
2120
]), set(index.get_graph()))
2122
def test_get_ancestry(self):
2123
# get_ancestry is defined as eliding ghosts, not erroring.
2124
index = self.two_graph_index()
2125
self.assertEqual([], index.get_ancestry([]))
2126
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2127
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2128
self.assertEqual(['tail', 'parent'], index.get_ancestry(['parent']))
2129
self.assertEqual(['tail', 'parent', 'tip'], index.get_ancestry(['tip']))
2130
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2131
(['tail', 'parent', 'tip', 'separate'],
2132
['separate', 'tail', 'parent', 'tip'],
2134
# and without topo_sort
2135
self.assertEqual(set(['separate']),
2136
set(index.get_ancestry(['separate'], topo_sorted=False)))
2137
self.assertEqual(set(['tail']),
2138
set(index.get_ancestry(['tail'], topo_sorted=False)))
2139
self.assertEqual(set(['tail', 'parent']),
2140
set(index.get_ancestry(['parent'], topo_sorted=False)))
2141
self.assertEqual(set(['tail', 'parent', 'tip']),
2142
set(index.get_ancestry(['tip'], topo_sorted=False)))
2143
self.assertEqual(set(['separate', 'tail', 'parent', 'tip']),
2144
set(index.get_ancestry(['tip', 'separate'])))
2145
# asking for a ghost makes it go boom.
2146
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2148
def test_get_ancestry_with_ghosts(self):
2149
index = self.two_graph_index()
2150
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2151
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2152
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2153
self.assertTrue(index.get_ancestry_with_ghosts(['parent']) in
2154
(['tail', 'ghost', 'parent'],
2155
['ghost', 'tail', 'parent'],
2157
self.assertTrue(index.get_ancestry_with_ghosts(['tip']) in
2158
(['tail', 'ghost', 'parent', 'tip'],
2159
['ghost', 'tail', 'parent', 'tip'],
2161
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2162
(['tail', 'ghost', 'parent', 'tip', 'separate'],
2163
['ghost', 'tail', 'parent', 'tip', 'separate'],
2164
['separate', 'tail', 'ghost', 'parent', 'tip'],
2165
['separate', 'ghost', 'tail', 'parent', 'tip'],
2167
# asking for a ghost makes it go boom.
2168
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2170
def test_num_versions(self):
2171
index = self.two_graph_index()
2172
self.assertEqual(4, index.num_versions())
2174
def test_get_versions(self):
2175
index = self.two_graph_index()
2176
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2177
set(index.get_versions()))
2179
def test_has_version(self):
2180
index = self.two_graph_index()
2181
self.assertTrue(index.has_version('tail'))
2182
self.assertFalse(index.has_version('ghost'))
1644
2184
def test_get_position(self):
1645
2185
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',)))
2186
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2187
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
1649
2189
def test_get_method_deltas(self):
1650
2190
index = self.two_graph_index(deltas=True)
1651
self.assertEqual('fulltext', index.get_method(('tip',)))
1652
self.assertEqual('line-delta', index.get_method(('parent',)))
2191
self.assertEqual('fulltext', index.get_method('tip'))
2192
self.assertEqual('line-delta', index.get_method('parent'))
1654
2194
def test_get_method_no_deltas(self):
1655
2195
# check that the parent-history lookup is ignored with deltas=False.
1656
2196
index = self.two_graph_index(deltas=False)
1657
self.assertEqual('fulltext', index.get_method(('tip',)))
1658
self.assertEqual('fulltext', index.get_method(('parent',)))
2197
self.assertEqual('fulltext', index.get_method('tip'))
2198
self.assertEqual('fulltext', index.get_method('parent'))
1660
2200
def test_get_options_deltas(self):
1661
2201
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',)))
2202
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2203
self.assertEqual(['line-delta'], index.get_options('parent'))
1665
2205
def test_get_options_no_deltas(self):
1666
2206
# check that the parent-history lookup is ignored with deltas=False.
1667
2207
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',)]))
2208
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2209
self.assertEqual(['fulltext'], index.get_options('parent'))
2211
def test_get_parents(self):
2212
# get_parents ignores ghosts
2213
index = self.two_graph_index()
2214
self.assertEqual(('tail', ), index.get_parents('parent'))
2215
# and errors on ghosts.
2216
self.assertRaises(errors.RevisionNotPresent,
2217
index.get_parents, 'ghost')
2219
def test_get_parents_with_ghosts(self):
2220
index = self.two_graph_index()
2221
self.assertEqual(('tail', 'ghost'), index.get_parents_with_ghosts('parent'))
2222
# and errors on ghosts.
2223
self.assertRaises(errors.RevisionNotPresent,
2224
index.get_parents_with_ghosts, 'ghost')
2226
def test_check_versions_present(self):
2227
# ghosts should not be considered present
2228
index = self.two_graph_index()
2229
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2231
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2233
index.check_versions_present(['tail', 'separate'])
1676
2235
def catch_add(self, entries):
1677
2236
self.caught_entries.append(entries)
1679
2238
def test_add_no_callback_errors(self):
1680
2239
index = self.two_graph_index()
1681
self.assertRaises(errors.ReadOnlyError, index.add_records,
1682
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
2240
self.assertRaises(errors.ReadOnlyError, index.add_version,
2241
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1684
2243
def test_add_version_smoke(self):
1685
2244
index = self.two_graph_index(catch_adds=True)
1686
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
2245
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1688
2246
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1689
2247
self.caught_entries)
1691
2249
def test_add_version_delta_not_delta_index(self):
1692
2250
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',)])])
2251
self.assertRaises(errors.KnitCorrupt, index.add_version,
2252
'new', 'no-eol,line-delta', (None, 0, 100), ['parent'])
1695
2253
self.assertEqual([], self.caught_entries)
1697
2255
def test_add_version_same_dup(self):
1698
2256
index = self.two_graph_index(catch_adds=True)
1699
2257
# 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)
2258
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2259
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])
2260
# but neither should have added data.
2261
self.assertEqual([[], []], self.caught_entries)
1711
2263
def test_add_version_different_dup(self):
1712
2264
index = self.two_graph_index(deltas=True, catch_adds=True)
1713
2265
# 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',)])])
2266
self.assertRaises(errors.KnitCorrupt, index.add_version,
2267
'tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])
2268
self.assertRaises(errors.KnitCorrupt, index.add_version,
2269
'tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])
2270
self.assertRaises(errors.KnitCorrupt, index.add_version,
2271
'tip', 'fulltext', (None, 0, 100), ['parent'])
2273
self.assertRaises(errors.KnitCorrupt, index.add_version,
2274
'tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])
2275
self.assertRaises(errors.KnitCorrupt, index.add_version,
2276
'tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])
1719
self.assertRaises(errors.KnitCorrupt, index.add_records,
1720
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2278
self.assertRaises(errors.KnitCorrupt, index.add_version,
2279
'tip', 'fulltext,no-eol', (None, 0, 100), [])
1721
2280
self.assertEqual([], self.caught_entries)
1723
2282
def test_add_versions_nodeltas(self):
1724
2283
index = self.two_graph_index(catch_adds=True)
1726
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1727
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
2284
index.add_versions([
2285
('new', 'fulltext,no-eol', (None, 50, 60), ['separate']),
2286
('new2', 'fulltext', (None, 0, 6), ['new']),
1729
2288
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1730
2289
(('new2', ), ' 0 6', ((('new',),),))],
1745
2304
def test_add_versions_delta_not_delta_index(self):
1746
2305
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',)])])
2306
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2307
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
1749
2308
self.assertEqual([], self.caught_entries)
1751
def test_add_versions_random_id_accepted(self):
1752
index = self.two_graph_index(catch_adds=True)
1753
index.add_records([], random_id=True)
1755
2310
def test_add_versions_same_dup(self):
1756
2311
index = self.two_graph_index(catch_adds=True)
1757
2312
# 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),
2313
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2314
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
1768
2315
# but neither should have added data.
1769
self.assertEqual([[], [], [], []], self.caught_entries)
2316
self.assertEqual([[], []], self.caught_entries)
1771
2318
def test_add_versions_different_dup(self):
1772
2319
index = self.two_graph_index(deltas=True, catch_adds=True)
1773
2320
# 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',)])])
2321
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2322
[('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2323
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2324
[('tip', 'line-delta,no-eol', (None, 0, 100), ['parent'])])
2325
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2326
[('tip', 'fulltext', (None, 0, 100), ['parent'])])
2328
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2329
[('tip', 'fulltext,no-eol', (None, 50, 100), ['parent'])])
2330
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2331
[('tip', 'fulltext,no-eol', (None, 0, 1000), ['parent'])])
1779
self.assertRaises(errors.KnitCorrupt, index.add_records,
1780
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2333
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2334
[('tip', 'fulltext,no-eol', (None, 0, 100), [])])
1781
2335
# 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',)])])
2336
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2337
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent']),
2338
('tip', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
1785
2339
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())
2341
def test_iter_parents(self):
2342
index1 = self.make_g_index('1', 1, [
2344
(('r0', ), 'N0 100', ([], )),
2346
(('r1', ), '', ([('r0', )], ))])
2347
index2 = self.make_g_index('2', 1, [
2349
(('r2', ), 'N0 100', ([('r1', ), ('r0', )], )),
2351
combined_index = CombinedGraphIndex([index1, index2])
2352
index = KnitGraphIndex(combined_index)
2354
# cases: each sample data individually:
2355
self.assertEqual(set([('r0', ())]),
2356
set(index.iter_parents(['r0'])))
2357
self.assertEqual(set([('r1', ('r0', ))]),
2358
set(index.iter_parents(['r1'])))
2359
self.assertEqual(set([('r2', ('r1', 'r0'))]),
2360
set(index.iter_parents(['r2'])))
2361
# no nodes returned for a missing node
2362
self.assertEqual(set(),
2363
set(index.iter_parents(['missing'])))
2364
# 1 node returned with missing nodes skipped
2365
self.assertEqual(set([('r1', ('r0', ))]),
2366
set(index.iter_parents(['ghost1', 'r1', 'ghost'])))
2368
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2369
set(index.iter_parents(['r0', 'r1'])))
2370
# 2 nodes returned, missing skipped
2371
self.assertEqual(set([('r0', ()), ('r1', ('r0', ))]),
2372
set(index.iter_parents(['a', 'r0', 'b', 'r1', 'c'])))
1893
2375
class TestNoParentsGraphIndexKnit(KnitTests):
1894
"""Tests for knits using _KnitGraphIndex with no parents."""
2376
"""Tests for knits using KnitGraphIndex with no parents."""
1896
2378
def make_g_index(self, name, ref_lists=0, nodes=[]):
1897
2379
builder = GraphIndexBuilder(ref_lists)
1935
2409
add_callback = self.catch_add
1937
2411
add_callback = None
1938
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
2412
return KnitGraphIndex(combined_index, parents=False,
1939
2413
add_callback=add_callback)
1941
def test_keys(self):
1942
index = self.two_graph_index()
1943
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
2415
def test_get_graph(self):
2416
index = self.two_graph_index()
2417
self.assertEqual(set([
2422
]), set(index.get_graph()))
2424
def test_get_ancestry(self):
2425
# with no parents, ancestry is always just the key.
2426
index = self.two_graph_index()
2427
self.assertEqual([], index.get_ancestry([]))
2428
self.assertEqual(['separate'], index.get_ancestry(['separate']))
2429
self.assertEqual(['tail'], index.get_ancestry(['tail']))
2430
self.assertEqual(['parent'], index.get_ancestry(['parent']))
2431
self.assertEqual(['tip'], index.get_ancestry(['tip']))
2432
self.assertTrue(index.get_ancestry(['tip', 'separate']) in
2433
(['tip', 'separate'],
2434
['separate', 'tip'],
2436
# asking for a ghost makes it go boom.
2437
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry, ['ghost'])
2439
def test_get_ancestry_with_ghosts(self):
2440
index = self.two_graph_index()
2441
self.assertEqual([], index.get_ancestry_with_ghosts([]))
2442
self.assertEqual(['separate'], index.get_ancestry_with_ghosts(['separate']))
2443
self.assertEqual(['tail'], index.get_ancestry_with_ghosts(['tail']))
2444
self.assertEqual(['parent'], index.get_ancestry_with_ghosts(['parent']))
2445
self.assertEqual(['tip'], index.get_ancestry_with_ghosts(['tip']))
2446
self.assertTrue(index.get_ancestry_with_ghosts(['tip', 'separate']) in
2447
(['tip', 'separate'],
2448
['separate', 'tip'],
2450
# asking for a ghost makes it go boom.
2451
self.assertRaises(errors.RevisionNotPresent, index.get_ancestry_with_ghosts, ['ghost'])
2453
def test_num_versions(self):
2454
index = self.two_graph_index()
2455
self.assertEqual(4, index.num_versions())
2457
def test_get_versions(self):
2458
index = self.two_graph_index()
2459
self.assertEqual(set(['tail', 'tip', 'parent', 'separate']),
2460
set(index.get_versions()))
2462
def test_has_version(self):
2463
index = self.two_graph_index()
2464
self.assertTrue(index.has_version('tail'))
2465
self.assertFalse(index.has_version('ghost'))
1946
2467
def test_get_position(self):
1947
2468
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',)))
2469
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position('tip'))
2470
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position('parent'))
1953
2472
def test_get_method(self):
1954
2473
index = self.two_graph_index()
1955
self.assertEqual('fulltext', index.get_method(('tip',)))
1956
self.assertEqual(['fulltext'], index.get_options(('parent',)))
2474
self.assertEqual('fulltext', index.get_method('tip'))
2475
self.assertEqual(['fulltext'], index.get_options('parent'))
1958
2477
def test_get_options(self):
1959
2478
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',)]))
2479
self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
2480
self.assertEqual(['fulltext'], index.get_options('parent'))
2482
def test_get_parents(self):
2483
index = self.two_graph_index()
2484
self.assertEqual((), index.get_parents('parent'))
2485
# and errors on ghosts.
2486
self.assertRaises(errors.RevisionNotPresent,
2487
index.get_parents, 'ghost')
2489
def test_get_parents_with_ghosts(self):
2490
index = self.two_graph_index()
2491
self.assertEqual((), index.get_parents_with_ghosts('parent'))
2492
# and errors on ghosts.
2493
self.assertRaises(errors.RevisionNotPresent,
2494
index.get_parents_with_ghosts, 'ghost')
2496
def test_check_versions_present(self):
2497
index = self.two_graph_index()
2498
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2500
self.assertRaises(RevisionNotPresent, index.check_versions_present,
2501
['tail', 'missing'])
2502
index.check_versions_present(['tail', 'separate'])
1968
2504
def catch_add(self, entries):
1969
2505
self.caught_entries.append(entries)
1971
2507
def test_add_no_callback_errors(self):
1972
2508
index = self.two_graph_index()
1973
self.assertRaises(errors.ReadOnlyError, index.add_records,
1974
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
2509
self.assertRaises(errors.ReadOnlyError, index.add_version,
2510
'new', 'fulltext,no-eol', (None, 50, 60), ['separate'])
1976
2512
def test_add_version_smoke(self):
1977
2513
index = self.two_graph_index(catch_adds=True)
1978
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
2514
index.add_version('new', 'fulltext,no-eol', (None, 50, 60), [])
1979
2515
self.assertEqual([[(('new', ), 'N50 60')]],
1980
2516
self.caught_entries)
1982
2518
def test_add_version_delta_not_delta_index(self):
1983
2519
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), [])])
2520
self.assertRaises(errors.KnitCorrupt, index.add_version,
2521
'new', 'no-eol,line-delta', (None, 0, 100), [])
1986
2522
self.assertEqual([], self.caught_entries)
1988
2524
def test_add_version_same_dup(self):
1989
2525
index = self.two_graph_index(catch_adds=True)
1990
2526
# 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), [])])
2527
index.add_version('tip', 'fulltext,no-eol', (None, 0, 100), [])
2528
index.add_version('tip', 'no-eol,fulltext', (None, 0, 100), [])
1997
2529
# but neither should have added data.
1998
self.assertEqual([[], [], [], []], self.caught_entries)
2530
self.assertEqual([[], []], self.caught_entries)
2000
2532
def test_add_version_different_dup(self):
2001
2533
index = self.two_graph_index(catch_adds=True)
2002
2534
# 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), [])])
2535
self.assertRaises(errors.KnitCorrupt, index.add_version,
2536
'tip', 'no-eol,line-delta', (None, 0, 100), [])
2537
self.assertRaises(errors.KnitCorrupt, index.add_version,
2538
'tip', 'line-delta,no-eol', (None, 0, 100), [])
2539
self.assertRaises(errors.KnitCorrupt, index.add_version,
2540
'tip', 'fulltext', (None, 0, 100), [])
2542
self.assertRaises(errors.KnitCorrupt, index.add_version,
2543
'tip', 'fulltext,no-eol', (None, 50, 100), [])
2544
self.assertRaises(errors.KnitCorrupt, index.add_version,
2545
'tip', 'fulltext,no-eol', (None, 0, 1000), [])
2010
self.assertRaises(errors.KnitCorrupt, index.add_records,
2011
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2547
self.assertRaises(errors.KnitCorrupt, index.add_version,
2548
'tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])
2012
2549
self.assertEqual([], self.caught_entries)
2014
2551
def test_add_versions(self):
2015
2552
index = self.two_graph_index(catch_adds=True)
2017
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2018
(('new2',), 'fulltext', (None, 0, 6), []),
2553
index.add_versions([
2554
('new', 'fulltext,no-eol', (None, 50, 60), []),
2555
('new2', 'fulltext', (None, 0, 6), []),
2020
2557
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2021
2558
sorted(self.caught_entries[0]))
2024
2561
def test_add_versions_delta_not_delta_index(self):
2025
2562
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',)])])
2563
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2564
[('new', 'no-eol,line-delta', (None, 0, 100), ['parent'])])
2028
2565
self.assertEqual([], self.caught_entries)
2030
2567
def test_add_versions_parents_not_parents_index(self):
2031
2568
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',)])])
2569
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2570
[('new', 'no-eol,fulltext', (None, 0, 100), ['parent'])])
2034
2571
self.assertEqual([], self.caught_entries)
2036
def test_add_versions_random_id_accepted(self):
2037
index = self.two_graph_index(catch_adds=True)
2038
index.add_records([], random_id=True)
2040
2573
def test_add_versions_same_dup(self):
2041
2574
index = self.two_graph_index(catch_adds=True)
2042
2575
# 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), [])])
2576
index.add_versions([('tip', 'fulltext,no-eol', (None, 0, 100), [])])
2577
index.add_versions([('tip', 'no-eol,fulltext', (None, 0, 100), [])])
2049
2578
# but neither should have added data.
2050
self.assertEqual([[], [], [], []], self.caught_entries)
2579
self.assertEqual([[], []], self.caught_entries)
2052
2581
def test_add_versions_different_dup(self):
2053
2582
index = self.two_graph_index(catch_adds=True)
2054
2583
# 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), [])])
2584
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2585
[('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2586
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2587
[('tip', 'line-delta,no-eol', (None, 0, 100), [])])
2588
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2589
[('tip', 'fulltext', (None, 0, 100), [])])
2591
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2592
[('tip', 'fulltext,no-eol', (None, 50, 100), [])])
2593
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2594
[('tip', 'fulltext,no-eol', (None, 0, 1000), [])])
2062
self.assertRaises(errors.KnitCorrupt, index.add_records,
2063
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2596
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2597
[('tip', 'fulltext,no-eol', (None, 0, 100), ['parent'])])
2064
2598
# 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), [])])
2599
self.assertRaises(errors.KnitCorrupt, index.add_versions,
2600
[('tip', 'fulltext,no-eol', (None, 0, 100), []),
2601
('tip', 'no-eol,line-delta', (None, 0, 100), [])])
2068
2602
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)
2604
def test_iter_parents(self):
2605
index = self.two_graph_index()
2606
self.assertEqual(set([
2607
('tip', ()), ('tail', ()), ('parent', ()), ('separate', ())
2609
set(index.iter_parents(['tip', 'tail', 'ghost', 'parent', 'separate'])))
2610
self.assertEqual(set([('tip', ())]),
2611
set(index.iter_parents(['tip'])))
2612
self.assertEqual(set(),
2613
set(index.iter_parents([])))
added
removed
bzrlib/tests/test_knit.py
