← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Patch Queue Manager
  • Date: 2012-03-16 14:15:06 UTC
  • mfrom: (6503.3.1 typo-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20120316141506-30gdc3wkbgmwkdus
(jelmer) Fix a typo: extention -> extension. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012 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
18
18
from StringIO import StringIO
19
19
 
20
20
from bzrlib import (
 
21
    branch as _mod_branch,
 
22
    cleanup,
21
23
    conflicts,
22
24
    errors,
 
25
    inventory,
23
26
    knit,
24
27
    memorytree,
25
28
    merge as _mod_merge,
26
29
    option,
27
 
    progress,
 
30
    revision as _mod_revision,
28
31
    tests,
29
32
    transform,
30
33
    versionedfile,
32
35
from bzrlib.conflicts import ConflictList, TextConflict
33
36
from bzrlib.errors import UnrelatedBranches, NoCommits
34
37
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
35
 
from bzrlib.osutils import pathjoin, file_kind
 
38
from bzrlib.osutils import basename, pathjoin, file_kind
36
39
from bzrlib.tests import (
 
40
    features,
37
41
    TestCaseWithMemoryTransport,
38
42
    TestCaseWithTransport,
39
43
    test_merge_core,
79
83
        tip = wt1.commit('empty commit')
80
84
        wt2 = self.make_branch_and_tree('branch2')
81
85
        wt2.pull(wt1.branch)
82
 
        file('branch1/foo', 'wb').write('foo')
83
 
        file('branch1/bar', 'wb').write('bar')
 
86
        with file('branch1/foo', 'wb') as f:
 
87
            f.write('foo')
 
88
        with file('branch1/bar', 'wb') as f:
 
89
            f.write('bar')
84
90
        wt1.add('foo')
85
91
        wt1.add('bar')
86
92
        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
 
93
        self.run_bzr('merge ../branch1/baz', retcode=3, working_dir='branch2')
 
94
        self.run_bzr('merge ../branch1/foo', working_dir='branch2')
 
95
        self.assertPathExists('branch2/foo')
 
96
        self.assertPathDoesNotExist('branch2/bar')
 
97
        wt2 = WorkingTree.open('branch2')
93
98
        self.assertEqual([tip], wt2.get_parent_ids())
94
99
 
95
100
    def test_pending_with_null(self):
118
123
        finally:
119
124
            wt1.unlock()
120
125
 
 
126
    def test_merge_into_null_tree(self):
 
127
        wt = self.make_branch_and_tree('tree')
 
128
        null_tree = wt.basis_tree()
 
129
        self.build_tree(['tree/file'])
 
130
        wt.add('file')
 
131
        wt.commit('tree with root')
 
132
        merger = _mod_merge.Merge3Merger(null_tree, null_tree, null_tree, wt,
 
133
                                         this_branch=wt.branch,
 
134
                                         do_merge=False)
 
135
        with merger.make_preview_transform() as tt:
 
136
            self.assertEqual([], tt.find_conflicts())
 
137
            preview = tt.get_preview_tree()
 
138
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
139
 
 
140
    def test_merge_unrelated_retains_root(self):
 
141
        wt = self.make_branch_and_tree('tree')
 
142
        other_tree = self.make_branch_and_tree('other')
 
143
        self.addCleanup(other_tree.lock_read().unlock)
 
144
        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
 
145
                                         this_branch=wt.branch,
 
146
                                         do_merge=False)
 
147
        with transform.TransformPreview(wt) as merger.tt:
 
148
            merger._compute_transform()
 
149
            new_root_id = merger.tt.final_file_id(merger.tt.root)
 
150
            self.assertEqual(wt.get_root_id(), new_root_id)
 
151
 
121
152
    def test_create_rename(self):
122
153
        """Rename an inventory entry while creating the file"""
123
154
        tree =self.make_branch_and_tree('.')
124
 
        file('name1', 'wb').write('Hello')
 
155
        with file('name1', 'wb') as f: f.write('Hello')
125
156
        tree.add('name1')
126
157
        tree.commit(message="hello")
127
158
        tree.rename_one('name1', 'name2')
134
165
        os.mkdir('dirname1')
135
166
        tree.add('dirname1')
136
167
        filename = pathjoin('dirname1', 'name1')
137
 
        file(filename, 'wb').write('Hello')
 
168
        with file(filename, 'wb') as f: f.write('Hello')
138
169
        tree.add(filename)
139
170
        tree.commit(message="hello")
140
171
        filename2 = pathjoin('dirname1', 'name2')
154
185
        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')
196
227
 
197
228
    def test_nested_merge(self):
198
229
        tree = self.make_branch_and_tree('tree',
199
 
            format='dirstate-with-subtree')
 
230
            format='development-subtree')
200
231
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
201
 
            format='dirstate-with-subtree')
 
232
            format='development-subtree')
202
233
        sub_tree.set_root_id('sub-tree-root')
203
234
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
204
235
        sub_tree.add('file')
384
415
                             '>>>>>>> MERGE-SOURCE\n',
385
416
                             'this/file')
386
417
 
 
418
    def test_merge_reverse_revision_range(self):
 
419
        tree = self.make_branch_and_tree(".")
 
420
        tree.lock_write()
 
421
        self.addCleanup(tree.unlock)
 
422
        self.build_tree(['a'])
 
423
        tree.add('a')
 
424
        first_rev = tree.commit("added a")
 
425
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
 
426
                                          _mod_revision.NULL_REVISION,
 
427
                                          first_rev)
 
428
        merger.merge_type = _mod_merge.Merge3Merger
 
429
        merger.interesting_files = 'a'
 
430
        conflict_count = merger.do_merge()
 
431
        self.assertEqual(0, conflict_count)
 
432
 
 
433
        self.assertPathDoesNotExist("a")
 
434
        tree.revert()
 
435
        self.assertPathExists("a")
 
436
 
387
437
    def test_make_merger(self):
388
438
        this_tree = self.make_branch_and_tree('this')
389
439
        this_tree.commit('rev1', rev_id='rev1')
397
447
        merger.merge_type = _mod_merge.Merge3Merger
398
448
        tree_merger = merger.make_merger()
399
449
        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())
 
450
        self.assertEqual('rev2b',
 
451
            tree_merger.other_tree.get_revision_id())
 
452
        self.assertEqual('rev1',
 
453
            tree_merger.base_tree.get_revision_id())
 
454
        self.assertEqual(other_tree.branch, tree_merger.other_branch)
402
455
 
403
456
    def test_make_preview_transform(self):
404
457
        this_tree = self.make_branch_and_tree('this')
453
506
        finally:
454
507
            tree_file.close()
455
508
 
 
509
    def test_merge_require_tree_root(self):
 
510
        tree = self.make_branch_and_tree(".")
 
511
        tree.lock_write()
 
512
        self.addCleanup(tree.unlock)
 
513
        self.build_tree(['a'])
 
514
        tree.add('a')
 
515
        first_rev = tree.commit("added a")
 
516
        old_root_id = tree.get_root_id()
 
517
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
 
518
                                          _mod_revision.NULL_REVISION,
 
519
                                          first_rev)
 
520
        merger.merge_type = _mod_merge.Merge3Merger
 
521
        conflict_count = merger.do_merge()
 
522
        self.assertEqual(0, conflict_count)
 
523
        self.assertEquals(set([old_root_id]), tree.all_file_ids())
 
524
        tree.set_parent_ids([])
 
525
 
456
526
    def test_merge_add_into_deleted_root(self):
457
527
        # Yes, people actually do this.  And report bugs if it breaks.
458
528
        source = self.make_branch_and_tree('source', format='rich-root-pack')
1267
1337
        self.assertEqual(['B-id', 'C-id', 'F-id'],
1268
1338
                         [t.get_revision_id() for t in merger._lca_trees])
1269
1339
 
 
1340
    def test_find_base_new_root_criss_cross(self):
 
1341
        # A   B
 
1342
        # |\ /|
 
1343
        # | X |
 
1344
        # |/ \|
 
1345
        # C   D
 
1346
        
 
1347
        builder = self.get_builder()
 
1348
        builder.build_snapshot('A-id', None,
 
1349
            [('add', ('', None, 'directory', None))])
 
1350
        builder.build_snapshot('B-id', [],
 
1351
            [('add', ('', None, 'directory', None))])
 
1352
        builder.build_snapshot('D-id', ['A-id', 'B-id'], [])
 
1353
        builder.build_snapshot('C-id', ['A-id', 'B-id'], [])
 
1354
        merger = self.make_Merger(builder, 'D-id')
 
1355
        self.assertEqual('A-id', merger.base_rev_id)
 
1356
        self.assertTrue(merger._is_criss_cross)
 
1357
        self.assertEqual(['A-id', 'B-id'], [t.get_revision_id()
 
1358
                                            for t in merger._lca_trees])
 
1359
 
1270
1360
    def test_no_criss_cross_passed_to_merge_type(self):
1271
1361
        class LCATreesMerger(LoggingMerger):
1272
1362
            supports_lca_trees = True
1804
1894
        builder.build_snapshot('C-id', ['A-id'], [])
1805
1895
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1806
1896
            [('unversion', 'a-id'),
 
1897
             ('flush', None),
1807
1898
             ('add', (u'a', 'a-id', 'directory', None))])
1808
1899
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1809
1900
        merge_obj = self.make_merge_obj(builder, 'E-id')
1827
1918
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1828
1919
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1829
1920
            [('unversion', 'a-id'),
 
1921
             ('flush', None),
1830
1922
             ('add', (u'a', 'a-id', 'directory', None))])
1831
1923
        merge_obj = self.make_merge_obj(builder, 'E-id')
1832
1924
        entries = list(merge_obj._entries_lca())
2095
2187
        self.assertTrue(wt.is_executable('foo-id'))
2096
2188
 
2097
2189
    def test_create_symlink(self):
2098
 
        self.requireFeature(tests.SymlinkFeature)
 
2190
        self.requireFeature(features.SymlinkFeature)
2099
2191
        #   A
2100
2192
        #  / \
2101
2193
        # B   C
2160
2252
                             wt.get_file_text('foo-id'))
2161
2253
 
2162
2254
    def test_modified_symlink(self):
2163
 
        self.requireFeature(tests.SymlinkFeature)
 
2255
        self.requireFeature(features.SymlinkFeature)
2164
2256
        #   A       Create symlink foo => bar
2165
2257
        #  / \
2166
2258
        # B   C     B relinks foo => baz
2205
2297
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2206
2298
 
2207
2299
    def test_renamed_symlink(self):
2208
 
        self.requireFeature(tests.SymlinkFeature)
 
2300
        self.requireFeature(features.SymlinkFeature)
2209
2301
        #   A       Create symlink foo => bar
2210
2302
        #  / \
2211
2303
        # B   C     B renames foo => barry
2261
2353
        self.assertEqual('blah', wt.id2path('foo-id'))
2262
2354
 
2263
2355
    def test_symlink_no_content_change(self):
2264
 
        self.requireFeature(tests.SymlinkFeature)
 
2356
        self.requireFeature(features.SymlinkFeature)
2265
2357
        #   A       Create symlink foo => bar
2266
2358
        #  / \
2267
2359
        # B   C     B relinks foo => baz
2312
2404
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2313
2405
 
2314
2406
    def test_symlink_this_changed_kind(self):
2315
 
        self.requireFeature(tests.SymlinkFeature)
 
2407
        self.requireFeature(features.SymlinkFeature)
2316
2408
        #   A       Nothing
2317
2409
        #  / \
2318
2410
        # B   C     B creates symlink foo => bar
2365
2457
 
2366
2458
    def test_symlink_all_wt(self):
2367
2459
        """Check behavior if all trees are Working Trees."""
2368
 
        self.requireFeature(tests.SymlinkFeature)
 
2460
        self.requireFeature(features.SymlinkFeature)
2369
2461
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2370
2462
        # So we need to make sure we handle that case correctly.
2371
2463
        #   A   foo => bar
2542
2634
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2543
2635
        # 'tree-reference'
2544
2636
        wt = self.make_branch_and_tree('tree',
2545
 
            format='dirstate-with-subtree')
 
2637
            format='development-subtree')
2546
2638
        wt.lock_write()
2547
2639
        self.addCleanup(wt.unlock)
2548
2640
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
2549
 
            format='dirstate-with-subtree')
 
2641
            format='development-subtree')
2550
2642
        wt.set_root_id('a-root-id')
2551
2643
        sub_tree.set_root_id('sub-tree-root')
2552
2644
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2577
2669
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2578
2670
        # 'tree-reference'
2579
2671
        wt = self.make_branch_and_tree('tree',
2580
 
            format='dirstate-with-subtree')
 
2672
            format='development-subtree')
2581
2673
        wt.lock_write()
2582
2674
        self.addCleanup(wt.unlock)
2583
2675
        sub_tree = self.make_branch_and_tree('tree/sub',
2584
 
            format='dirstate-with-subtree')
 
2676
            format='development-subtree')
2585
2677
        wt.set_root_id('a-root-id')
2586
2678
        sub_tree.set_root_id('sub-tree-root')
2587
2679
        self.build_tree_contents([('tree/sub/file', 'text1')])
2616
2708
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2617
2709
        # 'tree-reference'
2618
2710
        wt = self.make_branch_and_tree('tree',
2619
 
            format='dirstate-with-subtree')
 
2711
            format='development-subtree')
2620
2712
        wt.lock_write()
2621
2713
        self.addCleanup(wt.unlock)
2622
2714
        sub_tree = self.make_branch_and_tree('tree/sub',
2623
 
            format='dirstate-with-subtree')
 
2715
            format='development-subtree')
2624
2716
        wt.set_root_id('a-root-id')
2625
2717
        sub_tree.set_root_id('sub-tree-root')
2626
2718
        self.build_tree_contents([('tree/sub/file', 'text1')])
2659
2751
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2660
2752
        # 'tree-reference'
2661
2753
        wt = self.make_branch_and_tree('tree',
2662
 
            format='dirstate-with-subtree')
 
2754
            format='development-subtree')
2663
2755
        wt.lock_write()
2664
2756
        self.addCleanup(wt.unlock)
2665
2757
        sub_tree = self.make_branch_and_tree('tree/sub',
2666
 
            format='dirstate-with-subtree')
 
2758
            format='development-subtree')
2667
2759
        wt.set_root_id('a-root-id')
2668
2760
        sub_tree.set_root_id('sub-tree-root')
2669
2761
        self.build_tree_contents([('tree/sub/file', 'text1')])
2840
2932
 
2841
2933
    def get_merger_factory(self):
2842
2934
        # Allows  the inner methods to access the test attributes
2843
 
        test = self
 
2935
        calls = self.calls
2844
2936
 
2845
2937
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2846
2938
            name_prefix = "foo"
2847
2939
            default_files = ['bar']
2848
2940
 
2849
2941
            def merge_text(self, params):
2850
 
                test.calls.append('merge_text')
 
2942
                calls.append('merge_text')
2851
2943
                return ('not_applicable', None)
2852
2944
 
2853
2945
        def factory(merger):
2917
3009
        conflicts = builder.merge()
2918
3010
        # The hook should not call the merge_text() method
2919
3011
        self.assertEqual([], self.calls)
 
3012
 
 
3013
 
 
3014
class TestMergeIntoBase(tests.TestCaseWithTransport):
 
3015
 
 
3016
    def setup_simple_branch(self, relpath, shape=None, root_id=None):
 
3017
        """One commit, containing tree specified by optional shape.
 
3018
        
 
3019
        Default is empty tree (just root entry).
 
3020
        """
 
3021
        if root_id is None:
 
3022
            root_id = '%s-root-id' % (relpath,)
 
3023
        wt = self.make_branch_and_tree(relpath)
 
3024
        wt.set_root_id(root_id)
 
3025
        if shape is not None:
 
3026
            adjusted_shape = [relpath + '/' + elem for elem in shape]
 
3027
            self.build_tree(adjusted_shape)
 
3028
            ids = ['%s-%s-id' % (relpath, basename(elem.rstrip('/')))
 
3029
                   for elem in shape]
 
3030
            wt.add(shape, ids=ids)
 
3031
        rev_id = 'r1-%s' % (relpath,)
 
3032
        wt.commit("Initial commit of %s" % (relpath,), rev_id=rev_id)
 
3033
        self.assertEqual(root_id, wt.path2id(''))
 
3034
        return wt
 
3035
 
 
3036
    def setup_two_branches(self, custom_root_ids=True):
 
3037
        """Setup 2 branches, one will be a library, the other a project."""
 
3038
        if custom_root_ids:
 
3039
            root_id = None
 
3040
        else:
 
3041
            root_id = inventory.ROOT_ID
 
3042
        project_wt = self.setup_simple_branch(
 
3043
            'project', ['README', 'dir/', 'dir/file.c'],
 
3044
            root_id)
 
3045
        lib_wt = self.setup_simple_branch(
 
3046
            'lib1', ['README', 'Makefile', 'foo.c'], root_id)
 
3047
 
 
3048
        return project_wt, lib_wt
 
3049
 
 
3050
    def do_merge_into(self, location, merge_as):
 
3051
        """Helper for using MergeIntoMerger.
 
3052
        
 
3053
        :param location: location of directory to merge from, either the
 
3054
            location of a branch or of a path inside a branch.
 
3055
        :param merge_as: the path in a tree to add the new directory as.
 
3056
        :returns: the conflicts from 'do_merge'.
 
3057
        """
 
3058
        operation = cleanup.OperationWithCleanups(self._merge_into)
 
3059
        return operation.run(location, merge_as)
 
3060
 
 
3061
    def _merge_into(self, op, location, merge_as):
 
3062
        # Open and lock the various tree and branch objects
 
3063
        wt, subdir_relpath = WorkingTree.open_containing(merge_as)
 
3064
        op.add_cleanup(wt.lock_write().unlock)
 
3065
        branch_to_merge, subdir_to_merge = _mod_branch.Branch.open_containing(
 
3066
            location)
 
3067
        op.add_cleanup(branch_to_merge.lock_read().unlock)
 
3068
        other_tree = branch_to_merge.basis_tree()
 
3069
        op.add_cleanup(other_tree.lock_read().unlock)
 
3070
        # Perform the merge
 
3071
        merger = _mod_merge.MergeIntoMerger(this_tree=wt, other_tree=other_tree,
 
3072
            other_branch=branch_to_merge, target_subdir=subdir_relpath,
 
3073
            source_subpath=subdir_to_merge)
 
3074
        merger.set_base_revision(_mod_revision.NULL_REVISION, branch_to_merge)
 
3075
        conflicts = merger.do_merge()
 
3076
        merger.set_pending()
 
3077
        return conflicts
 
3078
 
 
3079
    def assertTreeEntriesEqual(self, expected_entries, tree):
 
3080
        """Assert that 'tree' contains the expected inventory entries.
 
3081
 
 
3082
        :param expected_entries: sequence of (path, file-id) pairs.
 
3083
        """
 
3084
        files = [(path, ie.file_id) for path, ie in tree.iter_entries_by_dir()]
 
3085
        self.assertEqual(expected_entries, files)
 
3086
 
 
3087
 
 
3088
class TestMergeInto(TestMergeIntoBase):
 
3089
 
 
3090
    def test_newdir_with_unique_roots(self):
 
3091
        """Merge a branch with a unique root into a new directory."""
 
3092
        project_wt, lib_wt = self.setup_two_branches()
 
3093
        self.do_merge_into('lib1', 'project/lib1')
 
3094
        project_wt.lock_read()
 
3095
        self.addCleanup(project_wt.unlock)
 
3096
        # The r1-lib1 revision should be merged into this one
 
3097
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3098
        self.assertTreeEntriesEqual(
 
3099
            [('', 'project-root-id'),
 
3100
             ('README', 'project-README-id'),
 
3101
             ('dir', 'project-dir-id'),
 
3102
             ('lib1', 'lib1-root-id'),
 
3103
             ('dir/file.c', 'project-file.c-id'),
 
3104
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3105
             ('lib1/README', 'lib1-README-id'),
 
3106
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3107
            ], project_wt)
 
3108
 
 
3109
    def test_subdir(self):
 
3110
        """Merge a branch into a subdirectory of an existing directory."""
 
3111
        project_wt, lib_wt = self.setup_two_branches()
 
3112
        self.do_merge_into('lib1', 'project/dir/lib1')
 
3113
        project_wt.lock_read()
 
3114
        self.addCleanup(project_wt.unlock)
 
3115
        # The r1-lib1 revision should be merged into this one
 
3116
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3117
        self.assertTreeEntriesEqual(
 
3118
            [('', 'project-root-id'),
 
3119
             ('README', 'project-README-id'),
 
3120
             ('dir', 'project-dir-id'),
 
3121
             ('dir/file.c', 'project-file.c-id'),
 
3122
             ('dir/lib1', 'lib1-root-id'),
 
3123
             ('dir/lib1/Makefile', 'lib1-Makefile-id'),
 
3124
             ('dir/lib1/README', 'lib1-README-id'),
 
3125
             ('dir/lib1/foo.c', 'lib1-foo.c-id'),
 
3126
            ], project_wt)
 
3127
 
 
3128
    def test_newdir_with_repeat_roots(self):
 
3129
        """If the file-id of the dir to be merged already exists a new ID will
 
3130
        be allocated to let the merge happen.
 
3131
        """
 
3132
        project_wt, lib_wt = self.setup_two_branches(custom_root_ids=False)
 
3133
        root_id = project_wt.path2id('')
 
3134
        self.do_merge_into('lib1', 'project/lib1')
 
3135
        project_wt.lock_read()
 
3136
        self.addCleanup(project_wt.unlock)
 
3137
        # The r1-lib1 revision should be merged into this one
 
3138
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
 
3139
        new_lib1_id = project_wt.path2id('lib1')
 
3140
        self.assertNotEqual(None, new_lib1_id)
 
3141
        self.assertTreeEntriesEqual(
 
3142
            [('', root_id),
 
3143
             ('README', 'project-README-id'),
 
3144
             ('dir', 'project-dir-id'),
 
3145
             ('lib1', new_lib1_id),
 
3146
             ('dir/file.c', 'project-file.c-id'),
 
3147
             ('lib1/Makefile', 'lib1-Makefile-id'),
 
3148
             ('lib1/README', 'lib1-README-id'),
 
3149
             ('lib1/foo.c', 'lib1-foo.c-id'),
 
3150
            ], project_wt)
 
3151
 
 
3152
    def test_name_conflict(self):
 
3153
        """When the target directory name already exists a conflict is
 
3154
        generated and the original directory is renamed to foo.moved.
 
3155
        """
 
3156
        dest_wt = self.setup_simple_branch('dest', ['dir/', 'dir/file.txt'])
 
3157
        src_wt = self.setup_simple_branch('src', ['README'])
 
3158
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3159
        self.assertEqual(1, conflicts)
 
3160
        dest_wt.lock_read()
 
3161
        self.addCleanup(dest_wt.unlock)
 
3162
        # The r1-lib1 revision should be merged into this one
 
3163
        self.assertEqual(['r1-dest', 'r1-src'], dest_wt.get_parent_ids())
 
3164
        self.assertTreeEntriesEqual(
 
3165
            [('', 'dest-root-id'),
 
3166
             ('dir', 'src-root-id'),
 
3167
             ('dir.moved', 'dest-dir-id'),
 
3168
             ('dir/README', 'src-README-id'),
 
3169
             ('dir.moved/file.txt', 'dest-file.txt-id'),
 
3170
            ], dest_wt)
 
3171
 
 
3172
    def test_file_id_conflict(self):
 
3173
        """A conflict is generated if the merge-into adds a file (or other
 
3174
        inventory entry) with a file-id that already exists in the target tree.
 
3175
        """
 
3176
        dest_wt = self.setup_simple_branch('dest', ['file.txt'])
 
3177
        # Make a second tree with a file-id that will clash with file.txt in
 
3178
        # dest.
 
3179
        src_wt = self.make_branch_and_tree('src')
 
3180
        self.build_tree(['src/README'])
 
3181
        src_wt.add(['README'], ids=['dest-file.txt-id'])
 
3182
        src_wt.commit("Rev 1 of src.", rev_id='r1-src')
 
3183
        conflicts = self.do_merge_into('src', 'dest/dir')
 
3184
        # This is an edge case that shouldn't happen to users very often.  So
 
3185
        # we don't care really about the exact presentation of the conflict,
 
3186
        # just that there is one.
 
3187
        self.assertEqual(1, conflicts)
 
3188
 
 
3189
    def test_only_subdir(self):
 
3190
        """When the location points to just part of a tree, merge just that
 
3191
        subtree.
 
3192
        """
 
3193
        dest_wt = self.setup_simple_branch('dest')
 
3194
        src_wt = self.setup_simple_branch(
 
3195
            'src', ['hello.txt', 'dir/', 'dir/foo.c'])
 
3196
        conflicts = self.do_merge_into('src/dir', 'dest/dir')
 
3197
        dest_wt.lock_read()
 
3198
        self.addCleanup(dest_wt.unlock)
 
3199
        # The r1-lib1 revision should NOT be merged into this one (this is a
 
3200
        # partial merge).
 
3201
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3202
        self.assertTreeEntriesEqual(
 
3203
            [('', 'dest-root-id'),
 
3204
             ('dir', 'src-dir-id'),
 
3205
             ('dir/foo.c', 'src-foo.c-id'),
 
3206
            ], dest_wt)
 
3207
 
 
3208
    def test_only_file(self):
 
3209
        """An edge case: merge just one file, not a whole dir."""
 
3210
        dest_wt = self.setup_simple_branch('dest')
 
3211
        two_file_wt = self.setup_simple_branch(
 
3212
            'two-file', ['file1.txt', 'file2.txt'])
 
3213
        conflicts = self.do_merge_into('two-file/file1.txt', 'dest/file1.txt')
 
3214
        dest_wt.lock_read()
 
3215
        self.addCleanup(dest_wt.unlock)
 
3216
        # The r1-lib1 revision should NOT be merged into this one
 
3217
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3218
        self.assertTreeEntriesEqual(
 
3219
            [('', 'dest-root-id'), ('file1.txt', 'two-file-file1.txt-id')],
 
3220
            dest_wt)
 
3221
 
 
3222
    def test_no_such_source_path(self):
 
3223
        """PathNotInTree is raised if the specified path in the source tree
 
3224
        does not exist.
 
3225
        """
 
3226
        dest_wt = self.setup_simple_branch('dest')
 
3227
        two_file_wt = self.setup_simple_branch('src', ['dir/'])
 
3228
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3229
            'src/no-such-dir', 'dest/foo')
 
3230
        dest_wt.lock_read()
 
3231
        self.addCleanup(dest_wt.unlock)
 
3232
        # The dest tree is unmodified.
 
3233
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3234
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3235
 
 
3236
    def test_no_such_target_path(self):
 
3237
        """PathNotInTree is also raised if the specified path in the target
 
3238
        tree does not exist.
 
3239
        """
 
3240
        dest_wt = self.setup_simple_branch('dest')
 
3241
        two_file_wt = self.setup_simple_branch('src', ['file.txt'])
 
3242
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
 
3243
            'src', 'dest/no-such-dir/foo')
 
3244
        dest_wt.lock_read()
 
3245
        self.addCleanup(dest_wt.unlock)
 
3246
        # The dest tree is unmodified.
 
3247
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
 
3248
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
 
3249
 
 
3250
 
 
3251
class TestMergeHooks(TestCaseWithTransport):
 
3252
 
 
3253
    def setUp(self):
 
3254
        super(TestMergeHooks, self).setUp()
 
3255
        self.tree_a = self.make_branch_and_tree('tree_a')
 
3256
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
3257
        self.tree_a.add('file', 'file-id')
 
3258
        self.tree_a.commit('added file')
 
3259
 
 
3260
        self.tree_b = self.tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
3261
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
3262
        self.tree_b.commit('modify file')
 
3263
 
 
3264
    def test_pre_merge_hook_inject_different_tree(self):
 
3265
        tree_c = self.tree_b.bzrdir.sprout('tree_c').open_workingtree()
 
3266
        self.build_tree_contents([('tree_c/file', 'content_3')])
 
3267
        tree_c.commit("more content")
 
3268
        calls = []
 
3269
        def factory(merger):
 
3270
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3271
            merger.other_tree = tree_c
 
3272
            calls.append(merger)
 
3273
        _mod_merge.Merger.hooks.install_named_hook('pre_merge',
 
3274
                                                   factory, 'test factory')
 
3275
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3276
 
 
3277
        self.assertFileEqual("content_3", 'tree_a/file')
 
3278
        self.assertLength(1, calls)
 
3279
 
 
3280
    def test_post_merge_hook_called(self):
 
3281
        calls = []
 
3282
        def factory(merger):
 
3283
            self.assertIsInstance(merger, _mod_merge.Merge3Merger)
 
3284
            calls.append(merger)
 
3285
        _mod_merge.Merger.hooks.install_named_hook('post_merge',
 
3286
                                                   factory, 'test factory')
 
3287
 
 
3288
        self.tree_a.merge_from_branch(self.tree_b.branch)
 
3289
 
 
3290
        self.assertFileEqual("content_2", 'tree_a/file')
 
3291
        self.assertLength(1, calls)