1147
class TestMergeImplementation(object):
1149
def do_merge(self, target_tree, source_tree, **kwargs):
1150
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1151
target_tree, source_tree.last_revision(),
1152
other_branch=source_tree.branch)
1153
merger.merge_type=self.merge_type
1154
for name, value in kwargs.items():
1155
setattr(merger, name, value)
1158
def test_merge_specific_file(self):
1159
this_tree = self.make_branch_and_tree('this')
1160
this_tree.lock_write()
1161
self.addCleanup(this_tree.unlock)
1162
self.build_tree_contents([
1163
('this/file1', 'a\nb\n'),
1164
('this/file2', 'a\nb\n')
1166
this_tree.add(['file1', 'file2'])
1167
this_tree.commit('Added files')
1168
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1169
self.build_tree_contents([
1170
('other/file1', 'a\nb\nc\n'),
1171
('other/file2', 'a\nb\nc\n')
1173
other_tree.commit('modified both')
1174
self.build_tree_contents([
1175
('this/file1', 'd\na\nb\n'),
1176
('this/file2', 'd\na\nb\n')
1178
this_tree.commit('modified both')
1179
self.do_merge(this_tree, other_tree, interesting_files=['file1'])
1180
self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
1181
self.assertFileEqual('d\na\nb\n', 'this/file2')
1183
def test_merge_move_and_change(self):
1184
this_tree = self.make_branch_and_tree('this')
1185
this_tree.lock_write()
1186
self.addCleanup(this_tree.unlock)
1187
self.build_tree_contents([
1188
('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
1190
this_tree.add('file1',)
1191
this_tree.commit('Added file')
1192
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1193
self.build_tree_contents([
1194
('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
1196
other_tree.commit('Changed 2 to 2.1')
1197
self.build_tree_contents([
1198
('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
1200
this_tree.commit('Swapped 2 & 3')
1201
self.do_merge(this_tree, other_tree)
1202
self.assertFileEqual('line 1\n'
1209
'>>>>>>> MERGE-SOURCE\n'
1210
'line 4\n', 'this/file1')
1212
def test_modify_conflicts_with_delete(self):
1213
# If one side deletes a line, and the other modifies that line, then
1214
# the modification should be considered a conflict
1215
builder = self.make_branch_builder('test')
1216
builder.start_series()
1217
builder.build_snapshot('BASE-id', None,
1218
[('add', ('', None, 'directory', None)),
1219
('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
1222
builder.build_snapshot('OTHER-id', ['BASE-id'],
1223
[('modify', ('foo-id', 'a\nc\nd\ne\n'))])
1224
# Modify 'b\n', add 'X\n'
1225
builder.build_snapshot('THIS-id', ['BASE-id'],
1226
[('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
1227
builder.finish_series()
1228
branch = builder.get_branch()
1229
this_tree = branch.bzrdir.create_workingtree()
1230
this_tree.lock_write()
1231
self.addCleanup(this_tree.unlock)
1232
other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
1233
self.do_merge(this_tree, other_tree)
1234
if self.merge_type is _mod_merge.LCAMerger:
1235
self.expectFailure("lca merge doesn't track deleted lines",
1236
self.assertFileEqual,
1241
'>>>>>>> MERGE-SOURCE\n'
1247
self.assertFileEqual(
1252
'>>>>>>> MERGE-SOURCE\n'
1258
def get_limbodir_deletiondir(self, wt):
1259
transform = TreeTransform(wt)
1260
limbodir = transform._limbodir
1261
deletiondir = transform._deletiondir
1262
transform.finalize()
1263
return (limbodir, deletiondir)
1265
def test_merge_with_existing_limbo(self):
1266
wt = self.make_branch_and_tree('this')
1267
(limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
1269
self.assertRaises(errors.ExistingLimbo, self.do_merge, wt, wt)
1270
self.assertRaises(errors.LockError, wt.unlock)
1272
def test_merge_with_pending_deletion(self):
1273
wt = self.make_branch_and_tree('this')
1274
(limbodir, deletiondir) = self.get_limbodir_deletiondir(wt)
1275
os.mkdir(deletiondir)
1276
self.assertRaises(errors.ExistingPendingDeletion, self.do_merge, wt, wt)
1277
self.assertRaises(errors.LockError, wt.unlock)
1280
class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
1282
merge_type = _mod_merge.Merge3Merger
1285
class TestWeaveMerge(TestCaseWithTransport, TestMergeImplementation):
1287
merge_type = _mod_merge.WeaveMerger
1290
class TestLCAMerge(TestCaseWithTransport, TestMergeImplementation):
1292
merge_type = _mod_merge.LCAMerger
1294
def test_merge_move_and_change(self):
1295
self.expectFailure("lca merge doesn't conflict for move and change",
1296
super(TestLCAMerge, self).test_merge_move_and_change)
1141
1299
class LoggingMerger(object):
1142
1300
# These seem to be the required attributes
1143
1301
requires_base = False
2830
2988
'bval', ['lca1val', 'lca2val', 'lca2val'], 'oval', 'tval')
2831
2989
self.assertLCAMultiWay('conflict',
2832
2990
'bval', ['lca1val', 'lca2val', 'lca3val'], 'oval', 'tval')
2835
class TestConfigurableFileMerger(tests.TestCaseWithTransport):
2838
super(TestConfigurableFileMerger, self).setUp()
2841
def get_merger_factory(self):
2842
# Allows the inner methods to access the test attributes
2845
class FooMerger(_mod_merge.ConfigurableFileMerger):
2847
default_files = ['bar']
2849
def merge_text(self, params):
2850
test.calls.append('merge_text')
2851
return ('not_applicable', None)
2853
def factory(merger):
2854
result = FooMerger(merger)
2855
# Make sure we start with a clean slate
2856
self.assertEqual(None, result.affected_files)
2857
# Track the original merger
2858
self.merger = result
2863
def _install_hook(self, factory):
2864
_mod_merge.Merger.hooks.install_named_hook('merge_file_content',
2865
factory, 'test factory')
2867
def make_builder(self):
2868
builder = test_merge_core.MergeBuilder(self.test_base_dir)
2869
self.addCleanup(builder.cleanup)
2872
def make_text_conflict(self, file_name='bar'):
2873
factory = self.get_merger_factory()
2874
self._install_hook(factory)
2875
builder = self.make_builder()
2876
builder.add_file('bar-id', builder.tree_root, file_name, 'text1', True)
2877
builder.change_contents('bar-id', other='text4', this='text3')
2880
def make_kind_change(self):
2881
factory = self.get_merger_factory()
2882
self._install_hook(factory)
2883
builder = self.make_builder()
2884
builder.add_file('bar-id', builder.tree_root, 'bar', 'text1', True,
2886
builder.add_dir('bar-dir', builder.tree_root, 'bar-id',
2887
base=False, other=False)
2890
def test_uses_this_branch(self):
2891
builder = self.make_text_conflict()
2892
tt = builder.make_preview_transform()
2893
self.addCleanup(tt.finalize)
2895
def test_affected_files_cached(self):
2896
"""Ensures that the config variable is cached"""
2897
builder = self.make_text_conflict()
2898
conflicts = builder.merge()
2899
# The hook should set the variable
2900
self.assertEqual(['bar'], self.merger.affected_files)
2901
self.assertEqual(1, len(conflicts))
2903
def test_hook_called_for_text_conflicts(self):
2904
builder = self.make_text_conflict()
2905
conflicts = builder.merge()
2906
# The hook should call the merge_text() method
2907
self.assertEqual(['merge_text'], self.calls)
2909
def test_hook_not_called_for_kind_change(self):
2910
builder = self.make_kind_change()
2911
conflicts = builder.merge()
2912
# The hook should not call the merge_text() method
2913
self.assertEqual([], self.calls)
2915
def test_hook_not_called_for_other_files(self):
2916
builder = self.make_text_conflict('foobar')
2917
conflicts = builder.merge()
2918
# The hook should not call the merge_text() method
2919
self.assertEqual([], self.calls)
added
removed
bzrlib/tests/test_merge.py
