170
170
['text0', 'text1', 'text3'],
171
171
['line 1', 'aaa', 'middle line', 'bbb', 'line 2', 'ccc'])
173
self.assertEqual(k.annotate('text4'),
173
self.assertEqual(k.annotate('text4'),
174
174
[('text0', 'line 1'),
175
175
('text4', 'aaa'),
176
176
('text3', 'middle line'),
189
189
base_text = ['one', 'two', 'three', 'four']
191
191
k.add_lines('text0', [], base_text)
193
193
texts = [['one', 'two', 'three'],
194
194
['two', 'three', 'four'],
522
522
text0 = ['cheddar', 'stilton', 'gruyere']
523
523
text1 = ['cheddar', 'blue vein', 'neufchatel', 'chevre']
525
525
k.add_lines('text0', [], text0)
526
526
k.add_lines('text1', ['text0'], text1)
609
609
A Jug of Wine, a Loaf of Bread, -- and Thou
610
610
Beside me singing in the Wilderness --
611
611
Oh, Wilderness were Paradise enow!""",
613
613
"""A Book of Verses underneath the Bough,
614
614
A Jug of Wine, a Loaf of Bread, -- and Thou
615
615
Beside me singing in the Wilderness --
657
657
self.weave1.add_lines('v1', [], self.lines1)
658
658
self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
659
659
self.weave1.add_lines('v3', ['v2'], self.lines3)
661
def test_join_empty(self):
662
"""Join two empty weaves."""
663
eq = self.assertEqual
669
def test_join_empty_to_nonempty(self):
670
"""Join empty weave onto nonempty."""
671
self.weave1.join(Weave())
672
self.assertEqual(len(self.weave1), 3)
674
def test_join_unrelated(self):
675
"""Join two weaves with no history in common."""
677
wb.add_lines('b1', [], ['line from b\n'])
680
eq = self.assertEqual
682
eq(sorted(w1.versions()),
683
['b1', 'v1', 'v2', 'v3'])
685
def test_join_related(self):
686
wa = self.weave1.copy()
687
wb = self.weave1.copy()
688
wa.add_lines('a1', ['v3'], ['hello\n', 'sweet\n', 'world\n'])
689
wb.add_lines('b1', ['v3'], ['hello\n', 'pale blue\n', 'world\n'])
690
eq = self.assertEquals
695
eq(wa.get_lines('b1'),
696
['hello\n', 'pale blue\n', 'world\n'])
698
def test_join_text_disagreement(self):
699
"""Cannot join weaves with different texts for a version."""
702
wa.add_lines('v1', [], ['hello\n'])
703
wb.add_lines('v1', [], ['not\n', 'hello\n'])
704
self.assertRaises(WeaveError,
707
def test_join_unordered(self):
708
"""Join weaves where indexes differ.
710
The source weave contains a different version at index 0."""
711
wa = self.weave1.copy()
713
wb.add_lines('x1', [], ['line from x1\n'])
714
wb.add_lines('v1', [], ['hello\n'])
715
wb.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
717
eq = self.assertEquals
718
eq(sorted(wa.versions()), ['v1', 'v2', 'v3', 'x1',])
719
eq(wa.get_text('x1'), 'line from x1\n')
721
661
def test_written_detection(self):
722
662
# Test detection of weave file corruption.
767
707
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
710
class TestWeave(TestCase):
712
def test_allow_reserved_false(self):
713
w = Weave('name', allow_reserved=False)
714
# Add lines is checked at the WeaveFile level, not at the Weave level
715
w.add_lines('name:', [], TEXT_1)
716
# But get_lines is checked at this level
717
self.assertRaises(errors.ReservedId, w.get_lines, 'name:')
719
def test_allow_reserved_true(self):
720
w = Weave('name', allow_reserved=True)
721
w.add_lines('name:', [], TEXT_1)
722
self.assertEqual(TEXT_1, w.get_lines('name:'))
770
725
class InstrumentedWeave(Weave):
771
726
"""Keep track of how many times functions are called."""
773
728
def __init__(self, weave_name=None):
774
729
self._extract_count = 0
775
730
Weave.__init__(self, weave_name=weave_name)
779
734
return Weave._extract(self, versions)
782
class JoinOptimization(TestCase):
783
"""Test that Weave.join() doesn't extract all texts, only what must be done."""
786
w1 = InstrumentedWeave()
787
w2 = InstrumentedWeave()
790
txt1 = ['a\n', 'b\n']
791
txt2 = ['a\n', 'c\n']
792
txt3 = ['a\n', 'b\n', 'c\n']
794
w1.add_lines('txt0', [], txt0) # extract 1a
795
w2.add_lines('txt0', [], txt0) # extract 1b
796
w1.add_lines('txt1', ['txt0'], txt1)# extract 2a
797
w2.add_lines('txt2', ['txt0'], txt2)# extract 2b
798
w1.join(w2) # extract 3a to add txt2
799
w2.join(w1) # extract 3b to add txt1
801
w1.add_lines('txt3', ['txt1', 'txt2'], txt3) # extract 4a
802
w2.add_lines('txt3', ['txt2', 'txt1'], txt3) # extract 4b
803
# These secretly have inverted parents
805
# This should not have to do any extractions
806
w1.join(w2) # NO extract, texts already present with same parents
807
w2.join(w1) # NO extract, texts already present with same parents
809
self.assertEqual(4, w1._extract_count)
810
self.assertEqual(4, w2._extract_count)
812
def test_double_parent(self):
813
# It should not be considered illegal to add
814
# a revision with the same parent twice
815
w1 = InstrumentedWeave()
816
w2 = InstrumentedWeave()
819
txt1 = ['a\n', 'b\n']
820
txt2 = ['a\n', 'c\n']
821
txt3 = ['a\n', 'b\n', 'c\n']
823
w1.add_lines('txt0', [], txt0)
824
w2.add_lines('txt0', [], txt0)
825
w1.add_lines('txt1', ['txt0'], txt1)
826
w2.add_lines('txt1', ['txt0', 'txt0'], txt1)
827
# Same text, effectively the same, because the
828
# parent is only repeated
829
w1.join(w2) # extract 3a to add txt2
830
w2.join(w1) # extract 3b to add txt1
833
737
class TestNeedsReweave(TestCase):
834
738
"""Internal corner cases for when reweave is needed."""
added
removed
bzrlib/tests/test_weave.py
