← 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: Canonical.com Patch Queue Manager
  • Date: 2011-06-30 18:28:17 UTC
  • mfrom: (5967.10.2 test-cat)
  • Revision ID: pqm@pqm.ubuntu.com-20110630182817-83a5q9r9rxfkdn8r
(mbp) don't use subprocesses for testing cat (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
 
# Copyright (C) 2005-2012 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
37
37
from bzrlib.merge import transform_tree, merge_inner, _PlanMerge
38
38
from bzrlib.osutils import basename, pathjoin, file_kind
39
39
from bzrlib.tests import (
40
 
    features,
41
40
    TestCaseWithMemoryTransport,
42
41
    TestCaseWithTransport,
43
42
    test_merge_core,
83
82
        tip = wt1.commit('empty commit')
84
83
        wt2 = self.make_branch_and_tree('branch2')
85
84
        wt2.pull(wt1.branch)
86
 
        with file('branch1/foo', 'wb') as f:
87
 
            f.write('foo')
88
 
        with file('branch1/bar', 'wb') as f:
89
 
            f.write('bar')
 
85
        file('branch1/foo', 'wb').write('foo')
 
86
        file('branch1/bar', 'wb').write('bar')
90
87
        wt1.add('foo')
91
88
        wt1.add('bar')
92
89
        wt1.commit('add foobar')
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')
 
90
        os.chdir('branch2')
 
91
        self.run_bzr('merge ../branch1/baz', retcode=3)
 
92
        self.run_bzr('merge ../branch1/foo')
 
93
        self.assertPathExists('foo')
 
94
        self.assertPathDoesNotExist('bar')
 
95
        wt2 = WorkingTree.open('.') # opens branch2
98
96
        self.assertEqual([tip], wt2.get_parent_ids())
99
97
 
100
98
    def test_pending_with_null(self):
137
135
            preview = tt.get_preview_tree()
138
136
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
139
137
 
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
 
 
152
138
    def test_create_rename(self):
153
139
        """Rename an inventory entry while creating the file"""
154
140
        tree =self.make_branch_and_tree('.')
155
 
        with file('name1', 'wb') as f: f.write('Hello')
 
141
        file('name1', 'wb').write('Hello')
156
142
        tree.add('name1')
157
143
        tree.commit(message="hello")
158
144
        tree.rename_one('name1', 'name2')
165
151
        os.mkdir('dirname1')
166
152
        tree.add('dirname1')
167
153
        filename = pathjoin('dirname1', 'name1')
168
 
        with file(filename, 'wb') as f: f.write('Hello')
 
154
        file(filename, 'wb').write('Hello')
169
155
        tree.add(filename)
170
156
        tree.commit(message="hello")
171
157
        filename2 = pathjoin('dirname1', 'name2')
227
213
 
228
214
    def test_nested_merge(self):
229
215
        tree = self.make_branch_and_tree('tree',
230
 
            format='development-subtree')
 
216
            format='dirstate-with-subtree')
231
217
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
232
 
            format='development-subtree')
 
218
            format='dirstate-with-subtree')
233
219
        sub_tree.set_root_id('sub-tree-root')
234
220
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
235
221
        sub_tree.add('file')
421
407
        self.addCleanup(tree.unlock)
422
408
        self.build_tree(['a'])
423
409
        tree.add('a')
424
 
        first_rev = tree.commit("added a")
 
410
        tree.commit("added a")
 
411
        first_rev = tree.branch.revision_history()[0]
425
412
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
426
413
                                          _mod_revision.NULL_REVISION,
427
414
                                          first_rev)
447
434
        merger.merge_type = _mod_merge.Merge3Merger
448
435
        tree_merger = merger.make_merger()
449
436
        self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
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)
 
437
        self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
 
438
        self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
455
439
 
456
440
    def test_make_preview_transform(self):
457
441
        this_tree = self.make_branch_and_tree('this')
512
496
        self.addCleanup(tree.unlock)
513
497
        self.build_tree(['a'])
514
498
        tree.add('a')
515
 
        first_rev = tree.commit("added a")
 
499
        tree.commit("added a")
516
500
        old_root_id = tree.get_root_id()
 
501
        first_rev = tree.branch.revision_history()[0]
517
502
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
518
503
                                          _mod_revision.NULL_REVISION,
519
504
                                          first_rev)
559
544
class TestPlanMerge(TestCaseWithMemoryTransport):
560
545
 
561
546
    def setUp(self):
562
 
        super(TestPlanMerge, self).setUp()
 
547
        TestCaseWithMemoryTransport.setUp(self)
563
548
        mapper = versionedfile.PrefixMapper()
564
549
        factory = knit.make_file_factory(True, mapper)
565
550
        self.vf = factory(self.get_transport())
1894
1879
        builder.build_snapshot('C-id', ['A-id'], [])
1895
1880
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1896
1881
            [('unversion', 'a-id'),
1897
 
             ('flush', None),
1898
1882
             ('add', (u'a', 'a-id', 'directory', None))])
1899
1883
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1900
1884
        merge_obj = self.make_merge_obj(builder, 'E-id')
1918
1902
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1919
1903
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1920
1904
            [('unversion', 'a-id'),
1921
 
             ('flush', None),
1922
1905
             ('add', (u'a', 'a-id', 'directory', None))])
1923
1906
        merge_obj = self.make_merge_obj(builder, 'E-id')
1924
1907
        entries = list(merge_obj._entries_lca())
2187
2170
        self.assertTrue(wt.is_executable('foo-id'))
2188
2171
 
2189
2172
    def test_create_symlink(self):
2190
 
        self.requireFeature(features.SymlinkFeature)
 
2173
        self.requireFeature(tests.SymlinkFeature)
2191
2174
        #   A
2192
2175
        #  / \
2193
2176
        # B   C
2252
2235
                             wt.get_file_text('foo-id'))
2253
2236
 
2254
2237
    def test_modified_symlink(self):
2255
 
        self.requireFeature(features.SymlinkFeature)
 
2238
        self.requireFeature(tests.SymlinkFeature)
2256
2239
        #   A       Create symlink foo => bar
2257
2240
        #  / \
2258
2241
        # B   C     B relinks foo => baz
2297
2280
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2298
2281
 
2299
2282
    def test_renamed_symlink(self):
2300
 
        self.requireFeature(features.SymlinkFeature)
 
2283
        self.requireFeature(tests.SymlinkFeature)
2301
2284
        #   A       Create symlink foo => bar
2302
2285
        #  / \
2303
2286
        # B   C     B renames foo => barry
2353
2336
        self.assertEqual('blah', wt.id2path('foo-id'))
2354
2337
 
2355
2338
    def test_symlink_no_content_change(self):
2356
 
        self.requireFeature(features.SymlinkFeature)
 
2339
        self.requireFeature(tests.SymlinkFeature)
2357
2340
        #   A       Create symlink foo => bar
2358
2341
        #  / \
2359
2342
        # B   C     B relinks foo => baz
2404
2387
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2405
2388
 
2406
2389
    def test_symlink_this_changed_kind(self):
2407
 
        self.requireFeature(features.SymlinkFeature)
 
2390
        self.requireFeature(tests.SymlinkFeature)
2408
2391
        #   A       Nothing
2409
2392
        #  / \
2410
2393
        # B   C     B creates symlink foo => bar
2457
2440
 
2458
2441
    def test_symlink_all_wt(self):
2459
2442
        """Check behavior if all trees are Working Trees."""
2460
 
        self.requireFeature(features.SymlinkFeature)
 
2443
        self.requireFeature(tests.SymlinkFeature)
2461
2444
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2462
2445
        # So we need to make sure we handle that case correctly.
2463
2446
        #   A   foo => bar
2634
2617
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2635
2618
        # 'tree-reference'
2636
2619
        wt = self.make_branch_and_tree('tree',
2637
 
            format='development-subtree')
 
2620
            format='dirstate-with-subtree')
2638
2621
        wt.lock_write()
2639
2622
        self.addCleanup(wt.unlock)
2640
2623
        sub_tree = self.make_branch_and_tree('tree/sub-tree',
2641
 
            format='development-subtree')
 
2624
            format='dirstate-with-subtree')
2642
2625
        wt.set_root_id('a-root-id')
2643
2626
        sub_tree.set_root_id('sub-tree-root')
2644
2627
        self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2669
2652
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2670
2653
        # 'tree-reference'
2671
2654
        wt = self.make_branch_and_tree('tree',
2672
 
            format='development-subtree')
 
2655
            format='dirstate-with-subtree')
2673
2656
        wt.lock_write()
2674
2657
        self.addCleanup(wt.unlock)
2675
2658
        sub_tree = self.make_branch_and_tree('tree/sub',
2676
 
            format='development-subtree')
 
2659
            format='dirstate-with-subtree')
2677
2660
        wt.set_root_id('a-root-id')
2678
2661
        sub_tree.set_root_id('sub-tree-root')
2679
2662
        self.build_tree_contents([('tree/sub/file', 'text1')])
2708
2691
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2709
2692
        # 'tree-reference'
2710
2693
        wt = self.make_branch_and_tree('tree',
2711
 
            format='development-subtree')
 
2694
            format='dirstate-with-subtree')
2712
2695
        wt.lock_write()
2713
2696
        self.addCleanup(wt.unlock)
2714
2697
        sub_tree = self.make_branch_and_tree('tree/sub',
2715
 
            format='development-subtree')
 
2698
            format='dirstate-with-subtree')
2716
2699
        wt.set_root_id('a-root-id')
2717
2700
        sub_tree.set_root_id('sub-tree-root')
2718
2701
        self.build_tree_contents([('tree/sub/file', 'text1')])
2751
2734
        # Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2752
2735
        # 'tree-reference'
2753
2736
        wt = self.make_branch_and_tree('tree',
2754
 
            format='development-subtree')
 
2737
            format='dirstate-with-subtree')
2755
2738
        wt.lock_write()
2756
2739
        self.addCleanup(wt.unlock)
2757
2740
        sub_tree = self.make_branch_and_tree('tree/sub',
2758
 
            format='development-subtree')
 
2741
            format='dirstate-with-subtree')
2759
2742
        wt.set_root_id('a-root-id')
2760
2743
        sub_tree.set_root_id('sub-tree-root')
2761
2744
        self.build_tree_contents([('tree/sub/file', 'text1')])
3246
3229
        # The dest tree is unmodified.
3247
3230
        self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3248
3231
        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)