422
477
raise _TestException('foobar')
423
except _TestException, e:
478
except _TestException as e:
424
479
retry_exc = errors.RetryWithNewPacks(None, reload_occurred=False,
425
480
exc_info=sys.exc_info())
481
# GZ 2010-08-10: Cycle with exc_info affects 3 tests
428
484
def test_read_from_several_packs(self):
429
485
access, writer = self._get_access()
431
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
487
memos.extend(access.add_raw_records([(b'key', 10)], b'1234567890'))
433
489
access, writer = self._get_access('pack2', 'FOOBAR')
434
memos.extend(access.add_raw_records([('key', 5)], '12345'))
490
memos.extend(access.add_raw_records([(b'key', 5)], b'12345'))
436
492
access, writer = self._get_access('pack3', 'BAZ')
437
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
493
memos.extend(access.add_raw_records([(b'key', 5)], b'alpha'))
439
495
transport = self.get_transport()
440
access = _DirectPackAccess({"FOO":(transport, 'packfile'),
496
access = pack_repo._DirectPackAccess({"FOO":(transport, 'packfile'),
441
497
"FOOBAR":(transport, 'pack2'),
442
498
"BAZ":(transport, 'pack3')})
443
self.assertEqual(['1234567890', '12345', 'alpha'],
499
self.assertEqual([b'1234567890', b'12345', b'alpha'],
444
500
list(access.get_raw_records(memos)))
445
self.assertEqual(['1234567890'],
501
self.assertEqual([b'1234567890'],
446
502
list(access.get_raw_records(memos[0:1])))
447
self.assertEqual(['12345'],
503
self.assertEqual([b'12345'],
448
504
list(access.get_raw_records(memos[1:2])))
449
self.assertEqual(['alpha'],
505
self.assertEqual([b'alpha'],
450
506
list(access.get_raw_records(memos[2:3])))
451
self.assertEqual(['1234567890', 'alpha'],
507
self.assertEqual([b'1234567890', b'alpha'],
452
508
list(access.get_raw_records(memos[0:1] + memos[2:3])))
454
510
def test_set_writer(self):
455
511
"""The writer should be settable post construction."""
456
access = _DirectPackAccess({})
512
access = pack_repo._DirectPackAccess({})
457
513
transport = self.get_transport()
458
514
packname = 'packfile'
595
655
self.fail('Annotation was not identical with reloading.')
596
656
# Now delete the packs-in-use, which should trigger another reload, but
597
657
# this time we just raise an exception because we can't recover
598
for trans, name in vf._access._indices.itervalues():
658
for trans, name in vf._access._indices.values():
599
659
trans.delete(name)
600
660
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
601
661
self.assertEqual([2, 1, 1], reload_counter)
603
663
def test__get_record_map_retries(self):
604
664
vf, reload_counter = self.make_vf_for_retrying()
605
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
665
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
606
666
records = vf._get_record_map(keys)
607
667
self.assertEqual(keys, sorted(records.keys()))
608
668
self.assertEqual([1, 1, 0], reload_counter)
609
669
# Now delete the packs-in-use, which should trigger another reload, but
610
670
# this time we just raise an exception because we can't recover
611
for trans, name in vf._access._indices.itervalues():
671
for trans, name in vf._access._indices.values():
612
672
trans.delete(name)
613
673
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
614
674
self.assertEqual([2, 1, 1], reload_counter)
616
676
def test_get_record_stream_retries(self):
617
677
vf, reload_counter = self.make_vf_for_retrying()
618
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
678
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
619
679
record_stream = vf.get_record_stream(keys, 'topological', False)
620
record = record_stream.next()
621
self.assertEqual(('rev-1',), record.key)
680
record = next(record_stream)
681
self.assertEqual((b'rev-1',), record.key)
622
682
self.assertEqual([0, 0, 0], reload_counter)
623
record = record_stream.next()
624
self.assertEqual(('rev-2',), record.key)
683
record = next(record_stream)
684
self.assertEqual((b'rev-2',), record.key)
625
685
self.assertEqual([1, 1, 0], reload_counter)
626
record = record_stream.next()
627
self.assertEqual(('rev-3',), record.key)
686
record = next(record_stream)
687
self.assertEqual((b'rev-3',), record.key)
628
688
self.assertEqual([1, 1, 0], reload_counter)
629
689
# Now delete all pack files, and see that we raise the right error
630
for trans, name in vf._access._indices.itervalues():
690
for trans, name in vf._access._indices.values():
631
691
trans.delete(name)
632
692
self.assertListRaises(errors.NoSuchFile,
633
693
vf.get_record_stream, keys, 'topological', False)
635
695
def test_iter_lines_added_or_present_in_keys_retries(self):
636
696
vf, reload_counter = self.make_vf_for_retrying()
637
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
697
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
638
698
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
639
699
# result in random order (determined by the iteration order from a
640
700
# set()), so we don't have any solid way to trigger whether data is
665
725
self.addCleanup(repo.unlock)
666
726
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'])
728
vf.add_lines((b'f-id', b'rev-5'), [(b'f-id', b'rev-4')], [b'lines\n'])
729
vf.add_lines((b'f-id', b'rev-1'), [], [b'lines\n'])
730
vf.add_lines((b'f-id', b'rev-2'), [(b'f-id', b'rev-1')], [b'lines\n'])
671
731
repo.commit_write_group()
672
732
# 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)
734
stream = vf.get_record_stream([(b'f-id', b'rev-1'), (b'f-id', b'rev-5'),
735
(b'f-id', b'rev-2')], 'unordered', False)
676
736
keys = [r.key for r in stream]
677
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
678
('f-id', 'rev-2')], keys)
737
self.assertEqual([(b'f-id', b'rev-5'), (b'f-id', b'rev-1'),
738
(b'f-id', b'rev-2')], keys)
679
739
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'])
740
vf.add_lines((b'f-id', b'rev-4'), [(b'f-id', b'rev-3')], [b'lines\n'])
741
vf.add_lines((b'f-id', b'rev-3'), [(b'f-id', b'rev-2')], [b'lines\n'])
742
vf.add_lines((b'f-id', b'rev-6'), [(b'f-id', b'rev-5')], [b'lines\n'])
683
743
repo.commit_write_group()
684
744
# 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))
746
request_keys = set((b'f-id', b'rev-%d' % i) for i in range(1, 7))
687
747
stream = vf.get_record_stream(request_keys, 'unordered', False)
688
748
keys = [r.key for r in stream]
689
749
# We want to get the keys back in disk order, but it doesn't matter
690
750
# 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]]
751
alt1 = [(b'f-id', b'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
752
alt2 = [(b'f-id', b'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
693
753
if keys != alt1 and keys != alt2:
694
754
self.fail('Returned key order did not match either expected order.'
695
755
' expected %s or %s, not %s'
699
759
class LowLevelKnitDataTests(TestCase):
701
761
def create_gz_content(self, text):
703
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
763
with gzip.GzipFile(mode='wb', fileobj=sio) as gz_file:
706
765
return sio.getvalue()
708
767
def make_multiple_records(self):
709
768
"""Create the content for multiple records."""
710
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
769
sha1sum = osutils.sha_string(b'foo\nbar\n')
712
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
771
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
717
776
record_1 = (0, len(gz_txt), sha1sum)
718
777
total_txt.append(gz_txt)
719
sha1sum = osutils.sha('baz\n').hexdigest()
720
gz_txt = self.create_gz_content('version rev-id-2 1 %s\n'
778
sha1sum = osutils.sha_string(b'baz\n')
779
gz_txt = self.create_gz_content(b'version rev-id-2 1 %s\n'
724
783
record_2 = (record_1[1], len(gz_txt), sha1sum)
725
784
total_txt.append(gz_txt)
726
785
return total_txt, record_1, record_2
728
787
def test_valid_knit_data(self):
729
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
730
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
788
sha1sum = osutils.sha_string(b'foo\nbar\n')
789
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
735
794
transport = MockTransport([gz_txt])
736
795
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
737
796
knit = KnitVersionedFiles(None, access)
738
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
797
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
740
799
contents = list(knit._read_records_iter(records))
741
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'],
742
'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
800
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'],
801
b'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
744
803
raw_contents = list(knit._read_records_iter_raw(records))
745
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
804
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
747
806
def test_multiple_records_valid(self):
748
807
total_txt, record_1, record_2 = self.make_multiple_records()
749
transport = MockTransport([''.join(total_txt)])
808
transport = MockTransport([b''.join(total_txt)])
750
809
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
751
810
knit = KnitVersionedFiles(None, access)
752
records = [(('rev-id-1',), (('rev-id-1',), record_1[0], record_1[1])),
753
(('rev-id-2',), (('rev-id-2',), record_2[0], record_2[1]))]
811
records = [((b'rev-id-1',), ((b'rev-id-1',), record_1[0], record_1[1])),
812
((b'rev-id-2',), ((b'rev-id-2',), record_2[0], record_2[1]))]
755
814
contents = list(knit._read_records_iter(records))
756
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'], record_1[2]),
757
(('rev-id-2',), ['baz\n'], record_2[2])],
815
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'], record_1[2]),
816
((b'rev-id-2',), [b'baz\n'], record_2[2])],
760
819
raw_contents = list(knit._read_records_iter_raw(records))
761
self.assertEqual([(('rev-id-1',), total_txt[0], record_1[2]),
762
(('rev-id-2',), total_txt[1], record_2[2])],
820
self.assertEqual([((b'rev-id-1',), total_txt[0], record_1[2]),
821
((b'rev-id-2',), total_txt[1], record_2[2])],
765
824
def test_not_enough_lines(self):
766
sha1sum = osutils.sha('foo\n').hexdigest()
825
sha1sum = osutils.sha_string(b'foo\n')
767
826
# record says 2 lines data says 1
768
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
827
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
772
831
transport = MockTransport([gz_txt])
773
832
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
774
833
knit = KnitVersionedFiles(None, access)
775
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
776
self.assertRaises(errors.KnitCorrupt, list,
834
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
835
self.assertRaises(KnitCorrupt, list,
777
836
knit._read_records_iter(records))
779
838
# read_records_iter_raw won't detect that sort of mismatch/corruption
780
839
raw_contents = list(knit._read_records_iter_raw(records))
781
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
840
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
783
842
def test_too_many_lines(self):
784
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
843
sha1sum = osutils.sha_string(b'foo\nbar\n')
785
844
# record says 1 lines data says 2
786
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
845
gz_txt = self.create_gz_content(b'version rev-id-1 1 %s\n'
791
850
transport = MockTransport([gz_txt])
792
851
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
793
852
knit = KnitVersionedFiles(None, access)
794
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
795
self.assertRaises(errors.KnitCorrupt, list,
853
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
854
self.assertRaises(KnitCorrupt, list,
796
855
knit._read_records_iter(records))
798
857
# read_records_iter_raw won't detect that sort of mismatch/corruption
799
858
raw_contents = list(knit._read_records_iter_raw(records))
800
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
859
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
802
861
def test_mismatched_version_id(self):
803
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
804
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
862
sha1sum = osutils.sha_string(b'foo\nbar\n')
863
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
809
868
transport = MockTransport([gz_txt])
810
869
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
811
870
knit = KnitVersionedFiles(None, access)
812
871
# We are asking for rev-id-2, but the data is rev-id-1
813
records = [(('rev-id-2',), (('rev-id-2',), 0, len(gz_txt)))]
814
self.assertRaises(errors.KnitCorrupt, list,
872
records = [((b'rev-id-2',), ((b'rev-id-2',), 0, len(gz_txt)))]
873
self.assertRaises(KnitCorrupt, list,
815
874
knit._read_records_iter(records))
817
876
# read_records_iter_raw detects mismatches in the header
818
self.assertRaises(errors.KnitCorrupt, list,
877
self.assertRaises(KnitCorrupt, list,
819
878
knit._read_records_iter_raw(records))
821
880
def test_uncompressed_data(self):
822
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
823
txt = ('version rev-id-1 2 %s\n'
881
sha1sum = osutils.sha_string(b'foo\nbar\n')
882
txt = (b'version rev-id-1 2 %s\n'
828
887
transport = MockTransport([txt])
829
888
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
830
889
knit = KnitVersionedFiles(None, access)
831
records = [(('rev-id-1',), (('rev-id-1',), 0, len(txt)))]
890
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(txt)))]
833
892
# We don't have valid gzip data ==> corrupt
834
self.assertRaises(errors.KnitCorrupt, list,
893
self.assertRaises(KnitCorrupt, list,
835
894
knit._read_records_iter(records))
837
896
# read_records_iter_raw will notice the bad data
838
self.assertRaises(errors.KnitCorrupt, list,
897
self.assertRaises(KnitCorrupt, list,
839
898
knit._read_records_iter_raw(records))
841
900
def test_corrupted_data(self):
842
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
843
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
901
sha1sum = osutils.sha_string(b'foo\nbar\n')
902
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
848
907
# Change 2 bytes in the middle to \xff
849
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
908
gz_txt = gz_txt[:10] + b'\xff\xff' + gz_txt[12:]
850
909
transport = MockTransport([gz_txt])
851
910
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
852
911
knit = KnitVersionedFiles(None, access)
853
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
854
self.assertRaises(errors.KnitCorrupt, list,
912
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
913
self.assertRaises(KnitCorrupt, list,
855
914
knit._read_records_iter(records))
856
915
# read_records_iter_raw will barf on bad gz data
857
self.assertRaises(errors.KnitCorrupt, list,
916
self.assertRaises(KnitCorrupt, list,
858
917
knit._read_records_iter_raw(records))
861
920
class LowLevelKnitIndexTests(TestCase):
923
def _load_data(self):
924
from ..bzr._knit_load_data_py import _load_data_py
863
927
def get_knit_index(self, transport, name, mode):
864
928
mapper = ConstantMapper(name)
865
from bzrlib._knit_load_data_py import _load_data_py
866
self.overrideAttr(knit, '_load_data', _load_data_py)
929
self.overrideAttr(knit, '_load_data', self._load_data)
867
930
allow_writes = lambda: 'w' in mode
868
return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)
931
return _KndxIndex(transport, mapper, lambda: None, allow_writes, lambda: True)
870
933
def test_create_file(self):
871
934
transport = MockTransport()
872
935
index = self.get_knit_index(transport, "filename", "w")
874
937
call = transport.calls.pop(0)
875
# call[1][1] is a StringIO - we can't test it by simple equality.
938
# call[1][1] is a BytesIO - we can't test it by simple equality.
876
939
self.assertEqual('put_file_non_atomic', call[0])
877
940
self.assertEqual('filename.kndx', call[1][0])
878
941
# With no history, _KndxIndex writes a new index:
899
962
utf8_revision_id = unicode_revision_id.encode('utf-8')
900
963
transport = MockTransport([
901
964
_KndxIndex.HEADER,
902
"version option 0 1 .%s :" % (utf8_revision_id,)
965
b"version option 0 1 .%s :" % (utf8_revision_id,)
904
967
index = self.get_knit_index(transport, "filename", "r")
905
self.assertEqual({("version",):((utf8_revision_id,),)},
968
self.assertEqual({(b"version",): ((utf8_revision_id,),)},
906
969
index.get_parent_map(index.keys()))
908
971
def test_read_ignore_corrupted_lines(self):
909
972
transport = MockTransport([
910
973
_KndxIndex.HEADER,
912
"corrupted options 0 1 .b .c ",
913
"version options 0 1 :"
975
b"corrupted options 0 1 .b .c ",
976
b"version options 0 1 :"
915
978
index = self.get_knit_index(transport, "filename", "r")
916
979
self.assertEqual(1, len(index.keys()))
917
self.assertEqual(set([("version",)]), index.keys())
980
self.assertEqual({(b"version",)}, index.keys())
919
982
def test_read_corrupted_header(self):
920
transport = MockTransport(['not a bzr knit index header\n'])
983
transport = MockTransport([b'not a bzr knit index header\n'])
921
984
index = self.get_knit_index(transport, "filename", "r")
922
985
self.assertRaises(KnitHeaderError, index.keys)
924
987
def test_read_duplicate_entries(self):
925
988
transport = MockTransport([
926
989
_KndxIndex.HEADER,
927
"parent options 0 1 :",
928
"version options1 0 1 0 :",
929
"version options2 1 2 .other :",
930
"version options3 3 4 0 .other :"
990
b"parent options 0 1 :",
991
b"version options1 0 1 0 :",
992
b"version options2 1 2 .other :",
993
b"version options3 3 4 0 .other :"
932
995
index = self.get_knit_index(transport, "filename", "r")
933
996
self.assertEqual(2, len(index.keys()))
934
997
# check that the index used is the first one written. (Specific
935
998
# 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",)]))
999
self.assertEqual(b"1", index._dictionary_compress([(b"version",)]))
1000
self.assertEqual(((b"version",), 3, 4), index.get_position((b"version",)))
1001
self.assertEqual([b"options3"], index.get_options((b"version",)))
1002
self.assertEqual({(b"version",): ((b"parent",), (b"other",))},
1003
index.get_parent_map([(b"version",)]))
942
1005
def test_read_compressed_parents(self):
943
1006
transport = MockTransport([
944
1007
_KndxIndex.HEADER,
947
"c option 0 1 1 0 :",
1009
b"b option 0 1 0 :",
1010
b"c option 0 1 1 0 :",
949
1012
index = self.get_knit_index(transport, "filename", "r")
950
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
951
index.get_parent_map([("b",), ("c",)]))
1013
self.assertEqual({(b"b",):((b"a",),), (b"c",):((b"b",), (b"a",))},
1014
index.get_parent_map([(b"b",), (b"c",)]))
953
1016
def test_write_utf8_version_id(self):
954
1017
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
997
1060
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())
1062
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1063
self.assertEqual({(b"a",)}, index.keys())
1065
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1066
self.assertEqual({(b"a",)}, index.keys())
1068
index.add_records([((b"b",), [b"option"], ((b"b",), 0, 1), [])])
1069
self.assertEqual({(b"a",), (b"b",)}, index.keys())
1008
1071
def add_a_b(self, index, random_id=None):
1010
1073
if random_id is not None:
1011
1074
kwargs["random_id"] = random_id
1012
1075
index.add_records([
1013
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1014
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1015
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1076
((b"a",), [b"option"], ((b"a",), 0, 1), [(b"b",)]),
1077
((b"a",), [b"opt"], ((b"a",), 1, 2), [(b"c",)]),
1078
((b"b",), [b"option"], ((b"b",), 2, 3), [(b"a",)])
1018
1081
def assertIndexIsAB(self, index):
1019
1082
self.assertEqual({
1083
(b'a',): ((b'c',),),
1084
(b'b',): ((b'a',),),
1023
1086
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",)))
1087
self.assertEqual(((b"a",), 1, 2), index.get_position((b"a",)))
1088
self.assertEqual(((b"b",), 2, 3), index.get_position((b"b",)))
1089
self.assertEqual([b"opt"], index.get_options((b"a",)))
1028
1091
def test_add_versions(self):
1029
1092
transport = MockTransport([
1092
1155
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',)),
1157
(b'a',): (('fulltext', False), ((b'a',), 0, 100), None),
1158
(b'b',): (('line-delta', False), ((b'b',), 100, 21), (b'a',)),
1159
(b'c',): (('line-delta', False), ((b'c',), 121, 35), (b'b',)),
1160
(b'd',): (('line-delta', False), ((b'd',), 156, 12), (b'b',)),
1099
self.assertTotalBuildSize(100, [('a',)], positions)
1100
self.assertTotalBuildSize(121, [('b',)], positions)
1162
self.assertTotalBuildSize(100, [(b'a',)], positions)
1163
self.assertTotalBuildSize(121, [(b'b',)], positions)
1101
1164
# c needs both a & b
1102
self.assertTotalBuildSize(156, [('c',)], positions)
1165
self.assertTotalBuildSize(156, [(b'c',)], positions)
1103
1166
# 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)
1167
self.assertTotalBuildSize(156, [(b'b',), (b'c',)], positions)
1168
self.assertTotalBuildSize(133, [(b'd',)], positions)
1169
self.assertTotalBuildSize(168, [(b'c',), (b'd',)], positions)
1108
1171
def test_get_position(self):
1109
1172
transport = MockTransport([
1110
1173
_KndxIndex.HEADER,
1114
1177
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",)))
1179
self.assertEqual(((b"a",), 0, 1), index.get_position((b"a",)))
1180
self.assertEqual(((b"b",), 1, 2), index.get_position((b"b",)))
1119
1182
def test_get_method(self):
1120
1183
transport = MockTransport([
1121
1184
_KndxIndex.HEADER,
1122
"a fulltext,unknown 0 1 :",
1123
"b unknown,line-delta 1 2 :",
1185
b"a fulltext,unknown 0 1 :",
1186
b"b unknown,line-delta 1 2 :",
1126
1189
index = self.get_knit_index(transport, "filename", "r")
1128
self.assertEqual("fulltext", index.get_method("a"))
1129
self.assertEqual("line-delta", index.get_method("b"))
1130
self.assertRaises(errors.KnitIndexUnknownMethod, index.get_method, "c")
1191
self.assertEqual("fulltext", index.get_method(b"a"))
1192
self.assertEqual("line-delta", index.get_method(b"b"))
1193
self.assertRaises(knit.KnitIndexUnknownMethod, index.get_method, b"c")
1132
1195
def test_get_options(self):
1133
1196
transport = MockTransport([
1134
1197
_KndxIndex.HEADER,
1199
b"b opt2,opt3 1 2 :"
1138
1201
index = self.get_knit_index(transport, "filename", "r")
1140
self.assertEqual(["opt1"], index.get_options("a"))
1141
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
1203
self.assertEqual([b"opt1"], index.get_options(b"a"))
1204
self.assertEqual([b"opt2", b"opt3"], index.get_options(b"b"))
1143
1206
def test_get_parent_map(self):
1144
1207
transport = MockTransport([
1145
1208
_KndxIndex.HEADER,
1147
"b option 1 2 0 .c :",
1148
"c option 1 2 1 0 .e :"
1210
b"b option 1 2 0 .c :",
1211
b"c option 1 2 1 0 .e :"
1150
1213
index = self.get_knit_index(transport, "filename", "r")
1152
1215
self.assertEqual({
1154
("b",):(("a",), ("c",)),
1155
("c",):(("b",), ("a",), ("e",)),
1217
(b"b",): ((b"a",), (b"c",)),
1218
(b"c",): ((b"b",), (b"a",), (b"e",)),
1156
1219
}, index.get_parent_map(index.keys()))
1158
1221
def test_impossible_parent(self):
1159
1222
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1160
1223
transport = MockTransport([
1161
1224
_KndxIndex.HEADER,
1163
"b option 0 1 4 :" # We don't have a 4th record
1226
b"b option 0 1 4 :" # We don't have a 4th record
1165
1228
index = self.get_knit_index(transport, 'filename', 'r')
1167
self.assertRaises(errors.KnitCorrupt, index.keys)
1168
except TypeError, e:
1169
if (str(e) == ('exceptions must be strings, classes, or instances,'
1170
' not exceptions.IndexError')
1171
and sys.version_info[0:2] >= (2,5)):
1172
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1173
' raising new style exceptions with python'
1229
self.assertRaises(KnitCorrupt, index.keys)
1178
1231
def test_corrupted_parent(self):
1179
1232
transport = MockTransport([
1180
1233
_KndxIndex.HEADER,
1183
"c option 0 1 1v :", # Can't have a parent of '1v'
1236
b"c option 0 1 1v :", # Can't have a parent of '1v'
1185
1238
index = self.get_knit_index(transport, 'filename', 'r')
1187
self.assertRaises(errors.KnitCorrupt, index.keys)
1188
except TypeError, e:
1189
if (str(e) == ('exceptions must be strings, classes, or instances,'
1190
' not exceptions.ValueError')
1191
and sys.version_info[0:2] >= (2,5)):
1192
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1193
' raising new style exceptions with python'
1239
self.assertRaises(KnitCorrupt, index.keys)
1198
1241
def test_corrupted_parent_in_list(self):
1199
1242
transport = MockTransport([
1200
1243
_KndxIndex.HEADER,
1203
"c option 0 1 1 v :", # Can't have a parent of 'v'
1246
b"c option 0 1 1 v :", # Can't have a parent of 'v'
1205
1248
index = self.get_knit_index(transport, 'filename', 'r')
1207
self.assertRaises(errors.KnitCorrupt, index.keys)
1208
except TypeError, e:
1209
if (str(e) == ('exceptions must be strings, classes, or instances,'
1210
' not exceptions.ValueError')
1211
and sys.version_info[0:2] >= (2,5)):
1212
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1213
' raising new style exceptions with python'
1249
self.assertRaises(KnitCorrupt, index.keys)
1218
1251
def test_invalid_position(self):
1219
1252
transport = MockTransport([
1220
1253
_KndxIndex.HEADER,
1223
1256
index = self.get_knit_index(transport, 'filename', 'r')
1225
self.assertRaises(errors.KnitCorrupt, index.keys)
1226
except TypeError, e:
1227
if (str(e) == ('exceptions must be strings, classes, or instances,'
1228
' not exceptions.ValueError')
1229
and sys.version_info[0:2] >= (2,5)):
1230
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1231
' raising new style exceptions with python'
1257
self.assertRaises(KnitCorrupt, index.keys)
1236
1259
def test_invalid_size(self):
1237
1260
transport = MockTransport([
1238
1261
_KndxIndex.HEADER,
1241
1264
index = self.get_knit_index(transport, 'filename', 'r')
1243
self.assertRaises(errors.KnitCorrupt, index.keys)
1244
except TypeError, e:
1245
if (str(e) == ('exceptions must be strings, classes, or instances,'
1246
' not exceptions.ValueError')
1247
and sys.version_info[0:2] >= (2,5)):
1248
self.knownFailure('Pyrex <0.9.5 fails with TypeError when'
1249
' raising new style exceptions with python'
1265
self.assertRaises(KnitCorrupt, index.keys)
1254
1267
def test_scan_unvalidated_index_not_implemented(self):
1255
1268
transport = MockTransport()
1263
1276
def test_short_line(self):
1264
1277
transport = MockTransport([
1265
1278
_KndxIndex.HEADER,
1267
"b option 10 10 0", # This line isn't terminated, ignored
1280
b"b option 10 10 0", # This line isn't terminated, ignored
1269
1282
index = self.get_knit_index(transport, "filename", "r")
1270
self.assertEqual(set([('a',)]), index.keys())
1283
self.assertEqual({(b'a',)}, index.keys())
1272
1285
def test_skip_incomplete_record(self):
1273
1286
# A line with bogus data should just be skipped
1274
1287
transport = MockTransport([
1275
1288
_KndxIndex.HEADER,
1277
"b option 10 10 0", # This line isn't terminated, ignored
1278
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1290
b"b option 10 10 0", # This line isn't terminated, ignored
1291
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1280
1293
index = self.get_knit_index(transport, "filename", "r")
1281
self.assertEqual(set([('a',), ('c',)]), index.keys())
1294
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1283
1296
def test_trailing_characters(self):
1284
1297
# A line with bogus data should just be skipped
1285
1298
transport = MockTransport([
1286
1299
_KndxIndex.HEADER,
1288
"b option 10 10 0 :a", # This line has extra trailing characters
1289
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1301
b"b option 10 10 0 :a", # This line has extra trailing characters
1302
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1291
1304
index = self.get_knit_index(transport, "filename", "r")
1292
self.assertEqual(set([('a',), ('c',)]), index.keys())
1305
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1295
1308
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1297
1310
_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)
1313
def _load_data(self):
1314
from ..bzr._knit_load_data_pyx import _load_data_c
1308
1318
class Test_KnitAnnotator(TestCaseWithMemoryTransport):
1508
1518
"""Adding versions to the index should update the lookup dict"""
1509
1519
knit = self.make_test_knit()
1510
1520
idx = knit._index
1511
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1521
idx.add_records([((b'a-1',), [b'fulltext'], ((b'a-1',), 0, 0), [])])
1512
1522
self.check_file_contents('test.kndx',
1513
'# bzr knit index 8\n'
1515
'a-1 fulltext 0 0 :'
1523
b'# bzr knit index 8\n'
1525
b'a-1 fulltext 0 0 :'
1517
1527
idx.add_records([
1518
(('a-2',), ['fulltext'], (('a-2',), 0, 0), [('a-1',)]),
1519
(('a-3',), ['fulltext'], (('a-3',), 0, 0), [('a-2',)]),
1528
((b'a-2',), [b'fulltext'], ((b'a-2',), 0, 0), [(b'a-1',)]),
1529
((b'a-3',), [b'fulltext'], ((b'a-3',), 0, 0), [(b'a-2',)]),
1521
1531
self.check_file_contents('test.kndx',
1522
'# bzr knit index 8\n'
1524
'a-1 fulltext 0 0 :\n'
1525
'a-2 fulltext 0 0 0 :\n'
1526
'a-3 fulltext 0 0 1 :'
1532
b'# bzr knit index 8\n'
1534
b'a-1 fulltext 0 0 :\n'
1535
b'a-2 fulltext 0 0 0 :\n'
1536
b'a-3 fulltext 0 0 1 :'
1528
self.assertEqual(set([('a-3',), ('a-1',), ('a-2',)]), idx.keys())
1538
self.assertEqual({(b'a-3',), (b'a-1',), (b'a-2',)}, idx.keys())
1529
1539
self.assertEqual({
1530
('a-1',): ((('a-1',), 0, 0), None, (), ('fulltext', False)),
1531
('a-2',): ((('a-2',), 0, 0), None, (('a-1',),), ('fulltext', False)),
1532
('a-3',): ((('a-3',), 0, 0), None, (('a-2',),), ('fulltext', False)),
1540
(b'a-1',): (((b'a-1',), 0, 0), None, (), ('fulltext', False)),
1541
(b'a-2',): (((b'a-2',), 0, 0), None, ((b'a-1',),), ('fulltext', False)),
1542
(b'a-3',): (((b'a-3',), 0, 0), None, ((b'a-2',),), ('fulltext', False)),
1533
1543
}, idx.get_build_details(idx.keys()))
1534
self.assertEqual({('a-1',):(),
1535
('a-2',):(('a-1',),),
1536
('a-3',):(('a-2',),),},
1544
self.assertEqual({(b'a-1',): (),
1545
(b'a-2',): ((b'a-1',),),
1546
(b'a-3',): ((b'a-2',),),},
1537
1547
idx.get_parent_map(idx.keys()))
1539
1549
def test_add_versions_fails_clean(self):
1614
1624
# delta compression inn the index
1615
1625
index1 = self.make_g_index('1', 2, [
1616
(('tip', ), 'N0 100', ([('parent', )], [], )),
1617
(('tail', ), '', ([], []))])
1626
((b'tip', ), b'N0 100', ([(b'parent', )], [], )),
1627
((b'tail', ), b'', ([], []))])
1618
1628
index2 = self.make_g_index('2', 2, [
1619
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1620
(('separate', ), '', ([], []))])
1629
((b'parent', ), b' 100 78', ([(b'tail', ), (b'ghost', )], [(b'tail', )])),
1630
((b'separate', ), b'', ([], []))])
1622
1632
# just blob location and graph in the index.
1623
1633
index1 = self.make_g_index('1', 1, [
1624
(('tip', ), 'N0 100', ([('parent', )], )),
1625
(('tail', ), '', ([], ))])
1634
((b'tip', ), b'N0 100', ([(b'parent', )], )),
1635
((b'tail', ), b'', ([], ))])
1626
1636
index2 = self.make_g_index('2', 1, [
1627
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1628
(('separate', ), '', ([], ))])
1637
((b'parent', ), b' 100 78', ([(b'tail', ), (b'ghost', )], )),
1638
((b'separate', ), b'', ([], ))])
1629
1639
combined_index = CombinedGraphIndex([index1, index2])
1631
1641
self.combined_index = combined_index
1639
1649
def test_keys(self):
1640
1650
index = self.two_graph_index()
1641
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1651
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1642
1652
set(index.keys()))
1644
1654
def test_get_position(self):
1645
1655
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',)))
1656
self.assertEqual((index._graph_index._indices[0], 0, 100), index.get_position((b'tip',)))
1657
self.assertEqual((index._graph_index._indices[1], 100, 78), index.get_position((b'parent',)))
1649
1659
def test_get_method_deltas(self):
1650
1660
index = self.two_graph_index(deltas=True)
1651
self.assertEqual('fulltext', index.get_method(('tip',)))
1652
self.assertEqual('line-delta', index.get_method(('parent',)))
1661
self.assertEqual('fulltext', index.get_method((b'tip',)))
1662
self.assertEqual('line-delta', index.get_method((b'parent',)))
1654
1664
def test_get_method_no_deltas(self):
1655
1665
# check that the parent-history lookup is ignored with deltas=False.
1656
1666
index = self.two_graph_index(deltas=False)
1657
self.assertEqual('fulltext', index.get_method(('tip',)))
1658
self.assertEqual('fulltext', index.get_method(('parent',)))
1667
self.assertEqual('fulltext', index.get_method((b'tip',)))
1668
self.assertEqual('fulltext', index.get_method((b'parent',)))
1660
1670
def test_get_options_deltas(self):
1661
1671
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',)))
1672
self.assertEqual([b'fulltext', b'no-eol'], index.get_options((b'tip',)))
1673
self.assertEqual([b'line-delta'], index.get_options((b'parent',)))
1665
1675
def test_get_options_no_deltas(self):
1666
1676
# check that the parent-history lookup is ignored with deltas=False.
1667
1677
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',)))
1678
self.assertEqual([b'fulltext', b'no-eol'], index.get_options((b'tip',)))
1679
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1671
1681
def test_get_parent_map(self):
1672
1682
index = self.two_graph_index()
1673
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1674
index.get_parent_map([('parent',), ('ghost',)]))
1683
self.assertEqual({(b'parent',):((b'tail',), (b'ghost',))},
1684
index.get_parent_map([(b'parent',), (b'ghost',)]))
1676
1686
def catch_add(self, entries):
1677
1687
self.caught_entries.append(entries)
1679
1689
def test_add_no_callback_errors(self):
1680
1690
index = self.two_graph_index()
1681
1691
self.assertRaises(errors.ReadOnlyError, index.add_records,
1682
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1692
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [b'separate'])])
1684
1694
def test_add_version_smoke(self):
1685
1695
index = self.two_graph_index(catch_adds=True)
1686
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1688
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1696
index.add_records([((b'new',), b'fulltext,no-eol', (None, 50, 60),
1698
self.assertEqual([[((b'new', ), b'N50 60', (((b'separate',),),))]],
1689
1699
self.caught_entries)
1691
1701
def test_add_version_delta_not_delta_index(self):
1692
1702
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',)])])
1703
self.assertRaises(KnitCorrupt, index.add_records,
1704
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1695
1705
self.assertEqual([], self.caught_entries)
1697
1707
def test_add_version_same_dup(self):
1698
1708
index = self.two_graph_index(catch_adds=True)
1699
1709
# 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',)])])
1710
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
1711
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
1702
1712
# position/length are ignored (because each pack could have fulltext or
1703
1713
# 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),
1714
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1716
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1708
1718
# but neither should have added data:
1709
1719
self.assertEqual([[], [], [], []], self.caught_entries)
1711
1721
def test_add_version_different_dup(self):
1712
1722
index = self.two_graph_index(deltas=True, catch_adds=True)
1713
1723
# 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',)])])
1724
self.assertRaises(KnitCorrupt, index.add_records,
1725
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1726
self.assertRaises(KnitCorrupt, index.add_records,
1727
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1719
self.assertRaises(errors.KnitCorrupt, index.add_records,
1720
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1729
self.assertRaises(KnitCorrupt, index.add_records,
1730
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1721
1731
self.assertEqual([], self.caught_entries)
1723
1733
def test_add_versions_nodeltas(self):
1724
1734
index = self.two_graph_index(catch_adds=True)
1725
1735
index.add_records([
1726
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1727
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1736
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1737
((b'new2',), b'fulltext', (None, 0, 6), [(b'new',)]),
1729
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1730
(('new2', ), ' 0 6', ((('new',),),))],
1739
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),),)),
1740
((b'new2', ), b' 0 6', (((b'new',),),))],
1731
1741
sorted(self.caught_entries[0]))
1732
1742
self.assertEqual(1, len(self.caught_entries))
1734
1744
def test_add_versions_deltas(self):
1735
1745
index = self.two_graph_index(deltas=True, catch_adds=True)
1736
1746
index.add_records([
1737
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1738
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1747
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1748
((b'new2',), b'line-delta', (None, 0, 6), [(b'new',)]),
1740
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1741
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1750
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),), ())),
1751
((b'new2', ), b' 0 6', (((b'new',),), ((b'new',),), ))],
1742
1752
sorted(self.caught_entries[0]))
1743
1753
self.assertEqual(1, len(self.caught_entries))
1745
1755
def test_add_versions_delta_not_delta_index(self):
1746
1756
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',)])])
1757
self.assertRaises(KnitCorrupt, index.add_records,
1758
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1749
1759
self.assertEqual([], self.caught_entries)
1751
1761
def test_add_versions_random_id_accepted(self):
1755
1765
def test_add_versions_same_dup(self):
1756
1766
index = self.two_graph_index(catch_adds=True)
1757
1767
# 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),
1768
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100),
1770
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100),
1762
1772
# position/length are ignored (because each pack could have fulltext or
1763
1773
# 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),
1774
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1776
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1768
1778
# but neither should have added data.
1769
1779
self.assertEqual([[], [], [], []], self.caught_entries)
1771
1781
def test_add_versions_different_dup(self):
1772
1782
index = self.two_graph_index(deltas=True, catch_adds=True)
1773
1783
# 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',)])])
1784
self.assertRaises(KnitCorrupt, index.add_records,
1785
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1786
self.assertRaises(KnitCorrupt, index.add_records,
1787
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
1779
self.assertRaises(errors.KnitCorrupt, index.add_records,
1780
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1789
self.assertRaises(KnitCorrupt, index.add_records,
1790
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1781
1791
# 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',)])])
1792
self.assertRaises(KnitCorrupt, index.add_records,
1793
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)]),
1794
((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1785
1795
self.assertEqual([], self.caught_entries)
1787
1797
def make_g_index_missing_compression_parent(self):
1788
1798
graph_index = self.make_g_index('missing_comp', 2,
1789
[(('tip', ), ' 100 78',
1790
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1799
[((b'tip', ), b' 100 78',
1800
([(b'missing-parent', ), (b'ghost', )], [(b'missing-parent', )]))])
1791
1801
return graph_index
1793
1803
def make_g_index_missing_parent(self):
1794
1804
graph_index = self.make_g_index('missing_parent', 2,
1795
[(('parent', ), ' 100 78', ([], [])),
1796
(('tip', ), ' 100 78',
1797
([('parent', ), ('missing-parent', )], [('parent', )])),
1805
[((b'parent', ), b' 100 78', ([], [])),
1806
((b'tip', ), b' 100 78',
1807
([(b'parent', ), (b'missing-parent', )], [(b'parent', )])),
1799
1809
return graph_index
1801
1811
def make_g_index_no_external_refs(self):
1802
1812
graph_index = self.make_g_index('no_external_refs', 2,
1803
[(('rev', ), ' 100 78',
1804
([('parent', ), ('ghost', )], []))])
1813
[((b'rev', ), b' 100 78',
1814
([(b'parent', ), (b'ghost', )], []))])
1805
1815
return graph_index
1807
1817
def test_add_good_unvalidated_index(self):
1870
1880
index.scan_unvalidated_index(g_index_1)
1871
1881
index.scan_unvalidated_index(g_index_2)
1872
1882
self.assertEqual(
1873
frozenset([('one-missing-parent',), ('two-missing-parent',)]),
1883
frozenset([(b'one-missing-parent',), (b'two-missing-parent',)]),
1874
1884
index.get_missing_compression_parents())
1876
1886
def test_add_mulitiple_unvalidated_indices_with_mutual_dependencies(self):
1877
1887
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',)]))])
1888
[((b'parent-one', ), b' 100 78', ([(b'non-compression-parent',)], [])),
1889
((b'child-of-two', ), b' 100 78',
1890
([(b'parent-two',)], [(b'parent-two',)]))])
1881
1891
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',)]))])
1892
[((b'parent-two', ), b' 100 78', ([(b'non-compression-parent',)], [])),
1893
((b'child-of-one', ), b' 100 78',
1894
([(b'parent-one',)], [(b'parent-one',)]))])
1885
1895
combined = CombinedGraphIndex([graph_index_a, graph_index_b])
1886
1896
index = _KnitGraphIndex(combined, lambda: True, deltas=True)
1887
1897
index.scan_unvalidated_index(graph_index_a)
1941
1951
def test_keys(self):
1942
1952
index = self.two_graph_index()
1943
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1953
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1944
1954
set(index.keys()))
1946
1956
def test_get_position(self):
1947
1957
index = self.two_graph_index()
1948
1958
self.assertEqual((index._graph_index._indices[0], 0, 100),
1949
index.get_position(('tip',)))
1959
index.get_position((b'tip',)))
1950
1960
self.assertEqual((index._graph_index._indices[1], 100, 78),
1951
index.get_position(('parent',)))
1961
index.get_position((b'parent',)))
1953
1963
def test_get_method(self):
1954
1964
index = self.two_graph_index()
1955
self.assertEqual('fulltext', index.get_method(('tip',)))
1956
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1965
self.assertEqual('fulltext', index.get_method((b'tip',)))
1966
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1958
1968
def test_get_options(self):
1959
1969
index = self.two_graph_index()
1960
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1961
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1970
self.assertEqual([b'fulltext', b'no-eol'], index.get_options((b'tip',)))
1971
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1963
1973
def test_get_parent_map(self):
1964
1974
index = self.two_graph_index()
1965
self.assertEqual({('parent',):None},
1966
index.get_parent_map([('parent',), ('ghost',)]))
1975
self.assertEqual({(b'parent',):None},
1976
index.get_parent_map([(b'parent',), (b'ghost',)]))
1968
1978
def catch_add(self, entries):
1969
1979
self.caught_entries.append(entries)
1971
1981
def test_add_no_callback_errors(self):
1972
1982
index = self.two_graph_index()
1973
1983
self.assertRaises(errors.ReadOnlyError, index.add_records,
1974
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
1984
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)])])
1976
1986
def test_add_version_smoke(self):
1977
1987
index = self.two_graph_index(catch_adds=True)
1978
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1979
self.assertEqual([[(('new', ), 'N50 60')]],
1988
index.add_records([((b'new',), b'fulltext,no-eol', (None, 50, 60), [])])
1989
self.assertEqual([[((b'new', ), b'N50 60')]],
1980
1990
self.caught_entries)
1982
1992
def test_add_version_delta_not_delta_index(self):
1983
1993
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), [])])
1994
self.assertRaises(KnitCorrupt, index.add_records,
1995
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [])])
1986
1996
self.assertEqual([], self.caught_entries)
1988
1998
def test_add_version_same_dup(self):
1989
1999
index = self.two_graph_index(catch_adds=True)
1990
2000
# 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), [])])
2001
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2002
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
1993
2003
# position/length are ignored (because each pack could have fulltext or
1994
2004
# 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), [])])
2005
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2006
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
1997
2007
# but neither should have added data.
1998
2008
self.assertEqual([[], [], [], []], self.caught_entries)
2000
2010
def test_add_version_different_dup(self):
2001
2011
index = self.two_graph_index(catch_adds=True)
2002
2012
# 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), [])])
2013
self.assertRaises(KnitCorrupt, index.add_records,
2014
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2015
self.assertRaises(KnitCorrupt, index.add_records,
2016
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2017
self.assertRaises(KnitCorrupt, index.add_records,
2018
[((b'tip',), b'fulltext', (None, 0, 100), [])])
2010
self.assertRaises(errors.KnitCorrupt, index.add_records,
2011
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2020
self.assertRaises(KnitCorrupt, index.add_records,
2021
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2012
2022
self.assertEqual([], self.caught_entries)
2014
2024
def test_add_versions(self):
2015
2025
index = self.two_graph_index(catch_adds=True)
2016
2026
index.add_records([
2017
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2018
(('new2',), 'fulltext', (None, 0, 6), []),
2027
((b'new',), b'fulltext,no-eol', (None, 50, 60), []),
2028
((b'new2',), b'fulltext', (None, 0, 6), []),
2020
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2030
self.assertEqual([((b'new', ), b'N50 60'), ((b'new2', ), b' 0 6')],
2021
2031
sorted(self.caught_entries[0]))
2022
2032
self.assertEqual(1, len(self.caught_entries))
2024
2034
def test_add_versions_delta_not_delta_index(self):
2025
2035
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',)])])
2036
self.assertRaises(KnitCorrupt, index.add_records,
2037
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
2028
2038
self.assertEqual([], self.caught_entries)
2030
2040
def test_add_versions_parents_not_parents_index(self):
2031
2041
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',)])])
2042
self.assertRaises(KnitCorrupt, index.add_records,
2043
[((b'new',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
2034
2044
self.assertEqual([], self.caught_entries)
2036
2046
def test_add_versions_random_id_accepted(self):
2040
2050
def test_add_versions_same_dup(self):
2041
2051
index = self.two_graph_index(catch_adds=True)
2042
2052
# 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), [])])
2053
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2054
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
2045
2055
# position/length are ignored (because each pack could have fulltext or
2046
2056
# 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), [])])
2057
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2058
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
2049
2059
# but neither should have added data.
2050
2060
self.assertEqual([[], [], [], []], self.caught_entries)
2052
2062
def test_add_versions_different_dup(self):
2053
2063
index = self.two_graph_index(catch_adds=True)
2054
2064
# 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), [])])
2065
self.assertRaises(KnitCorrupt, index.add_records,
2066
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2067
self.assertRaises(KnitCorrupt, index.add_records,
2068
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2069
self.assertRaises(KnitCorrupt, index.add_records,
2070
[((b'tip',), b'fulltext', (None, 0, 100), [])])
2062
self.assertRaises(errors.KnitCorrupt, index.add_records,
2063
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2072
self.assertRaises(KnitCorrupt, index.add_records,
2073
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2064
2074
# 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), [])])
2075
self.assertRaises(KnitCorrupt, index.add_records,
2076
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), []),
2077
((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2068
2078
self.assertEqual([], self.caught_entries)
2126
2136
_min_buffer_size=125)
2128
2138
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')])
2139
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2140
b'g': [(b'g', b'b'), (b'g', b'a')],
2142
[(b'f', b'a'), (b'g', b'b'),
2143
(b'g', b'a'), (b'f', b'b')])
2145
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2146
b'g': [(b'g', b'b'), (b'g', b'a')],
2148
[(b'f', b'a'), (b'f', b'b'),
2149
(b'g', b'b'), (b'g', b'a')])
2151
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2152
b'g': [(b'g', b'b'), (b'g', b'a')],
2154
[(b'f', b'a'), (b'f', b'b'),
2155
(b'g', b'b'), (b'g', b'a')])
2157
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2158
b'g': [(b'g', b'b'), (b'g', b'a')],
2159
b'': [(b'a',), (b'b',)]
2160
}, [b'f', b'g', b''],
2161
[(b'f', b'a'), (b'g', b'b'),
2163
(b'g', b'a'), (b'f', b'b')])
2156
2166
class TestStacking(KnitTests):
2172
2182
def test_add_lines(self):
2173
2183
# lines added to the test are not added to the basis
2174
2184
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'])
2186
key_basis = (b'bar',)
2187
key_cross_border = (b'quux',)
2188
key_delta = (b'zaphod',)
2189
test.add_lines(key, (), [b'foo\n'])
2180
2190
self.assertEqual({}, basis.get_parent_map([key]))
2181
2191
# lines added to the test that reference across the stack do a
2183
basis.add_lines(key_basis, (), ['foo\n'])
2193
basis.add_lines(key_basis, (), [b'foo\n'])
2184
2194
basis.calls = []
2185
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2195
test.add_lines(key_cross_border, (key_basis,), [b'foo\n'])
2186
2196
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2187
2197
# we don't even need to look at the basis to see that this should be
2188
2198
# stored as a fulltext
2189
2199
self.assertEqual([], basis.calls)
2190
2200
# Subsequent adds do delta.
2191
2201
basis.calls = []
2192
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2202
test.add_lines(key_delta, (key_cross_border,), [b'foo\n'])
2193
2203
self.assertEqual('line-delta', test._index.get_method(key_delta))
2194
2204
self.assertEqual([], basis.calls)
2196
2206
def test_annotate(self):
2197
2207
# annotations from the test knit are answered without asking the basis
2198
2208
basis, test = self.get_basis_and_test_knit()
2200
key_basis = ('bar',)
2201
key_missing = ('missing',)
2202
test.add_lines(key, (), ['foo\n'])
2210
key_basis = (b'bar',)
2211
key_missing = (b'missing',)
2212
test.add_lines(key, (), [b'foo\n'])
2203
2213
details = test.annotate(key)
2204
self.assertEqual([(key, 'foo\n')], details)
2214
self.assertEqual([(key, b'foo\n')], details)
2205
2215
self.assertEqual([], basis.calls)
2206
2216
# 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'])
2218
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2209
2219
basis.calls = []
2210
2220
details = test.annotate(key_basis)
2211
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2221
self.assertEqual([(key_basis, b'foo\n'), (key_basis, b'bar\n')], details)
2212
2222
# Not optimised to date:
2213
2223
# self.assertEqual([("annotate", key_basis)], basis.calls)
2214
self.assertEqual([('get_parent_map', set([key_basis])),
2215
('get_parent_map', set([key_basis])),
2224
self.assertEqual([('get_parent_map', {key_basis}),
2225
('get_parent_map', {key_basis}),
2216
2226
('get_record_stream', [key_basis], 'topological', True)],
2408
2422
# It's not strictly minimal, but it seems reasonable for now for it to
2409
2423
# ask which fallbacks have which parents.
2410
2424
self.assertEqual([
2411
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2425
("get_parent_map", {key_basis, key_basis_2, key_missing}),
2412
2426
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2415
2429
def test_get_sha1s(self):
2416
2430
# sha1's in the test knit are answered without asking the basis
2417
2431
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()
2433
key_basis = (b'bar',)
2434
key_missing = (b'missing',)
2435
test.add_lines(key, (), [b'foo\n'])
2436
key_sha1sum = osutils.sha_string(b'foo\n')
2423
2437
sha1s = test.get_sha1s([key])
2424
2438
self.assertEqual({key: key_sha1sum}, sha1s)
2425
2439
self.assertEqual([], basis.calls)
2426
2440
# But texts that are not in the test knit are looked for in the basis
2427
2441
# directly (rather than via text reconstruction) so that remote servers
2428
2442
# 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()
2443
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2444
basis_sha1sum = osutils.sha_string(b'foo\nbar\n')
2431
2445
basis.calls = []
2432
2446
sha1s = test.get_sha1s([key, key_missing, key_basis])
2433
2447
self.assertEqual({key: key_sha1sum,
2434
2448
key_basis: basis_sha1sum}, sha1s)
2435
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2449
self.assertEqual([("get_sha1s", {key_basis, key_missing})],
2438
2452
def test_insert_record_stream(self):
2439
2453
# records are inserted as normal; insert_record_stream builds on
2440
2454
# add_lines, so a smoke test should be all that's needed:
2442
key_basis = ('bar',)
2443
key_delta = ('zaphod',)
2456
key_basis = (b'bar',)
2457
key_delta = (b'zaphod',)
2444
2458
basis, test = self.get_basis_and_test_knit()
2445
2459
source = self.make_test_knit(name='source')
2446
basis.add_lines(key_basis, (), ['foo\n'])
2460
basis.add_lines(key_basis, (), [b'foo\n'])
2447
2461
basis.calls = []
2448
source.add_lines(key_basis, (), ['foo\n'])
2449
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2462
source.add_lines(key_basis, (), [b'foo\n'])
2463
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2450
2464
stream = source.get_record_stream([key_delta], 'unordered', False)
2451
2465
test.insert_record_stream(stream)
2452
2466
# XXX: this does somewhat too many calls in making sure of whether it
2453
2467
# has to recreate the full text.
2454
self.assertEqual([("get_parent_map", set([key_basis])),
2455
('get_parent_map', set([key_basis])),
2468
self.assertEqual([("get_parent_map", {key_basis}),
2469
('get_parent_map', {key_basis}),
2456
2470
('get_record_stream', [key_basis], 'unordered', True)],
2458
2472
self.assertEqual({key_delta:(key_basis,)},
2459
2473
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'))
2474
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2475
'unordered', True)).get_bytes_as('fulltext'))
2463
2477
def test_iter_lines_added_or_present_in_keys(self):
2464
2478
# Lines from the basis are returned, and lines for a given key are only
2465
2479
# returned once.
2468
2482
# all sources are asked for keys:
2469
2483
basis, test = self.get_basis_and_test_knit()
2470
basis.add_lines(key1, (), ["foo"])
2484
basis.add_lines(key1, (), [b"foo"])
2471
2485
basis.calls = []
2472
2486
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]))],
2487
self.assertEqual([(b"foo\n", key1)], lines)
2488
self.assertEqual([("iter_lines_added_or_present_in_keys", {key1})],
2476
2490
# keys in both are not duplicated:
2477
test.add_lines(key2, (), ["bar\n"])
2478
basis.add_lines(key2, (), ["bar\n"])
2491
test.add_lines(key2, (), [b"bar\n"])
2492
basis.add_lines(key2, (), [b"bar\n"])
2479
2493
basis.calls = []
2480
2494
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2481
self.assertEqual([("bar\n", key2)], lines)
2495
self.assertEqual([(b"bar\n", key2)], lines)
2482
2496
self.assertEqual([], basis.calls)
2484
2498
def test_keys(self):
2487
2501
# all sources are asked for keys:
2488
2502
basis, test = self.get_basis_and_test_knit()
2489
2503
keys = test.keys()
2501
2515
basis.calls = []
2502
2516
keys = test.keys()
2503
2517
self.assertEqual(2, len(keys))
2504
self.assertEqual(set([key1, key2]), set(keys))
2518
self.assertEqual({key1, key2}, set(keys))
2505
2519
self.assertEqual([("keys",)], basis.calls)
2507
2521
def test_add_mpdiffs(self):
2508
2522
# records are inserted as normal; add_mpdiff builds on
2509
2523
# add_lines, so a smoke test should be all that's needed:
2511
key_basis = ('bar',)
2512
key_delta = ('zaphod',)
2525
key_basis = (b'bar',)
2526
key_delta = (b'zaphod',)
2513
2527
basis, test = self.get_basis_and_test_knit()
2514
2528
source = self.make_test_knit(name='source')
2515
basis.add_lines(key_basis, (), ['foo\n'])
2529
basis.add_lines(key_basis, (), [b'foo\n'])
2516
2530
basis.calls = []
2517
source.add_lines(key_basis, (), ['foo\n'])
2518
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2531
source.add_lines(key_basis, (), [b'foo\n'])
2532
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2519
2533
diffs = source.make_mpdiffs([key_delta])
2520
2534
test.add_mpdiffs([(key_delta, (key_basis,),
2521
2535
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2522
self.assertEqual([("get_parent_map", set([key_basis])),
2536
self.assertEqual([("get_parent_map", {key_basis}),
2523
2537
('get_record_stream', [key_basis], 'unordered', True),],
2525
2539
self.assertEqual({key_delta:(key_basis,)},
2526
2540
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'))
2541
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2542
'unordered', True)).get_bytes_as('fulltext'))
2530
2544
def test_make_mpdiffs(self):
2531
2545
# Generating an mpdiff across a stacking boundary should detect parent
2532
2546
# texts regions.
2535
key_right = ('zaphod',)
2548
key_left = (b'bar',)
2549
key_right = (b'zaphod',)
2536
2550
basis, test = self.get_basis_and_test_knit()
2537
basis.add_lines(key_left, (), ['bar\n'])
2538
basis.add_lines(key_right, (), ['zaphod\n'])
2551
basis.add_lines(key_left, (), [b'bar\n'])
2552
basis.add_lines(key_right, (), [b'zaphod\n'])
2539
2553
basis.calls = []
2540
2554
test.add_lines(key, (key_left, key_right),
2541
['bar\n', 'foo\n', 'zaphod\n'])
2555
[b'bar\n', b'foo\n', b'zaphod\n'])
2542
2556
diffs = test.make_mpdiffs([key])
2543
2557
self.assertEqual([
2544
2558
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2545
multiparent.NewText(['foo\n']),
2559
multiparent.NewText([b'foo\n']),
2546
2560
multiparent.ParentText(1, 0, 2, 1)])],
2548
2562
self.assertEqual(3, len(basis.calls))
2549
2563
self.assertEqual([
2550
("get_parent_map", set([key_left, key_right])),
2551
("get_parent_map", set([key_left, key_right])),
2564
("get_parent_map", {key_left, key_right}),
2565
("get_parent_map", {key_left, key_right}),
2553
2567
basis.calls[:-1])
2554
2568
last_call = basis.calls[-1]
2555
2569
self.assertEqual('get_record_stream', last_call[0])
2556
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2570
self.assertEqual({key_left, key_right}, set(last_call[1]))
2557
2571
self.assertEqual('topological', last_call[2])
2558
2572
self.assertEqual(True, last_call[3])
2564
2578
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2565
2579
vf = self.make_test_knit(name='test')
2566
2580
# 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'])
2581
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2582
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2583
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2570
2584
# But heuristics could interfere, so check what happened:
2571
2585
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2572
2586
[record.storage_kind for record in
2573
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2587
vf.get_record_stream([(b'base',), (b'd1',), (b'd2',)],
2574
2588
'topological', False)])
2575
2589
# generate a stream of just the deltas include_delta_closure=True,
2576
2590
# 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)
2591
stream = vf.get_record_stream([(b'd1',), (b'd2',)], 'topological', True)
2578
2592
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2579
2593
# The first bytes should be a memo from _ContentMapGenerator, and the
2580
2594
# second bytes should be empty (because its a API proxy not something
2581
2595
# for wire serialisation.
2582
self.assertEqual('', netb[1])
2596
self.assertEqual(b'', netb[1])
2583
2597
bytes = netb[0]
2584
2598
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2585
2599
self.assertEqual('knit-delta-closure', kind)
2591
2605
def test_get_record_stream_gives_records(self):
2592
2606
vf = self.make_test_knit(name='test')
2593
2607
# 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',)]
2608
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2609
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2610
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2611
keys = [(b'd1',), (b'd2',)]
2598
2612
generator = _VFContentMapGenerator(vf, keys,
2599
2613
global_map=vf.get_parent_map(keys))
2600
2614
for record in generator.get_record_stream():
2601
if record.key == ('d1',):
2602
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2615
if record.key == (b'd1',):
2616
self.assertEqual(b'd1\n', record.get_bytes_as('fulltext'))
2604
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2618
self.assertEqual(b'd2\n', record.get_bytes_as('fulltext'))
2606
2620
def test_get_record_stream_kinds_are_raw(self):
2607
2621
vf = self.make_test_knit(name='test')
2608
2622
# 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',)]
2623
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2624
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2625
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2626
keys = [(b'base',), (b'd1',), (b'd2',)]
2613
2627
generator = _VFContentMapGenerator(vf, keys,
2614
2628
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',
2629
kinds = {(b'base',): 'knit-delta-closure',
2630
(b'd1',): 'knit-delta-closure-ref',
2631
(b'd2',): 'knit-delta-closure-ref',
2619
2633
for record in generator.get_record_stream():
2620
2634
self.assertEqual(kinds[record.key], record.storage_kind)
added
removed
breezy/tests/test_knit.py
