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