15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib.selftest import InTempDir, TestBase
18
from bzrlib.tests import TestCaseInTempDir, TestCase
19
19
from bzrlib.merge3 import Merge3
25
class NoChanges(TestBase):
26
"""No conflicts because nothing changed"""
20
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
23
from cStringIO import StringIO
24
return StringIO(t).readlines()
26
############################################################
27
# test case data from the gnu diffutils manual
29
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
30
The named is the mother of all things.
32
Therefore let there always be non-being,
33
so we may see their subtlety,
34
And let there always be being,
35
so we may see their outcome.
37
But after they are produced,
38
they have different names.
39
They both may be called deep and profound.
40
Deeper and more profound,
41
The door of all subtleties!
44
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
45
The name that can be named is not the eternal name.
46
The Nameless is the origin of Heaven and Earth;
47
The Named is the mother of all things.
48
Therefore let there always be non-being,
49
so we may see their subtlety,
50
And let there always be being,
51
so we may see their outcome.
53
But after they are produced,
54
they have different names.
58
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
59
The name that can be named is not the eternal name.
60
The Nameless is the origin of Heaven and Earth;
61
The named is the mother of all things.
63
Therefore let there always be non-being,
64
so we may see their subtlety,
65
And let there always be being,
66
so we may see their result.
68
But after they are produced,
69
they have different names.
71
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
75
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
76
The name that can be named is not the eternal name.
77
The Nameless is the origin of Heaven and Earth;
78
The Named is the mother of all things.
79
Therefore let there always be non-being,
80
so we may see their subtlety,
81
And let there always be being,
82
so we may see their result.
84
But after they are produced,
85
they have different names.
89
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
94
class TestMerge3(TestCase):
96
def test_no_changes(self):
97
"""No conflicts because nothing changed"""
28
98
m3 = Merge3(['aaa', 'bbb'],
252
295
(4,4, 5,5, 6,6),])
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"""
297
def test_merge_poem(self):
298
"""Test case from diff3 manual"""
340
299
m3 = Merge3(TZU, LAO, TAO)
341
300
ml = list(m3.merge_lines('LAO', 'TAO'))
342
301
self.log('merge result:')
343
302
self.log(''.join(ml))
344
303
self.assertEquals(ml, MERGED_RESULT)
305
def test_minimal_conflicts_common(self):
307
base_text = ("a\n" * 20).splitlines(True)
308
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
309
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
310
m3 = Merge3(base_text, other_text, this_text)
311
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
312
merged_text = "".join(list(m_lines))
313
optimal_text = ("a\n" * 10 + "<<<<<<< OTHER\nc\n"
314
+ 8* "b\n" + "c\n=======\n"
315
+ 10*"b\n" + ">>>>>>> THIS\n")
316
self.assertEqualDiff(optimal_text, merged_text)
318
def test_minimal_conflicts_unique(self):
320
"""Add a newline to each entry in the string"""
321
return [(x+'\n') for x in s]
323
base_text = add_newline("abcdefghijklm")
324
this_text = add_newline("abcdefghijklmNOPQRSTUVWXYZ")
325
other_text = add_newline("abcdefghijklm1OPQRSTUVWXY2")
326
m3 = Merge3(base_text, other_text, this_text)
327
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
328
merged_text = "".join(list(m_lines))
329
optimal_text = ''.join(add_newline("abcdefghijklm")
330
+ ["<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
331
+ add_newline('OPQRSTUVWXY')
332
+ ["<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
334
self.assertEqualDiff(optimal_text, merged_text)
336
def test_minimal_conflicts_nonunique(self):
338
"""Add a newline to each entry in the string"""
339
return [(x+'\n') for x in s]
341
base_text = add_newline("abacddefgghij")
342
this_text = add_newline("abacddefgghijkalmontfprz")
343
other_text = add_newline("abacddefgghijknlmontfprd")
344
m3 = Merge3(base_text, other_text, this_text)
345
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
346
merged_text = "".join(list(m_lines))
347
optimal_text = ''.join(add_newline("abacddefgghijk")
348
+ ["<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
349
+ add_newline('lmontfpr')
350
+ ["<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
352
self.assertEqualDiff(optimal_text, merged_text)
354
def test_reprocess_and_base(self):
355
"""Reprocessing and showing base breaks correctly"""
356
base_text = ("a\n" * 20).splitlines(True)
357
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
358
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
359
m3 = Merge3(base_text, other_text, this_text)
360
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True,
361
base_marker='|||||||')
362
self.assertRaises(CantReprocessAndShowBase, list, m_lines)
364
def test_binary(self):
365
self.assertRaises(BinaryFile, Merge3, ['\x00'], ['a'], ['b'])