1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
|
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from StringIO import StringIO
from bzrlib import (
conflicts,
errors,
merge as _mod_merge,
option,
progress,
)
from bzrlib.branch import Branch
from bzrlib.conflicts import ConflictList, TextConflict
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
from bzrlib.merge import transform_tree, merge_inner
from bzrlib.osutils import pathjoin, file_kind
from bzrlib.revision import common_ancestor
from bzrlib.tests import TestCaseWithTransport
from bzrlib.trace import (enable_test_log, disable_test_log)
from bzrlib.workingtree import WorkingTree
class TestMerge(TestCaseWithTransport):
"""Test appending more than one revision"""
def test_pending(self):
wt = self.make_branch_and_tree('.')
rev_a = wt.commit("lala!")
self.assertEqual([rev_a], wt.get_parent_ids())
self.assertRaises(errors.PointlessMerge, wt.merge_from_branch,
wt.branch)
self.assertEqual([rev_a], wt.get_parent_ids())
return wt
def test_undo(self):
wt = self.make_branch_and_tree('.')
wt.commit("lala!")
wt.commit("haha!")
wt.commit("blabla!")
wt.merge_from_branch(wt.branch, wt.branch.get_rev_id(2),
wt.branch.get_rev_id(1))
def test_nocommits(self):
wt = self.test_pending()
wt2 = self.make_branch_and_tree('branch2')
self.assertRaises(NoCommits, wt.merge_from_branch, wt2.branch)
return wt, wt2
def test_unrelated(self):
wt, wt2 = self.test_nocommits()
wt2.commit("blah")
self.assertRaises(UnrelatedBranches, wt.merge_from_branch, wt2.branch)
return wt2
def test_merge_one_file(self):
"""Do a partial merge of a tree which should not affect tree parents."""
wt1 = self.make_branch_and_tree('branch1')
tip = wt1.commit('empty commit')
wt2 = self.make_branch_and_tree('branch2')
wt2.pull(wt1.branch)
file('branch1/foo', 'wb').write('foo')
file('branch1/bar', 'wb').write('bar')
wt1.add('foo')
wt1.add('bar')
wt1.commit('add foobar')
os.chdir('branch2')
self.run_bzr('merge ../branch1/baz', retcode=3)
self.run_bzr('merge ../branch1/foo')
self.failUnlessExists('foo')
self.failIfExists('bar')
wt2 = WorkingTree.open('.') # opens branch2
self.assertEqual([tip], wt2.get_parent_ids())
def test_pending_with_null(self):
"""When base is forced to revno 0, parent_ids are set"""
wt2 = self.test_unrelated()
wt1 = WorkingTree.open('.')
br1 = wt1.branch
br1.fetch(wt2.branch)
# merge all of branch 2 into branch 1 even though they
# are not related.
wt1.merge_from_branch(wt2.branch, wt2.last_revision(), 'null:')
self.assertEqual([br1.last_revision(), wt2.branch.last_revision()],
wt1.get_parent_ids())
return (wt1, wt2.branch)
def test_two_roots(self):
"""Merge base is sane when two unrelated branches are merged"""
wt1, br2 = self.test_pending_with_null()
wt1.commit("blah")
last = wt1.branch.last_revision()
self.assertEqual(common_ancestor(last, last, wt1.branch.repository), last)
def test_create_rename(self):
"""Rename an inventory entry while creating the file"""
tree =self.make_branch_and_tree('.')
file('name1', 'wb').write('Hello')
tree.add('name1')
tree.commit(message="hello")
tree.rename_one('name1', 'name2')
os.unlink('name2')
transform_tree(tree, tree.branch.basis_tree())
def test_layered_rename(self):
"""Rename both child and parent at same time"""
tree =self.make_branch_and_tree('.')
os.mkdir('dirname1')
tree.add('dirname1')
filename = pathjoin('dirname1', 'name1')
file(filename, 'wb').write('Hello')
tree.add(filename)
tree.commit(message="hello")
filename2 = pathjoin('dirname1', 'name2')
tree.rename_one(filename, filename2)
tree.rename_one('dirname1', 'dirname2')
transform_tree(tree, tree.branch.basis_tree())
def test_ignore_zero_merge_inner(self):
# Test that merge_inner's ignore zero parameter is effective
tree_a =self.make_branch_and_tree('a')
tree_a.commit(message="hello")
dir_b = tree_a.bzrdir.sprout('b')
tree_b = dir_b.open_workingtree()
tree_a.commit(message="hello again")
log = StringIO()
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
this_tree=tree_b, ignore_zero=True)
log = self._get_log(keep_log_file=True)
self.failUnless('All changes applied successfully.\n' not in log)
tree_b.revert([])
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
this_tree=tree_b, ignore_zero=False)
log = self._get_log(keep_log_file=True)
self.failUnless('All changes applied successfully.\n' in log)
def test_merge_inner_conflicts(self):
tree_a = self.make_branch_and_tree('a')
tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
self.assertEqual(1, len(tree_a.conflicts()))
def test_rmdir_conflict(self):
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/b/'])
tree_a.add('b', 'b-id')
tree_a.commit('added b')
# basis_tree() is only guaranteed to be valid as long as it is actually
# the basis tree. This mutates the tree after grabbing basis, so go to
# the repository.
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
self.build_tree(['a/b/c'])
tree_a.add('b/c')
tree_a.commit('added c')
os.rmdir('z/b')
tree_z.commit('removed b')
merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
self.assertEqual([
conflicts.MissingParent('Created directory', 'b', 'b-id'),
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
tree_z.conflicts())
merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
this_tree=tree_a)
self.assertEqual([
conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
tree_a.conflicts())
def test_nested_merge(self):
tree = self.make_branch_and_tree('tree',
format='dirstate-with-subtree')
sub_tree = self.make_branch_and_tree('tree/sub-tree',
format='dirstate-with-subtree')
sub_tree.set_root_id('sub-tree-root')
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
sub_tree.add('file')
sub_tree.commit('foo')
tree.add_reference(sub_tree)
tree.commit('set text to 1')
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
# modify the file in the subtree
self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
# and merge the changes from the diverged subtree into the containing
# tree
tree2.commit('changed file text')
tree.merge_from_branch(tree2.branch)
self.assertFileEqual('text2', 'tree/sub-tree/file')
def test_merge_with_missing(self):
tree_a = self.make_branch_and_tree('tree_a')
self.build_tree_contents([('tree_a/file', 'content_1')])
tree_a.add('file')
tree_a.commit('commit base')
# basis_tree() is only guaranteed to be valid as long as it is actually
# the basis tree. This mutates the tree after grabbing basis, so go to
# the repository.
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
self.build_tree_contents([('tree_a/file', 'content_2')])
tree_a.commit('commit other')
other_tree = tree_a.basis_tree()
os.unlink('tree_b/file')
merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
def test_merge_kind_change(self):
tree_a = self.make_branch_and_tree('tree_a')
self.build_tree_contents([('tree_a/file', 'content_1')])
tree_a.add('file', 'file-id')
tree_a.commit('added file')
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
os.unlink('tree_a/file')
self.build_tree(['tree_a/file/'])
tree_a.commit('changed file to directory')
tree_b.merge_from_branch(tree_a.branch)
self.assertEqual('directory', file_kind('tree_b/file'))
tree_b.revert([])
self.assertEqual('file', file_kind('tree_b/file'))
self.build_tree_contents([('tree_b/file', 'content_2')])
tree_b.commit('content change')
tree_b.merge_from_branch(tree_a.branch)
self.assertEqual(tree_b.conflicts(),
[conflicts.ContentsConflict('file',
file_id='file-id')])
def test_merge_type_registry(self):
merge_type_option = option.Option.OPTIONS['merge-type']
self.assertFalse('merge4' in [x[0] for x in
merge_type_option.iter_switches()])
registry = _mod_merge.get_merge_type_registry()
registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
'time-travelling merge')
self.assertTrue('merge4' in [x[0] for x in
merge_type_option.iter_switches()])
registry.remove('merge4')
self.assertFalse('merge4' in [x[0] for x in
merge_type_option.iter_switches()])
def test_merge_other_moves_we_deleted(self):
tree_a = self.make_branch_and_tree('A')
tree_a.lock_write()
self.addCleanup(tree_a.unlock)
self.build_tree(['A/a'])
tree_a.add('a')
tree_a.commit('1', rev_id='rev-1')
tree_a.flush()
tree_a.rename_one('a', 'b')
tree_a.commit('2')
bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
tree_b = bzrdir_b.open_workingtree()
tree_b.lock_write()
self.addCleanup(tree_b.unlock)
os.unlink('B/a')
tree_b.commit('3')
try:
tree_b.merge_from_branch(tree_a.branch)
except AttributeError:
self.fail('tried to join a path when name was None')
def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/file_1', 'a/file_2'])
tree_a.add(['file_1'])
tree_a.commit('commit 1')
tree_a.add(['file_2'])
tree_a.commit('commit 2')
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
tree_b.rename_one('file_1', 'renamed')
merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
progress.DummyProgress())
merger.merge_type = _mod_merge.Merge3Merger
merger.do_merge()
self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
|