1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
25
from cStringIO import StringIO
26
return StringIO(t).readlines()
28
############################################################
29
# test case data from the gnu diffutils manual
31
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
32
The named is the mother of all things.
34
Therefore let there always be non-being,
35
so we may see their subtlety,
36
And let there always be being,
37
so we may see their outcome.
39
But after they are produced,
40
they have different names.
41
They both may be called deep and profound.
42
Deeper and more profound,
43
The door of all subtleties!
46
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
47
The name that can be named is not the eternal name.
48
The Nameless is the origin of Heaven and Earth;
49
The Named is the mother of all things.
50
Therefore let there always be non-being,
51
so we may see their subtlety,
52
And let there always be being,
53
so we may see their outcome.
55
But after they are produced,
56
they have different names.
60
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
61
The name that can be named is not the eternal name.
62
The Nameless is the origin of Heaven and Earth;
63
The named is the mother of all things.
65
Therefore let there always be non-being,
66
so we may see their subtlety,
67
And let there always be being,
68
so we may see their result.
70
But after they are produced,
71
they have different names.
73
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
77
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
78
The name that can be named is not the eternal name.
79
The Nameless is the origin of Heaven and Earth;
80
The Named is the mother of all things.
81
Therefore let there always be non-being,
82
so we may see their subtlety,
83
And let there always be being,
84
so we may see their result.
86
But after they are produced,
87
they have different names.
91
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
96
class TestMerge3(tests.TestCase):
98
def test_no_changes(self):
99
"""No conflicts because nothing changed"""
100
m3 = merge3.Merge3(['aaa', 'bbb'],
104
self.assertEquals(m3.find_unconflicted(),
107
self.assertEquals(list(m3.find_sync_regions()),
113
self.assertEquals(list(m3.merge_regions()),
114
[('unchanged', 0, 2)])
116
self.assertEquals(list(m3.merge_groups()),
117
[('unchanged', ['aaa', 'bbb'])])
119
def test_front_insert(self):
120
m3 = merge3.Merge3(['zz'],
121
['aaa', 'bbb', 'zz'],
124
# todo: should use a sentinal at end as from get_matching_blocks
125
# to match without zz
126
self.assertEquals(list(m3.find_sync_regions()),
130
self.assertEquals(list(m3.merge_regions()),
132
('unchanged', 0, 1)])
134
self.assertEquals(list(m3.merge_groups()),
135
[('a', ['aaa', 'bbb']),
136
('unchanged', ['zz'])])
138
def test_null_insert(self):
139
m3 = merge3.Merge3([],
142
# todo: should use a sentinal at end as from get_matching_blocks
143
# to match without zz
144
self.assertEquals(list(m3.find_sync_regions()),
147
self.assertEquals(list(m3.merge_regions()),
150
self.assertEquals(list(m3.merge_lines()),
153
def test_no_conflicts(self):
154
"""No conflicts because only one side changed"""
155
m3 = merge3.Merge3(['aaa', 'bbb'],
156
['aaa', '111', 'bbb'],
159
self.assertEquals(m3.find_unconflicted(),
162
self.assertEquals(list(m3.find_sync_regions()),
167
self.assertEquals(list(m3.merge_regions()),
168
[('unchanged', 0, 1),
170
('unchanged', 1, 2),])
172
def test_append_a(self):
173
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
174
['aaa\n', 'bbb\n', '222\n'],
177
self.assertEquals(''.join(m3.merge_lines()),
180
def test_append_b(self):
181
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
183
['aaa\n', 'bbb\n', '222\n'])
185
self.assertEquals(''.join(m3.merge_lines()),
188
def test_append_agreement(self):
189
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
190
['aaa\n', 'bbb\n', '222\n'],
191
['aaa\n', 'bbb\n', '222\n'])
193
self.assertEquals(''.join(m3.merge_lines()),
196
def test_append_clash(self):
197
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
198
['aaa\n', 'bbb\n', '222\n'],
199
['aaa\n', 'bbb\n', '333\n'])
201
ml = m3.merge_lines(name_a='a',
206
self.assertEquals(''.join(ml),
217
def test_insert_agreement(self):
218
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
219
['aaa\n', '222\n', 'bbb\n'],
220
['aaa\n', '222\n', 'bbb\n'])
222
ml = m3.merge_lines(name_a='a',
227
self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
230
def test_insert_clash(self):
231
"""Both try to insert lines in the same place."""
232
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
233
['aaa\n', '111\n', 'bbb\n'],
234
['aaa\n', '222\n', 'bbb\n'])
236
self.assertEquals(m3.find_unconflicted(),
239
self.assertEquals(list(m3.find_sync_regions()),
244
self.assertEquals(list(m3.merge_regions()),
246
('conflict', 1,1, 1,2, 1,2),
249
self.assertEquals(list(m3.merge_groups()),
250
[('unchanged', ['aaa\n']),
251
('conflict', [], ['111\n'], ['222\n']),
252
('unchanged', ['bbb\n']),
255
ml = m3.merge_lines(name_a='a',
260
self.assertEquals(''.join(ml),
270
def test_replace_clash(self):
271
"""Both try to insert lines in the same place."""
272
m3 = merge3.Merge3(['aaa', '000', 'bbb'],
273
['aaa', '111', 'bbb'],
274
['aaa', '222', 'bbb'])
276
self.assertEquals(m3.find_unconflicted(),
279
self.assertEquals(list(m3.find_sync_regions()),
284
def test_replace_multi(self):
285
"""Replacement with regions of different size."""
286
m3 = merge3.Merge3(['aaa', '000', '000', 'bbb'],
287
['aaa', '111', '111', '111', 'bbb'],
288
['aaa', '222', '222', '222', '222', 'bbb'])
290
self.assertEquals(m3.find_unconflicted(),
294
self.assertEquals(list(m3.find_sync_regions()),
299
def test_merge_poem(self):
300
"""Test case from diff3 manual"""
301
m3 = merge3.Merge3(TZU, LAO, TAO)
302
ml = list(m3.merge_lines('LAO', 'TAO'))
303
self.log('merge result:')
304
self.log(''.join(ml))
305
self.assertEquals(ml, MERGED_RESULT)
307
def test_minimal_conflicts_common(self):
309
base_text = ("a\n" * 20).splitlines(True)
310
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
311
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
312
m3 = merge3.Merge3(base_text, other_text, this_text)
313
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
314
merged_text = "".join(list(m_lines))
315
optimal_text = ("a\n" * 10 + "<<<<<<< OTHER\nc\n"
316
+ 8* "b\n" + "c\n=======\n"
317
+ 10*"b\n" + ">>>>>>> THIS\n")
318
self.assertEqualDiff(optimal_text, merged_text)
320
def test_minimal_conflicts_unique(self):
322
"""Add a newline to each entry in the string"""
323
return [(x+'\n') for x in s]
325
base_text = add_newline("abcdefghijklm")
326
this_text = add_newline("abcdefghijklmNOPQRSTUVWXYZ")
327
other_text = add_newline("abcdefghijklm1OPQRSTUVWXY2")
328
m3 = merge3.Merge3(base_text, other_text, this_text)
329
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
330
merged_text = "".join(list(m_lines))
331
optimal_text = ''.join(add_newline("abcdefghijklm")
332
+ ["<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
333
+ add_newline('OPQRSTUVWXY')
334
+ ["<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
336
self.assertEqualDiff(optimal_text, merged_text)
338
def test_minimal_conflicts_nonunique(self):
340
"""Add a newline to each entry in the string"""
341
return [(x+'\n') for x in s]
343
base_text = add_newline("abacddefgghij")
344
this_text = add_newline("abacddefgghijkalmontfprz")
345
other_text = add_newline("abacddefgghijknlmontfprd")
346
m3 = merge3.Merge3(base_text, other_text, this_text)
347
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
348
merged_text = "".join(list(m_lines))
349
optimal_text = ''.join(add_newline("abacddefgghijk")
350
+ ["<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
351
+ add_newline('lmontfpr')
352
+ ["<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
354
self.assertEqualDiff(optimal_text, merged_text)
356
def test_reprocess_and_base(self):
357
"""Reprocessing and showing base breaks correctly"""
358
base_text = ("a\n" * 20).splitlines(True)
359
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
360
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
361
m3 = merge3.Merge3(base_text, other_text, this_text)
362
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True,
363
base_marker='|||||||')
364
self.assertRaises(CantReprocessAndShowBase, list, m_lines)
366
def test_binary(self):
367
self.assertRaises(BinaryFile, merge3.Merge3, ['\x00'], ['a'], ['b'])
369
def test_dos_text(self):
373
m3 = merge3.Merge3(base_text.splitlines(True),
374
other_text.splitlines(True),
375
this_text.splitlines(True))
376
m_lines = m3.merge_lines('OTHER', 'THIS')
377
self.assertEqual('<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
378
'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
380
def test_mac_text(self):
384
m3 = merge3.Merge3(base_text.splitlines(True),
385
other_text.splitlines(True),
386
this_text.splitlines(True))
387
m_lines = m3.merge_lines('OTHER', 'THIS')
388
self.assertEqual('<<<<<<< OTHER\rc\r=======\rb\r'
389
'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
391
def test_merge3_cherrypick(self):
394
other_text = "a\nb\nc\n"
395
# When cherrypicking, lines in base are not part of the conflict
396
m3 = merge3.Merge3(base_text.splitlines(True),
397
this_text.splitlines(True),
398
other_text.splitlines(True), is_cherrypick=True)
399
m_lines = m3.merge_lines()
400
self.assertEqualDiff('a\n<<<<<<<\n=======\nc\n>>>>>>>\n',
403
# This is not symmetric
404
m3 = merge3.Merge3(base_text.splitlines(True),
405
other_text.splitlines(True),
406
this_text.splitlines(True), is_cherrypick=True)
407
m_lines = m3.merge_lines()
408
self.assertEqualDiff('a\n<<<<<<<\nb\nc\n=======\n>>>>>>>\n',
411
def test_merge3_cherrypick_w_mixed(self):
412
base_text = 'a\nb\nc\nd\ne\n'
413
this_text = 'a\nb\nq\n'
414
other_text = 'a\nb\nc\nd\nf\ne\ng\n'
415
# When cherrypicking, lines in base are not part of the conflict
416
m3 = merge3.Merge3(base_text.splitlines(True),
417
this_text.splitlines(True),
418
other_text.splitlines(True), is_cherrypick=True)
419
m_lines = m3.merge_lines()
420
self.assertEqualDiff('a\n'
433
def test_allow_objects(self):
434
"""Objects other than strs may be used with Merge3 when
437
merge_groups and merge_regions work with non-str input. Methods that
438
return lines like merge_lines fail.
440
base = [(x,x) for x in 'abcde']
441
a = [(x,x) for x in 'abcdef']
442
b = [(x,x) for x in 'Zabcde']
443
m3 = merge3.Merge3(base, a, b, allow_objects=True)
448
list(m3.merge_regions()))
450
[('b', [('Z', 'Z')]),
451
('unchanged', [(x,x) for x in 'abcde']),
452
('a', [('f', 'f')])],
453
list(m3.merge_groups()))
added
removed
bzrlib/tests/test_merge3.py
