1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005 by Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.selftest import InTempDir, TestBase
23
19
from bzrlib.merge3 import Merge3
24
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
27
from cStringIO import StringIO
28
return StringIO(t).readlines()
30
############################################################
31
# test case data from the gnu diffutils manual
33
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
34
The named is the mother of all things.
36
Therefore let there always be non-being,
37
so we may see their subtlety,
38
And let there always be being,
39
so we may see their outcome.
41
But after they are produced,
42
they have different names.
43
They both may be called deep and profound.
44
Deeper and more profound,
45
The door of all subtleties!
48
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
49
The name that can be named is not the eternal name.
50
The Nameless is the origin of Heaven and Earth;
51
The Named is the mother of all things.
52
Therefore let there always be non-being,
53
so we may see their subtlety,
54
And let there always be being,
55
so we may see their outcome.
57
But after they are produced,
58
they have different names.
62
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
63
The name that can be named is not the eternal name.
64
The Nameless is the origin of Heaven and Earth;
65
The named is the mother of all things.
67
Therefore let there always be non-being,
68
so we may see their subtlety,
69
And let there always be being,
70
so we may see their result.
72
But after they are produced,
73
they have different names.
75
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
79
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
80
The name that can be named is not the eternal name.
81
The Nameless is the origin of Heaven and Earth;
82
The Named is the mother of all things.
83
Therefore let there always be non-being,
84
so we may see their subtlety,
85
And let there always be being,
86
so we may see their result.
88
But after they are produced,
89
they have different names.
93
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
98
class TestMerge3(tests.TestCase):
100
def test_no_changes(self):
101
"""No conflicts because nothing changed"""
102
m3 = merge3.Merge3(['aaa', 'bbb'],
25
class NoChanges(TestBase):
26
"""No conflicts because nothing changed"""
28
m3 = Merge3(['aaa', 'bbb'],
106
32
self.assertEquals(m3.find_unconflicted(),
172
107
('unchanged', 1, 2),])
174
def test_append_a(self):
175
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
176
['aaa\n', 'bbb\n', '222\n'],
179
self.assertEquals(''.join(m3.merge_lines()),
182
def test_append_b(self):
183
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
185
['aaa\n', 'bbb\n', '222\n'])
187
self.assertEquals(''.join(m3.merge_lines()),
190
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
self.assertEquals(''.join(m3.merge_lines()),
198
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'])
111
class AppendA(TestBase):
113
m3 = Merge3(['aaa\n', 'bbb\n'],
114
['aaa\n', 'bbb\n', '222\n'],
117
self.assertEquals(''.join(m3.merge_lines()),
120
class AppendB(TestBase):
122
m3 = Merge3(['aaa\n', 'bbb\n'],
124
['aaa\n', 'bbb\n', '222\n'])
126
self.assertEquals(''.join(m3.merge_lines()),
129
class AppendAgreement(TestBase):
131
m3 = Merge3(['aaa\n', 'bbb\n'],
132
['aaa\n', 'bbb\n', '222\n'],
133
['aaa\n', 'bbb\n', '222\n'])
135
self.assertEquals(''.join(m3.merge_lines()),
138
class AppendClash(TestBase):
140
m3 = Merge3(['aaa\n', 'bbb\n'],
141
['aaa\n', 'bbb\n', '222\n'],
142
['aaa\n', 'bbb\n', '333\n'])
203
144
ml = m3.merge_lines(name_a='a',
219
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'])
161
class InsertAgreement(TestBase):
163
m3 = Merge3(['aaa\n', 'bbb\n'],
164
['aaa\n', '222\n', 'bbb\n'],
165
['aaa\n', '222\n', 'bbb\n'])
224
167
ml = m3.merge_lines(name_a='a',
226
169
start_marker='<<',
229
self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
232
def test_insert_clash(self):
233
"""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'])
172
self.assertEquals(''.join(m3.merge_lines()),
178
class InsertClash(TestBase):
179
"""Both try to insert lines in the same place."""
181
m3 = Merge3(['aaa\n', 'bbb\n'],
182
['aaa\n', '111\n', 'bbb\n'],
183
['aaa\n', '222\n', 'bbb\n'])
238
185
self.assertEquals(m3.find_unconflicted(),
239
186
[(0, 1), (1, 2)])
299
252
(4,4, 5,5, 6,6),])
301
def test_merge_poem(self):
302
"""Test case from diff3 manual"""
303
m3 = merge3.Merge3(TZU, LAO, TAO)
261
from cStringIO import StringIO
262
return StringIO(t).readlines()
266
############################################################
267
# test case from the gnu diffutils manual
270
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
271
The named is the mother of all things.
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!
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.
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.
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.
312
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
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.
330
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
337
class MergePoem(TestBase):
338
"""Test case from diff3 manual"""
340
m3 = Merge3(TZU, LAO, TAO)
304
341
ml = list(m3.merge_lines('LAO', 'TAO'))
305
342
self.log('merge result:')
306
343
self.log(''.join(ml))
307
344
self.assertEquals(ml, MERGED_RESULT)
309
def test_minimal_conflicts_common(self):
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)
314
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")
320
self.assertEqualDiff(optimal_text, merged_text)
322
def test_minimal_conflicts_unique(self):
324
"""Add a newline to each entry in the string"""
325
return [(x+'\n') for x in s]
327
base_text = add_newline("abcdefghijklm")
328
this_text = add_newline("abcdefghijklmNOPQRSTUVWXYZ")
329
other_text = add_newline("abcdefghijklm1OPQRSTUVWXY2")
330
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"]
338
self.assertEqualDiff(optimal_text, merged_text)
340
def test_minimal_conflicts_nonunique(self):
342
"""Add a newline to each entry in the string"""
343
return [(x+'\n') for x in s]
345
base_text = add_newline("abacddefgghij")
346
this_text = add_newline("abacddefgghijkalmontfprz")
347
other_text = add_newline("abacddefgghijknlmontfprd")
348
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"]
356
self.assertEqualDiff(optimal_text, merged_text)
358
def test_reprocess_and_base(self):
359
"""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
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
def test_binary(self):
369
self.assertRaises(BinaryFile, merge3.Merge3, ['\x00'], ['a'], ['b'])
371
def test_dos_text(self):
375
m3 = merge3.Merge3(base_text.splitlines(True),
376
other_text.splitlines(True),
377
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
def test_mac_text(self):
386
m3 = merge3.Merge3(base_text.splitlines(True),
387
other_text.splitlines(True),
388
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
def test_merge3_cherrypick(self):
396
other_text = "a\nb\nc\n"
397
# When cherrypicking, lines in base are not part of the conflict
398
m3 = merge3.Merge3(base_text.splitlines(True),
399
this_text.splitlines(True),
400
other_text.splitlines(True), is_cherrypick=True)
401
m_lines = m3.merge_lines()
402
self.assertEqualDiff('a\n<<<<<<<\n=======\nc\n>>>>>>>\n',
405
# This is not symmetric
406
m3 = merge3.Merge3(base_text.splitlines(True),
407
other_text.splitlines(True),
408
this_text.splitlines(True), is_cherrypick=True)
409
m_lines = m3.merge_lines()
410
self.assertEqualDiff('a\n<<<<<<<\nb\nc\n=======\n>>>>>>>\n',
413
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'
417
# When cherrypicking, lines in base are not part of the conflict
418
m3 = merge3.Merge3(base_text.splitlines(True),
419
this_text.splitlines(True),
420
other_text.splitlines(True), is_cherrypick=True)
421
m_lines = m3.merge_lines()
422
self.assertEqualDiff('a\n'
435
def test_allow_objects(self):
436
"""Objects other than strs may be used with Merge3 when
439
merge_groups and merge_regions work with non-str input. Methods that
440
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']
445
m3 = merge3.Merge3(base, a, b, allow_objects=True)
450
list(m3.merge_regions()))
452
[('b', [('Z', 'Z')]),
453
('unchanged', [(x,x) for x in 'abcde']),
454
('a', [('f', 'f')])],
455
list(m3.merge_groups()))
added
removed
bzrlib/selftest/testmerge3.py
