645
ver = k.add(list(parents), t)
638
ver = k.add_lines('text%d' % i,
640
parents.add('text%d' % i)
648
643
self.log("k._weave=" + pformat(k._weave))
650
645
for i, t in enumerate(texts):
651
self.assertEqual(k.get(i), t)
646
self.assertEqual(k.get_lines(i), t)
653
648
self.check_read_write(k)
657
class MergeCases(TestBase):
658
def doMerge(self, base, a, b, mp):
651
class JoinWeavesTests(TestBase):
653
super(JoinWeavesTests, self).setUp()
654
self.weave1 = Weave()
655
self.lines1 = ['hello\n']
656
self.lines3 = ['hello\n', 'cruel\n', 'world\n']
657
self.weave1.add_lines('v1', [], self.lines1)
658
self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
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
def test_written_detection(self):
722
# Test detection of weave file corruption.
724
# Make sure that we can detect if a weave file has
725
# been corrupted. This doesn't test all forms of corruption,
726
# but it at least helps verify the data you get, is what you want.
659
727
from cStringIO import StringIO
660
from textwrap import dedent
666
w.add([], map(addcrlf, base))
667
w.add([0], map(addcrlf, a))
668
w.add([0], map(addcrlf, b))
730
w.add_lines('v1', [], ['hello\n'])
731
w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
670
self.log('weave is:')
671
733
tmpf = StringIO()
672
734
write_weave(w, tmpf)
673
self.log(tmpf.getvalue())
675
self.log('merge plan:')
676
p = list(w.plan_merge(1, 2))
677
for state, line in p:
679
self.log('%12s | %s' % (state, line[:-1]))
683
mt.writelines(w.weave_merge(p))
685
self.log(mt.getvalue())
687
mp = map(addcrlf, mp)
688
self.assertEqual(mt.readlines(), mp)
691
def testOneInsert(self):
697
def testSeparateInserts(self):
698
self.doMerge(['aaa', 'bbb', 'ccc'],
699
['aaa', 'xxx', 'bbb', 'ccc'],
700
['aaa', 'bbb', 'yyy', 'ccc'],
701
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
703
def testSameInsert(self):
704
self.doMerge(['aaa', 'bbb', 'ccc'],
705
['aaa', 'xxx', 'bbb', 'ccc'],
706
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
707
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
709
def testOverlappedInsert(self):
710
self.doMerge(['aaa', 'bbb'],
711
['aaa', 'xxx', 'yyy', 'bbb'],
712
['aaa', 'xxx', 'bbb'],
713
['aaa', '<<<<', 'xxx', 'yyy', '====', 'xxx', '>>>>', 'bbb'])
715
# really it ought to reduce this to
716
# ['aaa', 'xxx', 'yyy', 'bbb']
719
def testClashReplace(self):
720
self.doMerge(['aaa'],
723
['<<<<', 'xxx', '====', 'yyy', 'zzz', '>>>>'])
725
def testNonClashInsert(self):
726
self.doMerge(['aaa'],
729
['<<<<', 'xxx', 'aaa', '====', 'yyy', 'zzz', '>>>>'])
731
self.doMerge(['aaa'],
737
def testDeleteAndModify(self):
738
"""Clashing delete and modification.
740
If one side modifies a region and the other deletes it then
741
there should be a conflict with one side blank.
744
#######################################
745
# skippd, not working yet
748
self.doMerge(['aaa', 'bbb', 'ccc'],
749
['aaa', 'ddd', 'ccc'],
751
['<<<<', 'aaa', '====', '>>>>', 'ccc'])
757
from unittest import TestSuite, TestLoader
762
suite.addTest(tl.loadTestsFromModule(testweave))
764
return int(not testsweet.run_suite(suite)) # for shell 0=true
767
if __name__ == '__main__':
769
sys.exit(testweave())
736
# Because we are corrupting, we need to make sure we have the exact text
737
self.assertEquals('# bzr weave file v5\n'
738
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
739
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
740
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',
743
# Change a single letter
744
tmpf = StringIO('# bzr weave file v5\n'
745
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
746
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
747
'w\n{ 0\n. hello\n}\n{ 1\n. There\n}\nW\n')
751
self.assertEqual('hello\n', w.get_text('v1'))
752
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
753
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
754
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
756
# Change the sha checksum
757
tmpf = StringIO('# bzr weave file v5\n'
758
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
759
'i 0\n1 f0f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
760
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n')
764
self.assertEqual('hello\n', w.get_text('v1'))
765
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
766
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
767
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
770
class InstrumentedWeave(Weave):
771
"""Keep track of how many times functions are called."""
773
def __init__(self, weave_name=None):
774
self._extract_count = 0
775
Weave.__init__(self, weave_name=weave_name)
777
def _extract(self, versions):
778
self._extract_count += 1
779
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
class TestNeedsReweave(TestCase):
834
"""Internal corner cases for when reweave is needed."""
836
def test_compatible_parents(self):
838
my_parents = set([1, 2, 3])
840
self.assertTrue(w1._compatible_parents(my_parents, set([3])))
842
self.assertTrue(w1._compatible_parents(my_parents, set(my_parents)))
843
# same empty corner case
844
self.assertTrue(w1._compatible_parents(set(), set()))
845
# other cannot contain stuff my_parents does not
846
self.assertFalse(w1._compatible_parents(set(), set([1])))
847
self.assertFalse(w1._compatible_parents(my_parents, set([1, 2, 3, 4])))
848
self.assertFalse(w1._compatible_parents(my_parents, set([4])))
851
class TestWeaveFile(TestCaseInTempDir):
853
def test_empty_file(self):
854
f = open('empty.weave', 'wb+')
856
self.assertRaises(errors.WeaveFormatError,
added
removed
bzrlib/tests/test_weave.py
