1
1
#! /usr/bin/python2.4
3
# Copyright (C) 2005 Canonical Ltd
3
# Copyright (C) 2005 by Canonical Ltd
5
5
# This program is free software; you can redistribute it and/or modify
6
6
# it under the terms of the GNU General Public License as published by
7
7
# the Free Software Foundation; either version 2 of the License, or
8
8
# (at your option) any later version.
10
10
# This program is distributed in the hope that it will be useful,
11
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
13
# GNU General Public License for more details.
15
15
# You should have received a copy of the GNU General Public License
16
16
# along with this program; if not, write to the Free Software
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
80
78
class StoreText(TestBase):
81
79
"""Store and retrieve a simple text."""
83
def test_storing_text(self):
85
idx = k.add_lines('text0', [], TEXT_0)
86
self.assertEqual(k.get_lines(idx), TEXT_0)
82
idx = k.add('text0', [], TEXT_0)
83
self.assertEqual(k.get(idx), TEXT_0)
87
84
self.assertEqual(idx, 0)
90
87
class AnnotateOne(TestBase):
93
k.add_lines('text0', [], TEXT_0)
94
self.assertEqual(k.annotate('text0'),
95
[('text0', TEXT_0[0])])
90
k.add('text0', [], TEXT_0)
91
self.assertEqual(k.annotate(0),
98
95
class StoreTwo(TestBase):
102
idx = k.add_lines('text0', [], TEXT_0)
99
idx = k.add('text0', [], TEXT_0)
103
100
self.assertEqual(idx, 0)
105
idx = k.add_lines('text1', [], TEXT_1)
102
idx = k.add('text1', [], TEXT_1)
106
103
self.assertEqual(idx, 1)
108
self.assertEqual(k.get_lines(0), TEXT_0)
109
self.assertEqual(k.get_lines(1), TEXT_1)
105
self.assertEqual(k.get(0), TEXT_0)
106
self.assertEqual(k.get(1), TEXT_1)
109
class AddWithGivenSha(TestBase):
111
"""Add with caller-supplied SHA-1"""
115
k.add('text0', [], [t], sha1=sha_string(t))
112
118
class GetSha1(TestBase):
113
119
def test_get_sha1(self):
115
k.add_lines('text0', [], 'text0')
121
k.add('text0', [], 'text0')
116
122
self.assertEqual('34dc0e430c642a26c3dd1c2beb7a8b4f4445eb79',
117
123
k.get_sha1('text0'))
118
self.assertRaises(errors.RevisionNotPresent,
124
self.assertRaises(errors.WeaveRevisionNotPresent,
120
self.assertRaises(errors.RevisionNotPresent,
126
self.assertRaises(errors.WeaveRevisionNotPresent,
121
127
k.get_sha1, 'text1')
137
143
"""Add the same version twice; harmless."""
138
144
def runTest(self):
140
idx = k.add_lines('text0', [], TEXT_0)
141
idx2 = k.add_lines('text0', [], TEXT_0)
146
idx = k.add('text0', [], TEXT_0)
147
idx2 = k.add('text0', [], TEXT_0)
142
148
self.assertEqual(idx, idx2)
145
151
class InvalidRepeatedAdd(TestBase):
146
152
def runTest(self):
148
k.add_lines('basis', [], TEXT_0)
149
idx = k.add_lines('text0', [], TEXT_0)
150
self.assertRaises(errors.RevisionAlreadyPresent,
154
idx = k.add('text0', [], TEXT_0)
155
self.assertRaises(WeaveError,
154
159
['not the same text'])
155
self.assertRaises(errors.RevisionAlreadyPresent,
160
self.assertRaises(WeaveError,
158
['basis'], # not the right parents
163
[12], # not the right parents
167
172
def runTest(self):
170
k.add_lines('text0', [], ['line 1'])
171
k.add_lines('text1', ['text0'], ['line 1', 'line 2'])
173
self.assertEqual(k.annotate('text0'),
174
[('text0', 'line 1')])
176
self.assertEqual(k.get_lines(1),
175
k.add('text0', [], ['line 1'])
176
k.add('text1', [0], ['line 1', 'line 2'])
178
self.assertEqual(k.annotate(0),
181
self.assertEqual(k.get(1),
180
self.assertEqual(k.annotate('text1'),
181
[('text0', 'line 1'),
182
('text1', 'line 2')])
184
k.add_lines('text2', ['text0'], ['line 1', 'diverged line'])
186
self.assertEqual(k.annotate('text2'),
187
[('text0', 'line 1'),
188
('text2', 'diverged line')])
185
self.assertEqual(k.annotate(1),
189
k.add('text2', [0], ['line 1', 'diverged line'])
191
self.assertEqual(k.annotate(2),
193
(2, 'diverged line')])
190
195
text3 = ['line 1', 'middle line', 'line 2']
195
200
# self.log("changes to text3: " + pformat(list(k._delta(set([0, 1]), text3))))
197
202
self.log("k._weave=" + pformat(k._weave))
199
self.assertEqual(k.annotate('text3'),
200
[('text0', 'line 1'),
201
('text3', 'middle line'),
202
('text1', 'line 2')])
204
self.assertEqual(k.annotate(3),
204
209
# now multiple insertions at different places
206
['text0', 'text1', 'text3'],
207
212
['line 1', 'aaa', 'middle line', 'bbb', 'line 2', 'ccc'])
209
self.assertEqual(k.annotate('text4'),
210
[('text0', 'line 1'),
212
('text3', 'middle line'),
214
self.assertEqual(k.annotate(4),
218
223
class DeleteLines(TestBase):
457
462
def runTest(self):
460
k.add_lines('text0', [], ["line the first",
465
k.add('text0', [], ["line the first",
465
self.assertEqual(len(k.get_lines(0)), 4)
470
self.assertEqual(len(k.get(0)), 4)
467
k.add_lines('text1', ['text0'], ["line the first",
472
k.add('text1', [0], ["line the first",
470
self.assertEqual(k.get_lines(1),
475
self.assertEqual(k.get(1),
471
476
["line the first",
474
self.assertEqual(k.annotate('text1'),
475
[('text0', "line the first"),
479
self.assertEqual(k.annotate(1),
480
[(0, "line the first"),
479
484
class IncludeVersions(TestBase):
558
560
text0 = ['cheddar', 'stilton', 'gruyere']
559
561
text1 = ['cheddar', 'blue vein', 'neufchatel', 'chevre']
561
k.add_lines('text0', [], text0)
562
k.add_lines('text1', ['text0'], text1)
563
k.add('text0', [], text0)
564
k.add('text1', [0], text1)
564
566
self.log('k._weave=' + pformat(k._weave))
566
self.assertEqual(k.get_lines(0), text0)
567
self.assertEqual(k.get_lines(1), text1)
568
self.assertEqual(k.get(0), text0)
569
self.assertEqual(k.get(1), text1)
570
572
class Merge(TestBase):
578
580
['header', '', 'line from 1', 'fixup line', 'line from 2'],
581
k.add_lines('text0', [], texts[0])
582
k.add_lines('text1', ['text0'], texts[1])
583
k.add_lines('text2', ['text0'], texts[2])
584
k.add_lines('merge', ['text0', 'text1', 'text2'], texts[3])
583
k.add('text0', [], texts[0])
584
k.add('text1', [0], texts[1])
585
k.add('text2', [0], texts[2])
586
k.add('merge', [0, 1, 2], texts[3])
586
588
for i, t in enumerate(texts):
587
self.assertEqual(k.get_lines(i), t)
589
self.assertEqual(k.get(i), t)
589
self.assertEqual(k.annotate('merge'),
590
[('text0', 'header'),
592
('text1', 'line from 1'),
593
('merge', 'fixup line'),
594
('text2', 'line from 2'),
591
self.assertEqual(k.annotate(3),
597
self.assertEqual(list(k.get_ancestry(['merge'])),
598
['text0', 'text1', 'text2', 'merge'])
599
self.assertEqual(list(k.inclusions([3])),
600
602
self.log('k._weave=' + pformat(k._weave))
634
k.add_lines([], ['aaa', 'bbb'])
635
k.add_lines([0], ['111', 'aaa', 'ccc', 'bbb'])
636
k.add_lines([1], ['aaa', 'ccc', 'bbb', '222'])
636
k.add([], ['aaa', 'bbb'])
637
k.add([0], ['111', 'aaa', 'ccc', 'bbb'])
638
k.add([1], ['aaa', 'ccc', 'bbb', '222'])
641
class AutoMerge(TestBase):
645
texts = [['header', 'aaa', 'bbb'],
646
['header', 'aaa', 'line from 1', 'bbb'],
647
['header', 'aaa', 'bbb', 'line from 2', 'more from 2'],
650
k.add('text0', [], texts[0])
651
k.add('text1', [0], texts[1])
652
k.add('text2', [0], texts[2])
654
self.log('k._weave=' + pformat(k._weave))
656
m = list(k.mash_iter([0, 1, 2]))
662
'line from 2', 'more from 2'])
639
665
class Khayyam(TestBase):
640
666
"""Test changes to multi-line texts, and read/write"""
642
def test_multi_line_merge(self):
644
669
"""A Book of Verses underneath the Bough,
645
670
A Jug of Wine, a Loaf of Bread, -- and Thou
674
ver = k.add_lines('text%d' % i,
699
ver = k.add('text%d' % i,
675
700
list(parents), t)
676
parents.add('text%d' % i)
679
704
self.log("k._weave=" + pformat(k._weave))
681
706
for i, t in enumerate(texts):
682
self.assertEqual(k.get_lines(i), t)
707
self.assertEqual(k.get(i), t)
684
709
self.check_read_write(k)
712
class MergeCases(TestBase):
713
def doMerge(self, base, a, b, mp):
714
from cStringIO import StringIO
715
from textwrap import dedent
721
w.add('text0', [], map(addcrlf, base))
722
w.add('text1', [0], map(addcrlf, a))
723
w.add('text2', [0], map(addcrlf, b))
725
self.log('weave is:')
728
self.log(tmpf.getvalue())
730
self.log('merge plan:')
731
p = list(w.plan_merge(1, 2))
732
for state, line in p:
734
self.log('%12s | %s' % (state, line[:-1]))
738
mt.writelines(w.weave_merge(p))
740
self.log(mt.getvalue())
742
mp = map(addcrlf, mp)
743
self.assertEqual(mt.readlines(), mp)
746
def testOneInsert(self):
752
def testSeparateInserts(self):
753
self.doMerge(['aaa', 'bbb', 'ccc'],
754
['aaa', 'xxx', 'bbb', 'ccc'],
755
['aaa', 'bbb', 'yyy', 'ccc'],
756
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
758
def testSameInsert(self):
759
self.doMerge(['aaa', 'bbb', 'ccc'],
760
['aaa', 'xxx', 'bbb', 'ccc'],
761
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'],
762
['aaa', 'xxx', 'bbb', 'yyy', 'ccc'])
764
def testOverlappedInsert(self):
765
self.doMerge(['aaa', 'bbb'],
766
['aaa', 'xxx', 'yyy', 'bbb'],
767
['aaa', 'xxx', 'bbb'],
768
['aaa', '<<<<<<< ', 'xxx', 'yyy', '=======', 'xxx',
771
# really it ought to reduce this to
772
# ['aaa', 'xxx', 'yyy', 'bbb']
775
def testClashReplace(self):
776
self.doMerge(['aaa'],
779
['<<<<<<< ', 'xxx', '=======', 'yyy', 'zzz',
782
def testNonClashInsert(self):
783
self.doMerge(['aaa'],
786
['<<<<<<< ', 'xxx', 'aaa', '=======', 'yyy', 'zzz',
789
self.doMerge(['aaa'],
795
def testDeleteAndModify(self):
796
"""Clashing delete and modification.
798
If one side modifies a region and the other deletes it then
799
there should be a conflict with one side blank.
802
#######################################
803
# skippd, not working yet
806
self.doMerge(['aaa', 'bbb', 'ccc'],
807
['aaa', 'ddd', 'ccc'],
809
['<<<<<<<< ', 'aaa', '=======', '>>>>>>> ', 'ccc'])
687
812
class JoinWeavesTests(TestBase):
689
814
super(JoinWeavesTests, self).setUp()
690
815
self.weave1 = Weave()
691
816
self.lines1 = ['hello\n']
692
817
self.lines3 = ['hello\n', 'cruel\n', 'world\n']
693
self.weave1.add_lines('v1', [], self.lines1)
694
self.weave1.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
695
self.weave1.add_lines('v3', ['v2'], self.lines3)
818
self.weave1.add('v1', [], self.lines1)
819
self.weave1.add('v2', [0], ['hello\n', 'world\n'])
820
self.weave1.add('v3', [1], self.lines3)
697
822
def test_join_empty(self):
698
823
"""Join two empty weaves."""
710
835
def test_join_unrelated(self):
711
836
"""Join two weaves with no history in common."""
713
wb.add_lines('b1', [], ['line from b\n'])
838
wb.add('b1', [], ['line from b\n'])
716
841
eq = self.assertEqual
718
eq(sorted(w1.versions()),
843
eq(sorted(list(w1.iter_names())),
719
844
['b1', 'v1', 'v2', 'v3'])
721
846
def test_join_related(self):
722
847
wa = self.weave1.copy()
723
848
wb = self.weave1.copy()
724
wa.add_lines('a1', ['v3'], ['hello\n', 'sweet\n', 'world\n'])
725
wb.add_lines('b1', ['v3'], ['hello\n', 'pale blue\n', 'world\n'])
849
wa.add('a1', ['v3'], ['hello\n', 'sweet\n', 'world\n'])
850
wb.add('b1', ['v3'], ['hello\n', 'pale blue\n', 'world\n'])
726
851
eq = self.assertEquals
732
857
['hello\n', 'pale blue\n', 'world\n'])
734
859
def test_join_parent_disagreement(self):
735
#join reconciles differening parents into a union.
860
"""Cannot join weaves with different parents for a version."""
738
wa.add_lines('v1', [], ['hello\n'])
739
wb.add_lines('v0', [], [])
740
wb.add_lines('v1', ['v0'], ['hello\n'])
742
self.assertEqual(['v0'], wa.get_parents('v1'))
863
wa.add('v1', [], ['hello\n'])
865
wb.add('v1', ['v0'], ['hello\n'])
866
self.assertRaises(WeaveError,
744
869
def test_join_text_disagreement(self):
745
870
"""Cannot join weaves with different texts for a version."""
748
wa.add_lines('v1', [], ['hello\n'])
749
wb.add_lines('v1', [], ['not\n', 'hello\n'])
873
wa.add('v1', [], ['hello\n'])
874
wb.add('v1', [], ['not\n', 'hello\n'])
750
875
self.assertRaises(WeaveError,
756
881
The source weave contains a different version at index 0."""
757
882
wa = self.weave1.copy()
759
wb.add_lines('x1', [], ['line from x1\n'])
760
wb.add_lines('v1', [], ['hello\n'])
761
wb.add_lines('v2', ['v1'], ['hello\n', 'world\n'])
884
wb.add('x1', [], ['line from x1\n'])
885
wb.add('v1', [], ['hello\n'])
886
wb.add('v2', ['v1'], ['hello\n', 'world\n'])
763
888
eq = self.assertEquals
764
eq(sorted(wa.versions()), ['v1', 'v2', 'v3', 'x1',])
889
eq(sorted(wa.iter_names()), ['v1', 'v2', 'v3', 'x1',])
765
890
eq(wa.get_text('x1'), 'line from x1\n')
893
class Corruption(TestCase):
895
def test_detection(self):
896
# Test weaves detect corruption.
898
# Weaves contain a checksum of their texts.
899
# When a text is extracted, this checksum should be
903
w.add('v1', [], ['hello\n'])
904
w.add('v2', ['v1'], ['hello\n', 'there\n'])
906
# We are going to invasively corrupt the text
907
# Make sure the internals of weave are the same
908
self.assertEqual([('{', 0)
916
self.assertEqual(['f572d396fae9206628714fb2ce00f72e94f2258f'
917
, '90f265c6e75f1c8f9ab76dcf85528352c5f215ef'
922
w._weave[4] = 'There\n'
924
self.assertEqual('hello\n', w.get_text('v1'))
925
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
926
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
927
self.assertRaises(errors.WeaveInvalidChecksum, list, w.get_iter('v2'))
928
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
931
w._weave[4] = 'there\n'
932
self.assertEqual('hello\nthere\n', w.get_text('v2'))
934
#Invalid checksum, first digit changed
935
w._sha1s[1] = 'f0f265c6e75f1c8f9ab76dcf85528352c5f215ef'
937
self.assertEqual('hello\n', w.get_text('v1'))
938
self.assertRaises(errors.WeaveInvalidChecksum, w.get_text, 'v2')
939
self.assertRaises(errors.WeaveInvalidChecksum, w.get_lines, 'v2')
940
self.assertRaises(errors.WeaveInvalidChecksum, list, w.get_iter('v2'))
941
self.assertRaises(errors.WeaveInvalidChecksum, w.check)
767
943
def test_written_detection(self):
768
944
# Test detection of weave file corruption.
837
1015
txt2 = ['a\n', 'c\n']
838
1016
txt3 = ['a\n', 'b\n', 'c\n']
840
w1.add_lines('txt0', [], txt0) # extract 1a
841
w2.add_lines('txt0', [], txt0) # extract 1b
842
w1.add_lines('txt1', ['txt0'], txt1)# extract 2a
843
w2.add_lines('txt2', ['txt0'], txt2)# extract 2b
1018
w1.add('txt0', [], txt0) # extract 1a
1019
w2.add('txt0', [], txt0) # extract 1b
1020
w1.add('txt1', [0], txt1)# extract 2a
1021
w2.add('txt2', [0], txt2)# extract 2b
844
1022
w1.join(w2) # extract 3a to add txt2
845
1023
w2.join(w1) # extract 3b to add txt1
847
w1.add_lines('txt3', ['txt1', 'txt2'], txt3) # extract 4a
848
w2.add_lines('txt3', ['txt2', 'txt1'], txt3) # extract 4b
1025
w1.add('txt3', [1, 2], txt3) # extract 4a
1026
w2.add('txt3', [1, 2], txt3) # extract 4b
849
1027
# These secretly have inverted parents
851
1029
# This should not have to do any extractions
866
1044
txt2 = ['a\n', 'c\n']
867
1045
txt3 = ['a\n', 'b\n', 'c\n']
869
w1.add_lines('txt0', [], txt0)
870
w2.add_lines('txt0', [], txt0)
871
w1.add_lines('txt1', ['txt0'], txt1)
872
w2.add_lines('txt1', ['txt0', 'txt0'], txt1)
1047
w1.add('txt0', [], txt0)
1048
w2.add('txt0', [], txt0)
1049
w1.add('txt1', [0], txt1)
1050
w2.add('txt1', [0,0], txt1)
873
1051
# Same text, effectively the same, because the
874
1052
# parent is only repeated
875
1053
w1.join(w2) # extract 3a to add txt2
876
1054
w2.join(w1) # extract 3b to add txt1
879
class TestNeedsReweave(TestCase):
880
"""Internal corner cases for when reweave is needed."""
1057
class MismatchedTexts(TestCase):
1058
"""Test that merging two weaves with different texts fails."""
882
def test_compatible_parents(self):
1060
def test_reweave(self):
884
my_parents = set([1, 2, 3])
886
self.assertTrue(w1._compatible_parents(my_parents, set([3])))
888
self.assertTrue(w1._compatible_parents(my_parents, set(my_parents)))
889
# same empty corner case
890
self.assertTrue(w1._compatible_parents(set(), set()))
891
# other cannot contain stuff my_parents does not
892
self.assertFalse(w1._compatible_parents(set(), set([1])))
893
self.assertFalse(w1._compatible_parents(my_parents, set([1, 2, 3, 4])))
894
self.assertFalse(w1._compatible_parents(my_parents, set([4])))
897
class TestWeaveFile(TestCaseInTempDir):
899
def test_empty_file(self):
900
f = open('empty.weave', 'wb+')
902
self.assertRaises(errors.WeaveFormatError,
1064
w1.add('txt0', [], ['a\n'])
1065
w2.add('txt0', [], ['a\n'])
1066
w1.add('txt1', [0], ['a\n', 'b\n'])
1067
w2.add('txt1', [0], ['a\n', 'c\n'])
1069
self.assertRaises(errors.WeaveTextDiffers, w1.reweave, w2)