645
ver = k.add(list(parents), t)
650
ver = k.add_lines('text%d' % i,
652
parents.add('text%d' % i)
648
655
self.log("k._weave=" + pformat(k._weave))
650
657
for i, t in enumerate(texts):
651
self.assertEqual(k.get(i), t)
658
self.assertEqual(k.get_lines(i), t)
653
660
self.check_read_write(k)
657
class MergeCases(TestBase):
658
def doMerge(self, base, a, b, mp):
663
class JoinWeavesTests(TestBase):
665
super(JoinWeavesTests, self).setUp()
666
self.weave1 = Weave()
667
self.lines1 = ['hello\n']
668
self.lines3 = ['hello\n', 'cruel\n', 'world\n']
669
self.weave1.add_lines('v1', [], self.lines1)
670
self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
671
self.weave1.add_lines('v3', ['v2'], self.lines3)
673
def test_join_empty(self):
674
"""Join two empty weaves."""
675
eq = self.assertEqual
681
def test_join_empty_to_nonempty(self):
682
"""Join empty weave onto nonempty."""
683
self.weave1.join(Weave())
684
self.assertEqual(len(self.weave1), 3)
686
def test_join_unrelated(self):
687
"""Join two weaves with no history in common."""
689
wb.add_lines('b1', [], ['line from b\n'])
692
eq = self.assertEqual
694
eq(sorted(w1.versions()),
695
['b1', 'v1', 'v2', 'v3'])
697
def test_join_related(self):
698
wa = self.weave1.copy()
699
wb = self.weave1.copy()
700
wa.add_lines('a1', ['v3'], ['hello\n', 'sweet\n', 'world\n'])
701
wb.add_lines('b1', ['v3'], ['hello\n', 'pale blue\n', 'world\n'])
702
eq = self.assertEquals
707
eq(wa.get_lines('b1'),
708
['hello\n', 'pale blue\n', 'world\n'])
710
def test_join_parent_disagreement(self):
711
#join reconciles differening parents into a union.
714
wa.add_lines('v1', [], ['hello\n'])
715
wb.add_lines('v0', [], [])
716
wb.add_lines('v1', ['v0'], ['hello\n'])
718
self.assertEqual(['v0'], wa.get_parents('v1'))
720
def test_join_text_disagreement(self):
721
"""Cannot join weaves with different texts for a version."""
724
wa.add_lines('v1', [], ['hello\n'])
725
wb.add_lines('v1', [], ['not\n', 'hello\n'])
726
self.assertRaises(WeaveError,
729
def test_join_unordered(self):
730
"""Join weaves where indexes differ.
732
The source weave contains a different version at index 0."""
733
wa = self.weave1.copy()
735
wb.add_lines('x1', [], ['line from x1\n'])
736
wb.add_lines('v1', [], ['hello\n'])
737
wb.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
739
eq = self.assertEquals
740
eq(sorted(wa.versions()), ['v1', 'v2', 'v3', 'x1',])
741
eq(wa.get_text('x1'), 'line from x1\n')
743
def test_written_detection(self):
744
# Test detection of weave file corruption.
746
# Make sure that we can detect if a weave file has
747
# been corrupted. This doesn't test all forms of corruption,
748
# but it at least helps verify the data you get, is what you want.
659
749
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))
752
w.add_lines('v1', [], ['hello\n'])
753
w.add_lines('v2', ['v1'], ['hello\n', 'there\n'])
670
self.log('weave is:')
671
755
tmpf = StringIO()
672
756
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())
758
# Because we are corrupting, we need to make sure we have the exact text
759
self.assertEquals('# bzr weave file v5\n'
760
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
761
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
762
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n',
765
# Change a single letter
766
tmpf = StringIO('# bzr weave file v5\n'
767
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
768
'i 0\n1 90f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
769
'w\n{ 0\n. hello\n}\n{ 1\n. There\n}\nW\n')
773
self.assertEqual('hello\n', w.get_text('v1'))
774
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
775
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
776
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
778
# Change the sha checksum
779
tmpf = StringIO('# bzr weave file v5\n'
780
'i\n1 f572d396fae9206628714fb2ce00f72e94f2258f\nn v1\n\n'
781
'i 0\n1 f0f265c6e75f1c8f9ab76dcf85528352c5f215ef\nn v2\n\n'
782
'w\n{ 0\n. hello\n}\n{ 1\n. there\n}\nW\n')
786
self.assertEqual('hello\n', w.get_text('v1'))
787
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
788
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
789
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
792
class InstrumentedWeave(Weave):
793
"""Keep track of how many times functions are called."""
795
def __init__(self, weave_name=None):
796
self._extract_count = 0
797
Weave.__init__(self, weave_name=weave_name)
799
def _extract(self, versions):
800
self._extract_count += 1
801
return Weave._extract(self, versions)
804
class JoinOptimization(TestCase):
805
"""Test that Weave.join() doesn't extract all texts, only what must be done."""
808
w1 = InstrumentedWeave()
809
w2 = InstrumentedWeave()
812
txt1 = ['a\n', 'b\n']
813
txt2 = ['a\n', 'c\n']
814
txt3 = ['a\n', 'b\n', 'c\n']
816
w1.add_lines('txt0', [], txt0) # extract 1a
817
w2.add_lines('txt0', [], txt0) # extract 1b
818
w1.add_lines('txt1', ['txt0'], txt1)# extract 2a
819
w2.add_lines('txt2', ['txt0'], txt2)# extract 2b
820
w1.join(w2) # extract 3a to add txt2
821
w2.join(w1) # extract 3b to add txt1
823
w1.add_lines('txt3', ['txt1', 'txt2'], txt3) # extract 4a
824
w2.add_lines('txt3', ['txt2', 'txt1'], txt3) # extract 4b
825
# These secretly have inverted parents
827
# This should not have to do any extractions
828
w1.join(w2) # NO extract, texts already present with same parents
829
w2.join(w1) # NO extract, texts already present with same parents
831
self.assertEqual(4, w1._extract_count)
832
self.assertEqual(4, w2._extract_count)
834
def test_double_parent(self):
835
# It should not be considered illegal to add
836
# a revision with the same parent twice
837
w1 = InstrumentedWeave()
838
w2 = InstrumentedWeave()
841
txt1 = ['a\n', 'b\n']
842
txt2 = ['a\n', 'c\n']
843
txt3 = ['a\n', 'b\n', 'c\n']
845
w1.add_lines('txt0', [], txt0)
846
w2.add_lines('txt0', [], txt0)
847
w1.add_lines('txt1', ['txt0'], txt1)
848
w2.add_lines('txt1', ['txt0', 'txt0'], txt1)
849
# Same text, effectively the same, because the
850
# parent is only repeated
851
w1.join(w2) # extract 3a to add txt2
852
w2.join(w1) # extract 3b to add txt1
855
class TestNeedsReweave(TestCase):
856
"""Internal corner cases for when reweave is needed."""
858
def test_compatible_parents(self):
860
my_parents = set([1, 2, 3])
862
self.assertTrue(w1._compatible_parents(my_parents, set([3])))
864
self.assertTrue(w1._compatible_parents(my_parents, set(my_parents)))
865
# same empty corner case
866
self.assertTrue(w1._compatible_parents(set(), set()))
867
# other cannot contain stuff my_parents does not
868
self.assertFalse(w1._compatible_parents(set(), set([1])))
869
self.assertFalse(w1._compatible_parents(my_parents, set([1, 2, 3, 4])))
870
self.assertFalse(w1._compatible_parents(my_parents, set([4])))
873
class TestWeaveFile(TestCaseInTempDir):
875
def test_empty_file(self):
876
f = open('empty.weave', 'wb+')
878
self.assertRaises(errors.WeaveFormatError,
added
removed
bzrlib/tests/test_weave.py
