/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/test_merge.py

  • Committer: Martin
  • Date: 2017-06-27 00:10:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6721.
  • Revision ID: gzlist@googlemail.com-20170627001052-o70zln144nmwhamo
Switch c_api helpers for _static_tuple_c to capsules

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
 
from StringIO import StringIO
19
18
 
20
 
from bzrlib import (
 
19
from .. import (
 
20
    branch as _mod_branch,
 
21
    cleanup,
21
22
    conflicts,
22
23
    errors,
23
 
    knit,
24
24
    memorytree,
25
25
    merge as _mod_merge,
26
26
    option,
27
 
    progress,
 
27
    revision as _mod_revision,
28
28
    tests,
29
29
    transform,
 
30
    )
 
31
from ..bzr import (
 
32
    inventory,
 
33
    knit,
30
34
    versionedfile,
31
35
    )
32
 
from bzrlib.conflicts import ConflictList, TextConflict
33
 
from bzrlib.errors import UnrelatedBranches, NoCommits
34
 
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
35
 
from bzrlib.osutils import pathjoin, file_kind
36
 
from bzrlib.tests import (
 
36
from ..conflicts import ConflictList, TextConflict
 
37
from ..errors import UnrelatedBranches, NoCommits
 
38
from ..merge import transform_tree, merge_inner, _PlanMerge
 
39
from ..osutils import basename, pathjoin, file_kind
 
40
from . import (
 
41
    features,
37
42
    TestCaseWithMemoryTransport,
38
43
    TestCaseWithTransport,
39
44
    test_merge_core,
40
45
    )
41
 
from bzrlib.workingtree import WorkingTree
 
46
from ..workingtree import WorkingTree
42
47
 
43
48
 
44
49
class TestMerge(TestCaseWithTransport):
79
84
        tip = wt1.commit('empty commit')
80
85
        wt2 = self.make_branch_and_tree('branch2')
81
86
        wt2.pull(wt1.branch)
82
 
        file('branch1/foo', 'wb').write('foo')
83
 
        file('branch1/bar', 'wb').write('bar')
 
87
        with file('branch1/foo', 'wb') as f:
 
88
            f.write('foo')
 
89
        with file('branch1/bar', 'wb') as f:
 
90
            f.write('bar')
84
91
        wt1.add('foo')
85
92
        wt1.add('bar')
86
93
        wt1.commit('add foobar')
87
 
        os.chdir('branch2')
88
 
        self.run_bzr('merge ../branch1/baz', retcode=3)
89
 
        self.run_bzr('merge ../branch1/foo')
90
 
        self.failUnlessExists('foo')
91
 
        self.failIfExists('bar')
92
 
        wt2 = WorkingTree.open('.') # opens branch2
 
94
        self.run_bzr('merge ../branch1/baz', retcode=3, working_dir='branch2')
 
95
        self.run_bzr('merge ../branch1/foo', working_dir='branch2')
 
96
        self.assertPathExists('branch2/foo')
 
97
        self.assertPathDoesNotExist('branch2/bar')
 
98
        wt2 = WorkingTree.open('branch2')
93
99
        self.assertEqual([tip], wt2.get_parent_ids())
94
100
 
95
101
    def test_pending_with_null(self):
118
124
        finally:
119
125
            wt1.unlock()
120
126
 
 
127
    def test_merge_into_null_tree(self):
 
128
        wt = self.make_branch_and_tree('tree')
 
129
        null_tree = wt.basis_tree()
 
130
        self.build_tree(['tree/file'])
 
131
        wt.add('file')
 
132
        wt.commit('tree with root')
 
133
        merger = _mod_merge.Merge3Merger(null_tree, null_tree, null_tree, wt,
 
134
                                         this_branch=wt.branch,
 
135
                                         do_merge=False)
 
136
        with merger.make_preview_transform() as tt:
 
137
            self.assertEqual([], tt.find_conflicts())
 
138
            preview = tt.get_preview_tree()
 
139
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
140
 
 
141
    def test_merge_unrelated_retains_root(self):
 
142
        wt = self.make_branch_and_tree('tree')
 
143
        other_tree = self.make_branch_and_tree('other')
 
144
        self.addCleanup(other_tree.lock_read().unlock)
 
145
        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
 
146
                                         this_branch=wt.branch,
 
147
                                         do_merge=False)
 
148
        with transform.TransformPreview(wt) as merger.tt:
 
149
            merger._compute_transform()
 
150
            new_root_id = merger.tt.final_file_id(merger.tt.root)
 
151
            self.assertEqual(wt.get_root_id(), new_root_id)
 
152
 
121
153
    def test_create_rename(self):
122
154
        """Rename an inventory entry while creating the file"""
123
155
        tree =self.make_branch_and_tree('.')
124
 
        file('name1', 'wb').write('Hello')
 
156
        with file('name1', 'wb') as f: f.write('Hello')
125
157
        tree.add('name1')
126
158
        tree.commit(message="hello")
127
159
        tree.rename_one('name1', 'name2')
134
166
        os.mkdir('dirname1')
135
167
        tree.add('dirname1')
136
168
        filename = pathjoin('dirname1', 'name1')
137
 
        file(filename, 'wb').write('Hello')
 
169
        with file(filename, 'wb') as f: f.write('Hello')
138
170
        tree.add(filename)
139
171
        tree.commit(message="hello")
140
172
        filename2 = pathjoin('dirname1', 'name2')
146
178
        # Test that merge_inner's ignore zero parameter is effective
147
179
        tree_a =self.make_branch_and_tree('a')
148
180
        tree_a.commit(message="hello")
149
 
        dir_b = tree_a.bzrdir.sprout('b')
 
181
        dir_b = tree_a.controldir.sprout('b')
150
182
        tree_b = dir_b.open_workingtree()
151
183
        tree_b.lock_write()
152
184
        self.addCleanup(tree_b.unlock)
153
185
        tree_a.commit(message="hello again")
154
 
        log = StringIO()
155
186
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
156
187
                    this_tree=tree_b, ignore_zero=True)
157
 
        self.failUnless('All changes applied successfully.\n' not in
 
188
        self.assertTrue('All changes applied successfully.\n' not in
158
189
            self.get_log())
159
190
        tree_b.revert()
160
191
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
161
192
                    this_tree=tree_b, ignore_zero=False)
162
 
        self.failUnless('All changes applied successfully.\n' in self.get_log())
 
193
        self.assertTrue('All changes applied successfully.\n' in self.get_log())
163
194
 
164
195
    def test_merge_inner_conflicts(self):
165
196
        tree_a = self.make_branch_and_tree('a')
176
207
        # the basis tree. This mutates the tree after grabbing basis, so go to
177
208
        # the repository.
178
209
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
179
 
        tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
 
210
        tree_z = tree_a.controldir.sprout('z').open_workingtree()
180
211
        self.build_tree(['a/b/c'])
181
212
        tree_a.add('b/c')
182
213
        tree_a.commit('added c')
195
226
            tree_a.conflicts())
196
227
 
197
228
    def test_nested_merge(self):
 
229
        self.knownFailure(
 
230
            'iter_changes doesn\'t work with changes in nested trees')
198
231
        tree = self.make_branch_and_tree('tree',
199
 
            format='dirstate-with-subtree')
 
232
            format='development-subtree')
200
233
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
201
 
            format='dirstate-with-subtree')
 
234
            format='development-subtree')
202
235
        sub_tree.set_root_id('sub-tree-root')
203
236
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
204
237
        sub_tree.add('file')
205
238
        sub_tree.commit('foo')
206
239
        tree.add_reference(sub_tree)
207
240
        tree.commit('set text to 1')
208
 
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
 
241
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
209
242
        # modify the file in the subtree
210
243
        self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
211
244
        # and merge the changes from the diverged subtree into the containing
223
256
        # the basis tree. This test commits to the tree after grabbing basis,
224
257
        # so we go to the repository.
225
258
        base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
226
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
259
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
227
260
        self.build_tree_contents([('tree_a/file', 'content_2')])
228
261
        tree_a.commit('commit other')
229
262
        other_tree = tree_a.basis_tree()
237
270
        self.build_tree_contents([('tree_a/file', 'content_1')])
238
271
        tree_a.add('file', 'file-id')
239
272
        tree_a.commit('added file')
240
 
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
273
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
241
274
        os.unlink('tree_a/file')
242
275
        self.build_tree(['tree_a/file/'])
243
276
        tree_a.commit('changed file to directory')
257
290
        self.assertFalse('merge4' in [x[0] for x in
258
291
                        merge_type_option.iter_switches()])
259
292
        registry = _mod_merge.get_merge_type_registry()
260
 
        registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
 
293
        registry.register_lazy('merge4', 'breezy.merge', 'Merge4Merger',
261
294
                               'time-travelling merge')
262
295
        self.assertTrue('merge4' in [x[0] for x in
263
296
                        merge_type_option.iter_switches()])
275
308
        tree_a.flush()
276
309
        tree_a.rename_one('a', 'b')
277
310
        tree_a.commit('2')
278
 
        bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
 
311
        bzrdir_b = tree_a.controldir.sprout('B', revision_id='rev-1')
279
312
        tree_b = bzrdir_b.open_workingtree()
280
313
        tree_b.lock_write()
281
314
        self.addCleanup(tree_b.unlock)
293
326
        tree_a.commit('commit 1')
294
327
        tree_a.add(['file_2'])
295
328
        tree_a.commit('commit 2')
296
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
329
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
297
330
        tree_b.rename_one('file_1', 'renamed')
298
331
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
299
332
        merger.merge_type = _mod_merge.Merge3Merger
307
340
        tree_a.commit('commit 1')
308
341
        tree_a.add(['file_2'])
309
342
        tree_a.commit('commit 2')
310
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
343
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
311
344
        tree_b.rename_one('file_1', 'renamed')
312
345
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
313
346
        merger.merge_type = _mod_merge.WeaveMerger
329
362
        self.build_tree_contents([('this/file', "a\n")])
330
363
        this_tree.add('file')
331
364
        this_tree.commit('rev1')
332
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
365
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
333
366
        self.build_tree_contents([('other/file', "a\nb\n")])
334
367
        other_tree.commit('rev2b', rev_id='rev2b')
335
368
        self.build_tree_contents([('other/file', "c\na\nb\n")])
365
398
        self.build_tree_contents([('this/file', "a\n")])
366
399
        this_tree.add('file')
367
400
        this_tree.commit('rev1')
368
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
401
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
369
402
        self.build_tree_contents([('other/file', "a\nb\n")])
370
403
        other_tree.commit('rev2b', rev_id='rev2b')
371
404
        self.build_tree_contents([('other/file', "a\nb\nc\n")])
384
417
                             '>>>>>>> MERGE-SOURCE\n',
385
418
                             'this/file')
386
419
 
 
420
    def test_merge_reverse_revision_range(self):
 
421
        tree = self.make_branch_and_tree(".")
 
422
        tree.lock_write()
 
423
        self.addCleanup(tree.unlock)
 
424
        self.build_tree(['a'])
 
425
        tree.add('a')
 
426
        first_rev = tree.commit("added a")
 
427
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
 
428
                                          _mod_revision.NULL_REVISION,
 
429
                                          first_rev)
 
430
        merger.merge_type = _mod_merge.Merge3Merger
 
431
        merger.interesting_files = 'a'
 
432
        conflict_count = merger.do_merge()
 
433
        self.assertEqual(0, conflict_count)
 
434
 
 
435
        self.assertPathDoesNotExist("a")
 
436
        tree.revert()
 
437
        self.assertPathExists("a")
 
438
 
387
439
    def test_make_merger(self):
388
440
        this_tree = self.make_branch_and_tree('this')
389
441
        this_tree.commit('rev1', rev_id='rev1')
390
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
442
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
391
443
        this_tree.commit('rev2', rev_id='rev2a')
392
444
        other_tree.commit('rev2', rev_id='rev2b')
393
445
        this_tree.lock_write()
397
449
        merger.merge_type = _mod_merge.Merge3Merger
398
450
        tree_merger = merger.make_merger()
399
451
        self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
400
 
        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
401
 
        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
 
452
        self.assertEqual('rev2b',
 
453
            tree_merger.other_tree.get_revision_id())
 
454
        self.assertEqual('rev1',
 
455
            tree_merger.base_tree.get_revision_id())
 
456
        self.assertEqual(other_tree.branch, tree_merger.other_branch)
402
457
 
403
458
    def test_make_preview_transform(self):
404
459
        this_tree = self.make_branch_and_tree('this')
405
460
        self.build_tree_contents([('this/file', '1\n')])
406
461
        this_tree.add('file', 'file-id')
407
462
        this_tree.commit('rev1', rev_id='rev1')
408
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
463
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
409
464
        self.build_tree_contents([('this/file', '1\n2a\n')])
410
465
        this_tree.commit('rev2', rev_id='rev2a')
411
466
        self.build_tree_contents([('other/file', '2b\n1\n')])
435
490
        self.build_tree_contents([('this/file', '1\n')])
436
491
        this_tree.add('file', 'file-id')
437
492
        this_tree.commit('rev1', rev_id='rev1')
438
 
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
493
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
439
494
        self.build_tree_contents([('this/file', '1\n2a\n')])
440
495
        this_tree.commit('rev2', rev_id='rev2a')
441
496
        self.build_tree_contents([('other/file', '2b\n1\n')])
453
508
        finally:
454
509
            tree_file.close()
455
510
 
 
511
    def test_merge_require_tree_root(self):
 
512
        tree = self.make_branch_and_tree(".")
 
513
        tree.lock_write()
 
514
        self.addCleanup(tree.unlock)
 
515
        self.build_tree(['a'])
 
516
        tree.add('a')
 
517
        first_rev = tree.commit("added a")
 
518
        old_root_id = tree.get_root_id()
 
519
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
 
520
                                          _mod_revision.NULL_REVISION,
 
521
                                          first_rev)
 
522
        merger.merge_type = _mod_merge.Merge3Merger
 
523
        conflict_count = merger.do_merge()
 
524
        self.assertEqual(0, conflict_count)
 
525
        self.assertEqual({old_root_id}, tree.all_file_ids())
 
526
        tree.set_parent_ids([])
 
527
 
456
528
    def test_merge_add_into_deleted_root(self):
457
529
        # Yes, people actually do this.  And report bugs if it breaks.
458
530
        source = self.make_branch_and_tree('source', format='rich-root-pack')
459
531
        self.build_tree(['source/foo/'])
460
532
        source.add('foo', 'foo-id')
461
533
        source.commit('Add foo')
462
 
        target = source.bzrdir.sprout('target').open_workingtree()
 
534
        target = source.controldir.sprout('target').open_workingtree()
463
535
        subtree = target.extract('foo-id')
464
536
        subtree.commit('Delete root')
465
537
        self.build_tree(['source/bar'])
476
548
        self.build_tree(['target/bla'])
477
549
        target.add('bla')
478
550
        target.commit('Add bla')
479
 
        nested = source.bzrdir.sprout('target/subtree').open_workingtree()
 
551
        nested = source.controldir.sprout('target/subtree').open_workingtree()
480
552
        target.subsume(nested)
481
553
        target.commit('Join nested')
482
554
        self.build_tree(['source/bar'])
489
561
class TestPlanMerge(TestCaseWithMemoryTransport):
490
562
 
491
563
    def setUp(self):
492
 
        TestCaseWithMemoryTransport.setUp(self)
 
564
        super(TestPlanMerge, self).setUp()
493
565
        mapper = versionedfile.PrefixMapper()
494
566
        factory = knit.make_file_factory(True, mapper)
495
567
        self.vf = factory(self.get_transport())
975
1047
 
976
1048
    def assertPruneTails(self, pruned_map, tails, parent_map):
977
1049
        child_map = {}
978
 
        for key, parent_keys in parent_map.iteritems():
 
1050
        for key, parent_keys in parent_map.items():
979
1051
            child_map.setdefault(key, [])
980
1052
            for pkey in parent_keys:
981
1053
                child_map.setdefault(pkey, []).append(key)
1267
1339
        self.assertEqual(['B-id', 'C-id', 'F-id'],
1268
1340
                         [t.get_revision_id() for t in merger._lca_trees])
1269
1341
 
 
1342
    def test_find_base_new_root_criss_cross(self):
 
1343
        # A   B
 
1344
        # |\ /|
 
1345
        # | X |
 
1346
        # |/ \|
 
1347
        # C   D
 
1348
        
 
1349
        builder = self.get_builder()
 
1350
        builder.build_snapshot('A-id', None,
 
1351
            [('add', ('', None, 'directory', None))])
 
1352
        builder.build_snapshot('B-id', [],
 
1353
            [('add', ('', None, 'directory', None))])
 
1354
        builder.build_snapshot('D-id', ['A-id', 'B-id'], [])
 
1355
        builder.build_snapshot('C-id', ['A-id', 'B-id'], [])
 
1356
        merger = self.make_Merger(builder, 'D-id')
 
1357
        self.assertEqual('A-id', merger.base_rev_id)
 
1358
        self.assertTrue(merger._is_criss_cross)
 
1359
        self.assertEqual(['A-id', 'B-id'], [t.get_revision_id()
 
1360
                                            for t in merger._lca_trees])
 
1361
 
1270
1362
    def test_no_criss_cross_passed_to_merge_type(self):
1271
1363
        class LCATreesMerger(LoggingMerger):
1272
1364
            supports_lca_trees = True
1804
1896
        builder.build_snapshot('C-id', ['A-id'], [])
1805
1897
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1806
1898
            [('unversion', 'a-id'),
 
1899
             ('flush', None),
1807
1900
             ('add', (u'a', 'a-id', 'directory', None))])
1808
1901
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1809
1902
        merge_obj = self.make_merge_obj(builder, 'E-id')
1827
1920
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1828
1921
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1829
1922
            [('unversion', 'a-id'),
 
1923
             ('flush', None),
1830
1924
             ('add', (u'a', 'a-id', 'directory', None))])
1831
1925
        merge_obj = self.make_merge_obj(builder, 'E-id')
1832
1926
        entries = list(merge_obj._entries_lca())
1966
2060
    def get_wt_from_builder(self, builder):
1967
2061
        """Get a real WorkingTree from the builder."""
1968
2062
        the_branch = builder.get_branch()
1969
 
        wt = the_branch.bzrdir.create_workingtree()
 
2063
        wt = the_branch.controldir.create_workingtree()
1970
2064
        # Note: This is a little bit ugly, but we are holding the branch
1971
2065
        #       write-locked as part of the build process, and we would like to
1972
2066
        #       maintain that. So we just force the WT to re-use the same
2095
2189
        self.assertTrue(wt.is_executable('foo-id'))
2096
2190
 
2097
2191
    def test_create_symlink(self):
2098
 
        self.requireFeature(tests.SymlinkFeature)
 
2192
        self.requireFeature(features.SymlinkFeature)
2099
2193
        #   A
2100
2194
        #  / \
2101
2195
        # B   C
2160
2254
                             wt.get_file_text('foo-id'))
2161
2255
 
2162
2256
    def test_modified_symlink(self):
2163
 
        self.requireFeature(tests.SymlinkFeature)
 
2257
        self.requireFeature(features.SymlinkFeature)
2164
2258
        #   A       Create symlink foo => bar
2165
2259
        #  / \
2166
2260
        # B   C     B relinks foo => baz
2205
2299
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2206
2300
 
2207
2301
    def test_renamed_symlink(self):
2208
 
        self.requireFeature(tests.SymlinkFeature)
 
2302
        self.requireFeature(features.SymlinkFeature)
2209
2303
        #   A       Create symlink foo => bar
2210
2304
        #  / \
2211
2305
        # B   C     B renames foo => barry
2261
2355
        self.assertEqual('blah', wt.id2path('foo-id'))
2262
2356
 
2263
2357
    def test_symlink_no_content_change(self):
2264
 
        self.requireFeature(tests.SymlinkFeature)
 
2358
        self.requireFeature(features.SymlinkFeature)
2265
2359
        #   A       Create symlink foo => bar
2266
2360
        #  / \
2267
2361
        # B   C     B relinks foo => baz
2312
2406
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2313
2407
 
2314
2408
    def test_symlink_this_changed_kind(self):
2315
 
        self.requireFeature(tests.SymlinkFeature)
 
2409
        self.requireFeature(features.SymlinkFeature)
2316
2410
        #   A       Nothing
2317
2411
        #  / \
2318
2412
        # B   C     B creates symlink foo => bar
2365
2459
 
2366
2460
    def test_symlink_all_wt(self):
2367
2461
        """Check behavior if all trees are Working Trees."""
2368
 
        self.requireFeature(tests.SymlinkFeature)
 
2462
        self.requireFeature(features.SymlinkFeature)
2369
2463
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2370
2464
        # So we need to make sure we handle that case correctly.
2371
2465
        #   A   foo => bar
2402
2496
        wt.revert()
2403
2497
        wt.merge_from_branch(wt.branch, 'C-id')
2404
2498
        wt.commit('D merges B & C', rev_id='D-id')
2405
 
        wt_base = wt.bzrdir.sprout('base', 'A-id').open_workingtree()
 
2499
        wt_base = wt.controldir.sprout('base', 'A-id').open_workingtree()
2406
2500
        wt_base.lock_read()
2407
2501
        self.addCleanup(wt_base.unlock)
2408
 
        wt_lca1 = wt.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
 
2502
        wt_lca1 = wt.controldir.sprout('b-tree', 'B-id').open_workingtree()
2409
2503
        wt_lca1.lock_read()
2410
2504
        self.addCleanup(wt_lca1.unlock)
2411
 
        wt_lca2 = wt.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
 
2505
        wt_lca2 = wt.controldir.sprout('c-tree', 'C-id').open_workingtree()
2412
2506
        wt_lca2.lock_read()
2413
2507
        self.addCleanup(wt_lca2.unlock)
2414
 
        wt_other = wt.bzrdir.sprout('other', 'F-id').open_workingtree()
 
2508
        wt_other = wt.controldir.sprout('other', 'F-id').open_workingtree()
2415
2509
        wt_other.lock_read()
2416
2510
        self.addCleanup(wt_other.unlock)
2417
2511
        merge_obj = _mod_merge.Merge3Merger(wt, wt, wt_base,
2512
2606
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
2513
2607
            [('rename', ('a', 'b'))]) # merged change
2514
2608
        wt_this = self.get_wt_from_builder(builder)
2515
 
        wt_base = wt_this.bzrdir.sprout('base', 'A-id').open_workingtree()
 
2609
        wt_base = wt_this.controldir.sprout('base', 'A-id').open_workingtree()
2516
2610
        wt_base.lock_read()
2517
2611
        self.addCleanup(wt_base.unlock)
2518
 
        wt_lca1 = wt_this.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
 
2612
        wt_lca1 = wt_this.controldir.sprout('b-tree', 'B-id').open_workingtree()
2519
2613
        wt_lca1.lock_read()
2520
2614
        self.addCleanup(wt_lca1.unlock)
2521
 
        wt_lca2 = wt_this.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
 
2615
        wt_lca2 = wt_this.controldir.sprout('c-tree', 'C-id').open_workingtree()
2522
2616
        wt_lca2.lock_read()
2523
2617
        self.addCleanup(wt_lca2.unlock)
2524
 
        wt_other = wt_this.bzrdir.sprout('other', 'E-id').open_workingtree()
 
2618
        wt_other = wt_this.controldir.sprout('other', 'E-id').open_workingtree()
2525
2619
        wt_other.lock_read()
2526
2620
        self.addCleanup(wt_other.unlock)
2527
2621
        merge_obj = _mod_merge.Merge3Merger(wt_this, wt_this, wt_base,
2542
2636
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2543
2637
        # 'tree-reference'
2544
2638
        wt = self.make_branch_and_tree('tree',
2545
 
            format='dirstate-with-subtree')
 
2639
            format='development-subtree')
2546
2640
        wt.lock_write()
2547
2641
        self.addCleanup(wt.unlock)
2548
2642
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
2549
 
            format='dirstate-with-subtree')
 
2643
            format='development-subtree')
2550
2644
        wt.set_root_id('a-root-id')
2551
2645
        sub_tree.set_root_id('sub-tree-root')
2552
2646
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2577
2671
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2578
2672
        # 'tree-reference'
2579
2673
        wt = self.make_branch_and_tree('tree',
2580
 
            format='dirstate-with-subtree')
 
2674
            format='development-subtree')
2581
2675
        wt.lock_write()
2582
2676
        self.addCleanup(wt.unlock)
2583
2677
        sub_tree = self.make_branch_and_tree('tree/sub',
2584
 
            format='dirstate-with-subtree')
 
2678
            format='development-subtree')
2585
2679
        wt.set_root_id('a-root-id')
2586
2680
        sub_tree.set_root_id('sub-tree-root')
2587
2681
        self.build_tree_contents([('tree/sub/file', 'text1')])
2616
2710
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2617
2711
        # 'tree-reference'
2618
2712
        wt = self.make_branch_and_tree('tree',
2619
 
            format='dirstate-with-subtree')
 
2713
            format='development-subtree')
2620
2714
        wt.lock_write()
2621
2715
        self.addCleanup(wt.unlock)
2622
2716
        sub_tree = self.make_branch_and_tree('tree/sub',
2623
 
            format='dirstate-with-subtree')
 
2717
            format='development-subtree')
2624
2718
        wt.set_root_id('a-root-id')
2625
2719
        sub_tree.set_root_id('sub-tree-root')
2626
2720
        self.build_tree_contents([('tree/sub/file', 'text1')])
2659
2753
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2660
2754
        # 'tree-reference'
2661
2755
        wt = self.make_branch_and_tree('tree',
2662
 
            format='dirstate-with-subtree')
 
2756
            format='development-subtree')
2663
2757
        wt.lock_write()
2664
2758
        self.addCleanup(wt.unlock)
2665
2759
        sub_tree = self.make_branch_and_tree('tree/sub',
2666
 
            format='dirstate-with-subtree')
 
2760
            format='development-subtree')
2667
2761
        wt.set_root_id('a-root-id')
2668
2762
        sub_tree.set_root_id('sub-tree-root')
2669
2763
        self.build_tree_contents([('tree/sub/file', 'text1')])
2840
2934
 
2841
2935
    def get_merger_factory(self):
2842
2936
        # Allows  the inner methods to access the test attributes
2843
 
        test = self
 
2937
        calls = self.calls
2844
2938
 
2845
2939
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2846
2940
            name_prefix = "foo"
2847
2941
            default_files = ['bar']
2848
2942
 
2849
2943
            def merge_text(self, params):
2850
 
                test.calls.append('merge_text')
 
2944
                calls.append('merge_text')
2851
2945
                return ('not_applicable', None)
2852
2946
 
2853
2947
        def factory(merger):
2917
3011
        conflicts = builder.merge()
2918
3012
        # The hook should not call the merge_text() method
2919
3013
        self.assertEqual([], self.calls)
 
3014
 
 
3015
 
 
3016
class TestMergeIntoBase(tests.TestCaseWithTransport):
 
3017
 
 
3018
    def setup_simple_branch(self, relpath, shape=None, root_id=None):
 
3019
        """One commit, containing tree specified by optional shape.
 
3020
        
 
3021
        Default is empty tree (just root entry).
 
3022
        """
 
3023
        if root_id is None:
 
3024
            root_id = '%s-root-id' % (relpath,)
 
3025
        wt = self.make_branch_and_tree(relpath)
 
3026
        wt.set_root_id(root_id)
 
3027
        if shape is not None:
 
3028
            adjusted_shape = [relpath + '/' + elem for elem in shape]
 
3029
            self.build_tree(adjusted_shape)
 
3030
            ids = ['%s-%s-id' % (relpath, basename(elem.rstrip('/')))
 
3031
                   for elem in shape]
 
3032
            wt.add(shape, ids=ids)
 
3033
        rev_id = 'r1-%s' % (relpath,)
 
3034
        wt.commit("Initial commit of %s" % (relpath,), rev_id=rev_id)
 
3035
        self.assertEqual(root_id, wt.path2id(''))
 
3036
        return wt
 
3037
 
 
3038
    def setup_two_branches(self, custom_root_ids=True):
 
3039
        """Setup 2 branches, one will be a library, the other a project."""
 
3040
        if custom_root_ids:
 
3041
            root_id = None
 
3042
        else:
 
3043
            root_id = inventory.ROOT_ID
 
3044
        project_wt = self.setup_simple_branch(
 
3045
            'project', ['README', 'dir/', 'dir/file.c'],
 
3046
            root_id)
 
3047
        lib_wt = self.setup_simple_branch(
 
3048
            'lib1', ['README', 'Makefile', 'foo.c'], root_id)
 
3049
 
 
3050
        return project_wt, lib_wt
 
3051
 
 
3052
    def do_merge_into(self, location, merge_as):
 
3053
        """Helper for using MergeIntoMerger.
 
3054
        
 
3055
        :param location: location of directory to merge from, either the
 
3056
            location of a branch or of a path inside a branch.
 
3057
        :param merge_as: the path in a tree to add the new directory as.
 
3058
        :returns: the conflicts from 'do_merge'.
 
3059
        """
 
3060
        operation = cleanup.OperationWithCleanups(self._merge_into)
 
3061
        return operation.run(location, merge_as)
 
3062
 
 
3063
    def _merge_into(self, op, location, merge_as):
 
3064
        # Open and lock the various tree and branch objects
 
3065
        wt, subdir_relpath = WorkingTree.open_containing(merge_as)
 
3066
        op.add_cleanup(wt.lock_write().unlock)
 
3067
        branch_to_merge, subdir_to_merge = _mod_branch.Branch.open_containing(
 
3068
            location)
 
3069
        op.add_cleanup(branch_to_merge.lock_read().unlock)
 
3070
        other_tree = branch_to_merge.basis_tree()
 
3071
        op.add_cleanup(other_tree.lock_read().unlock)
 
3072
        # Perform the merge
 
3073
        merger = _mod_merge.MergeIntoMerger(this_tree=wt, other_tree=other_tree,
 
3074
            other_branch=branch_to_merge, target_subdir=subdir_relpath,
 
3075
            source_subpath=subdir_to_merge)
 
3076
        merger.set_base_revision(_mod_revision.NULL_REVISION, branch_to_merge)
 
3077
        conflicts = merger.do_merge()
 
3078
        merger.set_pending()
 
3079
        return conflicts
 
3080
 
 
3081
    def assertTreeEntriesEqual(self, expected_entries, tree):
 
3082
        """Assert that 'tree' contains the expected inventory entries.
 
3083
 
 
3084
        :param expected_entries: sequence of (path, file-id) pairs.
 
3085
        """
 
3086
        files = [(path, ie.file_id) for path, ie in tree.iter_entries_by_dir()]
 
3087
        self.assertEqual(expected_entries, files)
 
3088
 
 
3089
 
 
3090
class TestMergeInto(TestMergeIntoBase):
 
3091
 
 
3092
    def test_newdir_with_unique_roots(self):
 
3093
        """Merge a branch with a unique root into a new directory."""
 
3094
        project_wt, lib_wt = self.setup_two_branches()
 
3095
        self.do_merge_into('lib1', 'project/lib1')
 
3096
        project_wt.lock_read()
 
3097
        self.addCleanup(project_wt.unlock)
 
3098
        # The r1-lib1 revision should be merged into this one
 
3099
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3100
        self.assertTreeEntriesEqual(
 
3101
            [('', 'project-root-id'),
 
3102
             ('README', 'project-README-id'),
 
3103
             ('dir', 'project-dir-id'),
 
3104
             ('lib1', 'lib1-root-id'),
 
3105
             ('dir/file.c', 'project-file.c-id'),
 
3106
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3107
             ('lib1/README', 'lib1-README-id'),
 
3108
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3109
            ], project_wt)
 
3110
 
 
3111
    def test_subdir(self):
 
3112
        """Merge a branch into a subdirectory of an existing directory."""
 
3113
        project_wt, lib_wt = self.setup_two_branches()
 
3114
        self.do_merge_into('lib1', 'project/dir/lib1')
 
3115
        project_wt.lock_read()
 
3116
        self.addCleanup(project_wt.unlock)
 
3117
        # The r1-lib1 revision should be merged into this one
 
3118
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3119
        self.assertTreeEntriesEqual(
 
3120
            [('', 'project-root-id'),
 
3121
             ('README', 'project-README-id'),
 
3122
             ('dir', 'project-dir-id'),
 
3123
             ('dir/file.c', 'project-file.c-id'),
 
3124
             ('dir/lib1', 'lib1-root-id'),
 
3125
             ('dir/lib1/Makefile', 'lib1-Makefile-id'),
 
3126
             ('dir/lib1/README', 'lib1-README-id'),
 
3127
             ('dir/lib1/foo.c', 'lib1-foo.c-id'),
 
3128
            ], project_wt)
 
3129
 
 
3130
    def test_newdir_with_repeat_roots(self):
 
3131
        """If the file-id of the dir to be merged already exists a new ID will
 
3132
        be allocated to let the merge happen.
 
3133
        """
 
3134
        project_wt, lib_wt = self.setup_two_branches(custom_root_ids=False)
 
3135
        root_id = project_wt.path2id('')
 
3136
        self.do_merge_into('lib1', 'project/lib1')
 
3137
        project_wt.lock_read()
 
3138
        self.addCleanup(project_wt.unlock)
 
3139
        # The r1-lib1 revision should be merged into this one
 
3140
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3141
        new_lib1_id = project_wt.path2id('lib1')
 
3142
        self.assertNotEqual(None, new_lib1_id)
 
3143
        self.assertTreeEntriesEqual(
 
3144
            [('', root_id),
 
3145
             ('README', 'project-README-id'),
 
3146
             ('dir', 'project-dir-id'),
 
3147
             ('lib1', new_lib1_id),
 
3148
             ('dir/file.c', 'project-file.c-id'),
 
3149
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3150
             ('lib1/README', 'lib1-README-id'),
 
3151
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3152
            ], project_wt)
 
3153
 
 
3154
    def test_name_conflict(self):
 
3155
        """When the target directory name already exists a conflict is
 
3156
        generated and the original directory is renamed to foo.moved.
 
3157
        """
 
3158
        dest_wt = self.setup_simple_branch('dest', ['dir/', 'dir/file.txt'])
 
3159
        src_wt = self.setup_simple_branch('src', ['README'])
 
3160
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3161
        self.assertEqual(1, conflicts)
 
3162
        dest_wt.lock_read()
 
3163
        self.addCleanup(dest_wt.unlock)
 
3164
        # The r1-lib1 revision should be merged into this one
 
3165
        self.assertEqual(['r1-dest', 'r1-src'], dest_wt.get_parent_ids())
 
3166
        self.assertTreeEntriesEqual(
 
3167
            [('', 'dest-root-id'),
 
3168
             ('dir', 'src-root-id'),
 
3169
             ('dir.moved', 'dest-dir-id'),
 
3170
             ('dir/README', 'src-README-id'),
 
3171
             ('dir.moved/file.txt', 'dest-file.txt-id'),
 
3172
            ], dest_wt)
 
3173
 
 
3174
    def test_file_id_conflict(self):
 
3175
        """A conflict is generated if the merge-into adds a file (or other
 
3176
        inventory entry) with a file-id that already exists in the target tree.
 
3177
        """
 
3178
        dest_wt = self.setup_simple_branch('dest', ['file.txt'])
 
3179
        # Make a second tree with a file-id that will clash with file.txt in
 
3180
        # dest.
 
3181
        src_wt = self.make_branch_and_tree('src')
 
3182
        self.build_tree(['src/README'])
 
3183
        src_wt.add(['README'], ids=['dest-file.txt-id'])
 
3184
        src_wt.commit("Rev 1 of src.", rev_id='r1-src')
 
3185
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3186
        # This is an edge case that shouldn't happen to users very often.  So
 
3187
        # we don't care really about the exact presentation of the conflict,
 
3188
        # just that there is one.
 
3189
        self.assertEqual(1, conflicts)
 
3190
 
 
3191
    def test_only_subdir(self):
 
3192
        """When the location points to just part of a tree, merge just that
 
3193
        subtree.
 
3194
        """
 
3195
        dest_wt = self.setup_simple_branch('dest')
 
3196
        src_wt = self.setup_simple_branch(
 
3197
            'src', ['hello.txt', 'dir/', 'dir/foo.c'])
 
3198
        conflicts = self.do_merge_into('src/dir', 'dest/dir')
 
3199
        dest_wt.lock_read()
 
3200
        self.addCleanup(dest_wt.unlock)
 
3201
        # The r1-lib1 revision should NOT be merged into this one (this is a
 
3202
        # partial merge).
 
3203
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3204
        self.assertTreeEntriesEqual(
 
3205
            [('', 'dest-root-id'),
 
3206
             ('dir', 'src-dir-id'),
 
3207
             ('dir/foo.c', 'src-foo.c-id'),
 
3208
            ], dest_wt)
 
3209
 
 
3210
    def test_only_file(self):
 
3211
        """An edge case: merge just one file, not a whole dir."""
 
3212
        dest_wt = self.setup_simple_branch('dest')
 
3213
        two_file_wt = self.setup_simple_branch(
 
3214
            'two-file', ['file1.txt', 'file2.txt'])
 
3215
        conflicts = self.do_merge_into('two-file/file1.txt', 'dest/file1.txt')
 
3216
        dest_wt.lock_read()
 
3217
        self.addCleanup(dest_wt.unlock)
 
3218
        # The r1-lib1 revision should NOT be merged into this one
 
3219
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3220
        self.assertTreeEntriesEqual(
 
3221
            [('', 'dest-root-id'), ('file1.txt', 'two-file-file1.txt-id')],
 
3222
            dest_wt)
 
3223
 
 
3224
    def test_no_such_source_path(self):
 
3225
        """PathNotInTree is raised if the specified path in the source tree
 
3226
        does not exist.
 
3227
        """
 
3228
        dest_wt = self.setup_simple_branch('dest')
 
3229
        two_file_wt = self.setup_simple_branch('src', ['dir/'])
 
3230
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3231
            'src/no-such-dir', 'dest/foo')
 
3232
        dest_wt.lock_read()
 
3233
        self.addCleanup(dest_wt.unlock)
 
3234
        # The dest tree is unmodified.
 
3235
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3236
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3237
 
 
3238
    def test_no_such_target_path(self):
 
3239
        """PathNotInTree is also raised if the specified path in the target
 
3240
        tree does not exist.
 
3241
        """
 
3242
        dest_wt = self.setup_simple_branch('dest')
 
3243
        two_file_wt = self.setup_simple_branch('src', ['file.txt'])
 
3244
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3245
            'src', 'dest/no-such-dir/foo')
 
3246
        dest_wt.lock_read()
 
3247
        self.addCleanup(dest_wt.unlock)
 
3248
        # The dest tree is unmodified.
 
3249
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3250
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3251
 
 
3252
 
 
3253
class TestMergeHooks(TestCaseWithTransport):
 
3254
 
 
3255
    def setUp(self):
 
3256
        super(TestMergeHooks, self).setUp()
 
3257
        self.tree_a = self.make_branch_and_tree('tree_a')
 
3258
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
3259
        self.tree_a.add('file', 'file-id')
 
3260
        self.tree_a.commit('added file')
 
3261
 
 
3262
        self.tree_b = self.tree_a.controldir.sprout('tree_b').open_workingtree()
 
3263
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
3264
        self.tree_b.commit('modify file')
 
3265
 
 
3266
    def test_pre_merge_hook_inject_different_tree(self):
 
3267
        tree_c = self.tree_b.controldir.sprout('tree_c').open_workingtree()
 
3268
        self.build_tree_contents([('tree_c/file', 'content_3')])
 
3269
        tree_c.commit("more content")
 
3270
        calls = []
 
3271
        def factory(merger):
 
3272
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3273
            merger.other_tree = tree_c
 
3274
            calls.append(merger)
 
3275
        _mod_merge.Merger.hooks.install_named_hook('pre_merge',
 
3276
                                                   factory, 'test factory')
 
3277
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3278
 
 
3279
        self.assertFileEqual("content_3", 'tree_a/file')
 
3280
        self.assertLength(1, calls)
 
3281
 
 
3282
    def test_post_merge_hook_called(self):
 
3283
        calls = []
 
3284
        def factory(merger):
 
3285
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3286
            calls.append(merger)
 
3287
        _mod_merge.Merger.hooks.install_named_hook('post_merge',
 
3288
                                                   factory, 'test factory')
 
3289
 
 
3290
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3291
 
 
3292
        self.assertFileEqual("content_2", 'tree_a/file')
 
3293
        self.assertLength(1, calls)