1
# Copyright (C) 2005-2012 Canonical Ltd
1
# Copyright (C) 2005-2010 Canonical Ltd
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 (
41
40
TestCaseWithMemoryTransport,
42
41
TestCaseWithTransport,
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:
88
with file('branch1/bar', 'wb') as f:
85
file('branch1/foo', 'wb').write('foo')
86
file('branch1/bar', 'wb').write('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')
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())
100
98
def test_pending_with_null(self):
140
138
def test_merge_unrelated_retains_root(self):
141
139
wt = self.make_branch_and_tree('tree')
142
other_tree = self.make_branch_and_tree('other')
143
self.addCleanup(other_tree.lock_read().unlock)
140
root_id_before_merge = wt.get_root_id()
141
other_tree = self.make_branch_and_tree('other')
142
# Do a commit so there is something to merge
143
other_tree.commit('commit other')
144
self.assertNotEquals(root_id_before_merge, other_tree.get_root_id())
145
wt.merge_from_branch(other_tree.branch,
146
from_revision=_mod_revision.NULL_REVISION)
147
self.assertEqual(root_id_before_merge, wt.get_root_id())
149
def test_merge_preview_unrelated_retains_root(self):
150
wt = self.make_branch_and_tree('tree')
151
other_tree = self.make_branch_and_tree('other')
152
# Do a commit so there is something to merge
153
other_tree.commit('commit other')
144
154
merger = _mod_merge.Merge3Merger(wt, wt, wt.basis_tree(), other_tree,
145
155
this_branch=wt.branch,
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)
157
with merger.make_preview_transform() as tt:
158
preview = tt.get_preview_tree()
159
self.assertEqual(wt.get_root_id(), preview.get_root_id())
152
161
def test_create_rename(self):
153
162
"""Rename an inventory entry while creating the file"""
154
163
tree =self.make_branch_and_tree('.')
155
with file('name1', 'wb') as f: f.write('Hello')
164
file('name1', 'wb').write('Hello')
156
165
tree.add('name1')
157
166
tree.commit(message="hello")
158
167
tree.rename_one('name1', 'name2')
165
174
os.mkdir('dirname1')
166
175
tree.add('dirname1')
167
176
filename = pathjoin('dirname1', 'name1')
168
with file(filename, 'wb') as f: f.write('Hello')
177
file(filename, 'wb').write('Hello')
169
178
tree.add(filename)
170
179
tree.commit(message="hello")
171
180
filename2 = pathjoin('dirname1', 'name2')
228
237
def test_nested_merge(self):
229
238
tree = self.make_branch_and_tree('tree',
230
format='development-subtree')
239
format='dirstate-with-subtree')
231
240
sub_tree = self.make_branch_and_tree('tree/sub-tree',
232
format='development-subtree')
241
format='dirstate-with-subtree')
233
242
sub_tree.set_root_id('sub-tree-root')
234
243
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
235
244
sub_tree.add('file')
421
430
self.addCleanup(tree.unlock)
422
431
self.build_tree(['a'])
424
first_rev = tree.commit("added a")
433
tree.commit("added a")
434
first_rev = tree.branch.revision_history()[0]
425
435
merger = _mod_merge.Merger.from_revision_ids(None, tree,
426
436
_mod_revision.NULL_REVISION,
447
457
merger.merge_type = _mod_merge.Merge3Merger
448
458
tree_merger = merger.make_merger()
449
459
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)
460
self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
461
self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
456
463
def test_make_preview_transform(self):
457
464
this_tree = self.make_branch_and_tree('this')
512
519
self.addCleanup(tree.unlock)
513
520
self.build_tree(['a'])
515
first_rev = tree.commit("added a")
522
tree.commit("added a")
516
523
old_root_id = tree.get_root_id()
524
first_rev = tree.branch.revision_history()[0]
517
525
merger = _mod_merge.Merger.from_revision_ids(None, tree,
518
526
_mod_revision.NULL_REVISION,
559
567
class TestPlanMerge(TestCaseWithMemoryTransport):
562
super(TestPlanMerge, self).setUp()
570
TestCaseWithMemoryTransport.setUp(self)
563
571
mapper = versionedfile.PrefixMapper()
564
572
factory = knit.make_file_factory(True, mapper)
565
573
self.vf = factory(self.get_transport())
2252
2260
wt.get_file_text('foo-id'))
2254
2262
def test_modified_symlink(self):
2255
self.requireFeature(features.SymlinkFeature)
2263
self.requireFeature(tests.SymlinkFeature)
2256
2264
# A Create symlink foo => bar
2258
2266
# B C B relinks foo => baz
2297
2305
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2299
2307
def test_renamed_symlink(self):
2300
self.requireFeature(features.SymlinkFeature)
2308
self.requireFeature(tests.SymlinkFeature)
2301
2309
# A Create symlink foo => bar
2303
2311
# B C B renames foo => barry
2353
2361
self.assertEqual('blah', wt.id2path('foo-id'))
2355
2363
def test_symlink_no_content_change(self):
2356
self.requireFeature(features.SymlinkFeature)
2364
self.requireFeature(tests.SymlinkFeature)
2357
2365
# A Create symlink foo => bar
2359
2367
# B C B relinks foo => baz
2404
2412
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2406
2414
def test_symlink_this_changed_kind(self):
2407
self.requireFeature(features.SymlinkFeature)
2415
self.requireFeature(tests.SymlinkFeature)
2410
2418
# B C B creates symlink foo => bar
2458
2466
def test_symlink_all_wt(self):
2459
2467
"""Check behavior if all trees are Working Trees."""
2460
self.requireFeature(features.SymlinkFeature)
2468
self.requireFeature(tests.SymlinkFeature)
2461
2469
# The big issue is that entry.symlink_target is None for WorkingTrees.
2462
2470
# So we need to make sure we handle that case correctly.
2634
2642
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2635
2643
# 'tree-reference'
2636
2644
wt = self.make_branch_and_tree('tree',
2637
format='development-subtree')
2645
format='dirstate-with-subtree')
2638
2646
wt.lock_write()
2639
2647
self.addCleanup(wt.unlock)
2640
2648
sub_tree = self.make_branch_and_tree('tree/sub-tree',
2641
format='development-subtree')
2649
format='dirstate-with-subtree')
2642
2650
wt.set_root_id('a-root-id')
2643
2651
sub_tree.set_root_id('sub-tree-root')
2644
2652
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2669
2677
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2670
2678
# 'tree-reference'
2671
2679
wt = self.make_branch_and_tree('tree',
2672
format='development-subtree')
2680
format='dirstate-with-subtree')
2673
2681
wt.lock_write()
2674
2682
self.addCleanup(wt.unlock)
2675
2683
sub_tree = self.make_branch_and_tree('tree/sub',
2676
format='development-subtree')
2684
format='dirstate-with-subtree')
2677
2685
wt.set_root_id('a-root-id')
2678
2686
sub_tree.set_root_id('sub-tree-root')
2679
2687
self.build_tree_contents([('tree/sub/file', 'text1')])
2708
2716
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2709
2717
# 'tree-reference'
2710
2718
wt = self.make_branch_and_tree('tree',
2711
format='development-subtree')
2719
format='dirstate-with-subtree')
2712
2720
wt.lock_write()
2713
2721
self.addCleanup(wt.unlock)
2714
2722
sub_tree = self.make_branch_and_tree('tree/sub',
2715
format='development-subtree')
2723
format='dirstate-with-subtree')
2716
2724
wt.set_root_id('a-root-id')
2717
2725
sub_tree.set_root_id('sub-tree-root')
2718
2726
self.build_tree_contents([('tree/sub/file', 'text1')])
2751
2759
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2752
2760
# 'tree-reference'
2753
2761
wt = self.make_branch_and_tree('tree',
2754
format='development-subtree')
2762
format='dirstate-with-subtree')
2755
2763
wt.lock_write()
2756
2764
self.addCleanup(wt.unlock)
2757
2765
sub_tree = self.make_branch_and_tree('tree/sub',
2758
format='development-subtree')
2766
format='dirstate-with-subtree')
2759
2767
wt.set_root_id('a-root-id')
2760
2768
sub_tree.set_root_id('sub-tree-root')
2761
2769
self.build_tree_contents([('tree/sub/file', 'text1')])
3246
3254
# The dest tree is unmodified.
3247
3255
self.assertEqual(['r1-dest'], dest_wt.get_parent_ids())
3248
3256
self.assertTreeEntriesEqual([('', 'dest-root-id')], dest_wt)
3251
class TestMergeHooks(TestCaseWithTransport):
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')
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')
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")
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)
3277
self.assertFileEqual("content_3", 'tree_a/file')
3278
self.assertLength(1, calls)
3280
def test_post_merge_hook_called(self):
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')
3288
self.tree_a.merge_from_branch(self.tree_b.branch)
3290
self.assertFileEqual("content_2", 'tree_a/file')
3291
self.assertLength(1, calls)