← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge3.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
2
2
#
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
16
16
 
17
17
 
18
18
from bzrlib import (
19
 
    errors,
20
19
    merge3,
21
20
    tests,
22
21
    )
23
 
from bzrlib.merge3 import Merge3
24
22
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
25
23
 
26
24
def split_lines(t):
103
101
                           ['aaa', 'bbb'],
104
102
                           ['aaa', 'bbb'])
105
103
 
106
 
        self.assertEquals(m3.find_unconflicted(),
 
104
        self.assertEqual(m3.find_unconflicted(),
107
105
                          [(0, 2)])
108
106
 
109
 
        self.assertEquals(list(m3.find_sync_regions()),
 
107
        self.assertEqual(list(m3.find_sync_regions()),
110
108
                          [(0, 2,
111
109
                            0, 2,
112
110
                            0, 2),
113
111
                           (2,2, 2,2, 2,2)])
114
112
 
115
 
        self.assertEquals(list(m3.merge_regions()),
 
113
        self.assertEqual(list(m3.merge_regions()),
116
114
                          [('unchanged', 0, 2)])
117
115
 
118
 
        self.assertEquals(list(m3.merge_groups()),
 
116
        self.assertEqual(list(m3.merge_groups()),
119
117
                          [('unchanged', ['aaa', 'bbb'])])
120
118
 
121
119
    def test_front_insert(self):
125
123
 
126
124
        # todo: should use a sentinal at end as from get_matching_blocks
127
125
        # to match without zz
128
 
        self.assertEquals(list(m3.find_sync_regions()),
 
126
        self.assertEqual(list(m3.find_sync_regions()),
129
127
                          [(0,1, 2,3, 0,1),
130
128
                           (1,1, 3,3, 1,1),])
131
129
 
132
 
        self.assertEquals(list(m3.merge_regions()),
 
130
        self.assertEqual(list(m3.merge_regions()),
133
131
                          [('a', 0, 2),
134
132
                           ('unchanged', 0, 1)])
135
133
 
136
 
        self.assertEquals(list(m3.merge_groups()),
 
134
        self.assertEqual(list(m3.merge_groups()),
137
135
                          [('a', ['aaa', 'bbb']),
138
136
                           ('unchanged', ['zz'])])
139
137
 
143
141
                           [])
144
142
        # todo: should use a sentinal at end as from get_matching_blocks
145
143
        # to match without zz
146
 
        self.assertEquals(list(m3.find_sync_regions()),
 
144
        self.assertEqual(list(m3.find_sync_regions()),
147
145
                          [(0,0, 2,2, 0,0)])
148
146
 
149
 
        self.assertEquals(list(m3.merge_regions()),
 
147
        self.assertEqual(list(m3.merge_regions()),
150
148
                          [('a', 0, 2)])
151
149
 
152
 
        self.assertEquals(list(m3.merge_lines()),
 
150
        self.assertEqual(list(m3.merge_lines()),
153
151
                          ['aaa', 'bbb'])
154
152
 
155
153
    def test_no_conflicts(self):
158
156
                           ['aaa', '111', 'bbb'],
159
157
                           ['aaa', 'bbb'])
160
158
 
161
 
        self.assertEquals(m3.find_unconflicted(),
 
159
        self.assertEqual(m3.find_unconflicted(),
162
160
                          [(0, 1), (1, 2)])
163
161
 
164
 
        self.assertEquals(list(m3.find_sync_regions()),
 
162
        self.assertEqual(list(m3.find_sync_regions()),
165
163
                          [(0,1, 0,1, 0,1),
166
164
                           (1,2, 2,3, 1,2),
167
165
                           (2,2, 3,3, 2,2),])
168
166
 
169
 
        self.assertEquals(list(m3.merge_regions()),
 
167
        self.assertEqual(list(m3.merge_regions()),
170
168
                          [('unchanged', 0, 1),
171
169
                           ('a', 1, 2),
172
170
                           ('unchanged', 1, 2),])
176
174
                           ['aaa\n', 'bbb\n', '222\n'],
177
175
                           ['aaa\n', 'bbb\n'])
178
176
 
179
 
        self.assertEquals(''.join(m3.merge_lines()),
 
177
        self.assertEqual(''.join(m3.merge_lines()),
180
178
                          'aaa\nbbb\n222\n')
181
179
 
182
180
    def test_append_b(self):
184
182
                           ['aaa\n', 'bbb\n'],
185
183
                           ['aaa\n', 'bbb\n', '222\n'])
186
184
 
187
 
        self.assertEquals(''.join(m3.merge_lines()),
 
185
        self.assertEqual(''.join(m3.merge_lines()),
188
186
                          'aaa\nbbb\n222\n')
189
187
 
190
188
    def test_append_agreement(self):
192
190
                           ['aaa\n', 'bbb\n', '222\n'],
193
191
                           ['aaa\n', 'bbb\n', '222\n'])
194
192
 
195
 
        self.assertEquals(''.join(m3.merge_lines()),
 
193
        self.assertEqual(''.join(m3.merge_lines()),
196
194
                          'aaa\nbbb\n222\n')
197
195
 
198
196
    def test_append_clash(self):
205
203
                            start_marker='<<',
206
204
                            mid_marker='--',
207
205
                            end_marker='>>')
208
 
        self.assertEquals(''.join(ml),
 
206
        self.assertEqual(''.join(ml),
209
207
'''\
210
208
aaa
211
209
bbb
226
224
                            start_marker='<<',
227
225
                            mid_marker='--',
228
226
                            end_marker='>>')
229
 
        self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
 
227
        self.assertEqual(''.join(ml), 'aaa\n222\nbbb\n')
230
228
 
231
229
 
232
230
    def test_insert_clash(self):
235
233
                           ['aaa\n', '111\n', 'bbb\n'],
236
234
                           ['aaa\n', '222\n', 'bbb\n'])
237
235
 
238
 
        self.assertEquals(m3.find_unconflicted(),
 
236
        self.assertEqual(m3.find_unconflicted(),
239
237
                          [(0, 1), (1, 2)])
240
238
 
241
 
        self.assertEquals(list(m3.find_sync_regions()),
 
239
        self.assertEqual(list(m3.find_sync_regions()),
242
240
                          [(0,1, 0,1, 0,1),
243
241
                           (1,2, 2,3, 2,3),
244
242
                           (2,2, 3,3, 3,3),])
245
243
 
246
 
        self.assertEquals(list(m3.merge_regions()),
 
244
        self.assertEqual(list(m3.merge_regions()),
247
245
                          [('unchanged', 0,1),
248
246
                           ('conflict', 1,1, 1,2, 1,2),
249
247
                           ('unchanged', 1,2)])
250
248
 
251
 
        self.assertEquals(list(m3.merge_groups()),
 
249
        self.assertEqual(list(m3.merge_groups()),
252
250
                          [('unchanged', ['aaa\n']),
253
251
                           ('conflict', [], ['111\n'], ['222\n']),
254
252
                           ('unchanged', ['bbb\n']),
259
257
                            start_marker='<<',
260
258
                            mid_marker='--',
261
259
                            end_marker='>>')
262
 
        self.assertEquals(''.join(ml),
 
260
        self.assertEqual(''.join(ml),
263
261
'''aaa
264
262
<< a
265
263
111
275
273
                           ['aaa', '111', 'bbb'],
276
274
                           ['aaa', '222', 'bbb'])
277
275
 
278
 
        self.assertEquals(m3.find_unconflicted(),
 
276
        self.assertEqual(m3.find_unconflicted(),
279
277
                          [(0, 1), (2, 3)])
280
278
 
281
 
        self.assertEquals(list(m3.find_sync_regions()),
 
279
        self.assertEqual(list(m3.find_sync_regions()),
282
280
                          [(0,1, 0,1, 0,1),
283
281
                           (2,3, 2,3, 2,3),
284
282
                           (3,3, 3,3, 3,3),])
289
287
                           ['aaa', '111', '111', '111', 'bbb'],
290
288
                           ['aaa', '222', '222', '222', '222', 'bbb'])
291
289
 
292
 
        self.assertEquals(m3.find_unconflicted(),
 
290
        self.assertEqual(m3.find_unconflicted(),
293
291
                          [(0, 1), (3, 4)])
294
292
 
295
293
 
296
 
        self.assertEquals(list(m3.find_sync_regions()),
 
294
        self.assertEqual(list(m3.find_sync_regions()),
297
295
                          [(0,1, 0,1, 0,1),
298
296
                           (3,4, 4,5, 5,6),
299
297
                           (4,4, 5,5, 6,6),])
304
302
        ml = list(m3.merge_lines('LAO', 'TAO'))
305
303
        self.log('merge result:')
306
304
        self.log(''.join(ml))
307
 
        self.assertEquals(ml, MERGED_RESULT)
 
305
        self.assertEqual(ml, MERGED_RESULT)
308
306
 
309
307
    def test_minimal_conflicts_common(self):
310
308
        """Reprocessing"""