← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Abbreviate pack_stat struct format to '>6L'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
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,
121
122
        finally:
122
123
            wt1.unlock()
123
124
 
 
125
    def test_merge_into_null_tree(self):
 
126
        wt = self.make_branch_and_tree('tree')
 
127
        null_tree = wt.basis_tree()
 
128
        self.build_tree(['tree/file'])
 
129
        wt.add('file')
 
130
        wt.commit('tree with root')
 
131
        merger = _mod_merge.Merge3Merger(null_tree, null_tree, null_tree, wt,
 
132
                                         this_branch=wt.branch,
 
133
                                         do_merge=False)
 
134
        with merger.make_preview_transform() as tt:
 
135
            self.assertEqual([], tt.find_conflicts())
 
136
            preview = tt.get_preview_tree()
 
137
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
138
 
 
139
    def test_merge_unrelated_retains_root(self):
 
140
        wt = self.make_branch_and_tree('tree')
 
141
        other_tree = self.make_branch_and_tree('other')
 
142
        self.addCleanup(other_tree.lock_read().unlock)
 
143
        merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
 
144
                                         this_branch=wt.branch,
 
145
                                         do_merge=False)
 
146
        with transform.TransformPreview(wt) as merger.tt:
 
147
            merger._compute_transform()
 
148
            new_root_id = merger.tt.final_file_id(merger.tt.root)
 
149
            self.assertEqual(wt.get_root_id(), new_root_id)
 
150
 
124
151
    def test_create_rename(self):
125
152
        """Rename an inventory entry while creating the file"""
126
153
        tree =self.make_branch_and_tree('.')
387
414
                             '>>>>>>> MERGE-SOURCE\n',
388
415
                             'this/file')
389
416
 
 
417
    def test_merge_reverse_revision_range(self):
 
418
        tree = self.make_branch_and_tree(".")
 
419
        tree.lock_write()
 
420
        self.addCleanup(tree.unlock)
 
421
        self.build_tree(['a'])
 
422
        tree.add('a')
 
423
        tree.commit("added a")
 
424
        first_rev = tree.branch.revision_history()[0]
 
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
 
390
437
    def test_make_merger(self):
391
438
        this_tree = self.make_branch_and_tree('this')
392
439
        this_tree.commit('rev1', rev_id='rev1')
456
503
        finally:
457
504
            tree_file.close()
458
505
 
 
506
    def test_merge_require_tree_root(self):
 
507
        tree = self.make_branch_and_tree(".")
 
508
        tree.lock_write()
 
509
        self.addCleanup(tree.unlock)
 
510
        self.build_tree(['a'])
 
511
        tree.add('a')
 
512
        tree.commit("added a")
 
513
        old_root_id = tree.get_root_id()
 
514
        first_rev = tree.branch.revision_history()[0]
 
515
        merger = _mod_merge.Merger.from_revision_ids(None, tree,
 
516
                                          _mod_revision.NULL_REVISION,
 
517
                                          first_rev)
 
518
        merger.merge_type = _mod_merge.Merge3Merger
 
519
        conflict_count = merger.do_merge()
 
520
        self.assertEqual(0, conflict_count)
 
521
        self.assertEquals(set([old_root_id]), tree.all_file_ids())
 
522
        tree.set_parent_ids([])
 
523
 
459
524
    def test_merge_add_into_deleted_root(self):
460
525
        # Yes, people actually do this.  And report bugs if it breaks.
461
526
        source = self.make_branch_and_tree('source', format='rich-root-pack')
1827
1892
        builder.build_snapshot('C-id', ['A-id'], [])
1828
1893
        builder.build_snapshot('E-id', ['C-id', 'B-id'],
1829
1894
            [('unversion', 'a-id'),
 
1895
             ('flush', None),
1830
1896
             ('add', (u'a', 'a-id', 'directory', None))])
1831
1897
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1832
1898
        merge_obj = self.make_merge_obj(builder, 'E-id')
1850
1916
        builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1851
1917
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
1852
1918
            [('unversion', 'a-id'),
 
1919
             ('flush', None),
1853
1920
             ('add', (u'a', 'a-id', 'directory', None))])
1854
1921
        merge_obj = self.make_merge_obj(builder, 'E-id')
1855
1922
        entries = list(merge_obj._entries_lca())
2118
2185
        self.assertTrue(wt.is_executable('foo-id'))
2119
2186
 
2120
2187
    def test_create_symlink(self):
2121
 
        self.requireFeature(tests.SymlinkFeature)
 
2188
        self.requireFeature(features.SymlinkFeature)
2122
2189
        #   A
2123
2190
        #  / \
2124
2191
        # B   C
2183
2250
                             wt.get_file_text('foo-id'))
2184
2251
 
2185
2252
    def test_modified_symlink(self):
2186
 
        self.requireFeature(tests.SymlinkFeature)
 
2253
        self.requireFeature(features.SymlinkFeature)
2187
2254
        #   A       Create symlink foo => bar
2188
2255
        #  / \
2189
2256
        # B   C     B relinks foo => baz
2228
2295
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2229
2296
 
2230
2297
    def test_renamed_symlink(self):
2231
 
        self.requireFeature(tests.SymlinkFeature)
 
2298
        self.requireFeature(features.SymlinkFeature)
2232
2299
        #   A       Create symlink foo => bar
2233
2300
        #  / \
2234
2301
        # B   C     B renames foo => barry
2284
2351
        self.assertEqual('blah', wt.id2path('foo-id'))
2285
2352
 
2286
2353
    def test_symlink_no_content_change(self):
2287
 
        self.requireFeature(tests.SymlinkFeature)
 
2354
        self.requireFeature(features.SymlinkFeature)
2288
2355
        #   A       Create symlink foo => bar
2289
2356
        #  / \
2290
2357
        # B   C     B relinks foo => baz
2335
2402
        self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2336
2403
 
2337
2404
    def test_symlink_this_changed_kind(self):
2338
 
        self.requireFeature(tests.SymlinkFeature)
 
2405
        self.requireFeature(features.SymlinkFeature)
2339
2406
        #   A       Nothing
2340
2407
        #  / \
2341
2408
        # B   C     B creates symlink foo => bar
2388
2455
 
2389
2456
    def test_symlink_all_wt(self):
2390
2457
        """Check behavior if all trees are Working Trees."""
2391
 
        self.requireFeature(tests.SymlinkFeature)
 
2458
        self.requireFeature(features.SymlinkFeature)
2392
2459
        # The big issue is that entry.symlink_target is None for WorkingTrees.
2393
2460
        # So we need to make sure we handle that case correctly.
2394
2461
        #   A   foo => bar
2863
2930
 
2864
2931
    def get_merger_factory(self):
2865
2932
        # Allows  the inner methods to access the test attributes
2866
 
        test = self
 
2933
        calls = self.calls
2867
2934
 
2868
2935
        class FooMerger(_mod_merge.ConfigurableFileMerger):
2869
2936
            name_prefix = "foo"
2870
2937
            default_files = ['bar']
2871
2938
 
2872
2939
            def merge_text(self, params):
2873
 
                test.calls.append('merge_text')
 
2940
                calls.append('merge_text')
2874
2941
                return ('not_applicable', None)
2875
2942
 
2876
2943
        def factory(merger):