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
|
# Copyright (C) 2006-2010 Canonical Ltd
# Authors: Robert Collins <robert.collins@canonical.com>
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for the WorkingTree.merge_from_branch api."""
import os
from bzrlib import (
conflicts,
errors,
merge,
)
from bzrlib.tests import per_workingtree
class TestMergeFromBranch(per_workingtree.TestCaseWithWorkingTree):
def create_two_trees_for_merging(self):
"""Create two trees that can be merged from.
This sets self.tree_from, self.first_rev, self.tree_to, self.second_rev
and self.to_second_rev.
"""
self.tree_from = self.make_branch_and_tree('from')
self.first_rev = self.tree_from.commit('first post')
self.tree_to = self.tree_from.bzrdir.sprout('to').open_workingtree()
self.second_rev = self.tree_from.commit('second rev', allow_pointless=True)
self.to_second_rev = self.tree_to.commit('second rev', allow_pointless=True)
def test_smoking_merge(self):
"""Smoke test of merge_from_branch."""
self.create_two_trees_for_merging()
self.tree_to.merge_from_branch(self.tree_from.branch)
self.assertEqual([self.to_second_rev, self.second_rev],
self.tree_to.get_parent_ids())
def test_merge_to_revision(self):
"""Merge from a branch to a revision that is not the tip."""
self.create_two_trees_for_merging()
self.third_rev = self.tree_from.commit('real_tip')
self.tree_to.merge_from_branch(self.tree_from.branch,
to_revision=self.second_rev)
self.assertEqual([self.to_second_rev, self.second_rev],
self.tree_to.get_parent_ids())
def test_compare_after_merge(self):
tree_a = self.make_branch_and_tree('tree_a')
self.build_tree_contents([('tree_a/file', 'text-a')])
tree_a.add('file')
tree_a.commit('added file')
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
os.unlink('tree_a/file')
tree_a.commit('deleted file')
self.build_tree_contents([('tree_b/file', 'text-b')])
tree_b.commit('changed file')
tree_a.merge_from_branch(tree_b.branch)
tree_a.lock_read()
self.addCleanup(tree_a.unlock)
list(tree_a.iter_changes(tree_a.basis_tree()))
def test_merge_empty(self):
tree_a = self.make_branch_and_tree('tree_a')
self.build_tree_contents([('tree_a/file', 'text-a')])
tree_a.add('file')
tree_a.commit('added file')
tree_b = self.make_branch_and_tree('treeb')
self.assertRaises(errors.NoCommits, tree_a.merge_from_branch,
tree_b.branch)
tree_b.merge_from_branch(tree_a.branch)
def test_merge_base(self):
tree_a = self.make_branch_and_tree('tree_a')
self.build_tree_contents([('tree_a/file', 'text-a')])
tree_a.add('file')
tree_a.commit('added file', rev_id='rev_1')
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
os.unlink('tree_a/file')
tree_a.commit('deleted file')
self.build_tree_contents([('tree_b/file', 'text-b')])
tree_b.commit('changed file')
self.assertRaises(errors.PointlessMerge, tree_a.merge_from_branch,
tree_b.branch, from_revision=tree_b.branch.last_revision())
tree_a.merge_from_branch(tree_b.branch, from_revision='rev_1')
tree_a.lock_read()
self.addCleanup(tree_a.unlock)
changes = list(tree_a.iter_changes(tree_a.basis_tree()))
self.assertEqual(1, len(changes))
def test_merge_type(self):
this = self.make_branch_and_tree('this')
self.build_tree_contents([('this/foo', 'foo')])
this.add('foo', 'foo-id')
this.commit('added foo')
other = this.bzrdir.sprout('other').open_workingtree()
self.build_tree_contents([('other/foo', 'bar')])
other.commit('content -> bar')
self.build_tree_contents([('this/foo', 'baz')])
this.commit('content -> baz')
class QuxMerge(merge.Merge3Merger):
def text_merge(self, file_id, trans_id):
self.tt.create_file('qux', trans_id)
this.merge_from_branch(other.branch, merge_type=QuxMerge)
self.assertEqual('qux', this.get_file_text('foo-id'))
class TestMergedBranch(per_workingtree.TestCaseWithWorkingTree):
def make_inner_branch(self):
bld_inner = self.make_branch_builder('inner')
bld_inner.start_series()
bld_inner.build_snapshot(
'1', None,
[('add', ('', 'inner-root-id', 'directory', '')),
('add', ('dir', 'dir-id', 'directory', '')),
('add', ('dir/file1', 'file1-id', 'file', 'file1 content\n')),
('add', ('file3', 'file3-id', 'file', 'file3 content\n')),
])
bld_inner.build_snapshot(
'4', ['1'],
[('add', ('file4', 'file4-id', 'file', 'file4 content\n'))
])
bld_inner.build_snapshot(
'5', ['4'], [('rename', ('file4', 'dir/file4'))])
bld_inner.build_snapshot(
'3', ['1'], [('modify', ('file3-id', 'new file3 contents\n')),])
bld_inner.build_snapshot(
'2', ['1'],
[('add', ('dir/file2', 'file2-id', 'file', 'file2 content\n')),
])
bld_inner.finish_series()
br = bld_inner.get_branch()
return br
def assertTreeLayout(self, expected, tree):
tree.lock_read()
try:
actual = [e[0] for e in tree.list_files()]
# list_files doesn't guarantee order
actual = sorted(actual)
self.assertEqual(expected, actual)
finally:
tree.unlock()
def make_outer_tree(self):
outer = self.make_branch_and_tree('outer')
self.build_tree_contents([('outer/foo', 'foo')])
outer.add('foo', 'foo-id')
outer.commit('added foo')
inner = self.make_inner_branch()
outer.merge_from_branch(inner, to_revision='1', from_revision='null:')
#retain original root id.
outer.set_root_id(outer.basis_tree().get_root_id())
outer.commit('merge inner branch')
outer.mkdir('dir-outer', 'dir-outer-id')
outer.move(['dir', 'file3'], to_dir='dir-outer')
outer.commit('rename imported dir and file3 to dir-outer')
return outer, inner
def test_file1_deleted_in_dir(self):
outer, inner = self.make_outer_tree()
outer.remove(['dir-outer/dir/file1'], keep_files=False)
outer.commit('delete file1')
outer.merge_from_branch(inner)
outer.commit('merge the rest')
self.assertTreeLayout(['dir-outer',
'dir-outer/dir',
'dir-outer/dir/file2',
'dir-outer/file3',
'foo'],
outer)
def test_file3_deleted_in_root(self):
# Reproduce bug #375898
outer, inner = self.make_outer_tree()
outer.remove(['dir-outer/file3'], keep_files=False)
outer.commit('delete file3')
outer.merge_from_branch(inner)
outer.commit('merge the rest')
self.assertTreeLayout(['dir-outer',
'dir-outer/dir',
'dir-outer/dir/file1',
'dir-outer/dir/file2',
'foo'],
outer)
def test_file3_in_root_conflicted(self):
outer, inner = self.make_outer_tree()
outer.remove(['dir-outer/file3'], keep_files=False)
outer.commit('delete file3')
nb_conflicts = outer.merge_from_branch(inner, to_revision='3')
self.assertEqual(4, nb_conflicts)
self.assertTreeLayout(['dir-outer',
'dir-outer/dir',
'dir-outer/dir/file1',
# Ideally th conflict helpers should be in
# dir-outer/dir but since we can't easily find
# back the file3 -> outer-dir/dir rename, root
# is good enough -- vila 20100401
'file3.BASE',
'file3.OTHER',
'foo'],
outer)
def test_file4_added_in_root(self):
outer, inner = self.make_outer_tree()
nb_conflicts = outer.merge_from_branch(inner, to_revision='4')
# file4 could not be added to its original root, so it gets added to
# the new root with a conflict.
self.assertEqual(1, nb_conflicts)
self.assertTreeLayout(['dir-outer',
'dir-outer/dir',
'dir-outer/dir/file1',
'dir-outer/file3',
'file4',
'foo'],
outer)
def test_file4_added_then_renamed(self):
outer, inner = self.make_outer_tree()
# 1 conflict, because file4 can't be put into the old root
self.assertEqual(1, outer.merge_from_branch(inner, to_revision='4'))
try:
outer.set_conflicts(conflicts.ConflictList())
except errors.UnsupportedOperation:
# WT2 doesn't have a separate list of conflicts to clear. It
# actually says there is a conflict, but happily forgets all about
# it.
pass
outer.commit('added file4')
# And now file4 gets renamed into an existing dir
nb_conflicts = outer.merge_from_branch(inner, to_revision='5')
self.assertEqual(1, nb_conflicts)
self.assertTreeLayout(['dir-outer',
'dir-outer/dir',
'dir-outer/dir/file1',
'dir-outer/dir/file4',
'dir-outer/file3',
'foo'],
outer)
|