1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from StringIO import StringIO
20
from bzrlib import conflicts
1
21
from bzrlib.branch import Branch
2
from bzrlib.commit import commit
3
from bzrlib.selftest import TestCaseInTempDir
4
from bzrlib.merge import merge
5
from bzrlib.errors import UnrelatedBranches, NoCommits
7
class TestMerge(TestCaseInTempDir):
22
from bzrlib.builtins import merge
23
from bzrlib.conflicts import ConflictList, TextConflict
24
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
25
from bzrlib.merge import transform_tree, merge_inner
26
from bzrlib.osutils import pathjoin
27
from bzrlib.revision import common_ancestor
28
from bzrlib.tests import TestCaseWithTransport
29
from bzrlib.trace import (enable_test_log, disable_test_log)
30
from bzrlib.workingtree import WorkingTree
33
class TestMerge(TestCaseWithTransport):
8
34
"""Test appending more than one revision"""
9
36
def test_pending(self):
10
br = Branch(".", init=True)
12
self.assertEquals(len(br.pending_merges()), 0)
13
merge(['.', -1], [None, None])
14
self.assertEquals(len(br.pending_merges()), 0)
37
wt = self.make_branch_and_tree('.')
38
rev_a = wt.commit("lala!")
39
self.assertEqual([rev_a], wt.get_parent_ids())
40
merge([u'.', -1], [None, None])
41
self.assertEqual([rev_a], wt.get_parent_ids())
44
wt = self.make_branch_and_tree('.')
48
merge([u'.', 2], [u'.', 1])
16
50
def test_nocommits(self):
17
51
self.test_pending()
19
br2 = Branch('branch2', init=True)
52
wt2 = self.make_branch_and_tree('branch2')
20
53
self.assertRaises(NoCommits, merge, ['branch2', -1],
24
57
def test_unrelated(self):
25
br2 = self.test_nocommits()
27
merge, ['branch2', -1], [None, None]
58
wt2 = self.test_nocommits()
28
60
self.assertRaises(UnrelatedBranches, merge, ['branch2', -1],
64
def test_merge_one_file(self):
65
"""Do a partial merge of a tree which should not affect tree parents."""
66
wt1 = self.make_branch_and_tree('branch1')
67
tip = wt1.commit('empty commit')
68
wt2 = self.make_branch_and_tree('branch2')
70
file('branch1/foo', 'wb').write('foo')
71
file('branch1/bar', 'wb').write('bar')
74
wt1.commit('add foobar')
76
self.run_bzr('merge', '../branch1/baz', retcode=3)
77
self.run_bzr('merge', '../branch1/foo')
78
self.failUnlessExists('foo')
79
self.failIfExists('bar')
80
wt2 = WorkingTree.open('.') # opens branch2
81
self.assertEqual([tip], wt2.get_parent_ids())
83
def test_pending_with_null(self):
84
"""When base is forced to revno 0, parent_ids are set"""
85
wt2 = self.test_unrelated()
86
wt1 = WorkingTree.open('.')
89
# merge all of branch 2 into branch 1 even though they
91
self.assertRaises(BzrCommandError, merge, ['branch2', -1],
92
['branch2', 0], reprocess=True, show_base=True)
93
merge(['branch2', -1], ['branch2', 0], reprocess=True)
94
self.assertEqual([br1.last_revision(), wt2.branch.last_revision()],
96
return (wt1, wt2.branch)
98
def test_two_roots(self):
99
"""Merge base is sane when two unrelated branches are merged"""
100
wt1, br2 = self.test_pending_with_null()
102
last = wt1.branch.last_revision()
103
self.assertEqual(common_ancestor(last, last, wt1.branch.repository), last)
105
def test_create_rename(self):
106
"""Rename an inventory entry while creating the file"""
107
tree =self.make_branch_and_tree('.')
108
file('name1', 'wb').write('Hello')
110
tree.commit(message="hello")
111
tree.rename_one('name1', 'name2')
113
transform_tree(tree, tree.branch.basis_tree())
115
def test_layered_rename(self):
116
"""Rename both child and parent at same time"""
117
tree =self.make_branch_and_tree('.')
120
filename = pathjoin('dirname1', 'name1')
121
file(filename, 'wb').write('Hello')
123
tree.commit(message="hello")
124
filename2 = pathjoin('dirname1', 'name2')
125
tree.rename_one(filename, filename2)
126
tree.rename_one('dirname1', 'dirname2')
127
transform_tree(tree, tree.branch.basis_tree())
129
def test_ignore_zero_merge_inner(self):
130
# Test that merge_inner's ignore zero parameter is effective
131
tree_a =self.make_branch_and_tree('a')
132
tree_a.commit(message="hello")
133
dir_b = tree_a.bzrdir.sprout('b')
134
tree_b = dir_b.open_workingtree()
135
tree_a.commit(message="hello again")
137
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
138
this_tree=tree_b, ignore_zero=True)
139
log = self._get_log(keep_log_file=True)
140
self.failUnless('All changes applied successfully.\n' not in log)
142
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
143
this_tree=tree_b, ignore_zero=False)
144
log = self._get_log(keep_log_file=True)
145
self.failUnless('All changes applied successfully.\n' in log)
147
def test_merge_inner_conflicts(self):
148
tree_a = self.make_branch_and_tree('a')
149
tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
150
merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
151
self.assertEqual(1, len(tree_a.conflicts()))
153
def test_rmdir_conflict(self):
154
tree_a = self.make_branch_and_tree('a')
155
self.build_tree(['a/b/'])
156
tree_a.add('b', 'b-id')
157
tree_a.commit('added b')
158
base_tree = tree_a.basis_tree()
159
tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
160
self.build_tree(['a/b/c'])
162
tree_a.commit('added c')
164
tree_z.commit('removed b')
165
merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
167
conflicts.MissingParent('Created directory', 'b', 'b-id'),
168
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
170
merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
173
conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
174
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
added
removed
bzrlib/tests/test_merge.py
