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