98
102
class TestMerge3(tests.TestCase):
100
104
def test_no_changes(self):
101
105
"""No conflicts because nothing changed"""
102
m3 = merge3.Merge3(['aaa', 'bbb'],
106
self.assertEquals(m3.find_unconflicted(),
109
self.assertEquals(list(m3.find_sync_regions()),
115
self.assertEquals(list(m3.merge_regions()),
116
[('unchanged', 0, 2)])
118
self.assertEquals(list(m3.merge_groups()),
119
[('unchanged', ['aaa', 'bbb'])])
106
m3 = merge3.Merge3([b'aaa', b'bbb'],
110
self.assertEqual(m3.find_unconflicted(),
113
self.assertEqual(list(m3.find_sync_regions()),
119
self.assertEqual(list(m3.merge_regions()),
120
[('unchanged', 0, 2)])
122
self.assertEqual(list(m3.merge_groups()),
123
[('unchanged', [b'aaa', b'bbb'])])
121
125
def test_front_insert(self):
122
m3 = merge3.Merge3(['zz'],
123
['aaa', 'bbb', 'zz'],
126
m3 = merge3.Merge3([b'zz'],
127
[b'aaa', b'bbb', b'zz'],
126
130
# todo: should use a sentinal at end as from get_matching_blocks
127
131
# to match without zz
128
self.assertEquals(list(m3.find_sync_regions()),
132
self.assertEquals(list(m3.merge_regions()),
134
('unchanged', 0, 1)])
136
self.assertEquals(list(m3.merge_groups()),
137
[('a', ['aaa', 'bbb']),
138
('unchanged', ['zz'])])
132
self.assertEqual(list(m3.find_sync_regions()),
134
(1, 1, 3, 3, 1, 1), ])
136
self.assertEqual(list(m3.merge_regions()),
138
('unchanged', 0, 1)])
140
self.assertEqual(list(m3.merge_groups()),
141
[('a', [b'aaa', b'bbb']),
142
('unchanged', [b'zz'])])
140
144
def test_null_insert(self):
141
145
m3 = merge3.Merge3([],
144
148
# todo: should use a sentinal at end as from get_matching_blocks
145
149
# to match without zz
146
self.assertEquals(list(m3.find_sync_regions()),
149
self.assertEquals(list(m3.merge_regions()),
152
self.assertEquals(list(m3.merge_lines()),
150
self.assertEqual(list(m3.find_sync_regions()),
151
[(0, 0, 2, 2, 0, 0)])
153
self.assertEqual(list(m3.merge_regions()),
156
self.assertEqual(list(m3.merge_lines()),
155
159
def test_no_conflicts(self):
156
160
"""No conflicts because only one side changed"""
157
m3 = merge3.Merge3(['aaa', 'bbb'],
158
['aaa', '111', 'bbb'],
161
self.assertEquals(m3.find_unconflicted(),
164
self.assertEquals(list(m3.find_sync_regions()),
169
self.assertEquals(list(m3.merge_regions()),
170
[('unchanged', 0, 1),
172
('unchanged', 1, 2),])
161
m3 = merge3.Merge3([b'aaa', b'bbb'],
162
[b'aaa', b'111', b'bbb'],
165
self.assertEqual(m3.find_unconflicted(),
168
self.assertEqual(list(m3.find_sync_regions()),
171
(2, 2, 3, 3, 2, 2), ])
173
self.assertEqual(list(m3.merge_regions()),
174
[('unchanged', 0, 1),
176
('unchanged', 1, 2), ])
174
178
def test_append_a(self):
175
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
176
['aaa\n', 'bbb\n', '222\n'],
179
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
180
[b'aaa\n', b'bbb\n', b'222\n'],
181
[b'aaa\n', b'bbb\n'])
179
self.assertEquals(''.join(m3.merge_lines()),
183
self.assertEqual(b''.join(m3.merge_lines()),
182
186
def test_append_b(self):
183
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
185
['aaa\n', 'bbb\n', '222\n'])
187
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
188
[b'aaa\n', b'bbb\n'],
189
[b'aaa\n', b'bbb\n', b'222\n'])
187
self.assertEquals(''.join(m3.merge_lines()),
191
self.assertEqual(b''.join(m3.merge_lines()),
190
194
def test_append_agreement(self):
191
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
192
['aaa\n', 'bbb\n', '222\n'],
193
['aaa\n', 'bbb\n', '222\n'])
195
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
196
[b'aaa\n', b'bbb\n', b'222\n'],
197
[b'aaa\n', b'bbb\n', b'222\n'])
195
self.assertEquals(''.join(m3.merge_lines()),
199
self.assertEqual(b''.join(m3.merge_lines()),
198
202
def test_append_clash(self):
199
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
200
['aaa\n', 'bbb\n', '222\n'],
201
['aaa\n', 'bbb\n', '333\n'])
203
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
204
[b'aaa\n', b'bbb\n', b'222\n'],
205
[b'aaa\n', b'bbb\n', b'333\n'])
203
ml = m3.merge_lines(name_a='a',
208
self.assertEquals(''.join(ml),
207
ml = m3.merge_lines(name_a=b'a',
212
self.assertEqual(b''.join(ml),
219
223
def test_insert_agreement(self):
220
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
221
['aaa\n', '222\n', 'bbb\n'],
222
['aaa\n', '222\n', 'bbb\n'])
224
ml = m3.merge_lines(name_a='a',
229
self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
224
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
225
[b'aaa\n', b'222\n', b'bbb\n'],
226
[b'aaa\n', b'222\n', b'bbb\n'])
228
ml = m3.merge_lines(name_a=b'a',
233
self.assertEqual(b''.join(ml), b'aaa\n222\nbbb\n')
232
235
def test_insert_clash(self):
233
236
"""Both try to insert lines in the same place."""
234
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
235
['aaa\n', '111\n', 'bbb\n'],
236
['aaa\n', '222\n', 'bbb\n'])
238
self.assertEquals(m3.find_unconflicted(),
241
self.assertEquals(list(m3.find_sync_regions()),
246
self.assertEquals(list(m3.merge_regions()),
248
('conflict', 1,1, 1,2, 1,2),
251
self.assertEquals(list(m3.merge_groups()),
252
[('unchanged', ['aaa\n']),
253
('conflict', [], ['111\n'], ['222\n']),
254
('unchanged', ['bbb\n']),
257
ml = m3.merge_lines(name_a='a',
262
self.assertEquals(''.join(ml),
237
m3 = merge3.Merge3([b'aaa\n', b'bbb\n'],
238
[b'aaa\n', b'111\n', b'bbb\n'],
239
[b'aaa\n', b'222\n', b'bbb\n'])
241
self.assertEqual(m3.find_unconflicted(),
244
self.assertEqual(list(m3.find_sync_regions()),
247
(2, 2, 3, 3, 3, 3), ])
249
self.assertEqual(list(m3.merge_regions()),
250
[('unchanged', 0, 1),
251
('conflict', 1, 1, 1, 2, 1, 2),
252
('unchanged', 1, 2)])
254
self.assertEqual(list(m3.merge_groups()),
255
[('unchanged', [b'aaa\n']),
256
('conflict', [], [b'111\n'], [b'222\n']),
257
('unchanged', [b'bbb\n']),
260
ml = m3.merge_lines(name_a=b'a',
265
self.assertEqual(b''.join(ml),
272
275
def test_replace_clash(self):
273
276
"""Both try to insert lines in the same place."""
274
m3 = merge3.Merge3(['aaa', '000', 'bbb'],
275
['aaa', '111', 'bbb'],
276
['aaa', '222', 'bbb'])
278
self.assertEquals(m3.find_unconflicted(),
281
self.assertEquals(list(m3.find_sync_regions()),
277
m3 = merge3.Merge3([b'aaa', b'000', b'bbb'],
278
[b'aaa', b'111', b'bbb'],
279
[b'aaa', b'222', b'bbb'])
281
self.assertEqual(m3.find_unconflicted(),
284
self.assertEqual(list(m3.find_sync_regions()),
287
(3, 3, 3, 3, 3, 3), ])
286
289
def test_replace_multi(self):
287
290
"""Replacement with regions of different size."""
288
m3 = merge3.Merge3(['aaa', '000', '000', 'bbb'],
289
['aaa', '111', '111', '111', 'bbb'],
290
['aaa', '222', '222', '222', '222', 'bbb'])
292
self.assertEquals(m3.find_unconflicted(),
296
self.assertEquals(list(m3.find_sync_regions()),
291
m3 = merge3.Merge3([b'aaa', b'000', b'000', b'bbb'],
292
[b'aaa', b'111', b'111', b'111', b'bbb'],
293
[b'aaa', b'222', b'222', b'222', b'222', b'bbb'])
295
self.assertEqual(m3.find_unconflicted(),
298
self.assertEqual(list(m3.find_sync_regions()),
301
(4, 4, 5, 5, 6, 6), ])
301
303
def test_merge_poem(self):
302
304
"""Test case from diff3 manual"""
303
305
m3 = merge3.Merge3(TZU, LAO, TAO)
304
ml = list(m3.merge_lines('LAO', 'TAO'))
306
ml = list(m3.merge_lines(b'LAO', b'TAO'))
305
307
self.log('merge result:')
306
self.log(''.join(ml))
307
self.assertEquals(ml, MERGED_RESULT)
308
self.log(b''.join(ml))
309
self.assertEqual(ml, MERGED_RESULT)
309
311
def test_minimal_conflicts_common(self):
310
312
"""Reprocessing"""
311
base_text = ("a\n" * 20).splitlines(True)
312
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
313
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
313
base_text = (b"a\n" * 20).splitlines(True)
314
this_text = (b"a\n" * 10 + b"b\n" * 10).splitlines(True)
315
other_text = (b"a\n" * 10 + b"c\n" + b"b\n" *
316
8 + b"c\n").splitlines(True)
314
317
m3 = merge3.Merge3(base_text, other_text, this_text)
315
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
316
merged_text = "".join(list(m_lines))
317
optimal_text = ("a\n" * 10 + "<<<<<<< OTHER\nc\n"
318
+ 8* "b\n" + "c\n=======\n"
319
+ 10*"b\n" + ">>>>>>> THIS\n")
318
m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
319
merged_text = b"".join(list(m_lines))
320
optimal_text = (b"a\n" * 10 + b"<<<<<<< OTHER\nc\n"
321
+ 8 * b"b\n" + b"c\n=======\n"
322
+ 10 * b"b\n" + b">>>>>>> THIS\n")
320
323
self.assertEqualDiff(optimal_text, merged_text)
322
325
def test_minimal_conflicts_unique(self):
323
326
def add_newline(s):
324
327
"""Add a newline to each entry in the string"""
325
return [(x+'\n') for x in s]
328
return [(int2byte(x) + b'\n') for x in bytearray(s)]
327
base_text = add_newline("abcdefghijklm")
328
this_text = add_newline("abcdefghijklmNOPQRSTUVWXYZ")
329
other_text = add_newline("abcdefghijklm1OPQRSTUVWXY2")
330
base_text = add_newline(b"abcdefghijklm")
331
this_text = add_newline(b"abcdefghijklmNOPQRSTUVWXYZ")
332
other_text = add_newline(b"abcdefghijklm1OPQRSTUVWXY2")
330
333
m3 = merge3.Merge3(base_text, other_text, this_text)
331
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
332
merged_text = "".join(list(m_lines))
333
optimal_text = ''.join(add_newline("abcdefghijklm")
334
+ ["<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
335
+ add_newline('OPQRSTUVWXY')
336
+ ["<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
334
m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
335
merged_text = b"".join(list(m_lines))
336
optimal_text = b''.join(add_newline(b"abcdefghijklm")
337
+ [b"<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
338
+ add_newline(b'OPQRSTUVWXY')
339
+ [b"<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
338
341
self.assertEqualDiff(optimal_text, merged_text)
340
343
def test_minimal_conflicts_nonunique(self):
341
344
def add_newline(s):
342
345
"""Add a newline to each entry in the string"""
343
return [(x+'\n') for x in s]
346
return [(int2byte(x) + b'\n') for x in bytearray(s)]
345
base_text = add_newline("abacddefgghij")
346
this_text = add_newline("abacddefgghijkalmontfprz")
347
other_text = add_newline("abacddefgghijknlmontfprd")
348
base_text = add_newline(b"abacddefgghij")
349
this_text = add_newline(b"abacddefgghijkalmontfprz")
350
other_text = add_newline(b"abacddefgghijknlmontfprd")
348
351
m3 = merge3.Merge3(base_text, other_text, this_text)
349
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
350
merged_text = "".join(list(m_lines))
351
optimal_text = ''.join(add_newline("abacddefgghijk")
352
+ ["<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
353
+ add_newline('lmontfpr')
354
+ ["<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
352
m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
353
merged_text = b"".join(list(m_lines))
354
optimal_text = b''.join(add_newline(b"abacddefgghijk")
355
+ [b"<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
356
+ add_newline(b'lmontfpr')
357
+ [b"<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
356
359
self.assertEqualDiff(optimal_text, merged_text)
358
361
def test_reprocess_and_base(self):
359
362
"""Reprocessing and showing base breaks correctly"""
360
base_text = ("a\n" * 20).splitlines(True)
361
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
362
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
363
base_text = (b"a\n" * 20).splitlines(True)
364
this_text = (b"a\n" * 10 + b"b\n" * 10).splitlines(True)
365
other_text = (b"a\n" * 10 + b"c\n" + b"b\n" *
366
8 + b"c\n").splitlines(True)
363
367
m3 = merge3.Merge3(base_text, other_text, this_text)
364
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True,
365
base_marker='|||||||')
366
self.assertRaises(CantReprocessAndShowBase, list, m_lines)
368
m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True,
369
base_marker=b'|||||||')
370
self.assertRaises(merge3.CantReprocessAndShowBase, list, m_lines)
368
372
def test_binary(self):
369
self.assertRaises(BinaryFile, merge3.Merge3, ['\x00'], ['a'], ['b'])
373
self.assertRaises(BinaryFile, merge3.Merge3, [b'\x00'], [b'a'], [b'b'])
371
375
def test_dos_text(self):
378
other_text = b'c\r\n'
375
379
m3 = merge3.Merge3(base_text.splitlines(True),
376
380
other_text.splitlines(True),
377
381
this_text.splitlines(True))
378
m_lines = m3.merge_lines('OTHER', 'THIS')
379
self.assertEqual('<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
380
'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
382
m_lines = m3.merge_lines(b'OTHER', b'THIS')
383
self.assertEqual(b'<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
384
b'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
382
386
def test_mac_text(self):
386
390
m3 = merge3.Merge3(base_text.splitlines(True),
387
391
other_text.splitlines(True),
388
392
this_text.splitlines(True))
389
m_lines = m3.merge_lines('OTHER', 'THIS')
390
self.assertEqual('<<<<<<< OTHER\rc\r=======\rb\r'
391
'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
393
m_lines = m3.merge_lines(b'OTHER', b'THIS')
394
self.assertEqual(b'<<<<<<< OTHER\rc\r=======\rb\r'
395
b'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
393
397
def test_merge3_cherrypick(self):
396
other_text = "a\nb\nc\n"
398
base_text = b"a\nb\n"
400
other_text = b"a\nb\nc\n"
397
401
# When cherrypicking, lines in base are not part of the conflict
398
402
m3 = merge3.Merge3(base_text.splitlines(True),
399
403
this_text.splitlines(True),
400
404
other_text.splitlines(True), is_cherrypick=True)
401
405
m_lines = m3.merge_lines()
402
self.assertEqualDiff('a\n<<<<<<<\n=======\nc\n>>>>>>>\n',
406
self.assertEqualDiff(b'a\n<<<<<<<\n=======\nc\n>>>>>>>\n',
405
409
# This is not symmetric
406
410
m3 = merge3.Merge3(base_text.splitlines(True),
407
411
other_text.splitlines(True),
408
412
this_text.splitlines(True), is_cherrypick=True)
409
413
m_lines = m3.merge_lines()
410
self.assertEqualDiff('a\n<<<<<<<\nb\nc\n=======\n>>>>>>>\n',
414
self.assertEqualDiff(b'a\n<<<<<<<\nb\nc\n=======\n>>>>>>>\n',
413
417
def test_merge3_cherrypick_w_mixed(self):
414
base_text = 'a\nb\nc\nd\ne\n'
415
this_text = 'a\nb\nq\n'
416
other_text = 'a\nb\nc\nd\nf\ne\ng\n'
418
base_text = b'a\nb\nc\nd\ne\n'
419
this_text = b'a\nb\nq\n'
420
other_text = b'a\nb\nc\nd\nf\ne\ng\n'
417
421
# When cherrypicking, lines in base are not part of the conflict
418
422
m3 = merge3.Merge3(base_text.splitlines(True),
419
423
this_text.splitlines(True),
420
424
other_text.splitlines(True), is_cherrypick=True)
421
425
m_lines = m3.merge_lines()
422
self.assertEqualDiff('a\n'
426
self.assertEqualDiff(b'a\n'
435
439
def test_allow_objects(self):
436
440
"""Objects other than strs may be used with Merge3 when
437
441
allow_objects=True.
439
443
merge_groups and merge_regions work with non-str input. Methods that
440
444
return lines like merge_lines fail.
442
base = [(x,x) for x in 'abcde']
443
a = [(x,x) for x in 'abcdef']
444
b = [(x,x) for x in 'Zabcde']
446
base = [(x, x) for x in 'abcde']
447
a = [(x, x) for x in 'abcdef']
448
b = [(x, x) for x in 'Zabcde']
445
449
m3 = merge3.Merge3(base, a, b, allow_objects=True)
446
450
self.assertEqual(