487
422
raise _TestException('foobar')
488
except _TestException as e:
423
except _TestException, e:
489
424
retry_exc = errors.RetryWithNewPacks(None, reload_occurred=False,
490
425
exc_info=sys.exc_info())
491
# GZ 2010-08-10: Cycle with exc_info affects 3 tests
494
428
def test_read_from_several_packs(self):
495
429
access, writer = self._get_access()
497
memos.extend(access.add_raw_records([(b'key', 10)], b'1234567890'))
431
memos.extend(access.add_raw_records([('key', 10)], '1234567890'))
499
433
access, writer = self._get_access('pack2', 'FOOBAR')
500
memos.extend(access.add_raw_records([(b'key', 5)], b'12345'))
434
memos.extend(access.add_raw_records([('key', 5)], '12345'))
502
436
access, writer = self._get_access('pack3', 'BAZ')
503
memos.extend(access.add_raw_records([(b'key', 5)], b'alpha'))
437
memos.extend(access.add_raw_records([('key', 5)], 'alpha'))
505
439
transport = self.get_transport()
506
access = pack_repo._DirectPackAccess({"FOO": (transport, 'packfile'),
507
"FOOBAR": (transport, 'pack2'),
508
"BAZ": (transport, 'pack3')})
509
self.assertEqual([b'1234567890', b'12345', b'alpha'],
510
list(access.get_raw_records(memos)))
511
self.assertEqual([b'1234567890'],
512
list(access.get_raw_records(memos[0:1])))
513
self.assertEqual([b'12345'],
514
list(access.get_raw_records(memos[1:2])))
515
self.assertEqual([b'alpha'],
516
list(access.get_raw_records(memos[2:3])))
517
self.assertEqual([b'1234567890', b'alpha'],
518
list(access.get_raw_records(memos[0:1] + memos[2:3])))
440
access = _DirectPackAccess({"FOO":(transport, 'packfile'),
441
"FOOBAR":(transport, 'pack2'),
442
"BAZ":(transport, 'pack3')})
443
self.assertEqual(['1234567890', '12345', 'alpha'],
444
list(access.get_raw_records(memos)))
445
self.assertEqual(['1234567890'],
446
list(access.get_raw_records(memos[0:1])))
447
self.assertEqual(['12345'],
448
list(access.get_raw_records(memos[1:2])))
449
self.assertEqual(['alpha'],
450
list(access.get_raw_records(memos[2:3])))
451
self.assertEqual(['1234567890', 'alpha'],
452
list(access.get_raw_records(memos[0:1] + memos[2:3])))
520
454
def test_set_writer(self):
521
455
"""The writer should be settable post construction."""
522
access = pack_repo._DirectPackAccess({})
456
access = _DirectPackAccess({})
523
457
transport = self.get_transport()
524
458
packname = 'packfile'
527
460
def write_data(bytes):
528
461
transport.append_bytes(packname, bytes)
529
462
writer = pack.ContainerWriter(write_data)
531
464
access.set_writer(writer, index, (transport, packname))
532
memos = access.add_raw_records([(b'key', 10)], b'1234567890')
465
memos = access.add_raw_records([('key', 10)], '1234567890')
534
self.assertEqual([b'1234567890'], list(access.get_raw_records(memos)))
467
self.assertEqual(['1234567890'], list(access.get_raw_records(memos)))
536
469
def test_missing_index_raises_retry(self):
537
470
memos = self.make_pack_file()
538
471
transport = self.get_transport()
539
472
reload_called, reload_func = self.make_reload_func()
540
473
# Note that the index key has changed from 'foo' to 'bar'
541
access = pack_repo._DirectPackAccess({'bar': (transport, 'packname')},
542
reload_func=reload_func)
474
access = _DirectPackAccess({'bar':(transport, 'packname')},
475
reload_func=reload_func)
543
476
e = self.assertListRaises(errors.RetryWithNewPacks,
544
477
access.get_raw_records, memos)
545
478
# Because a key was passed in which does not match our index list, we
610
540
memos = self.make_pack_file()
611
541
transport = self.get_transport()
612
542
failing_transport = MockReadvFailingTransport(
613
[transport.get_bytes('packname')])
543
[transport.get_bytes('packname')])
614
544
reload_called, reload_func = self.make_reload_func()
615
access = pack_repo._DirectPackAccess(
616
{'foo': (failing_transport, 'packname')})
545
access = _DirectPackAccess({'foo':(failing_transport, 'packname')})
617
546
# Asking for a single record will not trigger the Mock failure
618
self.assertEqual([b'1234567890'],
619
list(access.get_raw_records(memos[:1])))
620
self.assertEqual([b'12345'],
621
list(access.get_raw_records(memos[1:2])))
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])))
622
551
# A multiple offset readv() will fail mid-way through
623
552
e = self.assertListRaises(errors.NoSuchFile,
624
553
access.get_raw_records, memos)
626
555
def test_reload_or_raise_no_reload(self):
627
access = pack_repo._DirectPackAccess({}, reload_func=None)
556
access = _DirectPackAccess({}, reload_func=None)
628
557
retry_exc = self.make_retry_exception()
629
558
# Without a reload_func, we will just re-raise the original exception
630
559
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
632
561
def test_reload_or_raise_reload_changed(self):
633
562
reload_called, reload_func = self.make_reload_func(return_val=True)
634
access = pack_repo._DirectPackAccess({}, reload_func=reload_func)
563
access = _DirectPackAccess({}, reload_func=reload_func)
635
564
retry_exc = self.make_retry_exception()
636
565
access.reload_or_raise(retry_exc)
637
566
self.assertEqual([1], reload_called)
638
retry_exc.reload_occurred = True
567
retry_exc.reload_occurred=True
639
568
access.reload_or_raise(retry_exc)
640
569
self.assertEqual([2], reload_called)
642
571
def test_reload_or_raise_reload_no_change(self):
643
572
reload_called, reload_func = self.make_reload_func(return_val=False)
644
access = pack_repo._DirectPackAccess({}, reload_func=reload_func)
573
access = _DirectPackAccess({}, reload_func=reload_func)
645
574
retry_exc = self.make_retry_exception()
646
575
# If reload_occurred is False, then we consider it an error to have
647
576
# reload_func() return False (no changes).
648
577
self.assertRaises(_TestException, access.reload_or_raise, retry_exc)
649
578
self.assertEqual([1], reload_called)
650
retry_exc.reload_occurred = True
579
retry_exc.reload_occurred=True
651
580
# If reload_occurred is True, then we assume nothing changed because
652
581
# it had changed earlier, but didn't change again
653
582
access.reload_or_raise(retry_exc)
657
586
vf, reload_counter = self.make_vf_for_retrying()
658
587
# It is a little bit bogus to annotate the Revision VF, but it works,
659
588
# as we have ancestry stored there
661
590
reload_lines = vf.annotate(key)
662
591
self.assertEqual([1, 1, 0], reload_counter)
663
592
plain_lines = vf.annotate(key)
664
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
593
self.assertEqual([1, 1, 0], reload_counter) # No extra reloading
665
594
if reload_lines != plain_lines:
666
595
self.fail('Annotation was not identical with reloading.')
667
596
# Now delete the packs-in-use, which should trigger another reload, but
668
597
# this time we just raise an exception because we can't recover
669
for trans, name in vf._access._indices.values():
598
for trans, name in vf._access._indices.itervalues():
670
599
trans.delete(name)
671
600
self.assertRaises(errors.NoSuchFile, vf.annotate, key)
672
601
self.assertEqual([2, 1, 1], reload_counter)
674
603
def test__get_record_map_retries(self):
675
604
vf, reload_counter = self.make_vf_for_retrying()
676
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
605
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
677
606
records = vf._get_record_map(keys)
678
607
self.assertEqual(keys, sorted(records.keys()))
679
608
self.assertEqual([1, 1, 0], reload_counter)
680
609
# Now delete the packs-in-use, which should trigger another reload, but
681
610
# this time we just raise an exception because we can't recover
682
for trans, name in vf._access._indices.values():
611
for trans, name in vf._access._indices.itervalues():
683
612
trans.delete(name)
684
613
self.assertRaises(errors.NoSuchFile, vf._get_record_map, keys)
685
614
self.assertEqual([2, 1, 1], reload_counter)
687
616
def test_get_record_stream_retries(self):
688
617
vf, reload_counter = self.make_vf_for_retrying()
689
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
618
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
690
619
record_stream = vf.get_record_stream(keys, 'topological', False)
691
record = next(record_stream)
692
self.assertEqual((b'rev-1',), record.key)
620
record = record_stream.next()
621
self.assertEqual(('rev-1',), record.key)
693
622
self.assertEqual([0, 0, 0], reload_counter)
694
record = next(record_stream)
695
self.assertEqual((b'rev-2',), record.key)
623
record = record_stream.next()
624
self.assertEqual(('rev-2',), record.key)
696
625
self.assertEqual([1, 1, 0], reload_counter)
697
record = next(record_stream)
698
self.assertEqual((b'rev-3',), record.key)
626
record = record_stream.next()
627
self.assertEqual(('rev-3',), record.key)
699
628
self.assertEqual([1, 1, 0], reload_counter)
700
629
# Now delete all pack files, and see that we raise the right error
701
for trans, name in vf._access._indices.values():
630
for trans, name in vf._access._indices.itervalues():
702
631
trans.delete(name)
703
632
self.assertListRaises(errors.NoSuchFile,
704
vf.get_record_stream, keys, 'topological', False)
633
vf.get_record_stream, keys, 'topological', False)
706
635
def test_iter_lines_added_or_present_in_keys_retries(self):
707
636
vf, reload_counter = self.make_vf_for_retrying()
708
keys = [(b'rev-1',), (b'rev-2',), (b'rev-3',)]
637
keys = [('rev-1',), ('rev-2',), ('rev-3',)]
709
638
# Unfortunately, iter_lines_added_or_present_in_keys iterates the
710
639
# result in random order (determined by the iteration order from a
711
640
# set()), so we don't have any solid way to trigger whether data is
736
665
self.addCleanup(repo.unlock)
737
666
repo.start_write_group()
739
vf.add_lines((b'f-id', b'rev-5'), [(b'f-id', b'rev-4')], [b'lines\n'])
740
vf.add_lines((b'f-id', b'rev-1'), [], [b'lines\n'])
741
vf.add_lines((b'f-id', b'rev-2'), [(b'f-id', b'rev-1')], [b'lines\n'])
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'])
742
671
repo.commit_write_group()
743
672
# We inserted them as rev-5, rev-1, rev-2, we should get them back in
745
stream = vf.get_record_stream([(b'f-id', b'rev-1'), (b'f-id', b'rev-5'),
746
(b'f-id', b'rev-2')], 'unordered', False)
674
stream = vf.get_record_stream([('f-id', 'rev-1'), ('f-id', 'rev-5'),
675
('f-id', 'rev-2')], 'unordered', False)
747
676
keys = [r.key for r in stream]
748
self.assertEqual([(b'f-id', b'rev-5'), (b'f-id', b'rev-1'),
749
(b'f-id', b'rev-2')], keys)
677
self.assertEqual([('f-id', 'rev-5'), ('f-id', 'rev-1'),
678
('f-id', 'rev-2')], keys)
750
679
repo.start_write_group()
751
vf.add_lines((b'f-id', b'rev-4'), [(b'f-id', b'rev-3')], [b'lines\n'])
752
vf.add_lines((b'f-id', b'rev-3'), [(b'f-id', b'rev-2')], [b'lines\n'])
753
vf.add_lines((b'f-id', b'rev-6'), [(b'f-id', b'rev-5')], [b'lines\n'])
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'])
754
683
repo.commit_write_group()
755
684
# Request in random order, to make sure the output order isn't based on
757
request_keys = set((b'f-id', b'rev-%d' % i) for i in range(1, 7))
686
request_keys = set(('f-id', 'rev-%d' % i) for i in range(1, 7))
758
687
stream = vf.get_record_stream(request_keys, 'unordered', False)
759
688
keys = [r.key for r in stream]
760
689
# We want to get the keys back in disk order, but it doesn't matter
761
690
# which pack we read from first. So this can come back in 2 orders
762
alt1 = [(b'f-id', b'rev-%d' % i) for i in [4, 3, 6, 5, 1, 2]]
763
alt2 = [(b'f-id', b'rev-%d' % i) for i in [5, 1, 2, 4, 3, 6]]
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]]
764
693
if keys != alt1 and keys != alt2:
765
694
self.fail('Returned key order did not match either expected order.'
766
695
' expected %s or %s, not %s'
770
699
class LowLevelKnitDataTests(TestCase):
772
701
def create_gz_content(self, text):
774
with gzip.GzipFile(mode='wb', fileobj=sio) as gz_file:
703
gz_file = gzip.GzipFile(mode='wb', fileobj=sio)
776
706
return sio.getvalue()
778
708
def make_multiple_records(self):
779
709
"""Create the content for multiple records."""
780
sha1sum = osutils.sha_string(b'foo\nbar\n')
710
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
782
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
712
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
787
717
record_1 = (0, len(gz_txt), sha1sum)
788
718
total_txt.append(gz_txt)
789
sha1sum = osutils.sha_string(b'baz\n')
790
gz_txt = self.create_gz_content(b'version rev-id-2 1 %s\n'
719
sha1sum = osutils.sha('baz\n').hexdigest()
720
gz_txt = self.create_gz_content('version rev-id-2 1 %s\n'
794
724
record_2 = (record_1[1], len(gz_txt), sha1sum)
795
725
total_txt.append(gz_txt)
796
726
return total_txt, record_1, record_2
798
728
def test_valid_knit_data(self):
799
sha1sum = osutils.sha_string(b'foo\nbar\n')
800
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
729
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
730
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
805
735
transport = MockTransport([gz_txt])
806
736
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
807
737
knit = KnitVersionedFiles(None, access)
808
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
738
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
810
740
contents = list(knit._read_records_iter(records))
811
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'],
812
b'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
741
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'],
742
'4e48e2c9a3d2ca8a708cb0cc545700544efb5021')], contents)
814
744
raw_contents = list(knit._read_records_iter_raw(records))
815
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
745
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
817
747
def test_multiple_records_valid(self):
818
748
total_txt, record_1, record_2 = self.make_multiple_records()
819
transport = MockTransport([b''.join(total_txt)])
749
transport = MockTransport([''.join(total_txt)])
820
750
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
821
751
knit = KnitVersionedFiles(None, access)
822
records = [((b'rev-id-1',), ((b'rev-id-1',), record_1[0], record_1[1])),
823
((b'rev-id-2',), ((b'rev-id-2',), record_2[0], record_2[1]))]
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]))]
825
755
contents = list(knit._read_records_iter(records))
826
self.assertEqual([((b'rev-id-1',), [b'foo\n', b'bar\n'], record_1[2]),
827
((b'rev-id-2',), [b'baz\n'], record_2[2])],
756
self.assertEqual([(('rev-id-1',), ['foo\n', 'bar\n'], record_1[2]),
757
(('rev-id-2',), ['baz\n'], record_2[2])],
830
760
raw_contents = list(knit._read_records_iter_raw(records))
831
self.assertEqual([((b'rev-id-1',), total_txt[0], record_1[2]),
832
((b'rev-id-2',), total_txt[1], record_2[2])],
761
self.assertEqual([(('rev-id-1',), total_txt[0], record_1[2]),
762
(('rev-id-2',), total_txt[1], record_2[2])],
835
765
def test_not_enough_lines(self):
836
sha1sum = osutils.sha_string(b'foo\n')
766
sha1sum = osutils.sha('foo\n').hexdigest()
837
767
# record says 2 lines data says 1
838
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
768
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
842
772
transport = MockTransport([gz_txt])
843
773
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
844
774
knit = KnitVersionedFiles(None, access)
845
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
846
self.assertRaises(KnitCorrupt, list,
847
knit._read_records_iter(records))
775
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
776
self.assertRaises(errors.KnitCorrupt, list,
777
knit._read_records_iter(records))
849
779
# read_records_iter_raw won't detect that sort of mismatch/corruption
850
780
raw_contents = list(knit._read_records_iter_raw(records))
851
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
781
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
853
783
def test_too_many_lines(self):
854
sha1sum = osutils.sha_string(b'foo\nbar\n')
784
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
855
785
# record says 1 lines data says 2
856
gz_txt = self.create_gz_content(b'version rev-id-1 1 %s\n'
786
gz_txt = self.create_gz_content('version rev-id-1 1 %s\n'
861
791
transport = MockTransport([gz_txt])
862
792
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
863
793
knit = KnitVersionedFiles(None, access)
864
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
865
self.assertRaises(KnitCorrupt, list,
866
knit._read_records_iter(records))
794
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
795
self.assertRaises(errors.KnitCorrupt, list,
796
knit._read_records_iter(records))
868
798
# read_records_iter_raw won't detect that sort of mismatch/corruption
869
799
raw_contents = list(knit._read_records_iter_raw(records))
870
self.assertEqual([((b'rev-id-1',), gz_txt, sha1sum)], raw_contents)
800
self.assertEqual([(('rev-id-1',), gz_txt, sha1sum)], raw_contents)
872
802
def test_mismatched_version_id(self):
873
sha1sum = osutils.sha_string(b'foo\nbar\n')
874
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
803
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
804
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
879
809
transport = MockTransport([gz_txt])
880
810
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
881
811
knit = KnitVersionedFiles(None, access)
882
812
# We are asking for rev-id-2, but the data is rev-id-1
883
records = [((b'rev-id-2',), ((b'rev-id-2',), 0, len(gz_txt)))]
884
self.assertRaises(KnitCorrupt, list,
885
knit._read_records_iter(records))
813
records = [(('rev-id-2',), (('rev-id-2',), 0, len(gz_txt)))]
814
self.assertRaises(errors.KnitCorrupt, list,
815
knit._read_records_iter(records))
887
817
# read_records_iter_raw detects mismatches in the header
888
self.assertRaises(KnitCorrupt, list,
889
knit._read_records_iter_raw(records))
818
self.assertRaises(errors.KnitCorrupt, list,
819
knit._read_records_iter_raw(records))
891
821
def test_uncompressed_data(self):
892
sha1sum = osutils.sha_string(b'foo\nbar\n')
893
txt = (b'version rev-id-1 2 %s\n'
822
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
823
txt = ('version rev-id-1 2 %s\n'
898
828
transport = MockTransport([txt])
899
829
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
900
830
knit = KnitVersionedFiles(None, access)
901
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(txt)))]
831
records = [(('rev-id-1',), (('rev-id-1',), 0, len(txt)))]
903
833
# We don't have valid gzip data ==> corrupt
904
self.assertRaises(KnitCorrupt, list,
905
knit._read_records_iter(records))
834
self.assertRaises(errors.KnitCorrupt, list,
835
knit._read_records_iter(records))
907
837
# read_records_iter_raw will notice the bad data
908
self.assertRaises(KnitCorrupt, list,
909
knit._read_records_iter_raw(records))
838
self.assertRaises(errors.KnitCorrupt, list,
839
knit._read_records_iter_raw(records))
911
841
def test_corrupted_data(self):
912
sha1sum = osutils.sha_string(b'foo\nbar\n')
913
gz_txt = self.create_gz_content(b'version rev-id-1 2 %s\n'
842
sha1sum = osutils.sha('foo\nbar\n').hexdigest()
843
gz_txt = self.create_gz_content('version rev-id-1 2 %s\n'
918
848
# Change 2 bytes in the middle to \xff
919
gz_txt = gz_txt[:10] + b'\xff\xff' + gz_txt[12:]
849
gz_txt = gz_txt[:10] + '\xff\xff' + gz_txt[12:]
920
850
transport = MockTransport([gz_txt])
921
851
access = _KnitKeyAccess(transport, ConstantMapper('filename'))
922
852
knit = KnitVersionedFiles(None, access)
923
records = [((b'rev-id-1',), ((b'rev-id-1',), 0, len(gz_txt)))]
924
self.assertRaises(KnitCorrupt, list,
925
knit._read_records_iter(records))
853
records = [(('rev-id-1',), (('rev-id-1',), 0, len(gz_txt)))]
854
self.assertRaises(errors.KnitCorrupt, list,
855
knit._read_records_iter(records))
926
856
# read_records_iter_raw will barf on bad gz data
927
self.assertRaises(KnitCorrupt, list,
928
knit._read_records_iter_raw(records))
857
self.assertRaises(errors.KnitCorrupt, list,
858
knit._read_records_iter_raw(records))
931
861
class LowLevelKnitIndexTests(TestCase):
934
def _load_data(self):
935
from ..bzr._knit_load_data_py import _load_data_py
938
863
def get_knit_index(self, transport, name, mode):
939
864
mapper = ConstantMapper(name)
940
self.overrideAttr(knit, '_load_data', self._load_data)
944
return _KndxIndex(transport, mapper, lambda: None, allow_writes, lambda: True)
865
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)
946
870
def test_create_file(self):
947
871
transport = MockTransport()
948
872
index = self.get_knit_index(transport, "filename", "w")
950
874
call = transport.calls.pop(0)
951
# call[1][1] is a BytesIO - we can't test it by simple equality.
875
# call[1][1] is a StringIO - we can't test it by simple equality.
952
876
self.assertEqual('put_file_non_atomic', call[0])
953
877
self.assertEqual('filename.kndx', call[1][0])
954
878
# With no history, _KndxIndex writes a new index:
955
879
self.assertEqual(_KndxIndex.HEADER,
956
call[1][1].getvalue())
880
call[1][1].getvalue())
957
881
self.assertEqual({'create_parent_dir': True}, call[2])
959
883
def test_read_utf8_version_id(self):
975
899
utf8_revision_id = unicode_revision_id.encode('utf-8')
976
900
transport = MockTransport([
977
901
_KndxIndex.HEADER,
978
b"version option 0 1 .%s :" % (utf8_revision_id,)
902
"version option 0 1 .%s :" % (utf8_revision_id,)
980
904
index = self.get_knit_index(transport, "filename", "r")
981
self.assertEqual({(b"version",): ((utf8_revision_id,),)},
982
index.get_parent_map(index.keys()))
905
self.assertEqual({("version",):((utf8_revision_id,),)},
906
index.get_parent_map(index.keys()))
984
908
def test_read_ignore_corrupted_lines(self):
985
909
transport = MockTransport([
986
910
_KndxIndex.HEADER,
988
b"corrupted options 0 1 .b .c ",
989
b"version options 0 1 :"
912
"corrupted options 0 1 .b .c ",
913
"version options 0 1 :"
991
915
index = self.get_knit_index(transport, "filename", "r")
992
916
self.assertEqual(1, len(index.keys()))
993
self.assertEqual({(b"version",)}, index.keys())
917
self.assertEqual(set([("version",)]), index.keys())
995
919
def test_read_corrupted_header(self):
996
transport = MockTransport([b'not a bzr knit index header\n'])
920
transport = MockTransport(['not a bzr knit index header\n'])
997
921
index = self.get_knit_index(transport, "filename", "r")
998
922
self.assertRaises(KnitHeaderError, index.keys)
1000
924
def test_read_duplicate_entries(self):
1001
925
transport = MockTransport([
1002
926
_KndxIndex.HEADER,
1003
b"parent options 0 1 :",
1004
b"version options1 0 1 0 :",
1005
b"version options2 1 2 .other :",
1006
b"version options3 3 4 0 .other :"
927
"parent options 0 1 :",
928
"version options1 0 1 0 :",
929
"version options2 1 2 .other :",
930
"version options3 3 4 0 .other :"
1008
932
index = self.get_knit_index(transport, "filename", "r")
1009
933
self.assertEqual(2, len(index.keys()))
1010
934
# check that the index used is the first one written. (Specific
1011
935
# to KnitIndex style indices.
1012
self.assertEqual(b"1", index._dictionary_compress([(b"version",)]))
1013
self.assertEqual(((b"version",), 3, 4),
1014
index.get_position((b"version",)))
1015
self.assertEqual([b"options3"], index.get_options((b"version",)))
1016
self.assertEqual({(b"version",): ((b"parent",), (b"other",))},
1017
index.get_parent_map([(b"version",)]))
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",)]))
1019
942
def test_read_compressed_parents(self):
1020
943
transport = MockTransport([
1021
944
_KndxIndex.HEADER,
1023
b"b option 0 1 0 :",
1024
b"c option 0 1 1 0 :",
947
"c option 0 1 1 0 :",
1026
949
index = self.get_knit_index(transport, "filename", "r")
1027
self.assertEqual({(b"b",): ((b"a",),), (b"c",): ((b"b",), (b"a",))},
1028
index.get_parent_map([(b"b",), (b"c",)]))
950
self.assertEqual({("b",):(("a",),), ("c",):(("b",), ("a",))},
951
index.get_parent_map([("b",), ("c",)]))
1030
953
def test_write_utf8_version_id(self):
1031
954
unicode_revision_id = u"version-\N{CYRILLIC CAPITAL LETTER A}"
1074
997
self.assertEqual(set(), index.keys())
1076
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1077
self.assertEqual({(b"a",)}, index.keys())
1079
index.add_records([((b"a",), [b"option"], ((b"a",), 0, 1), [])])
1080
self.assertEqual({(b"a",)}, index.keys())
1082
index.add_records([((b"b",), [b"option"], ((b"b",), 0, 1), [])])
1083
self.assertEqual({(b"a",), (b"b",)}, 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())
1085
1008
def add_a_b(self, index, random_id=None):
1087
1010
if random_id is not None:
1088
1011
kwargs["random_id"] = random_id
1089
1012
index.add_records([
1090
((b"a",), [b"option"], ((b"a",), 0, 1), [(b"b",)]),
1091
((b"a",), [b"opt"], ((b"a",), 1, 2), [(b"c",)]),
1092
((b"b",), [b"option"], ((b"b",), 2, 3), [(b"a",)])
1013
(("a",), ["option"], (("a",), 0, 1), [("b",)]),
1014
(("a",), ["opt"], (("a",), 1, 2), [("c",)]),
1015
(("b",), ["option"], (("b",), 2, 3), [("a",)])
1095
1018
def assertIndexIsAB(self, index):
1096
1019
self.assertEqual({
1097
(b'a',): ((b'c',),),
1098
(b'b',): ((b'a',),),
1100
1023
index.get_parent_map(index.keys()))
1101
self.assertEqual(((b"a",), 1, 2), index.get_position((b"a",)))
1102
self.assertEqual(((b"b",), 2, 3), index.get_position((b"b",)))
1103
self.assertEqual([b"opt"], index.get_options((b"a",)))
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",)))
1105
1028
def test_add_versions(self):
1106
1029
transport = MockTransport([
1169
1092
def test__get_total_build_size(self):
1171
(b'a',): (('fulltext', False), ((b'a',), 0, 100), None),
1172
(b'b',): (('line-delta', False), ((b'b',), 100, 21), (b'a',)),
1173
(b'c',): (('line-delta', False), ((b'c',), 121, 35), (b'b',)),
1174
(b'd',): (('line-delta', False), ((b'd',), 156, 12), (b'b',)),
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',)),
1176
self.assertTotalBuildSize(100, [(b'a',)], positions)
1177
self.assertTotalBuildSize(121, [(b'b',)], positions)
1099
self.assertTotalBuildSize(100, [('a',)], positions)
1100
self.assertTotalBuildSize(121, [('b',)], positions)
1178
1101
# c needs both a & b
1179
self.assertTotalBuildSize(156, [(b'c',)], positions)
1102
self.assertTotalBuildSize(156, [('c',)], positions)
1180
1103
# we shouldn't count 'b' twice
1181
self.assertTotalBuildSize(156, [(b'b',), (b'c',)], positions)
1182
self.assertTotalBuildSize(133, [(b'd',)], positions)
1183
self.assertTotalBuildSize(168, [(b'c',), (b'd',)], positions)
1104
self.assertTotalBuildSize(156, [('b',), ('c',)], positions)
1105
self.assertTotalBuildSize(133, [('d',)], positions)
1106
self.assertTotalBuildSize(168, [('c',), ('d',)], positions)
1185
1108
def test_get_position(self):
1186
1109
transport = MockTransport([
1187
1110
_KndxIndex.HEADER,
1191
1114
index = self.get_knit_index(transport, "filename", "r")
1193
self.assertEqual(((b"a",), 0, 1), index.get_position((b"a",)))
1194
self.assertEqual(((b"b",), 1, 2), index.get_position((b"b",)))
1116
self.assertEqual((("a",), 0, 1), index.get_position(("a",)))
1117
self.assertEqual((("b",), 1, 2), index.get_position(("b",)))
1196
1119
def test_get_method(self):
1197
1120
transport = MockTransport([
1198
1121
_KndxIndex.HEADER,
1199
b"a fulltext,unknown 0 1 :",
1200
b"b unknown,line-delta 1 2 :",
1122
"a fulltext,unknown 0 1 :",
1123
"b unknown,line-delta 1 2 :",
1203
1126
index = self.get_knit_index(transport, "filename", "r")
1205
self.assertEqual("fulltext", index.get_method(b"a"))
1206
self.assertEqual("line-delta", index.get_method(b"b"))
1207
self.assertRaises(knit.KnitIndexUnknownMethod, index.get_method, b"c")
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")
1209
1132
def test_get_options(self):
1210
1133
transport = MockTransport([
1211
1134
_KndxIndex.HEADER,
1213
b"b opt2,opt3 1 2 :"
1215
1138
index = self.get_knit_index(transport, "filename", "r")
1217
self.assertEqual([b"opt1"], index.get_options(b"a"))
1218
self.assertEqual([b"opt2", b"opt3"], index.get_options(b"b"))
1140
self.assertEqual(["opt1"], index.get_options("a"))
1141
self.assertEqual(["opt2", "opt3"], index.get_options("b"))
1220
1143
def test_get_parent_map(self):
1221
1144
transport = MockTransport([
1222
1145
_KndxIndex.HEADER,
1224
b"b option 1 2 0 .c :",
1225
b"c option 1 2 1 0 .e :"
1147
"b option 1 2 0 .c :",
1148
"c option 1 2 1 0 .e :"
1227
1150
index = self.get_knit_index(transport, "filename", "r")
1229
1152
self.assertEqual({
1231
(b"b",): ((b"a",), (b"c",)),
1232
(b"c",): ((b"b",), (b"a",), (b"e",)),
1154
("b",):(("a",), ("c",)),
1155
("c",):(("b",), ("a",), ("e",)),
1233
1156
}, index.get_parent_map(index.keys()))
1235
1158
def test_impossible_parent(self):
1236
1159
"""Test we get KnitCorrupt if the parent couldn't possibly exist."""
1237
1160
transport = MockTransport([
1238
1161
_KndxIndex.HEADER,
1240
b"b option 0 1 4 :" # We don't have a 4th record
1163
"b option 0 1 4 :" # We don't have a 4th record
1242
1165
index = self.get_knit_index(transport, 'filename', 'r')
1243
self.assertRaises(KnitCorrupt, index.keys)
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'
1245
1178
def test_corrupted_parent(self):
1246
1179
transport = MockTransport([
1247
1180
_KndxIndex.HEADER,
1250
b"c option 0 1 1v :", # Can't have a parent of '1v'
1183
"c option 0 1 1v :", # Can't have a parent of '1v'
1252
1185
index = self.get_knit_index(transport, 'filename', 'r')
1253
self.assertRaises(KnitCorrupt, index.keys)
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'
1255
1198
def test_corrupted_parent_in_list(self):
1256
1199
transport = MockTransport([
1257
1200
_KndxIndex.HEADER,
1260
b"c option 0 1 1 v :", # Can't have a parent of 'v'
1203
"c option 0 1 1 v :", # Can't have a parent of 'v'
1262
1205
index = self.get_knit_index(transport, 'filename', 'r')
1263
self.assertRaises(KnitCorrupt, index.keys)
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'
1265
1218
def test_invalid_position(self):
1266
1219
transport = MockTransport([
1267
1220
_KndxIndex.HEADER,
1270
1223
index = self.get_knit_index(transport, 'filename', 'r')
1271
self.assertRaises(KnitCorrupt, index.keys)
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'
1273
1236
def test_invalid_size(self):
1274
1237
transport = MockTransport([
1275
1238
_KndxIndex.HEADER,
1278
1241
index = self.get_knit_index(transport, 'filename', 'r')
1279
self.assertRaises(KnitCorrupt, index.keys)
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'
1281
1254
def test_scan_unvalidated_index_not_implemented(self):
1282
1255
transport = MockTransport()
1290
1263
def test_short_line(self):
1291
1264
transport = MockTransport([
1292
1265
_KndxIndex.HEADER,
1294
b"b option 10 10 0", # This line isn't terminated, ignored
1267
"b option 10 10 0", # This line isn't terminated, ignored
1296
1269
index = self.get_knit_index(transport, "filename", "r")
1297
self.assertEqual({(b'a',)}, index.keys())
1270
self.assertEqual(set([('a',)]), index.keys())
1299
1272
def test_skip_incomplete_record(self):
1300
1273
# A line with bogus data should just be skipped
1301
1274
transport = MockTransport([
1302
1275
_KndxIndex.HEADER,
1304
b"b option 10 10 0", # This line isn't terminated, ignored
1305
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1277
"b option 10 10 0", # This line isn't terminated, ignored
1278
"c option 20 10 0 :", # Properly terminated, and starts with '\n'
1307
1280
index = self.get_knit_index(transport, "filename", "r")
1308
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1281
self.assertEqual(set([('a',), ('c',)]), index.keys())
1310
1283
def test_trailing_characters(self):
1311
1284
# A line with bogus data should just be skipped
1312
1285
transport = MockTransport([
1313
1286
_KndxIndex.HEADER,
1315
b"b option 10 10 0 :a", # This line has extra trailing characters
1316
b"c option 20 10 0 :", # Properly terminated, and starts with '\n'
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'
1318
1291
index = self.get_knit_index(transport, "filename", "r")
1319
self.assertEqual({(b'a',), (b'c',)}, index.keys())
1292
self.assertEqual(set([('a',), ('c',)]), index.keys())
1322
1295
class LowLevelKnitIndexTests_c(LowLevelKnitIndexTests):
1324
1297
_test_needs_features = [compiled_knit_feature]
1327
def _load_data(self):
1328
from ..bzr._knit_load_data_pyx import _load_data_c
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)
1332
1308
class Test_KnitAnnotator(TestCaseWithMemoryTransport):
1391
1367
def test__expand_delta_records_blocks(self):
1392
1368
ann = self.make_annotator()
1393
rev_key = (b'rev-id',)
1394
parent_key = (b'parent-id',)
1395
record = [b'0,1,1\n', b'new-line\n']
1369
rev_key = ('rev-id',)
1370
parent_key = ('parent-id',)
1371
record = ['0,1,1\n', 'new-line\n']
1396
1372
details = ('line-delta', True)
1397
1373
ann._num_compression_children[parent_key] = 2
1398
1374
ann._expand_record(parent_key, (), None,
1399
[b'line1\n', b'line2\n', b'line3\n'],
1375
['line1\n', 'line2\n', 'line3\n'],
1400
1376
('fulltext', False))
1401
1377
ann._expand_record(rev_key, (parent_key,), parent_key, record, details)
1402
1378
self.assertEqual({(rev_key, parent_key): [(1, 1, 1), (3, 3, 0)]},
1403
1379
ann._matching_blocks)
1404
rev2_key = (b'rev2-id',)
1405
record = [b'0,1,1\n', b'new-line\n']
1380
rev2_key = ('rev2-id',)
1381
record = ['0,1,1\n', 'new-line\n']
1406
1382
details = ('line-delta', False)
1407
ann._expand_record(rev2_key, (parent_key,),
1408
parent_key, record, details)
1383
ann._expand_record(rev2_key, (parent_key,), parent_key, record, details)
1409
1384
self.assertEqual([(1, 1, 2), (3, 3, 0)],
1410
1385
ann._matching_blocks[(rev2_key, parent_key)])
1412
1387
def test__get_parent_ann_uses_matching_blocks(self):
1413
1388
ann = self.make_annotator()
1414
rev_key = (b'rev-id',)
1415
parent_key = (b'parent-id',)
1416
parent_ann = [(parent_key,)] * 3
1389
rev_key = ('rev-id',)
1390
parent_key = ('parent-id',)
1391
parent_ann = [(parent_key,)]*3
1417
1392
block_key = (rev_key, parent_key)
1418
1393
ann._annotations_cache[parent_key] = parent_ann
1419
1394
ann._matching_blocks[block_key] = [(0, 1, 1), (3, 3, 0)]
1420
1395
# We should not try to access any parent_lines content, because we know
1421
1396
# we already have the matching blocks
1422
1397
par_ann, blocks = ann._get_parent_annotations_and_matches(rev_key,
1423
[b'1\n', b'2\n', b'3\n'], parent_key)
1398
['1\n', '2\n', '3\n'], parent_key)
1424
1399
self.assertEqual(parent_ann, par_ann)
1425
1400
self.assertEqual([(0, 1, 1), (3, 3, 0)], blocks)
1426
1401
self.assertEqual({}, ann._matching_blocks)
1428
1403
def test__process_pending(self):
1429
1404
ann = self.make_annotator()
1430
rev_key = (b'rev-id',)
1431
p1_key = (b'p1-id',)
1432
p2_key = (b'p2-id',)
1433
record = [b'0,1,1\n', b'new-line\n']
1405
rev_key = ('rev-id',)
1408
record = ['0,1,1\n', 'new-line\n']
1434
1409
details = ('line-delta', False)
1435
p1_record = [b'line1\n', b'line2\n']
1410
p1_record = ['line1\n', 'line2\n']
1436
1411
ann._num_compression_children[p1_key] = 1
1437
res = ann._expand_record(rev_key, (p1_key, p2_key), p1_key,
1412
res = ann._expand_record(rev_key, (p1_key,p2_key), p1_key,
1438
1413
record, details)
1439
1414
self.assertEqual(None, res)
1440
1415
# self.assertTrue(p1_key in ann._pending_deltas)
1533
1508
"""Adding versions to the index should update the lookup dict"""
1534
1509
knit = self.make_test_knit()
1535
1510
idx = knit._index
1536
idx.add_records([((b'a-1',), [b'fulltext'], ((b'a-1',), 0, 0), [])])
1511
idx.add_records([(('a-1',), ['fulltext'], (('a-1',), 0, 0), [])])
1537
1512
self.check_file_contents('test.kndx',
1538
b'# bzr knit index 8\n'
1540
b'a-1 fulltext 0 0 :'
1513
'# bzr knit index 8\n'
1515
'a-1 fulltext 0 0 :'
1542
1517
idx.add_records([
1543
((b'a-2',), [b'fulltext'], ((b'a-2',), 0, 0), [(b'a-1',)]),
1544
((b'a-3',), [b'fulltext'], ((b'a-3',), 0, 0), [(b'a-2',)]),
1518
(('a-2',), ['fulltext'], (('a-2',), 0, 0), [('a-1',)]),
1519
(('a-3',), ['fulltext'], (('a-3',), 0, 0), [('a-2',)]),
1546
1521
self.check_file_contents('test.kndx',
1547
b'# bzr knit index 8\n'
1549
b'a-1 fulltext 0 0 :\n'
1550
b'a-2 fulltext 0 0 0 :\n'
1551
b'a-3 fulltext 0 0 1 :'
1553
self.assertEqual({(b'a-3',), (b'a-1',), (b'a-2',)}, idx.keys())
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 :'
1528
self.assertEqual(set([('a-3',), ('a-1',), ('a-2',)]), idx.keys())
1554
1529
self.assertEqual({
1555
(b'a-1',): (((b'a-1',), 0, 0), None, (), ('fulltext', False)),
1556
(b'a-2',): (((b'a-2',), 0, 0), None, ((b'a-1',),), ('fulltext', False)),
1557
(b'a-3',): (((b'a-3',), 0, 0), None, ((b'a-2',),), ('fulltext', False)),
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)),
1558
1533
}, idx.get_build_details(idx.keys()))
1559
self.assertEqual({(b'a-1',): (),
1560
(b'a-2',): ((b'a-1',),),
1561
(b'a-3',): ((b'a-2',),), },
1562
idx.get_parent_map(idx.keys()))
1534
self.assertEqual({('a-1',):(),
1535
('a-2',):(('a-1',),),
1536
('a-3',):(('a-2',),),},
1537
idx.get_parent_map(idx.keys()))
1564
1539
def test_add_versions_fails_clean(self):
1565
1540
"""If add_versions fails in the middle, it restores a pristine state.
1639
1614
# delta compression inn the index
1640
1615
index1 = self.make_g_index('1', 2, [
1641
((b'tip', ), b'N0 100', ([(b'parent', )], [], )),
1642
((b'tail', ), b'', ([], []))])
1616
(('tip', ), 'N0 100', ([('parent', )], [], )),
1617
(('tail', ), '', ([], []))])
1643
1618
index2 = self.make_g_index('2', 2, [
1644
((b'parent', ), b' 100 78',
1645
([(b'tail', ), (b'ghost', )], [(b'tail', )])),
1646
((b'separate', ), b'', ([], []))])
1619
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], [('tail', )])),
1620
(('separate', ), '', ([], []))])
1648
1622
# just blob location and graph in the index.
1649
1623
index1 = self.make_g_index('1', 1, [
1650
((b'tip', ), b'N0 100', ([(b'parent', )], )),
1651
((b'tail', ), b'', ([], ))])
1624
(('tip', ), 'N0 100', ([('parent', )], )),
1625
(('tail', ), '', ([], ))])
1652
1626
index2 = self.make_g_index('2', 1, [
1653
((b'parent', ), b' 100 78', ([(b'tail', ), (b'ghost', )], )),
1654
((b'separate', ), b'', ([], ))])
1627
(('parent', ), ' 100 78', ([('tail', ), ('ghost', )], )),
1628
(('separate', ), '', ([], ))])
1655
1629
combined_index = CombinedGraphIndex([index1, index2])
1657
1631
self.combined_index = combined_index
1659
1633
add_callback = self.catch_add
1661
1635
add_callback = None
1662
return _KnitGraphIndex(combined_index, lambda: True, deltas=deltas,
1663
add_callback=add_callback)
1636
return _KnitGraphIndex(combined_index, lambda:True, deltas=deltas,
1637
add_callback=add_callback)
1665
1639
def test_keys(self):
1666
1640
index = self.two_graph_index()
1667
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1641
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1670
1644
def test_get_position(self):
1671
1645
index = self.two_graph_index()
1673
(index._graph_index._indices[0], 0, 100), index.get_position((b'tip',)))
1675
(index._graph_index._indices[1], 100, 78), index.get_position((b'parent',)))
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',)))
1677
1649
def test_get_method_deltas(self):
1678
1650
index = self.two_graph_index(deltas=True)
1679
self.assertEqual('fulltext', index.get_method((b'tip',)))
1680
self.assertEqual('line-delta', index.get_method((b'parent',)))
1651
self.assertEqual('fulltext', index.get_method(('tip',)))
1652
self.assertEqual('line-delta', index.get_method(('parent',)))
1682
1654
def test_get_method_no_deltas(self):
1683
1655
# check that the parent-history lookup is ignored with deltas=False.
1684
1656
index = self.two_graph_index(deltas=False)
1685
self.assertEqual('fulltext', index.get_method((b'tip',)))
1686
self.assertEqual('fulltext', index.get_method((b'parent',)))
1657
self.assertEqual('fulltext', index.get_method(('tip',)))
1658
self.assertEqual('fulltext', index.get_method(('parent',)))
1688
1660
def test_get_options_deltas(self):
1689
1661
index = self.two_graph_index(deltas=True)
1690
self.assertEqual([b'fulltext', b'no-eol'],
1691
index.get_options((b'tip',)))
1692
self.assertEqual([b'line-delta'], index.get_options((b'parent',)))
1662
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1663
self.assertEqual(['line-delta'], index.get_options(('parent',)))
1694
1665
def test_get_options_no_deltas(self):
1695
1666
# check that the parent-history lookup is ignored with deltas=False.
1696
1667
index = self.two_graph_index(deltas=False)
1697
self.assertEqual([b'fulltext', b'no-eol'],
1698
index.get_options((b'tip',)))
1699
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1668
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1669
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1701
1671
def test_get_parent_map(self):
1702
1672
index = self.two_graph_index()
1703
self.assertEqual({(b'parent',): ((b'tail',), (b'ghost',))},
1704
index.get_parent_map([(b'parent',), (b'ghost',)]))
1673
self.assertEqual({('parent',):(('tail',), ('ghost',))},
1674
index.get_parent_map([('parent',), ('ghost',)]))
1706
1676
def catch_add(self, entries):
1707
1677
self.caught_entries.append(entries)
1709
1679
def test_add_no_callback_errors(self):
1710
1680
index = self.two_graph_index()
1711
1681
self.assertRaises(errors.ReadOnlyError, index.add_records,
1712
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [b'separate'])])
1682
[(('new',), 'fulltext,no-eol', (None, 50, 60), ['separate'])])
1714
1684
def test_add_version_smoke(self):
1715
1685
index = self.two_graph_index(catch_adds=True)
1716
index.add_records([((b'new',), b'fulltext,no-eol', (None, 50, 60),
1718
self.assertEqual([[((b'new', ), b'N50 60', (((b'separate',),),))]],
1719
self.caught_entries)
1686
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60),
1688
self.assertEqual([[(('new', ), 'N50 60', ((('separate',),),))]],
1689
self.caught_entries)
1721
1691
def test_add_version_delta_not_delta_index(self):
1722
1692
index = self.two_graph_index(catch_adds=True)
1723
self.assertRaises(KnitCorrupt, index.add_records,
1724
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1693
self.assertRaises(errors.KnitCorrupt, index.add_records,
1694
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1725
1695
self.assertEqual([], self.caught_entries)
1727
1697
def test_add_version_same_dup(self):
1728
1698
index = self.two_graph_index(catch_adds=True)
1729
1699
# options can be spelt two different ways
1731
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
1733
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
1700
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
1701
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
1734
1702
# position/length are ignored (because each pack could have fulltext or
1735
1703
# delta, and be at a different position.
1736
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1738
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1704
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1706
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1740
1708
# but neither should have added data:
1741
1709
self.assertEqual([[], [], [], []], self.caught_entries)
1743
1711
def test_add_version_different_dup(self):
1744
1712
index = self.two_graph_index(deltas=True, catch_adds=True)
1745
1713
# change options
1746
self.assertRaises(KnitCorrupt, index.add_records,
1747
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1748
self.assertRaises(KnitCorrupt, index.add_records,
1749
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
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',)])])
1751
self.assertRaises(KnitCorrupt, index.add_records,
1752
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1719
self.assertRaises(errors.KnitCorrupt, index.add_records,
1720
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1753
1721
self.assertEqual([], self.caught_entries)
1755
1723
def test_add_versions_nodeltas(self):
1756
1724
index = self.two_graph_index(catch_adds=True)
1757
1725
index.add_records([
1758
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1759
((b'new2',), b'fulltext', (None, 0, 6), [(b'new',)]),
1761
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),),)),
1762
((b'new2', ), b' 0 6', (((b'new',),),))],
1763
sorted(self.caught_entries[0]))
1726
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1727
(('new2',), 'fulltext', (None, 0, 6), [('new',)]),
1729
self.assertEqual([(('new', ), 'N50 60', ((('separate',),),)),
1730
(('new2', ), ' 0 6', ((('new',),),))],
1731
sorted(self.caught_entries[0]))
1764
1732
self.assertEqual(1, len(self.caught_entries))
1766
1734
def test_add_versions_deltas(self):
1767
1735
index = self.two_graph_index(deltas=True, catch_adds=True)
1768
1736
index.add_records([
1769
((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)]),
1770
((b'new2',), b'line-delta', (None, 0, 6), [(b'new',)]),
1772
self.assertEqual([((b'new', ), b'N50 60', (((b'separate',),), ())),
1773
((b'new2', ), b' 0 6', (((b'new',),), ((b'new',),), ))],
1774
sorted(self.caught_entries[0]))
1737
(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)]),
1738
(('new2',), 'line-delta', (None, 0, 6), [('new',)]),
1740
self.assertEqual([(('new', ), 'N50 60', ((('separate',),), ())),
1741
(('new2', ), ' 0 6', ((('new',),), (('new',),), ))],
1742
sorted(self.caught_entries[0]))
1775
1743
self.assertEqual(1, len(self.caught_entries))
1777
1745
def test_add_versions_delta_not_delta_index(self):
1778
1746
index = self.two_graph_index(catch_adds=True)
1779
self.assertRaises(KnitCorrupt, index.add_records,
1780
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
1747
self.assertRaises(errors.KnitCorrupt, index.add_records,
1748
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
1781
1749
self.assertEqual([], self.caught_entries)
1783
1751
def test_add_versions_random_id_accepted(self):
1787
1755
def test_add_versions_same_dup(self):
1788
1756
index = self.two_graph_index(catch_adds=True)
1789
1757
# options can be spelt two different ways
1790
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 100),
1792
index.add_records([((b'tip',), b'no-eol,fulltext', (None, 0, 100),
1758
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100),
1760
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100),
1794
1762
# position/length are ignored (because each pack could have fulltext or
1795
1763
# delta, and be at a different position.
1796
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 50, 100),
1798
index.add_records([((b'tip',), b'fulltext,no-eol', (None, 0, 1000),
1764
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100),
1766
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000),
1800
1768
# but neither should have added data.
1801
1769
self.assertEqual([[], [], [], []], self.caught_entries)
1803
1771
def test_add_versions_different_dup(self):
1804
1772
index = self.two_graph_index(deltas=True, catch_adds=True)
1805
1773
# change options
1806
self.assertRaises(KnitCorrupt, index.add_records,
1807
[((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
1808
self.assertRaises(KnitCorrupt, index.add_records,
1809
[((b'tip',), b'fulltext', (None, 0, 100), [(b'parent',)])])
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',)])])
1811
self.assertRaises(KnitCorrupt, index.add_records,
1812
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
1779
self.assertRaises(errors.KnitCorrupt, index.add_records,
1780
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1813
1781
# change options in the second record
1814
self.assertRaises(KnitCorrupt, index.add_records,
1815
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)]),
1816
((b'tip',), b'line-delta', (None, 0, 100), [(b'parent',)])])
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',)])])
1817
1785
self.assertEqual([], self.caught_entries)
1819
1787
def make_g_index_missing_compression_parent(self):
1820
1788
graph_index = self.make_g_index('missing_comp', 2,
1821
[((b'tip', ), b' 100 78',
1822
([(b'missing-parent', ), (b'ghost', )], [(b'missing-parent', )]))])
1789
[(('tip', ), ' 100 78',
1790
([('missing-parent', ), ('ghost', )], [('missing-parent', )]))])
1823
1791
return graph_index
1825
1793
def make_g_index_missing_parent(self):
1826
1794
graph_index = self.make_g_index('missing_parent', 2,
1827
[((b'parent', ), b' 100 78', ([], [])),
1828
((b'tip', ), b' 100 78',
1829
([(b'parent', ), (b'missing-parent', )], [(b'parent', )])),
1795
[(('parent', ), ' 100 78', ([], [])),
1796
(('tip', ), ' 100 78',
1797
([('parent', ), ('missing-parent', )], [('parent', )])),
1831
1799
return graph_index
1833
1801
def make_g_index_no_external_refs(self):
1834
1802
graph_index = self.make_g_index('no_external_refs', 2,
1835
[((b'rev', ), b' 100 78',
1836
([(b'parent', ), (b'ghost', )], []))])
1803
[(('rev', ), ' 100 78',
1804
([('parent', ), ('ghost', )], []))])
1837
1805
return graph_index
1839
1807
def test_add_good_unvalidated_index(self):
1967
1935
add_callback = self.catch_add
1969
1937
add_callback = None
1970
return _KnitGraphIndex(combined_index, lambda: True, parents=False,
1971
add_callback=add_callback)
1938
return _KnitGraphIndex(combined_index, lambda:True, parents=False,
1939
add_callback=add_callback)
1973
1941
def test_keys(self):
1974
1942
index = self.two_graph_index()
1975
self.assertEqual({(b'tail',), (b'tip',), (b'parent',), (b'separate',)},
1943
self.assertEqual(set([('tail',), ('tip',), ('parent',), ('separate',)]),
1978
1946
def test_get_position(self):
1979
1947
index = self.two_graph_index()
1980
1948
self.assertEqual((index._graph_index._indices[0], 0, 100),
1981
index.get_position((b'tip',)))
1949
index.get_position(('tip',)))
1982
1950
self.assertEqual((index._graph_index._indices[1], 100, 78),
1983
index.get_position((b'parent',)))
1951
index.get_position(('parent',)))
1985
1953
def test_get_method(self):
1986
1954
index = self.two_graph_index()
1987
self.assertEqual('fulltext', index.get_method((b'tip',)))
1988
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1955
self.assertEqual('fulltext', index.get_method(('tip',)))
1956
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1990
1958
def test_get_options(self):
1991
1959
index = self.two_graph_index()
1992
self.assertEqual([b'fulltext', b'no-eol'],
1993
index.get_options((b'tip',)))
1994
self.assertEqual([b'fulltext'], index.get_options((b'parent',)))
1960
self.assertEqual(['fulltext', 'no-eol'], index.get_options(('tip',)))
1961
self.assertEqual(['fulltext'], index.get_options(('parent',)))
1996
1963
def test_get_parent_map(self):
1997
1964
index = self.two_graph_index()
1998
self.assertEqual({(b'parent',): None},
1999
index.get_parent_map([(b'parent',), (b'ghost',)]))
1965
self.assertEqual({('parent',):None},
1966
index.get_parent_map([('parent',), ('ghost',)]))
2001
1968
def catch_add(self, entries):
2002
1969
self.caught_entries.append(entries)
2004
1971
def test_add_no_callback_errors(self):
2005
1972
index = self.two_graph_index()
2006
1973
self.assertRaises(errors.ReadOnlyError, index.add_records,
2007
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [(b'separate',)])])
1974
[(('new',), 'fulltext,no-eol', (None, 50, 60), [('separate',)])])
2009
1976
def test_add_version_smoke(self):
2010
1977
index = self.two_graph_index(catch_adds=True)
2012
[((b'new',), b'fulltext,no-eol', (None, 50, 60), [])])
2013
self.assertEqual([[((b'new', ), b'N50 60')]],
2014
self.caught_entries)
1978
index.add_records([(('new',), 'fulltext,no-eol', (None, 50, 60), [])])
1979
self.assertEqual([[(('new', ), 'N50 60')]],
1980
self.caught_entries)
2016
1982
def test_add_version_delta_not_delta_index(self):
2017
1983
index = self.two_graph_index(catch_adds=True)
2018
self.assertRaises(KnitCorrupt, index.add_records,
2019
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [])])
1984
self.assertRaises(errors.KnitCorrupt, index.add_records,
1985
[(('new',), 'no-eol,line-delta', (None, 0, 100), [])])
2020
1986
self.assertEqual([], self.caught_entries)
2022
1988
def test_add_version_same_dup(self):
2023
1989
index = self.two_graph_index(catch_adds=True)
2024
1990
# options can be spelt two different ways
2026
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2028
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
1991
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
1992
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2029
1993
# position/length are ignored (because each pack could have fulltext or
2030
1994
# delta, and be at a different position.
2032
[((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2034
[((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
1995
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
1996
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2035
1997
# but neither should have added data.
2036
1998
self.assertEqual([[], [], [], []], self.caught_entries)
2038
2000
def test_add_version_different_dup(self):
2039
2001
index = self.two_graph_index(catch_adds=True)
2040
2002
# change options
2041
self.assertRaises(KnitCorrupt, index.add_records,
2042
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2043
self.assertRaises(KnitCorrupt, index.add_records,
2044
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2045
self.assertRaises(KnitCorrupt, index.add_records,
2046
[((b'tip',), b'fulltext', (None, 0, 100), [])])
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), [])])
2048
self.assertRaises(KnitCorrupt, index.add_records,
2049
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2010
self.assertRaises(errors.KnitCorrupt, index.add_records,
2011
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2050
2012
self.assertEqual([], self.caught_entries)
2052
2014
def test_add_versions(self):
2053
2015
index = self.two_graph_index(catch_adds=True)
2054
2016
index.add_records([
2055
((b'new',), b'fulltext,no-eol', (None, 50, 60), []),
2056
((b'new2',), b'fulltext', (None, 0, 6), []),
2058
self.assertEqual([((b'new', ), b'N50 60'), ((b'new2', ), b' 0 6')],
2059
sorted(self.caught_entries[0]))
2017
(('new',), 'fulltext,no-eol', (None, 50, 60), []),
2018
(('new2',), 'fulltext', (None, 0, 6), []),
2020
self.assertEqual([(('new', ), 'N50 60'), (('new2', ), ' 0 6')],
2021
sorted(self.caught_entries[0]))
2060
2022
self.assertEqual(1, len(self.caught_entries))
2062
2024
def test_add_versions_delta_not_delta_index(self):
2063
2025
index = self.two_graph_index(catch_adds=True)
2064
self.assertRaises(KnitCorrupt, index.add_records,
2065
[((b'new',), b'no-eol,line-delta', (None, 0, 100), [(b'parent',)])])
2026
self.assertRaises(errors.KnitCorrupt, index.add_records,
2027
[(('new',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
2066
2028
self.assertEqual([], self.caught_entries)
2068
2030
def test_add_versions_parents_not_parents_index(self):
2069
2031
index = self.two_graph_index(catch_adds=True)
2070
self.assertRaises(KnitCorrupt, index.add_records,
2071
[((b'new',), b'no-eol,fulltext', (None, 0, 100), [(b'parent',)])])
2032
self.assertRaises(errors.KnitCorrupt, index.add_records,
2033
[(('new',), 'no-eol,fulltext', (None, 0, 100), [('parent',)])])
2072
2034
self.assertEqual([], self.caught_entries)
2074
2036
def test_add_versions_random_id_accepted(self):
2078
2040
def test_add_versions_same_dup(self):
2079
2041
index = self.two_graph_index(catch_adds=True)
2080
2042
# options can be spelt two different ways
2082
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [])])
2084
[((b'tip',), b'no-eol,fulltext', (None, 0, 100), [])])
2043
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 100), [])])
2044
index.add_records([(('tip',), 'no-eol,fulltext', (None, 0, 100), [])])
2085
2045
# position/length are ignored (because each pack could have fulltext or
2086
2046
# delta, and be at a different position.
2088
[((b'tip',), b'fulltext,no-eol', (None, 50, 100), [])])
2090
[((b'tip',), b'fulltext,no-eol', (None, 0, 1000), [])])
2047
index.add_records([(('tip',), 'fulltext,no-eol', (None, 50, 100), [])])
2048
index.add_records([(('tip',), 'fulltext,no-eol', (None, 0, 1000), [])])
2091
2049
# but neither should have added data.
2092
2050
self.assertEqual([[], [], [], []], self.caught_entries)
2094
2052
def test_add_versions_different_dup(self):
2095
2053
index = self.two_graph_index(catch_adds=True)
2096
2054
# change options
2097
self.assertRaises(KnitCorrupt, index.add_records,
2098
[((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
2099
self.assertRaises(KnitCorrupt, index.add_records,
2100
[((b'tip',), b'line-delta,no-eol', (None, 0, 100), [])])
2101
self.assertRaises(KnitCorrupt, index.add_records,
2102
[((b'tip',), b'fulltext', (None, 0, 100), [])])
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), [])])
2104
self.assertRaises(KnitCorrupt, index.add_records,
2105
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), [(b'parent',)])])
2062
self.assertRaises(errors.KnitCorrupt, index.add_records,
2063
[(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)])])
2106
2064
# change options in the second record
2107
self.assertRaises(KnitCorrupt, index.add_records,
2108
[((b'tip',), b'fulltext,no-eol', (None, 0, 100), []),
2109
((b'tip',), b'no-eol,line-delta', (None, 0, 100), [])])
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), [])])
2110
2068
self.assertEqual([], self.caught_entries)
2168
2126
_min_buffer_size=125)
2170
2128
def test__split_by_prefix(self):
2171
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2172
b'g': [(b'g', b'b'), (b'g', b'a')],
2174
[(b'f', b'a'), (b'g', b'b'),
2175
(b'g', b'a'), (b'f', b'b')])
2177
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2178
b'g': [(b'g', b'b'), (b'g', b'a')],
2180
[(b'f', b'a'), (b'f', b'b'),
2181
(b'g', b'b'), (b'g', b'a')])
2183
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2184
b'g': [(b'g', b'b'), (b'g', b'a')],
2186
[(b'f', b'a'), (b'f', b'b'),
2187
(b'g', b'b'), (b'g', b'a')])
2189
self.assertSplitByPrefix({b'f': [(b'f', b'a'), (b'f', b'b')],
2190
b'g': [(b'g', b'b'), (b'g', b'a')],
2191
b'': [(b'a',), (b'b',)]
2192
}, [b'f', b'g', b''],
2193
[(b'f', b'a'), (b'g', b'b'),
2195
(b'g', b'a'), (b'f', b'b')])
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')])
2198
2156
class TestStacking(KnitTests):
2214
2172
def test_add_lines(self):
2215
2173
# lines added to the test are not added to the basis
2216
2174
basis, test = self.get_basis_and_test_knit()
2218
key_basis = (b'bar',)
2219
key_cross_border = (b'quux',)
2220
key_delta = (b'zaphod',)
2221
test.add_lines(key, (), [b'foo\n'])
2176
key_basis = ('bar',)
2177
key_cross_border = ('quux',)
2178
key_delta = ('zaphod',)
2179
test.add_lines(key, (), ['foo\n'])
2222
2180
self.assertEqual({}, basis.get_parent_map([key]))
2223
2181
# lines added to the test that reference across the stack do a
2225
basis.add_lines(key_basis, (), [b'foo\n'])
2183
basis.add_lines(key_basis, (), ['foo\n'])
2226
2184
basis.calls = []
2227
test.add_lines(key_cross_border, (key_basis,), [b'foo\n'])
2185
test.add_lines(key_cross_border, (key_basis,), ['foo\n'])
2228
2186
self.assertEqual('fulltext', test._index.get_method(key_cross_border))
2229
2187
# we don't even need to look at the basis to see that this should be
2230
2188
# stored as a fulltext
2231
2189
self.assertEqual([], basis.calls)
2232
2190
# Subsequent adds do delta.
2233
2191
basis.calls = []
2234
test.add_lines(key_delta, (key_cross_border,), [b'foo\n'])
2192
test.add_lines(key_delta, (key_cross_border,), ['foo\n'])
2235
2193
self.assertEqual('line-delta', test._index.get_method(key_delta))
2236
2194
self.assertEqual([], basis.calls)
2238
2196
def test_annotate(self):
2239
2197
# annotations from the test knit are answered without asking the basis
2240
2198
basis, test = self.get_basis_and_test_knit()
2242
key_basis = (b'bar',)
2243
test.add_lines(key, (), [b'foo\n'])
2200
key_basis = ('bar',)
2201
key_missing = ('missing',)
2202
test.add_lines(key, (), ['foo\n'])
2244
2203
details = test.annotate(key)
2245
self.assertEqual([(key, b'foo\n')], details)
2204
self.assertEqual([(key, 'foo\n')], details)
2246
2205
self.assertEqual([], basis.calls)
2247
2206
# But texts that are not in the test knit are looked for in the basis
2249
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2208
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2250
2209
basis.calls = []
2251
2210
details = test.annotate(key_basis)
2253
[(key_basis, b'foo\n'), (key_basis, b'bar\n')], details)
2211
self.assertEqual([(key_basis, 'foo\n'), (key_basis, 'bar\n')], details)
2254
2212
# Not optimised to date:
2255
2213
# self.assertEqual([("annotate", key_basis)], basis.calls)
2256
self.assertEqual([('get_parent_map', {key_basis}),
2257
('get_parent_map', {key_basis}),
2258
('get_record_stream', [key_basis], 'topological', True)],
2214
self.assertEqual([('get_parent_map', set([key_basis])),
2215
('get_parent_map', set([key_basis])),
2216
('get_record_stream', [key_basis], 'topological', True)],
2261
2219
def test_check(self):
2262
2220
# At the moment checking a stacked knit does implicitly check the
2449
record = next(source.get_record_stream([result[0]], 'unordered',
2402
record = source.get_record_stream([result[0]], 'unordered',
2451
2404
self.assertEqual(record.key, result[0])
2452
2405
self.assertEqual(record.sha1, result[1])
2453
2406
self.assertEqual(record.storage_kind, result[2])
2454
self.assertEqual(record.get_bytes_as(
2455
record.storage_kind), result[3])
2407
self.assertEqual(record.get_bytes_as(record.storage_kind), result[3])
2456
2408
# It's not strictly minimal, but it seems reasonable for now for it to
2457
2409
# ask which fallbacks have which parents.
2458
2410
self.assertEqual([
2459
("get_parent_map", {key_basis, key_basis_2, key_missing}),
2411
("get_parent_map", set([key_basis, key_basis_2, key_missing])),
2460
2412
("get_record_stream", [key_basis_2, key_basis], 'topological', False)],
2463
2415
def test_get_sha1s(self):
2464
2416
# sha1's in the test knit are answered without asking the basis
2465
2417
basis, test = self.get_basis_and_test_knit()
2467
key_basis = (b'bar',)
2468
key_missing = (b'missing',)
2469
test.add_lines(key, (), [b'foo\n'])
2470
key_sha1sum = osutils.sha_string(b'foo\n')
2419
key_basis = ('bar',)
2420
key_missing = ('missing',)
2421
test.add_lines(key, (), ['foo\n'])
2422
key_sha1sum = osutils.sha('foo\n').hexdigest()
2471
2423
sha1s = test.get_sha1s([key])
2472
2424
self.assertEqual({key: key_sha1sum}, sha1s)
2473
2425
self.assertEqual([], basis.calls)
2474
2426
# But texts that are not in the test knit are looked for in the basis
2475
2427
# directly (rather than via text reconstruction) so that remote servers
2476
2428
# etc don't have to answer with full content.
2477
basis.add_lines(key_basis, (), [b'foo\n', b'bar\n'])
2478
basis_sha1sum = osutils.sha_string(b'foo\nbar\n')
2429
basis.add_lines(key_basis, (), ['foo\n', 'bar\n'])
2430
basis_sha1sum = osutils.sha('foo\nbar\n').hexdigest()
2479
2431
basis.calls = []
2480
2432
sha1s = test.get_sha1s([key, key_missing, key_basis])
2481
2433
self.assertEqual({key: key_sha1sum,
2482
key_basis: basis_sha1sum}, sha1s)
2483
self.assertEqual([("get_sha1s", {key_basis, key_missing})],
2434
key_basis: basis_sha1sum}, sha1s)
2435
self.assertEqual([("get_sha1s", set([key_basis, key_missing]))],
2486
2438
def test_insert_record_stream(self):
2487
2439
# records are inserted as normal; insert_record_stream builds on
2488
2440
# add_lines, so a smoke test should be all that's needed:
2489
key_basis = (b'bar',)
2490
key_delta = (b'zaphod',)
2442
key_basis = ('bar',)
2443
key_delta = ('zaphod',)
2491
2444
basis, test = self.get_basis_and_test_knit()
2492
2445
source = self.make_test_knit(name='source')
2493
basis.add_lines(key_basis, (), [b'foo\n'])
2446
basis.add_lines(key_basis, (), ['foo\n'])
2494
2447
basis.calls = []
2495
source.add_lines(key_basis, (), [b'foo\n'])
2496
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2448
source.add_lines(key_basis, (), ['foo\n'])
2449
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2497
2450
stream = source.get_record_stream([key_delta], 'unordered', False)
2498
2451
test.insert_record_stream(stream)
2499
2452
# XXX: this does somewhat too many calls in making sure of whether it
2500
2453
# has to recreate the full text.
2501
self.assertEqual([("get_parent_map", {key_basis}),
2502
('get_parent_map', {key_basis}),
2503
('get_record_stream', [key_basis], 'unordered', True)],
2505
self.assertEqual({key_delta: (key_basis,)},
2506
test.get_parent_map([key_delta]))
2507
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2508
'unordered', True)).get_bytes_as('fulltext'))
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'))
2510
2463
def test_iter_lines_added_or_present_in_keys(self):
2511
2464
# Lines from the basis are returned, and lines for a given key are only
2512
2465
# returned once.
2515
2468
# all sources are asked for keys:
2516
2469
basis, test = self.get_basis_and_test_knit()
2517
basis.add_lines(key1, (), [b"foo"])
2470
basis.add_lines(key1, (), ["foo"])
2518
2471
basis.calls = []
2519
2472
lines = list(test.iter_lines_added_or_present_in_keys([key1]))
2520
self.assertEqual([(b"foo\n", key1)], lines)
2521
self.assertEqual([("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]))],
2523
2476
# keys in both are not duplicated:
2524
test.add_lines(key2, (), [b"bar\n"])
2525
basis.add_lines(key2, (), [b"bar\n"])
2477
test.add_lines(key2, (), ["bar\n"])
2478
basis.add_lines(key2, (), ["bar\n"])
2526
2479
basis.calls = []
2527
2480
lines = list(test.iter_lines_added_or_present_in_keys([key2]))
2528
self.assertEqual([(b"bar\n", key2)], lines)
2481
self.assertEqual([("bar\n", key2)], lines)
2529
2482
self.assertEqual([], basis.calls)
2531
2484
def test_keys(self):
2534
2487
# all sources are asked for keys:
2535
2488
basis, test = self.get_basis_and_test_knit()
2536
2489
keys = test.keys()
2548
2501
basis.calls = []
2549
2502
keys = test.keys()
2550
2503
self.assertEqual(2, len(keys))
2551
self.assertEqual({key1, key2}, set(keys))
2504
self.assertEqual(set([key1, key2]), set(keys))
2552
2505
self.assertEqual([("keys",)], basis.calls)
2554
2507
def test_add_mpdiffs(self):
2555
2508
# records are inserted as normal; add_mpdiff builds on
2556
2509
# add_lines, so a smoke test should be all that's needed:
2557
key_basis = (b'bar',)
2558
key_delta = (b'zaphod',)
2511
key_basis = ('bar',)
2512
key_delta = ('zaphod',)
2559
2513
basis, test = self.get_basis_and_test_knit()
2560
2514
source = self.make_test_knit(name='source')
2561
basis.add_lines(key_basis, (), [b'foo\n'])
2515
basis.add_lines(key_basis, (), ['foo\n'])
2562
2516
basis.calls = []
2563
source.add_lines(key_basis, (), [b'foo\n'])
2564
source.add_lines(key_delta, (key_basis,), [b'bar\n'])
2517
source.add_lines(key_basis, (), ['foo\n'])
2518
source.add_lines(key_delta, (key_basis,), ['bar\n'])
2565
2519
diffs = source.make_mpdiffs([key_delta])
2566
2520
test.add_mpdiffs([(key_delta, (key_basis,),
2567
source.get_sha1s([key_delta])[key_delta], diffs[0])])
2568
self.assertEqual([("get_parent_map", {key_basis}),
2569
('get_record_stream', [key_basis], 'unordered', True), ],
2571
self.assertEqual({key_delta: (key_basis,)},
2572
test.get_parent_map([key_delta]))
2573
self.assertEqual(b'bar\n', next(test.get_record_stream([key_delta],
2574
'unordered', True)).get_bytes_as('fulltext'))
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'))
2576
2530
def test_make_mpdiffs(self):
2577
2531
# Generating an mpdiff across a stacking boundary should detect parent
2578
2532
# texts regions.
2580
key_left = (b'bar',)
2581
key_right = (b'zaphod',)
2535
key_right = ('zaphod',)
2582
2536
basis, test = self.get_basis_and_test_knit()
2583
basis.add_lines(key_left, (), [b'bar\n'])
2584
basis.add_lines(key_right, (), [b'zaphod\n'])
2537
basis.add_lines(key_left, (), ['bar\n'])
2538
basis.add_lines(key_right, (), ['zaphod\n'])
2585
2539
basis.calls = []
2586
2540
test.add_lines(key, (key_left, key_right),
2587
[b'bar\n', b'foo\n', b'zaphod\n'])
2541
['bar\n', 'foo\n', 'zaphod\n'])
2588
2542
diffs = test.make_mpdiffs([key])
2589
2543
self.assertEqual([
2590
2544
multiparent.MultiParent([multiparent.ParentText(0, 0, 0, 1),
2591
multiparent.NewText([b'foo\n']),
2592
multiparent.ParentText(1, 0, 2, 1)])],
2545
multiparent.NewText(['foo\n']),
2546
multiparent.ParentText(1, 0, 2, 1)])],
2594
2548
self.assertEqual(3, len(basis.calls))
2595
2549
self.assertEqual([
2596
("get_parent_map", {key_left, key_right}),
2597
("get_parent_map", {key_left, key_right}),
2550
("get_parent_map", set([key_left, key_right])),
2551
("get_parent_map", set([key_left, key_right])),
2599
2553
basis.calls[:-1])
2600
2554
last_call = basis.calls[-1]
2601
2555
self.assertEqual('get_record_stream', last_call[0])
2602
self.assertEqual({key_left, key_right}, set(last_call[1]))
2556
self.assertEqual(set([key_left, key_right]), set(last_call[1]))
2603
2557
self.assertEqual('topological', last_call[2])
2604
2558
self.assertEqual(True, last_call[3])
2610
2564
def test_include_delta_closure_generates_a_knit_delta_closure(self):
2611
2565
vf = self.make_test_knit(name='test')
2612
2566
# put in three texts, giving ft, delta, delta
2613
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2614
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2615
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
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'])
2616
2570
# But heuristics could interfere, so check what happened:
2617
2571
self.assertEqual(['knit-ft-gz', 'knit-delta-gz', 'knit-delta-gz'],
2618
[record.storage_kind for record in
2619
vf.get_record_stream([(b'base',), (b'd1',), (b'd2',)],
2620
'topological', False)])
2572
[record.storage_kind for record in
2573
vf.get_record_stream([('base',), ('d1',), ('d2',)],
2574
'topological', False)])
2621
2575
# generate a stream of just the deltas include_delta_closure=True,
2622
2576
# serialise to the network, and check that we get a delta closure on the wire.
2623
stream = vf.get_record_stream(
2624
[(b'd1',), (b'd2',)], 'topological', True)
2577
stream = vf.get_record_stream([('d1',), ('d2',)], 'topological', True)
2625
2578
netb = [record.get_bytes_as(record.storage_kind) for record in stream]
2626
2579
# The first bytes should be a memo from _ContentMapGenerator, and the
2627
2580
# second bytes should be empty (because its a API proxy not something
2628
2581
# for wire serialisation.
2629
self.assertEqual(b'', netb[1])
2582
self.assertEqual('', netb[1])
2630
2583
bytes = netb[0]
2631
2584
kind, line_end = network_bytes_to_kind_and_offset(bytes)
2632
2585
self.assertEqual('knit-delta-closure', kind)
2638
2591
def test_get_record_stream_gives_records(self):
2639
2592
vf = self.make_test_knit(name='test')
2640
2593
# put in three texts, giving ft, delta, delta
2641
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2642
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2643
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2644
keys = [(b'd1',), (b'd2',)]
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',)]
2645
2598
generator = _VFContentMapGenerator(vf, keys,
2646
global_map=vf.get_parent_map(keys))
2599
global_map=vf.get_parent_map(keys))
2647
2600
for record in generator.get_record_stream():
2648
if record.key == (b'd1',):
2649
self.assertEqual(b'd1\n', record.get_bytes_as('fulltext'))
2601
if record.key == ('d1',):
2602
self.assertEqual('d1\n', record.get_bytes_as('fulltext'))
2651
self.assertEqual(b'd2\n', record.get_bytes_as('fulltext'))
2604
self.assertEqual('d2\n', record.get_bytes_as('fulltext'))
2653
2606
def test_get_record_stream_kinds_are_raw(self):
2654
2607
vf = self.make_test_knit(name='test')
2655
2608
# put in three texts, giving ft, delta, delta
2656
vf.add_lines((b'base',), (), [b'base\n', b'content\n'])
2657
vf.add_lines((b'd1',), ((b'base',),), [b'd1\n'])
2658
vf.add_lines((b'd2',), ((b'd1',),), [b'd2\n'])
2659
keys = [(b'base',), (b'd1',), (b'd2',)]
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',)]
2660
2613
generator = _VFContentMapGenerator(vf, keys,
2661
global_map=vf.get_parent_map(keys))
2662
kinds = {(b'base',): 'knit-delta-closure',
2663
(b'd1',): 'knit-delta-closure-ref',
2664
(b'd2',): 'knit-delta-closure-ref',
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',
2666
2619
for record in generator.get_record_stream():
2667
2620
self.assertEqual(kinds[record.key], record.storage_kind)
added
removed
bzrlib/tests/test_knit.py
