215
215
self.assertFileEqual('text2', 'tree/sub-tree/file')
217
217
def test_merge_with_missing(self):
218
self.thisFailsStrictLockCheck()
218
219
tree_a = self.make_branch_and_tree('tree_a')
219
220
self.build_tree_contents([('tree_a/file', 'content_1')])
220
221
tree_a.add('file')
221
222
tree_a.commit('commit base')
222
223
# basis_tree() is only guaranteed to be valid as long as it is actually
223
# the basis tree. This test commits to the tree after grabbing basis,
224
# so we go to the repository.
224
# the basis tree. This mutates the tree after grabbing basis, so go to
225
226
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
226
227
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
227
228
self.build_tree_contents([('tree_a/file', 'content_2')])
228
229
tree_a.commit('commit other')
229
230
other_tree = tree_a.basis_tree()
230
# 'file' is now missing but isn't altered in any commit in b so no
231
# change should be applied.
232
231
os.unlink('tree_b/file')
233
232
merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
309
309
tree_a.commit('commit 2')
310
310
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
311
311
tree_b.rename_one('file_1', 'renamed')
312
merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b)
312
merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
313
progress.DummyProgress())
313
314
merger.merge_type = _mod_merge.WeaveMerger
314
315
merger.do_merge()
315
316
self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
318
def test_Merger_defaults_to_DummyProgress(self):
319
branch = self.make_branch('branch')
320
merger = _mod_merge.Merger(branch, pb=None)
321
self.assertIsInstance(merger._pb, progress.DummyProgress)
317
323
def prepare_cherrypick(self):
318
324
"""Prepare a pair of trees for cherrypicking tests.
349
355
def test_weave_cannot_reverse_cherrypick(self):
350
356
this_tree, other_tree = self.prepare_cherrypick()
351
merger = _mod_merge.Merger.from_revision_ids(None,
357
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
352
358
this_tree, 'rev2b', 'rev3b', other_tree.branch)
353
359
merger.merge_type = _mod_merge.WeaveMerger
354
360
self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
356
362
def test_merge3_can_reverse_cherrypick(self):
357
363
this_tree, other_tree = self.prepare_cherrypick()
358
merger = _mod_merge.Merger.from_revision_ids(None,
364
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
359
365
this_tree, 'rev2b', 'rev3b', other_tree.branch)
360
366
merger.merge_type = _mod_merge.Merge3Merger
361
367
merger.do_merge()
828
828
('unchanged', 'f\n'),
829
829
('unchanged', 'g\n')],
831
plan = self.plan_merge_vf.plan_lca_merge('F', 'G')
832
# This is one of the main differences between plan_merge and
833
# plan_lca_merge. plan_lca_merge generates a conflict for 'x => z',
834
# because 'x' was not present in one of the bases. However, in this
835
# case it is spurious because 'x' does not exist in the global base A.
837
('unchanged', 'h\n'),
838
('unchanged', 'a\n'),
839
('conflicted-a', 'x\n'),
841
('unchanged', 'c\n'),
842
('unchanged', 'd\n'),
843
('unchanged', 'y\n'),
844
('unchanged', 'f\n'),
845
('unchanged', 'g\n')],
848
def test_criss_cross_flip_flop(self):
849
# This is specificly trying to trigger problems when using limited
850
# ancestry and weaves. The ancestry graph looks like:
851
# XX unused ancestor, should not show up in the weave
855
# B C B & C both introduce a new line
859
# D E B & C are both merged, so both are common ancestors
860
# In the process of merging, both sides order the new
863
self.add_rev('root', 'XX', [], 'qrs')
864
self.add_rev('root', 'A', ['XX'], 'abcdef')
865
self.add_rev('root', 'B', ['A'], 'abcdgef')
866
self.add_rev('root', 'C', ['A'], 'abcdhef')
867
self.add_rev('root', 'D', ['B', 'C'], 'abcdghef')
868
self.add_rev('root', 'E', ['C', 'B'], 'abcdhgef')
869
plan = list(self.plan_merge_vf.plan_merge('D', 'E'))
871
('unchanged', 'a\n'),
872
('unchanged', 'b\n'),
873
('unchanged', 'c\n'),
874
('unchanged', 'd\n'),
876
('unchanged', 'g\n'),
878
('unchanged', 'e\n'),
879
('unchanged', 'f\n'),
881
pwm = versionedfile.PlanWeaveMerge(plan)
882
self.assertEqualDiff('\n'.join('abcdghef') + '\n',
883
''.join(pwm.base_from_plan()))
884
# Reversing the order reverses the merge plan, and final order of 'hg'
886
plan = list(self.plan_merge_vf.plan_merge('E', 'D'))
888
('unchanged', 'a\n'),
889
('unchanged', 'b\n'),
890
('unchanged', 'c\n'),
891
('unchanged', 'd\n'),
893
('unchanged', 'h\n'),
895
('unchanged', 'e\n'),
896
('unchanged', 'f\n'),
898
pwm = versionedfile.PlanWeaveMerge(plan)
899
self.assertEqualDiff('\n'.join('abcdhgef') + '\n',
900
''.join(pwm.base_from_plan()))
901
# This is where lca differs, in that it (fairly correctly) determines
902
# that there is a conflict because both sides resolved the merge
904
plan = list(self.plan_merge_vf.plan_lca_merge('D', 'E'))
906
('unchanged', 'a\n'),
907
('unchanged', 'b\n'),
908
('unchanged', 'c\n'),
909
('unchanged', 'd\n'),
910
('conflicted-b', 'h\n'),
911
('unchanged', 'g\n'),
912
('conflicted-a', 'h\n'),
913
('unchanged', 'e\n'),
914
('unchanged', 'f\n'),
916
pwm = versionedfile.PlanWeaveMerge(plan)
917
self.assertEqualDiff('\n'.join('abcdgef') + '\n',
918
''.join(pwm.base_from_plan()))
919
# Reversing it changes what line is doubled, but still gives a
921
plan = list(self.plan_merge_vf.plan_lca_merge('E', 'D'))
923
('unchanged', 'a\n'),
924
('unchanged', 'b\n'),
925
('unchanged', 'c\n'),
926
('unchanged', 'd\n'),
927
('conflicted-b', 'g\n'),
928
('unchanged', 'h\n'),
929
('conflicted-a', 'g\n'),
930
('unchanged', 'e\n'),
931
('unchanged', 'f\n'),
933
pwm = versionedfile.PlanWeaveMerge(plan)
934
self.assertEqualDiff('\n'.join('abcdhef') + '\n',
935
''.join(pwm.base_from_plan()))
937
832
def assertRemoveExternalReferences(self, filtered_parent_map,
938
833
child_map, tails, parent_map):
1036
class TestMergeImplementation(object):
1038
def do_merge(self, target_tree, source_tree, **kwargs):
1039
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1040
target_tree, source_tree.last_revision(),
1041
other_branch=source_tree.branch)
1042
merger.merge_type=self.merge_type
1043
for name, value in kwargs.items():
1044
setattr(merger, name, value)
1047
def test_merge_specific_file(self):
1048
this_tree = self.make_branch_and_tree('this')
1049
this_tree.lock_write()
1050
self.addCleanup(this_tree.unlock)
1051
self.build_tree_contents([
1052
('this/file1', 'a\nb\n'),
1053
('this/file2', 'a\nb\n')
1055
this_tree.add(['file1', 'file2'])
1056
this_tree.commit('Added files')
1057
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1058
self.build_tree_contents([
1059
('other/file1', 'a\nb\nc\n'),
1060
('other/file2', 'a\nb\nc\n')
1062
other_tree.commit('modified both')
1063
self.build_tree_contents([
1064
('this/file1', 'd\na\nb\n'),
1065
('this/file2', 'd\na\nb\n')
1067
this_tree.commit('modified both')
1068
self.do_merge(this_tree, other_tree, interesting_files=['file1'])
1069
self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
1070
self.assertFileEqual('d\na\nb\n', 'this/file2')
1072
def test_merge_move_and_change(self):
1073
this_tree = self.make_branch_and_tree('this')
1074
this_tree.lock_write()
1075
self.addCleanup(this_tree.unlock)
1076
self.build_tree_contents([
1077
('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
1079
this_tree.add('file1',)
1080
this_tree.commit('Added file')
1081
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1082
self.build_tree_contents([
1083
('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
1085
other_tree.commit('Changed 2 to 2.1')
1086
self.build_tree_contents([
1087
('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
1089
this_tree.commit('Swapped 2 & 3')
1090
self.do_merge(this_tree, other_tree)
1091
self.assertFileEqual('line 1\n'
1098
'>>>>>>> MERGE-SOURCE\n'
1099
'line 4\n', 'this/file1')
1101
def test_modify_conflicts_with_delete(self):
1102
# If one side deletes a line, and the other modifies that line, then
1103
# the modification should be considered a conflict
1104
builder = self.make_branch_builder('test')
1105
builder.start_series()
1106
builder.build_snapshot('BASE-id', None,
1107
[('add', ('', None, 'directory', None)),
1108
('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
1111
builder.build_snapshot('OTHER-id', ['BASE-id'],
1112
[('modify', ('foo-id', 'a\nc\nd\ne\n'))])
1113
# Modify 'b\n', add 'X\n'
1114
builder.build_snapshot('THIS-id', ['BASE-id'],
1115
[('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
1116
builder.finish_series()
1117
branch = builder.get_branch()
1118
this_tree = branch.bzrdir.create_workingtree()
1119
this_tree.lock_write()
1120
self.addCleanup(this_tree.unlock)
1121
other_tree = this_tree.bzrdir.sprout('other', 'OTHER-id').open_workingtree()
1122
self.do_merge(this_tree, other_tree)
1123
if self.merge_type is _mod_merge.LCAMerger:
1124
self.expectFailure("lca merge doesn't track deleted lines",
1125
self.assertFileEqual,
1130
'>>>>>>> MERGE-SOURCE\n'
1136
self.assertFileEqual(
1141
'>>>>>>> MERGE-SOURCE\n'
1148
class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
1150
merge_type = _mod_merge.Merge3Merger
1153
class TestWeaveMerge(TestCaseWithTransport, TestMergeImplementation):
1155
merge_type = _mod_merge.WeaveMerger
1158
class TestLCAMerge(TestCaseWithTransport, TestMergeImplementation):
1160
merge_type = _mod_merge.LCAMerger
1162
def test_merge_move_and_change(self):
1163
self.expectFailure("lca merge doesn't conflict for move and change",
1164
super(TestLCAMerge, self).test_merge_move_and_change)
1141
1167
class LoggingMerger(object):
1142
1168
# These seem to be the required attributes
1143
1169
requires_base = False
1210
1236
class TestMergerInMemory(TestMergerBase):
1212
def test_cache_trees_with_revision_ids_None(self):
1213
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1214
original_cache = dict(merger._cached_trees)
1215
merger.cache_trees_with_revision_ids([None])
1216
self.assertEqual(original_cache, merger._cached_trees)
1218
def test_cache_trees_with_revision_ids_no_revision_id(self):
1219
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1220
original_cache = dict(merger._cached_trees)
1221
tree = self.make_branch_and_memory_tree('tree')
1222
merger.cache_trees_with_revision_ids([tree])
1223
self.assertEqual(original_cache, merger._cached_trees)
1225
def test_cache_trees_with_revision_ids_having_revision_id(self):
1226
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1227
original_cache = dict(merger._cached_trees)
1228
tree = merger.this_branch.repository.revision_tree('B-id')
1229
original_cache['B-id'] = tree
1230
merger.cache_trees_with_revision_ids([tree])
1231
self.assertEqual(original_cache, merger._cached_trees)
1233
1238
def test_find_base(self):
1234
1239
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1235
1240
self.assertEqual('A-id', merger.base_rev_id)
2830
2835
'bval', ['lca1val', 'lca2val', 'lca2val'], 'oval', 'tval')
2831
2836
self.assertLCAMultiWay('conflict',
2832
2837
'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
