« back to all changes in this revision
Viewing changes to bzrlib/selftest/testmerge3.py
- browse files at revision 974.1.50
- compare with another revision
- compare with revision 1092.1.19
- download diff
- download tarball
- view history from revision 974.1.50
- Committer: aaron.bentley at utoronto
- Date: 2005-08-27 04:42:41 UTC
- mfrom: (1092.1.43)
- mto: (1185.3.4)
- mto: This revision was merged to the branch mainline in revision 1178.
- Revision ID: aaron.bentley@utoronto.ca-20050827044241-23d676133b9fc981
Merge of robertc@robertcollins.net-20050826013321-52eee1f1da679ee9
added
removed
bzrlib/selftest/testmerge3.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
17
18
from bzrlib.selftest import InTempDir, TestBase
18
from bzrlib.selftest import InTempDir, TestCase
19
19
from bzrlib.merge3 import Merge3
20
20
21
22
23
24
25
class NoChanges(TestBase):
26
"""No conflicts because nothing changed"""
27
def runTest(self):
21
def split_lines(t):
22
from cStringIO import StringIO
23
return StringIO(t).readlines()
24
25
############################################################
26
# test case data from the gnu diffutils manual
27
# common base
28
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
29
The named is the mother of all things.
30
31
Therefore let there always be non-being,
32
so we may see their subtlety,
33
And let there always be being,
34
so we may see their outcome.
35
The two are the same,
36
But after they are produced,
37
they have different names.
38
They both may be called deep and profound.
39
Deeper and more profound,
40
The door of all subtleties!
41
""")
42
43
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
44
The name that can be named is not the eternal name.
45
The Nameless is the origin of Heaven and Earth;
46
The Named is the mother of all things.
47
Therefore let there always be non-being,
48
so we may see their subtlety,
49
And let there always be being,
50
so we may see their outcome.
51
The two are the same,
52
But after they are produced,
53
they have different names.
54
""")
55
56
57
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
58
The name that can be named is not the eternal name.
59
The Nameless is the origin of Heaven and Earth;
60
The named is the mother of all things.
61
62
Therefore let there always be non-being,
63
so we may see their subtlety,
64
And let there always be being,
65
so we may see their result.
66
The two are the same,
67
But after they are produced,
68
they have different names.
69
70
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
71
72
""")
73
74
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
75
The name that can be named is not the eternal name.
76
The Nameless is the origin of Heaven and Earth;
77
The Named is the mother of all things.
78
Therefore let there always be non-being,
79
so we may see their subtlety,
80
And let there always be being,
81
so we may see their result.
82
The two are the same,
83
But after they are produced,
84
they have different names.
85
<<<<<<< LAO
86
=======
87
88
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
89
90
>>>>>>> TAO
91
""")
92
93
class TestMerge3(TestCase):
94
95
def test_no_changes(self):
96
"""No conflicts because nothing changed"""
28
97
m3 = Merge3(['aaa', 'bbb'],
29
98
['aaa', 'bbb'],
30
99
['aaa', 'bbb'])
44
113
self.assertEquals(list(m3.merge_groups()),
45
114
[('unchanged', ['aaa', 'bbb'])])
46
115
47
48
class FrontInsert(TestBase):
49
def runTest(self):
116
def test_front_insert(self):
50
117
m3 = Merge3(['zz'],
51
118
['aaa', 'bbb', 'zz'],
52
119
['zz'])
65
132
[('a', ['aaa', 'bbb']),
66
133
('unchanged', ['zz'])])
67
134
68
69
70
class NullInsert(TestBase):
71
def runTest(self):
135
def test_null_insert(self):
72
136
m3 = Merge3([],
73
137
['aaa', 'bbb'],
74
138
[])
75
76
139
# todo: should use a sentinal at end as from get_matching_blocks
77
140
# to match without zz
78
141
self.assertEquals(list(m3.find_sync_regions()),
83
146
84
147
self.assertEquals(list(m3.merge_lines()),
85
148
['aaa', 'bbb'])
86
87
88
149
89
class NoConflicts(TestBase):
90
"""No conflicts because only one side changed"""
91
def runTest(self):
150
def test_no_conflicts(self):
151
"""No conflicts because only one side changed"""
92
152
m3 = Merge3(['aaa', 'bbb'],
93
153
['aaa', '111', 'bbb'],
94
154
['aaa', 'bbb'])
106
166
('a', 1, 2),
107
167
('unchanged', 1, 2),])
108
168
109
110
111
class AppendA(TestBase):
112
def runTest(self):
169
def test_append_a(self):
113
170
m3 = Merge3(['aaa\n', 'bbb\n'],
114
171
['aaa\n', 'bbb\n', '222\n'],
115
172
['aaa\n', 'bbb\n'])
117
174
self.assertEquals(''.join(m3.merge_lines()),
118
175
'aaa\nbbb\n222\n')
119
176
120
class AppendB(TestBase):
121
def runTest(self):
177
def test_append_b(self):
122
178
m3 = Merge3(['aaa\n', 'bbb\n'],
123
179
['aaa\n', 'bbb\n'],
124
180
['aaa\n', 'bbb\n', '222\n'])
126
182
self.assertEquals(''.join(m3.merge_lines()),
127
183
'aaa\nbbb\n222\n')
128
184
129
class AppendAgreement(TestBase):
130
def runTest(self):
185
def test_append_agreement(self):
131
186
m3 = Merge3(['aaa\n', 'bbb\n'],
132
187
['aaa\n', 'bbb\n', '222\n'],
133
188
['aaa\n', 'bbb\n', '222\n'])
135
190
self.assertEquals(''.join(m3.merge_lines()),
136
191
'aaa\nbbb\n222\n')
137
192
138
class AppendClash(TestBase):
139
def runTest(self):
193
def test_append_clash(self):
140
194
m3 = Merge3(['aaa\n', 'bbb\n'],
141
195
['aaa\n', 'bbb\n', '222\n'],
142
196
['aaa\n', 'bbb\n', '333\n'])
157
211
>> b
158
212
''')
159
213
160
161
class InsertAgreement(TestBase):
162
def runTest(self):
214
def test_insert_agreement(self):
163
215
m3 = Merge3(['aaa\n', 'bbb\n'],
164
216
['aaa\n', '222\n', 'bbb\n'],
165
217
['aaa\n', '222\n', 'bbb\n'])
172
224
self.assertEquals(''.join(m3.merge_lines()),
173
225
'aaa\n222\nbbb\n')
174
226
175
176
177
178
class InsertClash(TestBase):
179
"""Both try to insert lines in the same place."""
180
def runTest(self):
227
def test_insert_clash(self):
228
"""Both try to insert lines in the same place."""
181
229
m3 = Merge3(['aaa\n', 'bbb\n'],
182
230
['aaa\n', '111\n', 'bbb\n'],
183
231
['aaa\n', '222\n', 'bbb\n'])
216
264
bbb
217
265
''')
218
266
219
220
221
class ReplaceClash(TestBase):
222
"""Both try to insert lines in the same place."""
223
def runTest(self):
267
def test_replace_clash(self):
268
"""Both try to insert lines in the same place."""
224
269
m3 = Merge3(['aaa', '000', 'bbb'],
225
270
['aaa', '111', 'bbb'],
226
271
['aaa', '222', 'bbb'])
233
278
(2,3, 2,3, 2,3),
234
279
(3,3, 3,3, 3,3),])
235
280
236
237
238
class ReplaceMulti(TestBase):
239
"""Replacement with regions of different size."""
240
def runTest(self):
281
def test_replace_multi(self):
282
"""Replacement with regions of different size."""
241
283
m3 = Merge3(['aaa', '000', '000', 'bbb'],
242
284
['aaa', '111', '111', '111', 'bbb'],
243
285
['aaa', '222', '222', '222', '222', 'bbb'])
251
293
(3,4, 4,5, 5,6),
252
294
(4,4, 5,5, 6,6),])
253
295
254
255
256
257
258
259
260
def split_lines(t):
261
from cStringIO import StringIO
262
return StringIO(t).readlines()
263
264
265
266
############################################################
267
# test case from the gnu diffutils manual
268
269
# common base
270
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
271
The named is the mother of all things.
272
273
Therefore let there always be non-being,
274
so we may see their subtlety,
275
And let there always be being,
276
so we may see their outcome.
277
The two are the same,
278
But after they are produced,
279
they have different names.
280
They both may be called deep and profound.
281
Deeper and more profound,
282
The door of all subtleties!
283
""")
284
285
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
286
The name that can be named is not the eternal name.
287
The Nameless is the origin of Heaven and Earth;
288
The Named is the mother of all things.
289
Therefore let there always be non-being,
290
so we may see their subtlety,
291
And let there always be being,
292
so we may see their outcome.
293
The two are the same,
294
But after they are produced,
295
they have different names.
296
""")
297
298
299
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
300
The name that can be named is not the eternal name.
301
The Nameless is the origin of Heaven and Earth;
302
The named is the mother of all things.
303
304
Therefore let there always be non-being,
305
so we may see their subtlety,
306
And let there always be being,
307
so we may see their result.
308
The two are the same,
309
But after they are produced,
310
they have different names.
311
312
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
313
314
""")
315
316
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
317
The name that can be named is not the eternal name.
318
The Nameless is the origin of Heaven and Earth;
319
The Named is the mother of all things.
320
Therefore let there always be non-being,
321
so we may see their subtlety,
322
And let there always be being,
323
so we may see their result.
324
The two are the same,
325
But after they are produced,
326
they have different names.
327
<<<<<<< LAO
328
=======
329
330
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
331
332
>>>>>>> TAO
333
""")
334
335
336
337
class MergePoem(TestBase):
338
"""Test case from diff3 manual"""
339
def runTest(self):
296
def test_merge_poem(self):
297
"""Test case from diff3 manual"""
340
298
m3 = Merge3(TZU, LAO, TAO)
341
299
ml = list(m3.merge_lines('LAO', 'TAO'))
342
300
self.log('merge result:')
343
301
self.log(''.join(ml))
344
302
self.assertEquals(ml, MERGED_RESULT)
345
346
347
348
TEST_CLASSES = [
349
NoChanges,
350
FrontInsert,
351
NullInsert,
352
NoConflicts,
353
AppendA,
354
AppendB,
355
AppendAgreement,
356
AppendClash,
357
InsertAgreement,
358
InsertClash,
359
ReplaceClash,
360
ReplaceMulti,
361
MergePoem,
362
]
Loggerhead is a web-based interface for Breezy
Version: 2.0.1