← 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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
18
18
from StringIO import StringIO
19
19
 
20
20
from bzrlib import (
21
 
    branch as _mod_branch,
22
 
    cleanup,
23
21
    conflicts,
24
22
    errors,
25
 
    inventory,
26
23
    knit,
27
24
    memorytree,
28
25
    merge as _mod_merge,
29
26
    option,
30
 
    revision as _mod_revision,
 
27
    progress,
31
28
    tests,
32
29
    transform,
33
30
    versionedfile,
35
32
from bzrlib.conflicts import ConflictList, TextConflict
36
33
from bzrlib.errors import UnrelatedBranches, NoCommits
37
34
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
38
 
from bzrlib.osutils import basename, pathjoin, file_kind
 
35
from bzrlib.osutils import pathjoin, file_kind
39
36
from bzrlib.tests import (
40
37
    TestCaseWithMemoryTransport,
41
38
    TestCaseWithTransport,
90
87
        os.chdir('branch2')
91
88
        self.run_bzr('merge ../branch1/baz', retcode=3)
92
89
        self.run_bzr('merge ../branch1/foo')
93
 
        self.assertPathExists('foo')
94
 
        self.assertPathDoesNotExist('bar')
 
90
        self.failUnlessExists('foo')
 
91
        self.failIfExists('bar')
95
92
        wt2 = WorkingTree.open('.') # opens branch2
96
93
        self.assertEqual([tip], wt2.get_parent_ids())
97
94
 
121
118
        finally:
122
119
            wt1.unlock()
123
120
 
124
 
    def test_merge_into_null_tree(self):
125
 
        wt = self.make_branch_and_tree('tree')
126
 
        null_tree = wt.basis_tree()
127
 
        self.build_tree(['tree/file'])
128
 
        wt.add('file')
129
 
        wt.commit('tree with root')
130
 
        merger = _mod_merge.Merge3Merger(null_tree, null_tree, null_tree, wt,
131
 
                                         this_branch=wt.branch,
132
 
                                         do_merge=False)
133
 
        with merger.make_preview_transform() as tt:
134
 
            self.assertEqual([], tt.find_conflicts())
135
 
            preview = tt.get_preview_tree()
136
 
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
137
 
 
138
121
    def test_create_rename(self):
139
122
        """Rename an inventory entry while creating the file"""
140
123
        tree =self.make_branch_and_tree('.')
171
154
        log = StringIO()
172
155
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
173
156
                    this_tree=tree_b, ignore_zero=True)
174
 
        self.assertTrue('All changes applied successfully.\n' not in
 
157
        self.failUnless('All changes applied successfully.\n' not in
175
158
            self.get_log())
176
159
        tree_b.revert()
177
160
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
178
161
                    this_tree=tree_b, ignore_zero=False)
179
 
        self.assertTrue('All changes applied successfully.\n' in self.get_log())
 
162
        self.failUnless('All changes applied successfully.\n' in self.get_log())
180
163
 
181
164
    def test_merge_inner_conflicts(self):
182
165
        tree_a = self.make_branch_and_tree('a')
401
384
                             '>>>>>>> MERGE-SOURCE\n',
402
385
                             'this/file')
403
386
 
404
 
    def test_merge_reverse_revision_range(self):
405
 
        tree = self.make_branch_and_tree(".")
406
 
        tree.lock_write()
407
 
        self.addCleanup(tree.unlock)
408
 
        self.build_tree(['a'])
409
 
        tree.add('a')
410
 
        tree.commit("added a")
411
 
        first_rev = tree.branch.revision_history()[0]
412
 
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
413
 
                                          _mod_revision.NULL_REVISION,
414
 
                                          first_rev)
415
 
        merger.merge_type = _mod_merge.Merge3Merger
416
 
        merger.interesting_files = 'a'
417
 
        conflict_count = merger.do_merge()
418
 
        self.assertEqual(0, conflict_count)
419
 
 
420
 
        self.assertPathDoesNotExist("a")
421
 
        tree.revert()
422
 
        self.assertPathExists("a")
423
 
 
424
387
    def test_make_merger(self):
425
388
        this_tree = self.make_branch_and_tree('this')
426
389
        this_tree.commit('rev1', rev_id='rev1')
490
453
        finally:
491
454
            tree_file.close()
492
455
 
493
 
    def test_merge_require_tree_root(self):
494
 
        tree = self.make_branch_and_tree(".")
495
 
        tree.lock_write()
496
 
        self.addCleanup(tree.unlock)
497
 
        self.build_tree(['a'])
498
 
        tree.add('a')
499
 
        tree.commit("added a")
500
 
        old_root_id = tree.get_root_id()
501
 
        first_rev = tree.branch.revision_history()[0]
502
 
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
503
 
                                          _mod_revision.NULL_REVISION,
504
 
                                          first_rev)
505
 
        merger.merge_type = _mod_merge.Merge3Merger
506
 
        conflict_count = merger.do_merge()
507
 
        self.assertEqual(0, conflict_count)
508
 
        self.assertEquals(set([old_root_id]), tree.all_file_ids())
509
 
        tree.set_parent_ids([])
510
 
 
511
456
    def test_merge_add_into_deleted_root(self):
512
457
        # Yes, people actually do this.  And report bugs if it breaks.
513
458
        source = self.make_branch_and_tree('source', format='rich-root-pack')
1322
1267
        self.assertEqual(['B-id', 'C-id', 'F-id'],
1323
1268
                         [t.get_revision_id() for t in merger._lca_trees])
1324
1269
 
1325
 
    def test_find_base_new_root_criss_cross(self):
1326
 
        # A   B
1327
 
        # |\ /|
1328
 
        # | X |
1329
 
        # |/ \|
1330
 
        # C   D
1331
 
        
1332
 
        builder = self.get_builder()
1333
 
        builder.build_snapshot('A-id', None,
1334
 
            [('add', ('', None, 'directory', None))])
1335
 
        builder.build_snapshot('B-id', [],
1336
 
            [('add', ('', None, 'directory', None))])
1337
 
        builder.build_snapshot('D-id', ['A-id', 'B-id'], [])
1338
 
        builder.build_snapshot('C-id', ['A-id', 'B-id'], [])
1339
 
        merger = self.make_Merger(builder, 'D-id')
1340
 
        self.assertEqual('A-id', merger.base_rev_id)
1341
 
        self.assertTrue(merger._is_criss_cross)
1342
 
        self.assertEqual(['A-id', 'B-id'], [t.get_revision_id()
1343
 
                                            for t in merger._lca_trees])
1344
 
 
1345
1270
    def test_no_criss_cross_passed_to_merge_type(self):
1346
1271
        class LCATreesMerger(LoggingMerger):
1347
1272
            supports_lca_trees = True
2915
2840
 
2916
2841
    def get_merger_factory(self):
2917
2842
        # Allows  the inner methods to access the test attributes
2918
 
        calls = self.calls
 
2843
        test = self
2919
2844
 
2920
2845
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2921
2846
            name_prefix = "foo"
2922
2847
            default_files = ['bar']
2923
2848
 
2924
2849
            def merge_text(self, params):
2925
 
                calls.append('merge_text')
 
2850
                test.calls.append('merge_text')
2926
2851
                return ('not_applicable', None)
2927
2852
 
2928
2853
        def factory(merger):
2992
2917
        conflicts = builder.merge()
2993
2918
        # The hook should not call the merge_text() method
2994
2919
        self.assertEqual([], self.calls)
2995
 
 
2996
 
 
2997
 
class TestMergeIntoBase(tests.TestCaseWithTransport):
2998
 
 
2999
 
    def setup_simple_branch(self, relpath, shape=None, root_id=None):
3000
 
        """One commit, containing tree specified by optional shape.
3001
 
        
3002
 
        Default is empty tree (just root entry).
3003
 
        """
3004
 
        if root_id is None:
3005
 
            root_id = '%s-root-id' % (relpath,)
3006
 
        wt = self.make_branch_and_tree(relpath)
3007
 
        wt.set_root_id(root_id)
3008
 
        if shape is not None:
3009
 
            adjusted_shape = [relpath + '/' + elem for elem in shape]
3010
 
            self.build_tree(adjusted_shape)
3011
 
            ids = ['%s-%s-id' % (relpath, basename(elem.rstrip('/')))
3012
 
                   for elem in shape]
3013
 
            wt.add(shape, ids=ids)
3014
 
        rev_id = 'r1-%s' % (relpath,)
3015
 
        wt.commit("Initial commit of %s" % (relpath,), rev_id=rev_id)
3016
 
        self.assertEqual(root_id, wt.path2id(''))
3017
 
        return wt
3018
 
 
3019
 
    def setup_two_branches(self, custom_root_ids=True):
3020
 
        """Setup 2 branches, one will be a library, the other a project."""
3021
 
        if custom_root_ids:
3022
 
            root_id = None
3023
 
        else:
3024
 
            root_id = inventory.ROOT_ID
3025
 
        project_wt = self.setup_simple_branch(
3026
 
            'project', ['README', 'dir/', 'dir/file.c'],
3027
 
            root_id)
3028
 
        lib_wt = self.setup_simple_branch(
3029
 
            'lib1', ['README', 'Makefile', 'foo.c'], root_id)
3030
 
 
3031
 
        return project_wt, lib_wt
3032
 
 
3033
 
    def do_merge_into(self, location, merge_as):
3034
 
        """Helper for using MergeIntoMerger.
3035
 
        
3036
 
        :param location: location of directory to merge from, either the
3037
 
            location of a branch or of a path inside a branch.
3038
 
        :param merge_as: the path in a tree to add the new directory as.
3039
 
        :returns: the conflicts from 'do_merge'.
3040
 
        """
3041
 
        operation = cleanup.OperationWithCleanups(self._merge_into)
3042
 
        return operation.run(location, merge_as)
3043
 
 
3044
 
    def _merge_into(self, op, location, merge_as):
3045
 
        # Open and lock the various tree and branch objects
3046
 
        wt, subdir_relpath = WorkingTree.open_containing(merge_as)
3047
 
        op.add_cleanup(wt.lock_write().unlock)
3048
 
        branch_to_merge, subdir_to_merge = _mod_branch.Branch.open_containing(
3049
 
            location)
3050
 
        op.add_cleanup(branch_to_merge.lock_read().unlock)
3051
 
        other_tree = branch_to_merge.basis_tree()
3052
 
        op.add_cleanup(other_tree.lock_read().unlock)
3053
 
        # Perform the merge
3054
 
        merger = _mod_merge.MergeIntoMerger(this_tree=wt, other_tree=other_tree,
3055
 
            other_branch=branch_to_merge, target_subdir=subdir_relpath,
3056
 
            source_subpath=subdir_to_merge)
3057
 
        merger.set_base_revision(_mod_revision.NULL_REVISION, branch_to_merge)
3058
 
        conflicts = merger.do_merge()
3059
 
        merger.set_pending()
3060
 
        return conflicts
3061
 
 
3062
 
    def assertTreeEntriesEqual(self, expected_entries, tree):
3063
 
        """Assert that 'tree' contains the expected inventory entries.
3064
 
 
3065
 
        :param expected_entries: sequence of (path, file-id) pairs.
3066
 
        """
3067
 
        files = [(path, ie.file_id) for path, ie in tree.iter_entries_by_dir()]
3068
 
        self.assertEqual(expected_entries, files)
3069
 
 
3070
 
 
3071
 
class TestMergeInto(TestMergeIntoBase):
3072
 
 
3073
 
    def test_newdir_with_unique_roots(self):
3074
 
        """Merge a branch with a unique root into a new directory."""
3075
 
        project_wt, lib_wt = self.setup_two_branches()
3076
 
        self.do_merge_into('lib1', 'project/lib1')
3077
 
        project_wt.lock_read()
3078
 
        self.addCleanup(project_wt.unlock)
3079
 
        # The r1-lib1 revision should be merged into this one
3080
 
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
3081
 
        self.assertTreeEntriesEqual(
3082
 
            [('', 'project-root-id'),
3083
 
             ('README', 'project-README-id'),
3084
 
             ('dir', 'project-dir-id'),
3085
 
             ('lib1', 'lib1-root-id'),
3086
 
             ('dir/file.c', 'project-file.c-id'),
3087
 
             ('lib1/Makefile', 'lib1-Makefile-id'),
3088
 
             ('lib1/README', 'lib1-README-id'),
3089
 
             ('lib1/foo.c', 'lib1-foo.c-id'),
3090
 
            ], project_wt)
3091
 
 
3092
 
    def test_subdir(self):
3093
 
        """Merge a branch into a subdirectory of an existing directory."""
3094
 
        project_wt, lib_wt = self.setup_two_branches()
3095
 
        self.do_merge_into('lib1', 'project/dir/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
 
             ('dir/file.c', 'project-file.c-id'),
3105
 
             ('dir/lib1', 'lib1-root-id'),
3106
 
             ('dir/lib1/Makefile', 'lib1-Makefile-id'),
3107
 
             ('dir/lib1/README', 'lib1-README-id'),
3108
 
             ('dir/lib1/foo.c', 'lib1-foo.c-id'),
3109
 
            ], project_wt)
3110
 
 
3111
 
    def test_newdir_with_repeat_roots(self):
3112
 
        """If the file-id of the dir to be merged already exists a new ID will
3113
 
        be allocated to let the merge happen.
3114
 
        """
3115
 
        project_wt, lib_wt = self.setup_two_branches(custom_root_ids=False)
3116
 
        root_id = project_wt.path2id('')
3117
 
        self.do_merge_into('lib1', 'project/lib1')
3118
 
        project_wt.lock_read()
3119
 
        self.addCleanup(project_wt.unlock)
3120
 
        # The r1-lib1 revision should be merged into this one
3121
 
        self.assertEqual(['r1-project', 'r1-lib1'], project_wt.get_parent_ids())
3122
 
        new_lib1_id = project_wt.path2id('lib1')
3123
 
        self.assertNotEqual(None, new_lib1_id)
3124
 
        self.assertTreeEntriesEqual(
3125
 
            [('', root_id),
3126
 
             ('README', 'project-README-id'),
3127
 
             ('dir', 'project-dir-id'),
3128
 
             ('lib1', new_lib1_id),
3129
 
             ('dir/file.c', 'project-file.c-id'),
3130
 
             ('lib1/Makefile', 'lib1-Makefile-id'),
3131
 
             ('lib1/README', 'lib1-README-id'),
3132
 
             ('lib1/foo.c', 'lib1-foo.c-id'),
3133
 
            ], project_wt)
3134
 
 
3135
 
    def test_name_conflict(self):
3136
 
        """When the target directory name already exists a conflict is
3137
 
        generated and the original directory is renamed to foo.moved.
3138
 
        """
3139
 
        dest_wt = self.setup_simple_branch('dest', ['dir/', 'dir/file.txt'])
3140
 
        src_wt = self.setup_simple_branch('src', ['README'])
3141
 
        conflicts = self.do_merge_into('src', 'dest/dir')
3142
 
        self.assertEqual(1, conflicts)
3143
 
        dest_wt.lock_read()
3144
 
        self.addCleanup(dest_wt.unlock)
3145
 
        # The r1-lib1 revision should be merged into this one
3146
 
        self.assertEqual(['r1-dest', 'r1-src'], dest_wt.get_parent_ids())
3147
 
        self.assertTreeEntriesEqual(
3148
 
            [('', 'dest-root-id'),
3149
 
             ('dir', 'src-root-id'),
3150
 
             ('dir.moved', 'dest-dir-id'),
3151
 
             ('dir/README', 'src-README-id'),
3152
 
             ('dir.moved/file.txt', 'dest-file.txt-id'),
3153
 
            ], dest_wt)
3154
 
 
3155
 
    def test_file_id_conflict(self):
3156
 
        """A conflict is generated if the merge-into adds a file (or other
3157
 
        inventory entry) with a file-id that already exists in the target tree.
3158
 
        """
3159
 
        dest_wt = self.setup_simple_branch('dest', ['file.txt'])
3160
 
        # Make a second tree with a file-id that will clash with file.txt in
3161
 
        # dest.
3162
 
        src_wt = self.make_branch_and_tree('src')
3163
 
        self.build_tree(['src/README'])
3164
 
        src_wt.add(['README'], ids=['dest-file.txt-id'])
3165
 
        src_wt.commit("Rev 1 of src.", rev_id='r1-src')
3166
 
        conflicts = self.do_merge_into('src', 'dest/dir')
3167
 
        # This is an edge case that shouldn't happen to users very often.  So
3168
 
        # we don't care really about the exact presentation of the conflict,
3169
 
        # just that there is one.
3170
 
        self.assertEqual(1, conflicts)
3171
 
 
3172
 
    def test_only_subdir(self):
3173
 
        """When the location points to just part of a tree, merge just that
3174
 
        subtree.
3175
 
        """
3176
 
        dest_wt = self.setup_simple_branch('dest')
3177
 
        src_wt = self.setup_simple_branch(
3178
 
            'src', ['hello.txt', 'dir/', 'dir/foo.c'])
3179
 
        conflicts = self.do_merge_into('src/dir', 'dest/dir')
3180
 
        dest_wt.lock_read()
3181
 
        self.addCleanup(dest_wt.unlock)
3182
 
        # The r1-lib1 revision should NOT be merged into this one (this is a
3183
 
        # partial merge).
3184
 
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3185
 
        self.assertTreeEntriesEqual(
3186
 
            [('', 'dest-root-id'),
3187
 
             ('dir', 'src-dir-id'),
3188
 
             ('dir/foo.c', 'src-foo.c-id'),
3189
 
            ], dest_wt)
3190
 
 
3191
 
    def test_only_file(self):
3192
 
        """An edge case: merge just one file, not a whole dir."""
3193
 
        dest_wt = self.setup_simple_branch('dest')
3194
 
        two_file_wt = self.setup_simple_branch(
3195
 
            'two-file', ['file1.txt', 'file2.txt'])
3196
 
        conflicts = self.do_merge_into('two-file/file1.txt', 'dest/file1.txt')
3197
 
        dest_wt.lock_read()
3198
 
        self.addCleanup(dest_wt.unlock)
3199
 
        # The r1-lib1 revision should NOT be merged into this one
3200
 
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3201
 
        self.assertTreeEntriesEqual(
3202
 
            [('', 'dest-root-id'), ('file1.txt', 'two-file-file1.txt-id')],
3203
 
            dest_wt)
3204
 
 
3205
 
    def test_no_such_source_path(self):
3206
 
        """PathNotInTree is raised if the specified path in the source tree
3207
 
        does not exist.
3208
 
        """
3209
 
        dest_wt = self.setup_simple_branch('dest')
3210
 
        two_file_wt = self.setup_simple_branch('src', ['dir/'])
3211
 
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
3212
 
            'src/no-such-dir', 'dest/foo')
3213
 
        dest_wt.lock_read()
3214
 
        self.addCleanup(dest_wt.unlock)
3215
 
        # The dest tree is unmodified.
3216
 
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3217
 
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
3218
 
 
3219
 
    def test_no_such_target_path(self):
3220
 
        """PathNotInTree is also raised if the specified path in the target
3221
 
        tree does not exist.
3222
 
        """
3223
 
        dest_wt = self.setup_simple_branch('dest')
3224
 
        two_file_wt = self.setup_simple_branch('src', ['file.txt'])
3225
 
        self.assertRaises(_mod_merge.PathNotInTree, self.do_merge_into,
3226
 
            'src', 'dest/no-such-dir/foo')
3227
 
        dest_wt.lock_read()
3228
 
        self.addCleanup(dest_wt.unlock)
3229
 
        # The dest tree is unmodified.
3230
 
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3231
 
        self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)