1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
|
# Copyright (C) 2005-2011, 2016 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from bzrlib import (
merge3,
tests,
)
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
def split_lines(t):
from cStringIO import StringIO
return StringIO(t).readlines()
############################################################
# test case data from the gnu diffutils manual
# common base
TZU = split_lines(""" The Nameless is the origin of Heaven and Earth;
The named is the mother of all things.
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
so we may see their outcome.
The two are the same,
But after they are produced,
they have different names.
They both may be called deep and profound.
Deeper and more profound,
The door of all subtleties!
""")
LAO = split_lines(""" The Way that can be told of is not the eternal Way;
The name that can be named is not the eternal name.
The Nameless is the origin of Heaven and Earth;
The Named is the mother of all things.
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
so we may see their outcome.
The two are the same,
But after they are produced,
they have different names.
""")
TAO = split_lines(""" The Way that can be told of is not the eternal Way;
The name that can be named is not the eternal name.
The Nameless is the origin of Heaven and Earth;
The named is the mother of all things.
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
so we may see their result.
The two are the same,
But after they are produced,
they have different names.
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
""")
MERGED_RESULT = split_lines(""" The Way that can be told of is not the eternal Way;
The name that can be named is not the eternal name.
The Nameless is the origin of Heaven and Earth;
The Named is the mother of all things.
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
so we may see their result.
The two are the same,
But after they are produced,
they have different names.
<<<<<<< LAO
=======
-- The Way of Lao-Tzu, tr. Wing-tsit Chan
>>>>>>> TAO
""")
class TestMerge3(tests.TestCase):
def test_no_changes(self):
"""No conflicts because nothing changed"""
m3 = merge3.Merge3(['aaa', 'bbb'],
['aaa', 'bbb'],
['aaa', 'bbb'])
self.assertEqual(m3.find_unconflicted(),
[(0, 2)])
self.assertEqual(list(m3.find_sync_regions()),
[(0, 2,
0, 2,
0, 2),
(2,2, 2,2, 2,2)])
self.assertEqual(list(m3.merge_regions()),
[('unchanged', 0, 2)])
self.assertEqual(list(m3.merge_groups()),
[('unchanged', ['aaa', 'bbb'])])
def test_front_insert(self):
m3 = merge3.Merge3(['zz'],
['aaa', 'bbb', 'zz'],
['zz'])
# todo: should use a sentinal at end as from get_matching_blocks
# to match without zz
self.assertEqual(list(m3.find_sync_regions()),
[(0,1, 2,3, 0,1),
(1,1, 3,3, 1,1),])
self.assertEqual(list(m3.merge_regions()),
[('a', 0, 2),
('unchanged', 0, 1)])
self.assertEqual(list(m3.merge_groups()),
[('a', ['aaa', 'bbb']),
('unchanged', ['zz'])])
def test_null_insert(self):
m3 = merge3.Merge3([],
['aaa', 'bbb'],
[])
# todo: should use a sentinal at end as from get_matching_blocks
# to match without zz
self.assertEqual(list(m3.find_sync_regions()),
[(0,0, 2,2, 0,0)])
self.assertEqual(list(m3.merge_regions()),
[('a', 0, 2)])
self.assertEqual(list(m3.merge_lines()),
['aaa', 'bbb'])
def test_no_conflicts(self):
"""No conflicts because only one side changed"""
m3 = merge3.Merge3(['aaa', 'bbb'],
['aaa', '111', 'bbb'],
['aaa', 'bbb'])
self.assertEqual(m3.find_unconflicted(),
[(0, 1), (1, 2)])
self.assertEqual(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(1,2, 2,3, 1,2),
(2,2, 3,3, 2,2),])
self.assertEqual(list(m3.merge_regions()),
[('unchanged', 0, 1),
('a', 1, 2),
('unchanged', 1, 2),])
def test_append_a(self):
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'],
['aaa\n', 'bbb\n'])
self.assertEqual(''.join(m3.merge_lines()),
'aaa\nbbb\n222\n')
def test_append_b(self):
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'])
self.assertEqual(''.join(m3.merge_lines()),
'aaa\nbbb\n222\n')
def test_append_agreement(self):
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'],
['aaa\n', 'bbb\n', '222\n'])
self.assertEqual(''.join(m3.merge_lines()),
'aaa\nbbb\n222\n')
def test_append_clash(self):
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'],
['aaa\n', 'bbb\n', '333\n'])
ml = m3.merge_lines(name_a='a',
name_b='b',
start_marker='<<',
mid_marker='--',
end_marker='>>')
self.assertEqual(''.join(ml),
'''\
aaa
bbb
<< a
222
--
333
>> b
''')
def test_insert_agreement(self):
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', '222\n', 'bbb\n'],
['aaa\n', '222\n', 'bbb\n'])
ml = m3.merge_lines(name_a='a',
name_b='b',
start_marker='<<',
mid_marker='--',
end_marker='>>')
self.assertEqual(''.join(ml), 'aaa\n222\nbbb\n')
def test_insert_clash(self):
"""Both try to insert lines in the same place."""
m3 = merge3.Merge3(['aaa\n', 'bbb\n'],
['aaa\n', '111\n', 'bbb\n'],
['aaa\n', '222\n', 'bbb\n'])
self.assertEqual(m3.find_unconflicted(),
[(0, 1), (1, 2)])
self.assertEqual(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(1,2, 2,3, 2,3),
(2,2, 3,3, 3,3),])
self.assertEqual(list(m3.merge_regions()),
[('unchanged', 0,1),
('conflict', 1,1, 1,2, 1,2),
('unchanged', 1,2)])
self.assertEqual(list(m3.merge_groups()),
[('unchanged', ['aaa\n']),
('conflict', [], ['111\n'], ['222\n']),
('unchanged', ['bbb\n']),
])
ml = m3.merge_lines(name_a='a',
name_b='b',
start_marker='<<',
mid_marker='--',
end_marker='>>')
self.assertEqual(''.join(ml),
'''aaa
<< a
111
--
222
>> b
bbb
''')
def test_replace_clash(self):
"""Both try to insert lines in the same place."""
m3 = merge3.Merge3(['aaa', '000', 'bbb'],
['aaa', '111', 'bbb'],
['aaa', '222', 'bbb'])
self.assertEqual(m3.find_unconflicted(),
[(0, 1), (2, 3)])
self.assertEqual(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(2,3, 2,3, 2,3),
(3,3, 3,3, 3,3),])
def test_replace_multi(self):
"""Replacement with regions of different size."""
m3 = merge3.Merge3(['aaa', '000', '000', 'bbb'],
['aaa', '111', '111', '111', 'bbb'],
['aaa', '222', '222', '222', '222', 'bbb'])
self.assertEqual(m3.find_unconflicted(),
[(0, 1), (3, 4)])
self.assertEqual(list(m3.find_sync_regions()),
[(0,1, 0,1, 0,1),
(3,4, 4,5, 5,6),
(4,4, 5,5, 6,6),])
def test_merge_poem(self):
"""Test case from diff3 manual"""
m3 = merge3.Merge3(TZU, LAO, TAO)
ml = list(m3.merge_lines('LAO', 'TAO'))
self.log('merge result:')
self.log(''.join(ml))
self.assertEqual(ml, MERGED_RESULT)
def test_minimal_conflicts_common(self):
"""Reprocessing"""
base_text = ("a\n" * 20).splitlines(True)
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
m3 = merge3.Merge3(base_text, other_text, this_text)
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
merged_text = "".join(list(m_lines))
optimal_text = ("a\n" * 10 + "<<<<<<< OTHER\nc\n"
+ 8* "b\n" + "c\n=======\n"
+ 10*"b\n" + ">>>>>>> THIS\n")
self.assertEqualDiff(optimal_text, merged_text)
def test_minimal_conflicts_unique(self):
def add_newline(s):
"""Add a newline to each entry in the string"""
return [(x+'\n') for x in s]
base_text = add_newline("abcdefghijklm")
this_text = add_newline("abcdefghijklmNOPQRSTUVWXYZ")
other_text = add_newline("abcdefghijklm1OPQRSTUVWXY2")
m3 = merge3.Merge3(base_text, other_text, this_text)
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
merged_text = "".join(list(m_lines))
optimal_text = ''.join(add_newline("abcdefghijklm")
+ ["<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
+ add_newline('OPQRSTUVWXY')
+ ["<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
)
self.assertEqualDiff(optimal_text, merged_text)
def test_minimal_conflicts_nonunique(self):
def add_newline(s):
"""Add a newline to each entry in the string"""
return [(x+'\n') for x in s]
base_text = add_newline("abacddefgghij")
this_text = add_newline("abacddefgghijkalmontfprz")
other_text = add_newline("abacddefgghijknlmontfprd")
m3 = merge3.Merge3(base_text, other_text, this_text)
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True)
merged_text = "".join(list(m_lines))
optimal_text = ''.join(add_newline("abacddefgghijk")
+ ["<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
+ add_newline('lmontfpr')
+ ["<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
)
self.assertEqualDiff(optimal_text, merged_text)
def test_reprocess_and_base(self):
"""Reprocessing and showing base breaks correctly"""
base_text = ("a\n" * 20).splitlines(True)
this_text = ("a\n"*10+"b\n" * 10).splitlines(True)
other_text = ("a\n"*10+"c\n"+"b\n" * 8 + "c\n").splitlines(True)
m3 = merge3.Merge3(base_text, other_text, this_text)
m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True,
base_marker='|||||||')
self.assertRaises(CantReprocessAndShowBase, list, m_lines)
def test_binary(self):
self.assertRaises(BinaryFile, merge3.Merge3, ['\x00'], ['a'], ['b'])
def test_dos_text(self):
base_text = 'a\r\n'
this_text = 'b\r\n'
other_text = 'c\r\n'
m3 = merge3.Merge3(base_text.splitlines(True),
other_text.splitlines(True),
this_text.splitlines(True))
m_lines = m3.merge_lines('OTHER', 'THIS')
self.assertEqual('<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
'>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
def test_mac_text(self):
base_text = 'a\r'
this_text = 'b\r'
other_text = 'c\r'
m3 = merge3.Merge3(base_text.splitlines(True),
other_text.splitlines(True),
this_text.splitlines(True))
m_lines = m3.merge_lines('OTHER', 'THIS')
self.assertEqual('<<<<<<< OTHER\rc\r=======\rb\r'
'>>>>>>> THIS\r'.splitlines(True), list(m_lines))
def test_merge3_cherrypick(self):
base_text = "a\nb\n"
this_text = "a\n"
other_text = "a\nb\nc\n"
# When cherrypicking, lines in base are not part of the conflict
m3 = merge3.Merge3(base_text.splitlines(True),
this_text.splitlines(True),
other_text.splitlines(True), is_cherrypick=True)
m_lines = m3.merge_lines()
self.assertEqualDiff('a\n<<<<<<<\n=======\nc\n>>>>>>>\n',
''.join(m_lines))
# This is not symmetric
m3 = merge3.Merge3(base_text.splitlines(True),
other_text.splitlines(True),
this_text.splitlines(True), is_cherrypick=True)
m_lines = m3.merge_lines()
self.assertEqualDiff('a\n<<<<<<<\nb\nc\n=======\n>>>>>>>\n',
''.join(m_lines))
def test_merge3_cherrypick_w_mixed(self):
base_text = 'a\nb\nc\nd\ne\n'
this_text = 'a\nb\nq\n'
other_text = 'a\nb\nc\nd\nf\ne\ng\n'
# When cherrypicking, lines in base are not part of the conflict
m3 = merge3.Merge3(base_text.splitlines(True),
this_text.splitlines(True),
other_text.splitlines(True), is_cherrypick=True)
m_lines = m3.merge_lines()
self.assertEqualDiff('a\n'
'b\n'
'<<<<<<<\n'
'q\n'
'=======\n'
'f\n'
'>>>>>>>\n'
'<<<<<<<\n'
'=======\n'
'g\n'
'>>>>>>>\n',
''.join(m_lines))
def test_allow_objects(self):
"""Objects other than strs may be used with Merge3 when
allow_objects=True.
merge_groups and merge_regions work with non-str input. Methods that
return lines like merge_lines fail.
"""
base = [(x,x) for x in 'abcde']
a = [(x,x) for x in 'abcdef']
b = [(x,x) for x in 'Zabcde']
m3 = merge3.Merge3(base, a, b, allow_objects=True)
self.assertEqual(
[('b', 0, 1),
('unchanged', 0, 5),
('a', 5, 6)],
list(m3.merge_regions()))
self.assertEqual(
[('b', [('Z', 'Z')]),
('unchanged', [(x,x) for x in 'abcde']),
('a', [('f', 'f')])],
list(m3.merge_groups()))
|