/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_merger.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009, 2010, 2011 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Implementation tests for bzrlib.merge.Merger."""
 
17
"""Implementation tests for breezy.merge.Merger."""
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib.conflicts import TextConflict
22
 
from bzrlib import (
 
21
from ..conflicts import TextConflict
 
22
from .. import (
23
23
    errors,
24
24
    merge as _mod_merge,
25
 
    option,
26
 
    progress,
27
25
    )
28
 
from bzrlib.tests import (
 
26
from . import (
29
27
    multiply_tests,
30
28
    TestCaseWithTransport,
31
29
    )
32
 
from bzrlib.tests.test_merge_core import MergeBuilder
33
 
from bzrlib.transform import TreeTransform
34
 
 
35
 
 
36
 
 
37
 
def load_tests(standard_tests, module, loader):
 
30
from .test_merge_core import MergeBuilder
 
31
from ..transform import TreeTransform
 
32
 
 
33
 
 
34
def load_tests(loader, standard_tests, pattern):
38
35
    """Multiply tests for tranport implementations."""
39
36
    result = loader.suiteClass()
40
37
    scenarios = [
41
38
        (name, {'merge_type': merger})
42
 
        for name, merger in option._merge_type_registry.items()]
 
39
        for name, merger in _mod_merge.merge_type_registry.items()]
43
40
    return multiply_tests(standard_tests, scenarios, result)
44
41
 
45
42
 
46
43
class TestMergeImplementation(TestCaseWithTransport):
47
44
 
48
45
    def do_merge(self, target_tree, source_tree, **kwargs):
49
 
        merger = _mod_merge.Merger.from_revision_ids(None,
 
46
        merger = _mod_merge.Merger.from_revision_ids(
50
47
            target_tree, source_tree.last_revision(),
51
48
            other_branch=source_tree.branch)
52
 
        merger.merge_type=self.merge_type
 
49
        merger.merge_type = self.merge_type
53
50
        for name, value in kwargs.items():
54
51
            setattr(merger, name, value)
55
52
        merger.do_merge()
59
56
        this_tree.lock_write()
60
57
        self.addCleanup(this_tree.unlock)
61
58
        self.build_tree_contents([
62
 
            ('this/file1', 'a\nb\n'),
63
 
            ('this/file2', 'a\nb\n')
 
59
            ('this/file1', b'a\nb\n'),
 
60
            ('this/file2', b'a\nb\n')
64
61
        ])
65
62
        this_tree.add(['file1', 'file2'])
66
63
        this_tree.commit('Added files')
67
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
64
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
68
65
        self.build_tree_contents([
69
 
            ('other/file1', 'a\nb\nc\n'),
70
 
            ('other/file2', 'a\nb\nc\n')
 
66
            ('other/file1', b'a\nb\nc\n'),
 
67
            ('other/file2', b'a\nb\nc\n')
71
68
        ])
72
69
        other_tree.commit('modified both')
73
70
        self.build_tree_contents([
74
 
            ('this/file1', 'd\na\nb\n'),
75
 
            ('this/file2', 'd\na\nb\n')
 
71
            ('this/file1', b'd\na\nb\n'),
 
72
            ('this/file2', b'd\na\nb\n')
76
73
        ])
77
74
        this_tree.commit('modified both')
78
75
        self.do_merge(this_tree, other_tree, interesting_files=['file1'])
79
 
        self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
80
 
        self.assertFileEqual('d\na\nb\n', 'this/file2')
 
76
        self.assertFileEqual(b'd\na\nb\nc\n', 'this/file1')
 
77
        self.assertFileEqual(b'd\na\nb\n', 'this/file2')
81
78
 
82
79
    def test_merge_move_and_change(self):
83
80
        this_tree = self.make_branch_and_tree('this')
84
81
        this_tree.lock_write()
85
82
        self.addCleanup(this_tree.unlock)
86
83
        self.build_tree_contents([
87
 
            ('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
 
84
            ('this/file1', b'line 1\nline 2\nline 3\nline 4\n'),
88
85
        ])
89
86
        this_tree.add('file1',)
90
87
        this_tree.commit('Added file')
91
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
88
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
92
89
        self.build_tree_contents([
93
 
            ('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
 
90
            ('other/file1', b'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
94
91
        ])
95
92
        other_tree.commit('Changed 2 to 2.1')
96
93
        self.build_tree_contents([
97
 
            ('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
 
94
            ('this/file1', b'line 1\nline 3\nline 2\nline 4\n'),
98
95
        ])
99
96
        this_tree.commit('Swapped 2 & 3')
100
97
        self.do_merge(this_tree, other_tree)
112
109
                '>>>>>>> MERGE-SOURCE\n'
113
110
                'line 4\n', 'this/file1')
114
111
        else:
115
 
            self.assertFileEqual('line 1\n'
 
112
            self.assertFileEqual(
 
113
                'line 1\n'
116
114
                '<<<<<<< TREE\n'
117
115
                'line 3\n'
118
116
                'line 2\n'
127
125
        # the modification should be considered a conflict
128
126
        builder = self.make_branch_builder('test')
129
127
        builder.start_series()
130
 
        builder.build_snapshot('BASE-id', None,
131
 
            [('add', ('', None, 'directory', None)),
132
 
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
133
 
            ])
 
128
        builder.build_snapshot(None,
 
129
                               [('add', ('', None, 'directory', None)),
 
130
                                ('add', ('foo', b'foo-id', 'file', b'a\nb\nc\nd\ne\n')),
 
131
                                ], revision_id=b'BASE-id')
134
132
        # Delete 'b\n'
135
 
        builder.build_snapshot('OTHER-id', ['BASE-id'],
136
 
            [('modify', ('foo-id', 'a\nc\nd\ne\n'))])
 
133
        builder.build_snapshot([b'BASE-id'],
 
134
                               [('modify', ('foo', b'a\nc\nd\ne\n'))],
 
135
                               revision_id=b'OTHER-id')
137
136
        # Modify 'b\n', add 'X\n'
138
 
        builder.build_snapshot('THIS-id', ['BASE-id'],
139
 
            [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
 
137
        builder.build_snapshot([b'BASE-id'],
 
138
                               [('modify', ('foo', b'a\nb2\nc\nd\nX\ne\n'))],
 
139
                               revision_id=b'THIS-id')
140
140
        builder.finish_series()
141
141
        branch = builder.get_branch()
142
 
        this_tree = branch.bzrdir.create_workingtree()
 
142
        this_tree = branch.controldir.create_workingtree()
143
143
        this_tree.lock_write()
144
144
        self.addCleanup(this_tree.unlock)
145
 
        other_tree = this_tree.bzrdir.sprout('other',
146
 
                                             'OTHER-id').open_workingtree()
 
145
        other_tree = this_tree.controldir.sprout(
 
146
            'other', b'OTHER-id').open_workingtree()
147
147
        self.do_merge(this_tree, other_tree)
148
148
        if self.merge_type is _mod_merge.LCAMerger:
149
149
            self.expectFailure("lca merge doesn't track deleted lines",
150
 
                self.assertFileEqual,
151
 
                    'a\n'
152
 
                    '<<<<<<< TREE\n'
153
 
                    'b2\n'
154
 
                    '=======\n'
155
 
                    '>>>>>>> MERGE-SOURCE\n'
156
 
                    'c\n'
157
 
                    'd\n'
158
 
                    'X\n'
159
 
                    'e\n', 'test/foo')
 
150
                               self.assertFileEqual,
 
151
                               'a\n'
 
152
                               '<<<<<<< TREE\n'
 
153
                               'b2\n'
 
154
                               '=======\n'
 
155
                               '>>>>>>> MERGE-SOURCE\n'
 
156
                               'c\n'
 
157
                               'd\n'
 
158
                               'X\n'
 
159
                               'e\n', 'test/foo')
160
160
        else:
161
161
            self.assertFileEqual(
162
 
                'a\n'
163
 
                '<<<<<<< TREE\n'
164
 
                'b2\n'
165
 
                '=======\n'
166
 
                '>>>>>>> MERGE-SOURCE\n'
167
 
                'c\n'
168
 
                'd\n'
169
 
                'X\n'
170
 
                'e\n', 'test/foo')
 
162
                b'a\n'
 
163
                b'<<<<<<< TREE\n'
 
164
                b'b2\n'
 
165
                b'=======\n'
 
166
                b'>>>>>>> MERGE-SOURCE\n'
 
167
                b'c\n'
 
168
                b'd\n'
 
169
                b'X\n'
 
170
                b'e\n', 'test/foo')
171
171
 
172
172
    def get_limbodir_deletiondir(self, wt):
173
173
        transform = TreeTransform(wt)
176
176
        transform.finalize()
177
177
        return (limbodir, deletiondir)
178
178
 
179
 
    def test_merge_with_existing_limbo(self):
180
 
        wt = self.make_branch_and_tree('this')
181
 
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
182
 
        os.mkdir(limbodir)
 
179
    def test_merge_with_existing_limbo_empty(self):
 
180
        """Empty limbo dir is just cleaned up - see bug 427773"""
 
181
        wt = self.make_branch_and_tree('this')
 
182
        (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
 
183
        os.mkdir(limbodir)
 
184
        self.do_merge(wt, wt)
 
185
 
 
186
    def test_merge_with_existing_limbo_non_empty(self):
 
187
        wt = self.make_branch_and_tree('this')
 
188
        (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
 
189
        os.mkdir(limbodir)
 
190
        os.mkdir(os.path.join(limbodir, 'something'))
183
191
        self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
184
192
        self.assertRaises(errors.LockError, wt.unlock)
185
193
 
186
 
    def test_merge_with_pending_deletion(self):
187
 
        wt = self.make_branch_and_tree('this')
188
 
        (limbodir, deletiondir) =  self.get_limbodir_deletiondir(wt)
189
 
        os.mkdir(deletiondir)
190
 
        self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
 
194
    def test_merge_with_pending_deletion_empty(self):
 
195
        wt = self.make_branch_and_tree('this')
 
196
        (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
 
197
        os.mkdir(deletiondir)
 
198
        self.do_merge(wt, wt)
 
199
 
 
200
    def test_merge_with_pending_deletion_non_empty(self):
 
201
        """Also see bug 427773"""
 
202
        wt = self.make_branch_and_tree('this')
 
203
        (limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
 
204
        os.mkdir(deletiondir)
 
205
        os.mkdir(os.path.join(deletiondir, 'something'))
 
206
        self.assertRaises(errors.ExistingPendingDeletion,
 
207
                          self.do_merge, wt, wt)
191
208
        self.assertRaises(errors.LockError, wt.unlock)
192
209
 
193
210
 
195
212
    """Tests that the 'merge_file_content' hook is invoked."""
196
213
 
197
214
    def setUp(self):
198
 
        TestCaseWithTransport.setUp(self)
 
215
        super(TestHookMergeFileContent, self).setUp()
199
216
        self.hook_log = []
200
217
 
201
218
    def install_hook_inactive(self):
208
225
 
209
226
    def install_hook_noop(self):
210
227
        test = self
 
228
 
211
229
        class HookNA(_mod_merge.AbstractPerFileMerger):
212
230
            def merge_contents(self, merge_params):
213
231
                # This hook unconditionally does nothing.
214
232
                test.hook_log.append(('no-op',))
215
233
                return 'not_applicable', None
 
234
 
216
235
        def hook_na_factory(merger):
217
236
            return HookNA(merger)
218
237
        _mod_merge.Merger.hooks.install_named_hook(
220
239
 
221
240
    def install_hook_success(self):
222
241
        test = self
 
242
 
223
243
        class HookSuccess(_mod_merge.AbstractPerFileMerger):
224
244
            def merge_contents(self, merge_params):
225
245
                test.hook_log.append(('success',))
226
 
                if merge_params.file_id == '1':
227
 
                    return 'success', ['text-merged-by-hook']
 
246
                if merge_params.file_id == b'1':
 
247
                    return 'success', [b'text-merged-by-hook']
228
248
                return 'not_applicable', None
 
249
 
229
250
        def hook_success_factory(merger):
230
251
            return HookSuccess(merger)
231
252
        _mod_merge.Merger.hooks.install_named_hook(
233
254
 
234
255
    def install_hook_conflict(self):
235
256
        test = self
 
257
 
236
258
        class HookConflict(_mod_merge.AbstractPerFileMerger):
237
259
            def merge_contents(self, merge_params):
238
260
                test.hook_log.append(('conflict',))
239
 
                if merge_params.file_id == '1':
 
261
                if merge_params.file_id == b'1':
240
262
                    return ('conflicted',
241
 
                        ['text-with-conflict-markers-from-hook'])
 
263
                            [b'text-with-conflict-markers-from-hook'])
242
264
                return 'not_applicable', None
 
265
 
243
266
        def hook_conflict_factory(merger):
244
267
            return HookConflict(merger)
245
268
        _mod_merge.Merger.hooks.install_named_hook(
247
270
 
248
271
    def install_hook_delete(self):
249
272
        test = self
 
273
 
250
274
        class HookDelete(_mod_merge.AbstractPerFileMerger):
251
275
            def merge_contents(self, merge_params):
252
276
                test.hook_log.append(('delete',))
253
 
                if merge_params.file_id == '1':
 
277
                if merge_params.file_id == b'1':
254
278
                    return 'delete', None
255
279
                return 'not_applicable', None
 
280
 
256
281
        def hook_delete_factory(merger):
257
282
            return HookDelete(merger)
258
283
        _mod_merge.Merger.hooks.install_named_hook(
263
288
        versions of the file.
264
289
        """
265
290
        test = self
 
291
 
266
292
        class HookLogLines(_mod_merge.AbstractPerFileMerger):
267
293
            def merge_contents(self, merge_params):
268
294
                test.hook_log.append((
272
298
                    merge_params.base_lines,
273
299
                    ))
274
300
                return 'not_applicable', None
 
301
 
275
302
        def hook_log_lines_factory(merger):
276
303
            return HookLogLines(merger)
277
304
        _mod_merge.Merger.hooks.install_named_hook(
284
311
        return builder
285
312
 
286
313
    def create_file_needing_contents_merge(self, builder, file_id):
287
 
        builder.add_file(file_id, builder.tree_root, "name1", "text1", True)
288
 
        builder.change_contents(file_id, other="text4", this="text3")
 
314
        builder.add_file(file_id, builder.tree_root, "name1", b"text1", True)
 
315
        builder.change_contents(file_id, other=b"text4", this=b"text3")
289
316
 
290
317
    def test_change_vs_change(self):
291
318
        """Hook is used for (changed, changed)"""
292
319
        self.install_hook_success()
293
320
        builder = self.make_merge_builder()
294
 
        builder.add_file("1", builder.tree_root, "name1", "text1", True)
295
 
        builder.change_contents("1", other="text4", this="text3")
 
321
        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
 
322
        builder.change_contents(b"1", other=b"text4", this=b"text3")
296
323
        conflicts = builder.merge(self.merge_type)
297
324
        self.assertEqual(conflicts, [])
298
 
        self.assertEqual(
299
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
325
        with builder.this.get_file('name1') as f:
 
326
            self.assertEqual(f.read(), b'text-merged-by-hook')
300
327
 
301
328
    def test_change_vs_deleted(self):
302
329
        """Hook is used for (changed, deleted)"""
303
330
        self.install_hook_success()
304
331
        builder = self.make_merge_builder()
305
 
        builder.add_file("1", builder.tree_root, "name1", "text1", True)
306
 
        builder.change_contents("1", this="text2")
307
 
        builder.remove_file("1", other=True)
 
332
        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
 
333
        builder.change_contents(b"1", this=b"text2")
 
334
        builder.remove_file(b"1", other=True)
308
335
        conflicts = builder.merge(self.merge_type)
309
336
        self.assertEqual(conflicts, [])
310
 
        self.assertEqual(
311
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
337
        with builder.this.get_file('name1') as f:
 
338
            self.assertEqual(f.read(), b'text-merged-by-hook')
312
339
 
313
340
    def test_result_can_be_delete(self):
314
341
        """A hook's result can be the deletion of a file."""
315
342
        self.install_hook_delete()
316
343
        builder = self.make_merge_builder()
317
 
        self.create_file_needing_contents_merge(builder, "1")
 
344
        self.create_file_needing_contents_merge(builder, b"1")
318
345
        conflicts = builder.merge(self.merge_type)
319
346
        self.assertEqual(conflicts, [])
320
 
        self.assertRaises(errors.NoSuchId, builder.this.id2path, '1')
 
347
        self.assertRaises(errors.NoSuchId, builder.this.id2path, b'1')
321
348
        self.assertEqual([], list(builder.this.list_files()))
322
349
 
323
350
    def test_result_can_be_conflict(self):
324
351
        """A hook's result can be a conflict."""
325
352
        self.install_hook_conflict()
326
353
        builder = self.make_merge_builder()
327
 
        self.create_file_needing_contents_merge(builder, "1")
 
354
        self.create_file_needing_contents_merge(builder, b"1")
328
355
        conflicts = builder.merge(self.merge_type)
329
 
        self.assertEqual(conflicts, [TextConflict('name1', file_id='1')])
 
356
        self.assertEqual(conflicts, [TextConflict('name1', file_id=b'1')])
330
357
        # The hook still gets to set the file contents in this case, so that it
331
358
        # can insert custom conflict markers.
332
 
        self.assertEqual(
333
 
            builder.this.get_file('1').read(),
334
 
            'text-with-conflict-markers-from-hook')
 
359
        with builder.this.get_file('name1') as f:
 
360
            self.assertEqual(f.read(), b'text-with-conflict-markers-from-hook')
335
361
 
336
362
    def test_can_access_this_other_and_base_versions(self):
337
363
        """The hook function can call params.merger.get_lines to access the
339
365
        """
340
366
        self.install_hook_log_lines()
341
367
        builder = self.make_merge_builder()
342
 
        builder.add_file("1", builder.tree_root, "name1", "text1", True)
343
 
        builder.change_contents("1", this="text2", other="text3")
 
368
        builder.add_file(b"1", builder.tree_root, "name1", b"text1", True)
 
369
        builder.change_contents(b"1", this=b"text2", other=b"text3")
344
370
        conflicts = builder.merge(self.merge_type)
345
371
        self.assertEqual(
346
 
            [('log_lines', ['text2'], ['text3'], ['text1'])], self.hook_log)
 
372
            [('log_lines', [b'text2'], [b'text3'], [b'text1'])], self.hook_log)
347
373
 
348
374
    def test_chain_when_not_active(self):
349
375
        """When a hook function returns None, merging still works."""
350
376
        self.install_hook_inactive()
351
377
        self.install_hook_success()
352
378
        builder = self.make_merge_builder()
353
 
        self.create_file_needing_contents_merge(builder, "1")
 
379
        self.create_file_needing_contents_merge(builder, b"1")
354
380
        conflicts = builder.merge(self.merge_type)
355
381
        self.assertEqual(conflicts, [])
356
 
        self.assertEqual(
357
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
382
        with builder.this.get_file('name1') as f:
 
383
            self.assertEqual(f.read(), b'text-merged-by-hook')
358
384
        self.assertEqual([('inactive',), ('success',)], self.hook_log)
359
385
 
360
386
    def test_chain_when_not_applicable(self):
364
390
        self.install_hook_noop()
365
391
        self.install_hook_success()
366
392
        builder = self.make_merge_builder()
367
 
        self.create_file_needing_contents_merge(builder, "1")
 
393
        self.create_file_needing_contents_merge(builder, b"1")
368
394
        conflicts = builder.merge(self.merge_type)
369
395
        self.assertEqual(conflicts, [])
370
 
        self.assertEqual(
371
 
            builder.this.get_file('1').read(), 'text-merged-by-hook')
 
396
        with builder.this.get_file('name1') as f:
 
397
            self.assertEqual(f.read(), b'text-merged-by-hook')
372
398
        self.assertEqual([('no-op',), ('success',)], self.hook_log)
373
399
 
374
400
    def test_chain_stops_after_success(self):
377
403
        self.install_hook_success()
378
404
        self.install_hook_noop()
379
405
        builder = self.make_merge_builder()
380
 
        self.create_file_needing_contents_merge(builder, "1")
 
406
        self.create_file_needing_contents_merge(builder, b"1")
381
407
        conflicts = builder.merge(self.merge_type)
382
408
        self.assertEqual([('success',)], self.hook_log)
383
409
 
387
413
        self.install_hook_conflict()
388
414
        self.install_hook_noop()
389
415
        builder = self.make_merge_builder()
390
 
        self.create_file_needing_contents_merge(builder, "1")
 
416
        self.create_file_needing_contents_merge(builder, b"1")
391
417
        conflicts = builder.merge(self.merge_type)
392
418
        self.assertEqual([('conflict',)], self.hook_log)
393
419
 
397
423
        self.install_hook_delete()
398
424
        self.install_hook_noop()
399
425
        builder = self.make_merge_builder()
400
 
        self.create_file_needing_contents_merge(builder, "1")
 
426
        self.create_file_needing_contents_merge(builder, b"1")
401
427
        conflicts = builder.merge(self.merge_type)
402
428
        self.assertEqual([('delete',)], self.hook_log)
403