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
|
# Copyright (C) 2009 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Implementation tests for bzrlib.merge.Merger."""
import os
from bzrlib import (
errors,
merge as _mod_merge,
option,
progress,
)
from bzrlib.tests import (
multiply_tests,
TestCaseWithTransport,
)
from bzrlib.transform import TreeTransform
def load_tests(standard_tests, module, loader):
"""Multiply tests for tranport implementations."""
result = loader.suiteClass()
scenarios = [
(name, {'merge_type': merger})
for name, merger in option._merge_type_registry.items()]
return multiply_tests(standard_tests, scenarios, result)
class TestMergeImplementation(TestCaseWithTransport):
def do_merge(self, target_tree, source_tree, **kwargs):
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
target_tree, source_tree.last_revision(),
other_branch=source_tree.branch)
merger.merge_type=self.merge_type
for name, value in kwargs.items():
setattr(merger, name, value)
merger.do_merge()
def test_merge_specific_file(self):
this_tree = self.make_branch_and_tree('this')
this_tree.lock_write()
self.addCleanup(this_tree.unlock)
self.build_tree_contents([
('this/file1', 'a\nb\n'),
('this/file2', 'a\nb\n')
])
this_tree.add(['file1', 'file2'])
this_tree.commit('Added files')
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
self.build_tree_contents([
('other/file1', 'a\nb\nc\n'),
('other/file2', 'a\nb\nc\n')
])
other_tree.commit('modified both')
self.build_tree_contents([
('this/file1', 'd\na\nb\n'),
('this/file2', 'd\na\nb\n')
])
this_tree.commit('modified both')
self.do_merge(this_tree, other_tree, interesting_files=['file1'])
self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
self.assertFileEqual('d\na\nb\n', 'this/file2')
def test_merge_move_and_change(self):
this_tree = self.make_branch_and_tree('this')
this_tree.lock_write()
self.addCleanup(this_tree.unlock)
self.build_tree_contents([
('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
])
this_tree.add('file1',)
this_tree.commit('Added file')
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
self.build_tree_contents([
('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
])
other_tree.commit('Changed 2 to 2.1')
self.build_tree_contents([
('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
])
this_tree.commit('Swapped 2 & 3')
self.do_merge(this_tree, other_tree)
if self.merge_type is _mod_merge.LCAMerger:
self.expectFailure(
"lca merge doesn't conflict for move and change",
self.assertFileEqual,
'line 1\n'
'<<<<<<< TREE\n'
'line 3\n'
'line 2\n'
'=======\n'
'line 2 to 2.1\n'
'line 3\n'
'>>>>>>> MERGE-SOURCE\n'
'line 4\n', 'this/file1')
else:
self.assertFileEqual('line 1\n'
'<<<<<<< TREE\n'
'line 3\n'
'line 2\n'
'=======\n'
'line 2 to 2.1\n'
'line 3\n'
'>>>>>>> MERGE-SOURCE\n'
'line 4\n', 'this/file1')
def test_modify_conflicts_with_delete(self):
# If one side deletes a line, and the other modifies that line, then
# the modification should be considered a conflict
builder = self.make_branch_builder('test')
builder.start_series()
builder.build_snapshot('BASE-id', None,
[('add', ('', None, 'directory', None)),
('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
])
# Delete 'b\n'
builder.build_snapshot('OTHER-id', ['BASE-id'],
[('modify', ('foo-id', 'a\nc\nd\ne\n'))])
# Modify 'b\n', add 'X\n'
builder.build_snapshot('THIS-id', ['BASE-id'],
[('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
builder.finish_series()
branch = builder.get_branch()
this_tree = branch.bzrdir.create_workingtree()
this_tree.lock_write()
self.addCleanup(this_tree.unlock)
other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
self.do_merge(this_tree, other_tree)
if self.merge_type is _mod_merge.LCAMerger:
self.expectFailure("lca merge doesn't track deleted lines",
self.assertFileEqual,
'a\n'
'<<<<<<< TREE\n'
'b2\n'
'=======\n'
'>>>>>>> MERGE-SOURCE\n'
'c\n'
'd\n'
'X\n'
'e\n', 'test/foo')
else:
self.assertFileEqual(
'a\n'
'<<<<<<< TREE\n'
'b2\n'
'=======\n'
'>>>>>>> MERGE-SOURCE\n'
'c\n'
'd\n'
'X\n'
'e\n', 'test/foo')
def get_limbodir_deletiondir(self, wt):
transform = TreeTransform(wt)
limbodir = transform._limbodir
deletiondir = transform._deletiondir
transform.finalize()
return (limbodir, deletiondir)
def test_merge_with_existing_limbo(self):
wt = self.make_branch_and_tree('this')
(limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
os.mkdir(limbodir)
self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
self.assertRaises(errors.LockError, wt.unlock)
def test_merge_with_pending_deletion(self):
wt = self.make_branch_and_tree('this')
(limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
os.mkdir(deletiondir)
self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
self.assertRaises(errors.LockError, wt.unlock)
|