108
141
transform_tree(tree, tree.branch.basis_tree())
110
143
def test_ignore_zero_merge_inner(self):
111
# Test that merge_inner's ignore zero paramter is effective
144
# Test that merge_inner's ignore zero parameter is effective
112
145
tree_a =self.make_branch_and_tree('a')
113
146
tree_a.commit(message="hello")
114
147
dir_b = tree_a.bzrdir.sprout('b')
115
148
tree_b = dir_b.open_workingtree()
150
self.addCleanup(tree_b.unlock)
116
151
tree_a.commit(message="hello again")
118
153
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
119
154
this_tree=tree_b, ignore_zero=True)
120
log = self._get_log()
155
log = self._get_log(keep_log_file=True)
121
156
self.failUnless('All changes applied successfully.\n' not in log)
123
158
merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
124
159
this_tree=tree_b, ignore_zero=False)
125
log = self._get_log()
160
log = self._get_log(keep_log_file=True)
126
161
self.failUnless('All changes applied successfully.\n' in log)
163
def test_merge_inner_conflicts(self):
164
tree_a = self.make_branch_and_tree('a')
165
tree_a.set_conflicts(ConflictList([TextConflict('patha')]))
166
merge_inner(tree_a.branch, tree_a, tree_a, this_tree=tree_a)
167
self.assertEqual(1, len(tree_a.conflicts()))
169
def test_rmdir_conflict(self):
170
tree_a = self.make_branch_and_tree('a')
171
self.build_tree(['a/b/'])
172
tree_a.add('b', 'b-id')
173
tree_a.commit('added b')
174
# basis_tree() is only guaranteed to be valid as long as it is actually
175
# the basis tree. This mutates the tree after grabbing basis, so go to
177
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
178
tree_z = tree_a.bzrdir.sprout('z').open_workingtree()
179
self.build_tree(['a/b/c'])
181
tree_a.commit('added c')
183
tree_z.commit('removed b')
184
merge_inner(tree_z.branch, tree_a, base_tree, this_tree=tree_z)
186
conflicts.MissingParent('Created directory', 'b', 'b-id'),
187
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
189
merge_inner(tree_a.branch, tree_z.basis_tree(), base_tree,
192
conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
193
conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
196
def test_nested_merge(self):
197
tree = self.make_branch_and_tree('tree',
198
format='dirstate-with-subtree')
199
sub_tree = self.make_branch_and_tree('tree/sub-tree',
200
format='dirstate-with-subtree')
201
sub_tree.set_root_id('sub-tree-root')
202
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
204
sub_tree.commit('foo')
205
tree.add_reference(sub_tree)
206
tree.commit('set text to 1')
207
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
208
# modify the file in the subtree
209
self.build_tree_contents([('tree2/sub-tree/file', 'text2')])
210
# and merge the changes from the diverged subtree into the containing
212
tree2.commit('changed file text')
213
tree.merge_from_branch(tree2.branch)
214
self.assertFileEqual('text2', 'tree/sub-tree/file')
216
def test_merge_with_missing(self):
217
tree_a = self.make_branch_and_tree('tree_a')
218
self.build_tree_contents([('tree_a/file', 'content_1')])
220
tree_a.commit('commit base')
221
# basis_tree() is only guaranteed to be valid as long as it is actually
222
# the basis tree. This mutates the tree after grabbing basis, so go to
224
base_tree = tree_a.branch.repository.revision_tree(tree_a.last_revision())
225
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
226
self.build_tree_contents([('tree_a/file', 'content_2')])
227
tree_a.commit('commit other')
228
other_tree = tree_a.basis_tree()
229
os.unlink('tree_b/file')
230
merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)
232
def test_merge_kind_change(self):
233
tree_a = self.make_branch_and_tree('tree_a')
234
self.build_tree_contents([('tree_a/file', 'content_1')])
235
tree_a.add('file', 'file-id')
236
tree_a.commit('added file')
237
tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
238
os.unlink('tree_a/file')
239
self.build_tree(['tree_a/file/'])
240
tree_a.commit('changed file to directory')
241
tree_b.merge_from_branch(tree_a.branch)
242
self.assertEqual('directory', file_kind('tree_b/file'))
244
self.assertEqual('file', file_kind('tree_b/file'))
245
self.build_tree_contents([('tree_b/file', 'content_2')])
246
tree_b.commit('content change')
247
tree_b.merge_from_branch(tree_a.branch)
248
self.assertEqual(tree_b.conflicts(),
249
[conflicts.ContentsConflict('file',
252
def test_merge_type_registry(self):
253
merge_type_option = option.Option.OPTIONS['merge-type']
254
self.assertFalse('merge4' in [x[0] for x in
255
merge_type_option.iter_switches()])
256
registry = _mod_merge.get_merge_type_registry()
257
registry.register_lazy('merge4', 'bzrlib.merge', 'Merge4Merger',
258
'time-travelling merge')
259
self.assertTrue('merge4' in [x[0] for x in
260
merge_type_option.iter_switches()])
261
registry.remove('merge4')
262
self.assertFalse('merge4' in [x[0] for x in
263
merge_type_option.iter_switches()])
265
def test_merge_other_moves_we_deleted(self):
266
tree_a = self.make_branch_and_tree('A')
268
self.addCleanup(tree_a.unlock)
269
self.build_tree(['A/a'])
271
tree_a.commit('1', rev_id='rev-1')
273
tree_a.rename_one('a', 'b')
275
bzrdir_b = tree_a.bzrdir.sprout('B', revision_id='rev-1')
276
tree_b = bzrdir_b.open_workingtree()
278
self.addCleanup(tree_b.unlock)
282
tree_b.merge_from_branch(tree_a.branch)
283
except AttributeError:
284
self.fail('tried to join a path when name was None')
286
def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis(self):
287
tree_a = self.make_branch_and_tree('a')
288
self.build_tree(['a/file_1', 'a/file_2'])
289
tree_a.add(['file_1'])
290
tree_a.commit('commit 1')
291
tree_a.add(['file_2'])
292
tree_a.commit('commit 2')
293
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
294
tree_b.rename_one('file_1', 'renamed')
295
merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
296
progress.DummyProgress())
297
merger.merge_type = _mod_merge.Merge3Merger
299
self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
301
def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis_weave(self):
302
tree_a = self.make_branch_and_tree('a')
303
self.build_tree(['a/file_1', 'a/file_2'])
304
tree_a.add(['file_1'])
305
tree_a.commit('commit 1')
306
tree_a.add(['file_2'])
307
tree_a.commit('commit 2')
308
tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
309
tree_b.rename_one('file_1', 'renamed')
310
merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
311
progress.DummyProgress())
312
merger.merge_type = _mod_merge.WeaveMerger
314
self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
316
def prepare_cherrypick(self):
317
"""Prepare a pair of trees for cherrypicking tests.
319
Both trees have a file, 'file'.
320
rev1 sets content to 'a'.
323
A full merge of rev2b and rev3b into this_tree would add both 'b' and
324
'c'. A successful cherrypick of rev2b-rev3b into this_tree will add
327
this_tree = self.make_branch_and_tree('this')
328
self.build_tree_contents([('this/file', "a\n")])
329
this_tree.add('file')
330
this_tree.commit('rev1')
331
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
332
self.build_tree_contents([('other/file', "a\nb\n")])
333
other_tree.commit('rev2b', rev_id='rev2b')
334
self.build_tree_contents([('other/file', "c\na\nb\n")])
335
other_tree.commit('rev3b', rev_id='rev3b')
336
this_tree.lock_write()
337
self.addCleanup(this_tree.unlock)
338
return this_tree, other_tree
340
def test_weave_cherrypick(self):
341
this_tree, other_tree = self.prepare_cherrypick()
342
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
343
this_tree, 'rev3b', 'rev2b', other_tree.branch)
344
merger.merge_type = _mod_merge.WeaveMerger
346
self.assertFileEqual('c\na\n', 'this/file')
348
def test_weave_cannot_reverse_cherrypick(self):
349
this_tree, other_tree = self.prepare_cherrypick()
350
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
351
this_tree, 'rev2b', 'rev3b', other_tree.branch)
352
merger.merge_type = _mod_merge.WeaveMerger
353
self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
355
def test_merge3_can_reverse_cherrypick(self):
356
this_tree, other_tree = self.prepare_cherrypick()
357
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
358
this_tree, 'rev2b', 'rev3b', other_tree.branch)
359
merger.merge_type = _mod_merge.Merge3Merger
362
def test_merge3_will_detect_cherrypick(self):
363
this_tree = self.make_branch_and_tree('this')
364
self.build_tree_contents([('this/file', "a\n")])
365
this_tree.add('file')
366
this_tree.commit('rev1')
367
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
368
self.build_tree_contents([('other/file', "a\nb\n")])
369
other_tree.commit('rev2b', rev_id='rev2b')
370
self.build_tree_contents([('other/file', "a\nb\nc\n")])
371
other_tree.commit('rev3b', rev_id='rev3b')
372
this_tree.lock_write()
373
self.addCleanup(this_tree.unlock)
375
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
376
this_tree, 'rev3b', 'rev2b', other_tree.branch)
377
merger.merge_type = _mod_merge.Merge3Merger
379
self.assertFileEqual('a\n'
383
'>>>>>>> MERGE-SOURCE\n',
386
def test_make_merger(self):
387
this_tree = self.make_branch_and_tree('this')
388
this_tree.commit('rev1', rev_id='rev1')
389
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
390
this_tree.commit('rev2', rev_id='rev2a')
391
other_tree.commit('rev2', rev_id='rev2b')
392
this_tree.lock_write()
393
self.addCleanup(this_tree.unlock)
394
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress,
395
this_tree, 'rev2b', other_branch=other_tree.branch)
396
merger.merge_type = _mod_merge.Merge3Merger
397
tree_merger = merger.make_merger()
398
self.assertIs(_mod_merge.Merge3Merger, tree_merger.__class__)
399
self.assertEqual('rev2b', tree_merger.other_tree.get_revision_id())
400
self.assertEqual('rev1', tree_merger.base_tree.get_revision_id())
402
def test_make_preview_transform(self):
403
this_tree = self.make_branch_and_tree('this')
404
self.build_tree_contents([('this/file', '1\n')])
405
this_tree.add('file', 'file-id')
406
this_tree.commit('rev1', rev_id='rev1')
407
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
408
self.build_tree_contents([('this/file', '1\n2a\n')])
409
this_tree.commit('rev2', rev_id='rev2a')
410
self.build_tree_contents([('other/file', '2b\n1\n')])
411
other_tree.commit('rev2', rev_id='rev2b')
412
this_tree.lock_write()
413
self.addCleanup(this_tree.unlock)
414
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
415
this_tree, 'rev2b', other_branch=other_tree.branch)
416
merger.merge_type = _mod_merge.Merge3Merger
417
tree_merger = merger.make_merger()
418
tt = tree_merger.make_preview_transform()
419
self.addCleanup(tt.finalize)
420
preview_tree = tt.get_preview_tree()
421
tree_file = this_tree.get_file('file-id')
423
self.assertEqual('1\n2a\n', tree_file.read())
426
preview_file = preview_tree.get_file('file-id')
428
self.assertEqual('2b\n1\n2a\n', preview_file.read())
432
def test_do_merge(self):
433
this_tree = self.make_branch_and_tree('this')
434
self.build_tree_contents([('this/file', '1\n')])
435
this_tree.add('file', 'file-id')
436
this_tree.commit('rev1', rev_id='rev1')
437
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
438
self.build_tree_contents([('this/file', '1\n2a\n')])
439
this_tree.commit('rev2', rev_id='rev2a')
440
self.build_tree_contents([('other/file', '2b\n1\n')])
441
other_tree.commit('rev2', rev_id='rev2b')
442
this_tree.lock_write()
443
self.addCleanup(this_tree.unlock)
444
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
445
this_tree, 'rev2b', other_branch=other_tree.branch)
446
merger.merge_type = _mod_merge.Merge3Merger
447
tree_merger = merger.make_merger()
448
tt = tree_merger.do_merge()
449
tree_file = this_tree.get_file('file-id')
451
self.assertEqual('2b\n1\n2a\n', tree_file.read())
455
def test_merge_add_into_deleted_root(self):
456
# Yes, people actually do this. And report bugs if it breaks.
457
source = self.make_branch_and_tree('source', format='rich-root-pack')
458
self.build_tree(['source/foo/'])
459
source.add('foo', 'foo-id')
460
source.commit('Add foo')
461
target = source.bzrdir.sprout('target').open_workingtree()
462
subtree = target.extract('foo-id')
463
subtree.commit('Delete root')
464
self.build_tree(['source/bar'])
465
source.add('bar', 'bar-id')
466
source.commit('Add bar')
467
subtree.merge_from_branch(source.branch)
469
def test_merge_joined_branch(self):
470
source = self.make_branch_and_tree('source', format='rich-root-pack')
471
self.build_tree(['source/foo'])
473
source.commit('Add foo')
474
target = self.make_branch_and_tree('target', format='rich-root-pack')
475
self.build_tree(['target/bla'])
477
target.commit('Add bla')
478
nested = source.bzrdir.sprout('target/subtree').open_workingtree()
479
target.subsume(nested)
480
target.commit('Join nested')
481
self.build_tree(['source/bar'])
483
source.commit('Add bar')
484
target.merge_from_branch(source.branch)
485
target.commit('Merge source')
488
class TestPlanMerge(TestCaseWithMemoryTransport):
491
TestCaseWithMemoryTransport.setUp(self)
492
mapper = versionedfile.PrefixMapper()
493
factory = knit.make_file_factory(True, mapper)
494
self.vf = factory(self.get_transport())
495
self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root')
496
self.plan_merge_vf.fallback_versionedfiles.append(self.vf)
498
def add_version(self, key, parents, text):
499
self.vf.add_lines(key, parents, [c+'\n' for c in text])
501
def add_rev(self, prefix, revision_id, parents, text):
502
self.add_version((prefix, revision_id), [(prefix, p) for p in parents],
505
def add_uncommitted_version(self, key, parents, text):
506
self.plan_merge_vf.add_lines(key, parents,
507
[c+'\n' for c in text])
509
def setup_plan_merge(self):
510
self.add_rev('root', 'A', [], 'abc')
511
self.add_rev('root', 'B', ['A'], 'acehg')
512
self.add_rev('root', 'C', ['A'], 'fabg')
513
return _PlanMerge('B', 'C', self.plan_merge_vf, ('root',))
515
def setup_plan_merge_uncommitted(self):
516
self.add_version(('root', 'A'), [], 'abc')
517
self.add_uncommitted_version(('root', 'B:'), [('root', 'A')], 'acehg')
518
self.add_uncommitted_version(('root', 'C:'), [('root', 'A')], 'fabg')
519
return _PlanMerge('B:', 'C:', self.plan_merge_vf, ('root',))
521
def test_unique_lines(self):
522
plan = self.setup_plan_merge()
523
self.assertEqual(plan._unique_lines(
524
plan._get_matching_blocks('B', 'C')),
527
def test_plan_merge(self):
528
self.setup_plan_merge()
529
plan = self.plan_merge_vf.plan_merge('B', 'C')
532
('unchanged', 'a\n'),
541
def test_plan_merge_cherrypick(self):
542
self.add_rev('root', 'A', [], 'abc')
543
self.add_rev('root', 'B', ['A'], 'abcde')
544
self.add_rev('root', 'C', ['A'], 'abcefg')
545
self.add_rev('root', 'D', ['A', 'B', 'C'], 'abcdegh')
546
my_plan = _PlanMerge('B', 'D', self.plan_merge_vf, ('root',))
547
# We shortcut when one text supersedes the other in the per-file graph.
548
# We don't actually need to compare the texts at this point.
557
list(my_plan.plan_merge()))
559
def test_plan_merge_no_common_ancestor(self):
560
self.add_rev('root', 'A', [], 'abc')
561
self.add_rev('root', 'B', [], 'xyz')
562
my_plan = _PlanMerge('A', 'B', self.plan_merge_vf, ('root',))
570
list(my_plan.plan_merge()))
572
def test_plan_merge_tail_ancestors(self):
573
# The graph looks like this:
574
# A # Common to all ancestors
576
# B C # Ancestors of E, only common to one side
578
# D E F # D, F are unique to G, H respectively
579
# |/ \| # E is the LCA for G & H, and the unique LCA for
584
# I J # criss-cross merge of G, H
586
# In this situation, a simple pruning of ancestors of E will leave D &
587
# F "dangling", which looks like they introduce lines different from
588
# the ones in E, but in actuality C&B introduced the lines, and they
589
# are already present in E
591
# Introduce the base text
592
self.add_rev('root', 'A', [], 'abc')
593
# Introduces a new line B
594
self.add_rev('root', 'B', ['A'], 'aBbc')
595
# Introduces a new line C
596
self.add_rev('root', 'C', ['A'], 'abCc')
597
# Introduce new line D
598
self.add_rev('root', 'D', ['B'], 'DaBbc')
599
# Merges B and C by just incorporating both
600
self.add_rev('root', 'E', ['B', 'C'], 'aBbCc')
601
# Introduce new line F
602
self.add_rev('root', 'F', ['C'], 'abCcF')
603
# Merge D & E by just combining the texts
604
self.add_rev('root', 'G', ['D', 'E'], 'DaBbCc')
605
# Merge F & E by just combining the texts
606
self.add_rev('root', 'H', ['F', 'E'], 'aBbCcF')
607
# Merge G & H by just combining texts
608
self.add_rev('root', 'I', ['G', 'H'], 'DaBbCcF')
609
# Merge G & H but supersede an old line in B
610
self.add_rev('root', 'J', ['H', 'G'], 'DaJbCcF')
611
plan = self.plan_merge_vf.plan_merge('I', 'J')
613
('unchanged', 'D\n'),
614
('unchanged', 'a\n'),
617
('unchanged', 'b\n'),
618
('unchanged', 'C\n'),
619
('unchanged', 'c\n'),
620
('unchanged', 'F\n')],
623
def test_plan_merge_tail_triple_ancestors(self):
624
# The graph looks like this:
625
# A # Common to all ancestors
627
# B C # Ancestors of E, only common to one side
629
# D E F # D, F are unique to G, H respectively
630
# |/|\| # E is the LCA for G & H, and the unique LCA for
632
# |\ /| # Q is just an extra node which is merged into both
635
# I J # criss-cross merge of G, H
637
# This is the same as the test_plan_merge_tail_ancestors, except we add
638
# a third LCA that doesn't add new lines, but will trigger our more
639
# involved ancestry logic
641
self.add_rev('root', 'A', [], 'abc')
642
self.add_rev('root', 'B', ['A'], 'aBbc')
643
self.add_rev('root', 'C', ['A'], 'abCc')
644
self.add_rev('root', 'D', ['B'], 'DaBbc')
645
self.add_rev('root', 'E', ['B', 'C'], 'aBbCc')
646
self.add_rev('root', 'F', ['C'], 'abCcF')
647
self.add_rev('root', 'G', ['D', 'E'], 'DaBbCc')
648
self.add_rev('root', 'H', ['F', 'E'], 'aBbCcF')
649
self.add_rev('root', 'Q', ['E'], 'aBbCc')
650
self.add_rev('root', 'I', ['G', 'Q', 'H'], 'DaBbCcF')
651
# Merge G & H but supersede an old line in B
652
self.add_rev('root', 'J', ['H', 'Q', 'G'], 'DaJbCcF')
653
plan = self.plan_merge_vf.plan_merge('I', 'J')
655
('unchanged', 'D\n'),
656
('unchanged', 'a\n'),
659
('unchanged', 'b\n'),
660
('unchanged', 'C\n'),
661
('unchanged', 'c\n'),
662
('unchanged', 'F\n')],
665
def test_plan_merge_2_tail_triple_ancestors(self):
666
# The graph looks like this:
667
# A B # 2 tails going back to NULL
669
# D E F # D, is unique to G, F to H
670
# |/|\| # E is the LCA for G & H, and the unique LCA for
672
# |\ /| # Q is just an extra node which is merged into both
675
# I J # criss-cross merge of G, H (and Q)
678
# This is meant to test after hitting a 3-way LCA, and multiple tail
679
# ancestors (only have NULL_REVISION in common)
681
self.add_rev('root', 'A', [], 'abc')
682
self.add_rev('root', 'B', [], 'def')
683
self.add_rev('root', 'D', ['A'], 'Dabc')
684
self.add_rev('root', 'E', ['A', 'B'], 'abcdef')
685
self.add_rev('root', 'F', ['B'], 'defF')
686
self.add_rev('root', 'G', ['D', 'E'], 'Dabcdef')
687
self.add_rev('root', 'H', ['F', 'E'], 'abcdefF')
688
self.add_rev('root', 'Q', ['E'], 'abcdef')
689
self.add_rev('root', 'I', ['G', 'Q', 'H'], 'DabcdefF')
690
# Merge G & H but supersede an old line in B
691
self.add_rev('root', 'J', ['H', 'Q', 'G'], 'DabcdJfF')
692
plan = self.plan_merge_vf.plan_merge('I', 'J')
694
('unchanged', 'D\n'),
695
('unchanged', 'a\n'),
696
('unchanged', 'b\n'),
697
('unchanged', 'c\n'),
698
('unchanged', 'd\n'),
701
('unchanged', 'f\n'),
702
('unchanged', 'F\n')],
705
def test_plan_merge_uncommitted_files(self):
706
self.setup_plan_merge_uncommitted()
707
plan = self.plan_merge_vf.plan_merge('B:', 'C:')
710
('unchanged', 'a\n'),
719
def test_plan_merge_insert_order(self):
720
"""Weave merges are sensitive to the order of insertion.
722
Specifically for overlapping regions, it effects which region gets put
723
'first'. And when a user resolves an overlapping merge, if they use the
724
same ordering, then the lines match the parents, if they don't only
725
*some* of the lines match.
727
self.add_rev('root', 'A', [], 'abcdef')
728
self.add_rev('root', 'B', ['A'], 'abwxcdef')
729
self.add_rev('root', 'C', ['A'], 'abyzcdef')
730
# Merge, and resolve the conflict by adding *both* sets of lines
731
# If we get the ordering wrong, these will look like new lines in D,
732
# rather than carried over from B, C
733
self.add_rev('root', 'D', ['B', 'C'],
735
# Supersede the lines in B and delete the lines in C, which will
736
# conflict if they are treated as being in D
737
self.add_rev('root', 'E', ['C', 'B'],
739
# Same thing for the lines in C
740
self.add_rev('root', 'F', ['C'], 'abpqcdef')
741
plan = self.plan_merge_vf.plan_merge('D', 'E')
743
('unchanged', 'a\n'),
744
('unchanged', 'b\n'),
751
('unchanged', 'c\n'),
752
('unchanged', 'd\n'),
753
('unchanged', 'e\n'),
754
('unchanged', 'f\n')],
756
plan = self.plan_merge_vf.plan_merge('E', 'D')
757
# Going in the opposite direction shows the effect of the opposite plan
759
('unchanged', 'a\n'),
760
('unchanged', 'b\n'),
765
('killed-both', 'w\n'),
766
('killed-both', 'x\n'),
769
('unchanged', 'c\n'),
770
('unchanged', 'd\n'),
771
('unchanged', 'e\n'),
772
('unchanged', 'f\n')],
775
def test_plan_merge_criss_cross(self):
776
# This is specificly trying to trigger problems when using limited
777
# ancestry and weaves. The ancestry graph looks like:
778
# XX unused ancestor, should not show up in the weave
782
# B \ Introduces a line 'foo'
784
# C D E C & D both have 'foo', E has different changes
788
# F G All of C, D, E are merged into F and G, so they are
789
# all common ancestors.
791
# The specific issue with weaves:
792
# B introduced a text ('foo') that is present in both C and D.
793
# If we do not include B (because it isn't an ancestor of E), then
794
# the A=>C and A=>D look like both sides independently introduce the
795
# text ('foo'). If F does not modify the text, it would still appear
796
# to have deleted on of the versions from C or D. If G then modifies
797
# 'foo', it should appear as superseding the value in F (since it
798
# came from B), rather than conflict because of the resolution during
800
self.add_rev('root', 'XX', [], 'qrs')
801
self.add_rev('root', 'A', ['XX'], 'abcdef')
802
self.add_rev('root', 'B', ['A'], 'axcdef')
803
self.add_rev('root', 'C', ['B'], 'axcdefg')
804
self.add_rev('root', 'D', ['B'], 'haxcdef')
805
self.add_rev('root', 'E', ['A'], 'abcdyf')
806
# Simple combining of all texts
807
self.add_rev('root', 'F', ['C', 'D', 'E'], 'haxcdyfg')
808
# combine and supersede 'x'
809
self.add_rev('root', 'G', ['C', 'D', 'E'], 'hazcdyfg')
810
plan = self.plan_merge_vf.plan_merge('F', 'G')
812
('unchanged', 'h\n'),
813
('unchanged', 'a\n'),
814
('killed-base', 'b\n'),
817
('unchanged', 'c\n'),
818
('unchanged', 'd\n'),
819
('killed-base', 'e\n'),
820
('unchanged', 'y\n'),
821
('unchanged', 'f\n'),
822
('unchanged', 'g\n')],
825
def assertRemoveExternalReferences(self, filtered_parent_map,
826
child_map, tails, parent_map):
827
"""Assert results for _PlanMerge._remove_external_references."""
828
(act_filtered_parent_map, act_child_map,
829
act_tails) = _PlanMerge._remove_external_references(parent_map)
831
# The parent map *should* preserve ordering, but the ordering of
832
# children is not strictly defined
833
# child_map = dict((k, sorted(children))
834
# for k, children in child_map.iteritems())
835
# act_child_map = dict(k, sorted(children)
836
# for k, children in act_child_map.iteritems())
837
self.assertEqual(filtered_parent_map, act_filtered_parent_map)
838
self.assertEqual(child_map, act_child_map)
839
self.assertEqual(sorted(tails), sorted(act_tails))
841
def test__remove_external_references(self):
842
# First, nothing to remove
843
self.assertRemoveExternalReferences({3: [2], 2: [1], 1: []},
844
{1: [2], 2: [3], 3: []}, [1], {3: [2], 2: [1], 1: []})
845
# The reverse direction
846
self.assertRemoveExternalReferences({1: [2], 2: [3], 3: []},
847
{3: [2], 2: [1], 1: []}, [3], {1: [2], 2: [3], 3: []})
849
self.assertRemoveExternalReferences({3: [2], 2: [1], 1: []},
850
{1: [2], 2: [3], 3: []}, [1], {3: [2, 4], 2: [1, 5], 1: [6]})
852
self.assertRemoveExternalReferences(
853
{4: [2, 3], 3: [], 2: [1], 1: []},
854
{1: [2], 2: [4], 3: [4], 4: []},
856
{4: [2, 3], 3: [5], 2: [1], 1: [6]})
858
self.assertRemoveExternalReferences(
859
{1: [3], 2: [3, 4], 3: [], 4: []},
860
{1: [], 2: [], 3: [1, 2], 4: [2]},
862
{1: [3], 2: [3, 4], 3: [5], 4: []})
864
def assertPruneTails(self, pruned_map, tails, parent_map):
866
for key, parent_keys in parent_map.iteritems():
867
child_map.setdefault(key, [])
868
for pkey in parent_keys:
869
child_map.setdefault(pkey, []).append(key)
870
_PlanMerge._prune_tails(parent_map, child_map, tails)
871
self.assertEqual(pruned_map, parent_map)
873
def test__prune_tails(self):
874
# Nothing requested to prune
875
self.assertPruneTails({1: [], 2: [], 3: []}, [],
876
{1: [], 2: [], 3: []})
877
# Prune a single entry
878
self.assertPruneTails({1: [], 3: []}, [2],
879
{1: [], 2: [], 3: []})
881
self.assertPruneTails({1: []}, [3],
882
{1: [], 2: [3], 3: []})
883
# Prune a chain with a diamond
884
self.assertPruneTails({1: []}, [5],
885
{1: [], 2: [3, 4], 3: [5], 4: [5], 5: []})
886
# Prune a partial chain
887
self.assertPruneTails({1: [6], 6:[]}, [5],
888
{1: [2, 6], 2: [3, 4], 3: [5], 4: [5], 5: [],
890
# Prune a chain with multiple tips, that pulls out intermediates
891
self.assertPruneTails({1:[3], 3:[]}, [4, 5],
892
{1: [2, 3], 2: [4, 5], 3: [], 4:[], 5:[]})
893
self.assertPruneTails({1:[3], 3:[]}, [5, 4],
894
{1: [2, 3], 2: [4, 5], 3: [], 4:[], 5:[]})
896
def test_subtract_plans(self):
898
('unchanged', 'a\n'),
907
('unchanged', 'a\n'),
916
('unchanged', 'a\n'),
920
('unchanged', 'f\n'),
923
self.assertEqual(subtracted_plan,
924
list(_PlanMerge._subtract_plans(old_plan, new_plan)))
926
def setup_merge_with_base(self):
927
self.add_rev('root', 'COMMON', [], 'abc')
928
self.add_rev('root', 'THIS', ['COMMON'], 'abcd')
929
self.add_rev('root', 'BASE', ['COMMON'], 'eabc')
930
self.add_rev('root', 'OTHER', ['BASE'], 'eafb')
932
def test_plan_merge_with_base(self):
933
self.setup_merge_with_base()
934
plan = self.plan_merge_vf.plan_merge('THIS', 'OTHER', 'BASE')
935
self.assertEqual([('unchanged', 'a\n'),
937
('unchanged', 'b\n'),
942
def test_plan_lca_merge(self):
943
self.setup_plan_merge()
944
plan = self.plan_merge_vf.plan_lca_merge('B', 'C')
947
('unchanged', 'a\n'),
952
('unchanged', 'g\n')],
955
def test_plan_lca_merge_uncommitted_files(self):
956
self.setup_plan_merge_uncommitted()
957
plan = self.plan_merge_vf.plan_lca_merge('B:', 'C:')
960
('unchanged', 'a\n'),
965
('unchanged', 'g\n')],
968
def test_plan_lca_merge_with_base(self):
969
self.setup_merge_with_base()
970
plan = self.plan_merge_vf.plan_lca_merge('THIS', 'OTHER', 'BASE')
971
self.assertEqual([('unchanged', 'a\n'),
973
('unchanged', 'b\n'),
978
def test_plan_lca_merge_with_criss_cross(self):
979
self.add_version(('root', 'ROOT'), [], 'abc')
980
# each side makes a change
981
self.add_version(('root', 'REV1'), [('root', 'ROOT')], 'abcd')
982
self.add_version(('root', 'REV2'), [('root', 'ROOT')], 'abce')
983
# both sides merge, discarding others' changes
984
self.add_version(('root', 'LCA1'),
985
[('root', 'REV1'), ('root', 'REV2')], 'abcd')
986
self.add_version(('root', 'LCA2'),
987
[('root', 'REV1'), ('root', 'REV2')], 'fabce')
988
plan = self.plan_merge_vf.plan_lca_merge('LCA1', 'LCA2')
989
self.assertEqual([('new-b', 'f\n'),
990
('unchanged', 'a\n'),
991
('unchanged', 'b\n'),
992
('unchanged', 'c\n'),
993
('conflicted-a', 'd\n'),
994
('conflicted-b', 'e\n'),
997
def test_plan_lca_merge_with_null(self):
998
self.add_version(('root', 'A'), [], 'ab')
999
self.add_version(('root', 'B'), [], 'bc')
1000
plan = self.plan_merge_vf.plan_lca_merge('A', 'B')
1001
self.assertEqual([('new-a', 'a\n'),
1002
('unchanged', 'b\n'),
1006
def test_plan_merge_with_delete_and_change(self):
1007
self.add_rev('root', 'C', [], 'a')
1008
self.add_rev('root', 'A', ['C'], 'b')
1009
self.add_rev('root', 'B', ['C'], '')
1010
plan = self.plan_merge_vf.plan_merge('A', 'B')
1011
self.assertEqual([('killed-both', 'a\n'),
1015
def test_plan_merge_with_move_and_change(self):
1016
self.add_rev('root', 'C', [], 'abcd')
1017
self.add_rev('root', 'A', ['C'], 'acbd')
1018
self.add_rev('root', 'B', ['C'], 'aBcd')
1019
plan = self.plan_merge_vf.plan_merge('A', 'B')
1020
self.assertEqual([('unchanged', 'a\n'),
1022
('killed-b', 'b\n'),
1024
('killed-a', 'c\n'),
1025
('unchanged', 'd\n'),
1029
class TestMergeImplementation(object):
1031
def do_merge(self, target_tree, source_tree, **kwargs):
1032
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1033
target_tree, source_tree.last_revision(),
1034
other_branch=source_tree.branch)
1035
merger.merge_type=self.merge_type
1036
for name, value in kwargs.items():
1037
setattr(merger, name, value)
1040
def test_merge_specific_file(self):
1041
this_tree = self.make_branch_and_tree('this')
1042
this_tree.lock_write()
1043
self.addCleanup(this_tree.unlock)
1044
self.build_tree_contents([
1045
('this/file1', 'a\nb\n'),
1046
('this/file2', 'a\nb\n')
1048
this_tree.add(['file1', 'file2'])
1049
this_tree.commit('Added files')
1050
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1051
self.build_tree_contents([
1052
('other/file1', 'a\nb\nc\n'),
1053
('other/file2', 'a\nb\nc\n')
1055
other_tree.commit('modified both')
1056
self.build_tree_contents([
1057
('this/file1', 'd\na\nb\n'),
1058
('this/file2', 'd\na\nb\n')
1060
this_tree.commit('modified both')
1061
self.do_merge(this_tree, other_tree, interesting_files=['file1'])
1062
self.assertFileEqual('d\na\nb\nc\n', 'this/file1')
1063
self.assertFileEqual('d\na\nb\n', 'this/file2')
1065
def test_merge_move_and_change(self):
1066
this_tree = self.make_branch_and_tree('this')
1067
this_tree.lock_write()
1068
self.addCleanup(this_tree.unlock)
1069
self.build_tree_contents([
1070
('this/file1', 'line 1\nline 2\nline 3\nline 4\n'),
1072
this_tree.add('file1',)
1073
this_tree.commit('Added file')
1074
other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
1075
self.build_tree_contents([
1076
('other/file1', 'line 1\nline 2 to 2.1\nline 3\nline 4\n'),
1078
other_tree.commit('Changed 2 to 2.1')
1079
self.build_tree_contents([
1080
('this/file1', 'line 1\nline 3\nline 2\nline 4\n'),
1082
this_tree.commit('Swapped 2 & 3')
1083
self.do_merge(this_tree, other_tree)
1084
self.assertFileEqual('line 1\n'
1091
'>>>>>>> MERGE-SOURCE\n'
1092
'line 4\n', 'this/file1')
1095
class TestMerge3Merge(TestCaseWithTransport, TestMergeImplementation):
1097
merge_type = _mod_merge.Merge3Merger
1100
class TestWeaveMerge(TestCaseWithTransport, TestMergeImplementation):
1102
merge_type = _mod_merge.WeaveMerger
1105
class TestLCAMerge(TestCaseWithTransport, TestMergeImplementation):
1107
merge_type = _mod_merge.LCAMerger
1109
def test_merge_move_and_change(self):
1110
self.expectFailure("lca merge doesn't conflict for move and change",
1111
super(TestLCAMerge, self).test_merge_move_and_change)
1114
class LoggingMerger(object):
1115
# These seem to be the required attributes
1116
requires_base = False
1117
supports_reprocess = False
1118
supports_show_base = False
1119
supports_cherrypick = False
1120
# We intentionally do not define supports_lca_trees
1122
def __init__(self, *args, **kwargs):
1124
self.kwargs = kwargs
1127
class TestMergerBase(TestCaseWithMemoryTransport):
1128
"""Common functionality for Merger tests that don't write to disk."""
1130
def get_builder(self):
1131
builder = self.make_branch_builder('path')
1132
builder.start_series()
1133
self.addCleanup(builder.finish_series)
1136
def setup_simple_graph(self):
1137
"""Create a simple 3-node graph.
1139
:return: A BranchBuilder
1146
builder = self.get_builder()
1147
builder.build_snapshot('A-id', None,
1148
[('add', ('', None, 'directory', None))])
1149
builder.build_snapshot('C-id', ['A-id'], [])
1150
builder.build_snapshot('B-id', ['A-id'], [])
1153
def setup_criss_cross_graph(self):
1154
"""Create a 5-node graph with a criss-cross.
1156
:return: A BranchBuilder
1163
builder = self.setup_simple_graph()
1164
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1165
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1168
def make_Merger(self, builder, other_revision_id,
1169
interesting_files=None, interesting_ids=None):
1170
"""Make a Merger object from a branch builder"""
1171
mem_tree = memorytree.MemoryTree.create_on_branch(builder.get_branch())
1172
mem_tree.lock_write()
1173
self.addCleanup(mem_tree.unlock)
1174
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1175
mem_tree, other_revision_id)
1176
merger.set_interesting_files(interesting_files)
1177
# It seems there is no matching function for set_interesting_ids
1178
merger.interesting_ids = interesting_ids
1179
merger.merge_type = _mod_merge.Merge3Merger
1183
class TestMergerInMemory(TestMergerBase):
1185
def test_find_base(self):
1186
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1187
self.assertEqual('A-id', merger.base_rev_id)
1188
self.assertFalse(merger._is_criss_cross)
1189
self.assertIs(None, merger._lca_trees)
1191
def test_find_base_criss_cross(self):
1192
builder = self.setup_criss_cross_graph()
1193
merger = self.make_Merger(builder, 'E-id')
1194
self.assertEqual('A-id', merger.base_rev_id)
1195
self.assertTrue(merger._is_criss_cross)
1196
self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1197
for t in merger._lca_trees])
1198
# If we swap the order, we should get a different lca order
1199
builder.build_snapshot('F-id', ['E-id'], [])
1200
merger = self.make_Merger(builder, 'D-id')
1201
self.assertEqual(['C-id', 'B-id'], [t.get_revision_id()
1202
for t in merger._lca_trees])
1204
def test_find_base_triple_criss_cross(self):
1207
# B C F # F is merged into both branches
1214
builder = self.setup_criss_cross_graph()
1215
builder.build_snapshot('F-id', ['A-id'], [])
1216
builder.build_snapshot('H-id', ['E-id', 'F-id'], [])
1217
builder.build_snapshot('G-id', ['D-id', 'F-id'], [])
1218
merger = self.make_Merger(builder, 'H-id')
1219
self.assertEqual(['B-id', 'C-id', 'F-id'],
1220
[t.get_revision_id() for t in merger._lca_trees])
1222
def test_no_criss_cross_passed_to_merge_type(self):
1223
class LCATreesMerger(LoggingMerger):
1224
supports_lca_trees = True
1226
merger = self.make_Merger(self.setup_simple_graph(), 'C-id')
1227
merger.merge_type = LCATreesMerger
1228
merge_obj = merger.make_merger()
1229
self.assertIsInstance(merge_obj, LCATreesMerger)
1230
self.assertFalse('lca_trees' in merge_obj.kwargs)
1232
def test_criss_cross_passed_to_merge_type(self):
1233
merger = self.make_Merger(self.setup_criss_cross_graph(), 'E-id')
1234
merger.merge_type = _mod_merge.Merge3Merger
1235
merge_obj = merger.make_merger()
1236
self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1237
for t in merger._lca_trees])
1239
def test_criss_cross_not_supported_merge_type(self):
1240
merger = self.make_Merger(self.setup_criss_cross_graph(), 'E-id')
1241
# We explicitly do not define supports_lca_trees
1242
merger.merge_type = LoggingMerger
1243
merge_obj = merger.make_merger()
1244
self.assertIsInstance(merge_obj, LoggingMerger)
1245
self.assertFalse('lca_trees' in merge_obj.kwargs)
1247
def test_criss_cross_unsupported_merge_type(self):
1248
class UnsupportedLCATreesMerger(LoggingMerger):
1249
supports_lca_trees = False
1251
merger = self.make_Merger(self.setup_criss_cross_graph(), 'E-id')
1252
merger.merge_type = UnsupportedLCATreesMerger
1253
merge_obj = merger.make_merger()
1254
self.assertIsInstance(merge_obj, UnsupportedLCATreesMerger)
1255
self.assertFalse('lca_trees' in merge_obj.kwargs)
1258
class TestMergerEntriesLCA(TestMergerBase):
1260
def make_merge_obj(self, builder, other_revision_id,
1261
interesting_files=None, interesting_ids=None):
1262
merger = self.make_Merger(builder, other_revision_id,
1263
interesting_files=interesting_files,
1264
interesting_ids=interesting_ids)
1265
return merger.make_merger()
1267
def test_simple(self):
1268
builder = self.get_builder()
1269
builder.build_snapshot('A-id', None,
1270
[('add', (u'', 'a-root-id', 'directory', None)),
1271
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1272
builder.build_snapshot('C-id', ['A-id'],
1273
[('modify', ('a-id', 'a\nb\nC\nc\n'))])
1274
builder.build_snapshot('B-id', ['A-id'],
1275
[('modify', ('a-id', 'a\nB\nb\nc\n'))])
1276
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1277
[('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))])
1278
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1279
[('modify', ('a-id', 'a\nB\nb\nC\nc\n'))])
1280
merge_obj = self.make_merge_obj(builder, 'E-id')
1282
self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1283
for t in merge_obj._lca_trees])
1284
self.assertEqual('A-id', merge_obj.base_tree.get_revision_id())
1285
entries = list(merge_obj._entries_lca())
1287
# (file_id, changed, parents, names, executable)
1288
# BASE, lca1, lca2, OTHER, THIS
1289
root_id = 'a-root-id'
1290
self.assertEqual([('a-id', True,
1291
((root_id, [root_id, root_id]), root_id, root_id),
1292
((u'a', [u'a', u'a']), u'a', u'a'),
1293
((False, [False, False]), False, False)),
1296
def test_not_in_base(self):
1297
# LCAs all have the same last-modified revision for the file, as do
1298
# the tips, but the base has something different
1299
# A base, doesn't have the file
1301
# B C B introduces 'foo', C introduces 'bar'
1303
# D E D and E now both have 'foo' and 'bar'
1305
# F G the files are now in F, G, D and E, but not in A
1308
builder = self.get_builder()
1309
builder.build_snapshot('A-id', None,
1310
[('add', (u'', 'a-root-id', 'directory', None))])
1311
builder.build_snapshot('B-id', ['A-id'],
1312
[('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1313
builder.build_snapshot('C-id', ['A-id'],
1314
[('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))])
1315
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1316
[('add', (u'bar', 'bar-id', 'file', 'd\ne\nf\n'))])
1317
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1318
[('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1319
builder.build_snapshot('G-id', ['E-id', 'D-id'],
1320
[('modify', (u'bar-id', 'd\ne\nf\nG\n'))])
1321
builder.build_snapshot('F-id', ['D-id', 'E-id'], [])
1322
merge_obj = self.make_merge_obj(builder, 'G-id')
1324
self.assertEqual(['D-id', 'E-id'], [t.get_revision_id()
1325
for t in merge_obj._lca_trees])
1326
self.assertEqual('A-id', merge_obj.base_tree.get_revision_id())
1327
entries = list(merge_obj._entries_lca())
1328
root_id = 'a-root-id'
1329
self.assertEqual([('bar-id', True,
1330
((None, [root_id, root_id]), root_id, root_id),
1331
((None, [u'bar', u'bar']), u'bar', u'bar'),
1332
((None, [False, False]), False, False)),
1335
def test_not_in_this(self):
1336
builder = self.get_builder()
1337
builder.build_snapshot('A-id', None,
1338
[('add', (u'', 'a-root-id', 'directory', None)),
1339
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1340
builder.build_snapshot('B-id', ['A-id'],
1341
[('modify', ('a-id', 'a\nB\nb\nc\n'))])
1342
builder.build_snapshot('C-id', ['A-id'],
1343
[('modify', ('a-id', 'a\nb\nC\nc\n'))])
1344
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1345
[('modify', ('a-id', 'a\nB\nb\nC\nc\nE\n'))])
1346
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1347
[('unversion', 'a-id')])
1348
merge_obj = self.make_merge_obj(builder, 'E-id')
1350
self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1351
for t in merge_obj._lca_trees])
1352
self.assertEqual('A-id', merge_obj.base_tree.get_revision_id())
1354
entries = list(merge_obj._entries_lca())
1355
root_id = 'a-root-id'
1356
self.assertEqual([('a-id', True,
1357
((root_id, [root_id, root_id]), root_id, None),
1358
((u'a', [u'a', u'a']), u'a', None),
1359
((False, [False, False]), False, None)),
1362
def test_file_not_in_one_lca(self):
1365
# B C # B no file, C introduces a file
1367
# D E # D and E both have the file, unchanged from C
1368
builder = self.get_builder()
1369
builder.build_snapshot('A-id', None,
1370
[('add', (u'', 'a-root-id', 'directory', None))])
1371
builder.build_snapshot('B-id', ['A-id'], [])
1372
builder.build_snapshot('C-id', ['A-id'],
1373
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1374
builder.build_snapshot('E-id', ['C-id', 'B-id'], []) # Inherited from C
1375
builder.build_snapshot('D-id', ['B-id', 'C-id'], # Merged from C
1376
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1377
merge_obj = self.make_merge_obj(builder, 'E-id')
1379
self.assertEqual(['B-id', 'C-id'], [t.get_revision_id()
1380
for t in merge_obj._lca_trees])
1381
self.assertEqual('A-id', merge_obj.base_tree.get_revision_id())
1383
entries = list(merge_obj._entries_lca())
1384
root_id = 'a-root-id'
1385
self.assertEqual([], entries)
1387
def test_not_in_other(self):
1388
builder = self.get_builder()
1389
builder.build_snapshot('A-id', None,
1390
[('add', (u'', 'a-root-id', 'directory', None)),
1391
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1392
builder.build_snapshot('B-id', ['A-id'], [])
1393
builder.build_snapshot('C-id', ['A-id'], [])
1394
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1395
[('unversion', 'a-id')])
1396
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1397
merge_obj = self.make_merge_obj(builder, 'E-id')
1399
entries = list(merge_obj._entries_lca())
1400
root_id = 'a-root-id'
1401
self.assertEqual([('a-id', True,
1402
((root_id, [root_id, root_id]), None, root_id),
1403
((u'a', [u'a', u'a']), None, u'a'),
1404
((False, [False, False]), None, False)),
1407
def test_not_in_other_or_lca(self):
1408
# A base, introduces 'foo'
1410
# B C B nothing, C deletes foo
1412
# D E D restores foo (same as B), E leaves it deleted
1413
# We should emit an entry for this
1414
builder = self.get_builder()
1415
builder.build_snapshot('A-id', None,
1416
[('add', (u'', 'a-root-id', 'directory', None)),
1417
('add', (u'foo', 'foo-id', 'file', 'content\n'))])
1418
builder.build_snapshot('B-id', ['A-id'], [])
1419
builder.build_snapshot('C-id', ['A-id'],
1420
[('unversion', 'foo-id')])
1421
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1422
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1423
merge_obj = self.make_merge_obj(builder, 'E-id')
1425
entries = list(merge_obj._entries_lca())
1426
root_id = 'a-root-id'
1427
self.assertEqual([('foo-id', True,
1428
((root_id, [root_id, None]), None, root_id),
1429
((u'foo', [u'foo', None]), None, 'foo'),
1430
((False, [False, None]), None, False)),
1433
def test_only_in_one_lca(self):
1434
builder = self.get_builder()
1435
builder.build_snapshot('A-id', None,
1436
[('add', (u'', 'a-root-id', 'directory', None))])
1437
builder.build_snapshot('B-id', ['A-id'], [])
1438
builder.build_snapshot('C-id', ['A-id'],
1439
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1440
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1441
[('unversion', 'a-id')])
1442
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1443
merge_obj = self.make_merge_obj(builder, 'E-id')
1445
entries = list(merge_obj._entries_lca())
1446
root_id = 'a-root-id'
1447
self.assertEqual([('a-id', True,
1448
((None, [None, root_id]), None, None),
1449
((None, [None, u'a']), None, None),
1450
((None, [None, False]), None, None)),
1453
def test_only_in_other(self):
1454
builder = self.get_builder()
1455
builder.build_snapshot('A-id', None,
1456
[('add', (u'', 'a-root-id', 'directory', None))])
1457
builder.build_snapshot('B-id', ['A-id'], [])
1458
builder.build_snapshot('C-id', ['A-id'], [])
1459
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1460
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1461
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1462
merge_obj = self.make_merge_obj(builder, 'E-id')
1464
entries = list(merge_obj._entries_lca())
1465
root_id = 'a-root-id'
1466
self.assertEqual([('a-id', True,
1467
((None, [None, None]), root_id, None),
1468
((None, [None, None]), u'a', None),
1469
((None, [None, None]), False, None)),
1472
def test_one_lca_supersedes(self):
1473
# One LCA supersedes the other LCAs last modified value, but the
1474
# value is not the same as BASE.
1475
# A base, introduces 'foo', last mod A
1477
# B C B modifies 'foo' (mod B), C does nothing (mod A)
1479
# D E D does nothing (mod B), E updates 'foo' (mod E)
1481
# F G F updates 'foo' (mod F). G does nothing (mod E)
1483
# At this point, G should not be considered to modify 'foo', even
1484
# though its LCAs disagree. This is because the modification in E
1485
# completely supersedes the value in D.
1486
builder = self.get_builder()
1487
builder.build_snapshot('A-id', None,
1488
[('add', (u'', 'a-root-id', 'directory', None)),
1489
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1490
builder.build_snapshot('C-id', ['A-id'], [])
1491
builder.build_snapshot('B-id', ['A-id'],
1492
[('modify', ('foo-id', 'B content\n'))])
1493
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1494
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1495
[('modify', ('foo-id', 'E content\n'))])
1496
builder.build_snapshot('G-id', ['E-id', 'D-id'], [])
1497
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1498
[('modify', ('foo-id', 'F content\n'))])
1499
merge_obj = self.make_merge_obj(builder, 'G-id')
1501
self.assertEqual([], list(merge_obj._entries_lca()))
1503
def test_one_lca_supersedes_path(self):
1504
# Double-criss-cross merge, the ultimate base value is different from
1508
# B C B value 'bar', C = 'foo'
1510
# D E D = 'bar', E supersedes to 'bing'
1512
# F G F = 'bing', G supersedes to 'barry'
1514
# In this case, we technically should not care about the value 'bar' for
1515
# D, because it was clearly superseded by E's 'bing'. The
1516
# per-file/attribute graph would actually look like:
1525
# Because the other side of the merge never modifies the value, it just
1526
# takes the value from the merge.
1528
# ATM this fails because we will prune 'foo' from the LCAs, but we
1529
# won't prune 'bar'. This is getting far off into edge-case land, so we
1530
# aren't supporting it yet.
1532
builder = self.get_builder()
1533
builder.build_snapshot('A-id', None,
1534
[('add', (u'', 'a-root-id', 'directory', None)),
1535
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1536
builder.build_snapshot('C-id', ['A-id'], [])
1537
builder.build_snapshot('B-id', ['A-id'],
1538
[('rename', ('foo', 'bar'))])
1539
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1540
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1541
[('rename', ('foo', 'bing'))]) # override to bing
1542
builder.build_snapshot('G-id', ['E-id', 'D-id'],
1543
[('rename', ('bing', 'barry'))]) # override to barry
1544
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1545
[('rename', ('bar', 'bing'))]) # Merge in E's change
1546
merge_obj = self.make_merge_obj(builder, 'G-id')
1548
self.expectFailure("We don't do an actual heads() check on lca values,"
1549
" or use the per-attribute graph",
1550
self.assertEqual, [], list(merge_obj._entries_lca()))
1552
def test_one_lca_accidentally_pruned(self):
1553
# Another incorrect resolution from the same basic flaw:
1556
# B C B value 'bar', C = 'foo'
1558
# D E D = 'bar', E reverts to 'foo'
1560
# F G F = 'bing', G switches to 'bar'
1562
# 'bar' will not be seen as an interesting change, because 'foo' will
1563
# be pruned from the LCAs, even though it was newly introduced by E
1565
builder = self.get_builder()
1566
builder.build_snapshot('A-id', None,
1567
[('add', (u'', 'a-root-id', 'directory', None)),
1568
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1569
builder.build_snapshot('C-id', ['A-id'], [])
1570
builder.build_snapshot('B-id', ['A-id'],
1571
[('rename', ('foo', 'bar'))])
1572
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1573
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1574
builder.build_snapshot('G-id', ['E-id', 'D-id'],
1575
[('rename', ('foo', 'bar'))])
1576
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1577
[('rename', ('bar', 'bing'))]) # should end up conflicting
1578
merge_obj = self.make_merge_obj(builder, 'G-id')
1580
entries = list(merge_obj._entries_lca())
1581
root_id = 'a-root-id'
1582
self.expectFailure("We prune values from BASE even when relevant.",
1585
((root_id, [root_id, root_id]), root_id, root_id),
1586
((u'foo', [u'bar', u'foo']), u'bar', u'bing'),
1587
((False, [False, False]), False, False)),
1590
def test_both_sides_revert(self):
1591
# Both sides of a criss-cross revert the text to the lca
1592
# A base, introduces 'foo'
1594
# B C B modifies 'foo', C modifies 'foo'
1596
# D E D reverts to B, E reverts to C
1597
# This should conflict
1598
builder = self.get_builder()
1599
builder.build_snapshot('A-id', None,
1600
[('add', (u'', 'a-root-id', 'directory', None)),
1601
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1602
builder.build_snapshot('B-id', ['A-id'],
1603
[('modify', ('foo-id', 'B content\n'))])
1604
builder.build_snapshot('C-id', ['A-id'],
1605
[('modify', ('foo-id', 'C content\n'))])
1606
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1607
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1608
merge_obj = self.make_merge_obj(builder, 'E-id')
1610
entries = list(merge_obj._entries_lca())
1611
root_id = 'a-root-id'
1612
self.assertEqual([('foo-id', True,
1613
((root_id, [root_id, root_id]), root_id, root_id),
1614
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1615
((False, [False, False]), False, False)),
1618
def test_different_lca_resolve_one_side_updates_content(self):
1619
# Both sides converge, but then one side updates the text.
1620
# A base, introduces 'foo'
1622
# B C B modifies 'foo', C modifies 'foo'
1624
# D E D reverts to B, E reverts to C
1626
# F F updates to a new value
1627
# We need to emit an entry for 'foo', because D & E differed on the
1629
builder = self.get_builder()
1630
builder.build_snapshot('A-id', None,
1631
[('add', (u'', 'a-root-id', 'directory', None)),
1632
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1633
builder.build_snapshot('B-id', ['A-id'],
1634
[('modify', ('foo-id', 'B content\n'))])
1635
builder.build_snapshot('C-id', ['A-id'],
1636
[('modify', ('foo-id', 'C content\n'))])
1637
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1638
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1639
builder.build_snapshot('F-id', ['D-id'],
1640
[('modify', ('foo-id', 'F content\n'))])
1641
merge_obj = self.make_merge_obj(builder, 'E-id')
1643
entries = list(merge_obj._entries_lca())
1644
root_id = 'a-root-id'
1645
self.assertEqual([('foo-id', True,
1646
((root_id, [root_id, root_id]), root_id, root_id),
1647
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1648
((False, [False, False]), False, False)),
1651
def test_same_lca_resolution_one_side_updates_content(self):
1652
# Both sides converge, but then one side updates the text.
1653
# A base, introduces 'foo'
1655
# B C B modifies 'foo', C modifies 'foo'
1657
# D E D and E use C's value
1659
# F F updates to a new value
1660
# I think it is a bug that this conflicts, but we don't have a way to
1661
# detect otherwise. And because of:
1662
# test_different_lca_resolve_one_side_updates_content
1663
# We need to conflict.
1665
builder = self.get_builder()
1666
builder.build_snapshot('A-id', None,
1667
[('add', (u'', 'a-root-id', 'directory', None)),
1668
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1669
builder.build_snapshot('B-id', ['A-id'],
1670
[('modify', ('foo-id', 'B content\n'))])
1671
builder.build_snapshot('C-id', ['A-id'],
1672
[('modify', ('foo-id', 'C content\n'))])
1673
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1674
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1675
[('modify', ('foo-id', 'C content\n'))]) # Same as E
1676
builder.build_snapshot('F-id', ['D-id'],
1677
[('modify', ('foo-id', 'F content\n'))])
1678
merge_obj = self.make_merge_obj(builder, 'E-id')
1680
entries = list(merge_obj._entries_lca())
1681
root_id = 'a-root-id'
1682
self.expectFailure("We don't detect that LCA resolution was the"
1683
" same on both sides",
1684
self.assertEqual, [], entries)
1686
def test_only_path_changed(self):
1687
builder = self.get_builder()
1688
builder.build_snapshot('A-id', None,
1689
[('add', (u'', 'a-root-id', 'directory', None)),
1690
('add', (u'a', 'a-id', 'file', 'content\n'))])
1691
builder.build_snapshot('B-id', ['A-id'], [])
1692
builder.build_snapshot('C-id', ['A-id'], [])
1693
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1694
[('rename', (u'a', u'b'))])
1695
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1696
merge_obj = self.make_merge_obj(builder, 'E-id')
1697
entries = list(merge_obj._entries_lca())
1698
root_id = 'a-root-id'
1699
# The content was not changed, only the path
1700
self.assertEqual([('a-id', False,
1701
((root_id, [root_id, root_id]), root_id, root_id),
1702
((u'a', [u'a', u'a']), u'b', u'a'),
1703
((False, [False, False]), False, False)),
1706
def test_kind_changed(self):
1707
# Identical content, except 'D' changes a-id into a directory
1708
builder = self.get_builder()
1709
builder.build_snapshot('A-id', None,
1710
[('add', (u'', 'a-root-id', 'directory', None)),
1711
('add', (u'a', 'a-id', 'file', 'content\n'))])
1712
builder.build_snapshot('B-id', ['A-id'], [])
1713
builder.build_snapshot('C-id', ['A-id'], [])
1714
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1715
[('unversion', 'a-id'),
1716
('add', (u'a', 'a-id', 'directory', None))])
1717
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1718
merge_obj = self.make_merge_obj(builder, 'E-id')
1719
entries = list(merge_obj._entries_lca())
1720
root_id = 'a-root-id'
1721
# Only the kind was changed (content)
1722
self.assertEqual([('a-id', True,
1723
((root_id, [root_id, root_id]), root_id, root_id),
1724
((u'a', [u'a', u'a']), u'a', u'a'),
1725
((False, [False, False]), False, False)),
1728
def test_this_changed_kind(self):
1729
# Identical content, but THIS changes a file to a directory
1730
builder = self.get_builder()
1731
builder.build_snapshot('A-id', None,
1732
[('add', (u'', 'a-root-id', 'directory', None)),
1733
('add', (u'a', 'a-id', 'file', 'content\n'))])
1734
builder.build_snapshot('B-id', ['A-id'], [])
1735
builder.build_snapshot('C-id', ['A-id'], [])
1736
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1737
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1738
[('unversion', 'a-id'),
1739
('add', (u'a', 'a-id', 'directory', None))])
1740
merge_obj = self.make_merge_obj(builder, 'E-id')
1741
entries = list(merge_obj._entries_lca())
1742
root_id = 'a-root-id'
1743
# Only the kind was changed (content)
1744
self.assertEqual([], entries)
1746
def test_interesting_files(self):
1747
# Two files modified, but we should filter one of them
1748
builder = self.get_builder()
1749
builder.build_snapshot('A-id', None,
1750
[('add', (u'', 'a-root-id', 'directory', None)),
1751
('add', (u'a', 'a-id', 'file', 'content\n')),
1752
('add', (u'b', 'b-id', 'file', 'content\n'))])
1753
builder.build_snapshot('B-id', ['A-id'], [])
1754
builder.build_snapshot('C-id', ['A-id'], [])
1755
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1756
[('modify', ('a-id', 'new-content\n')),
1757
('modify', ('b-id', 'new-content\n'))])
1758
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1759
merge_obj = self.make_merge_obj(builder, 'E-id',
1760
interesting_files=['b'])
1761
entries = list(merge_obj._entries_lca())
1762
root_id = 'a-root-id'
1763
self.assertEqual([('b-id', True,
1764
((root_id, [root_id, root_id]), root_id, root_id),
1765
((u'b', [u'b', u'b']), u'b', u'b'),
1766
((False, [False, False]), False, False)),
1769
def test_interesting_file_in_this(self):
1770
# This renamed the file, but it should still match the entry in other
1771
builder = self.get_builder()
1772
builder.build_snapshot('A-id', None,
1773
[('add', (u'', 'a-root-id', 'directory', None)),
1774
('add', (u'a', 'a-id', 'file', 'content\n')),
1775
('add', (u'b', 'b-id', 'file', 'content\n'))])
1776
builder.build_snapshot('B-id', ['A-id'], [])
1777
builder.build_snapshot('C-id', ['A-id'], [])
1778
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1779
[('modify', ('a-id', 'new-content\n')),
1780
('modify', ('b-id', 'new-content\n'))])
1781
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1782
[('rename', ('b', 'c'))])
1783
merge_obj = self.make_merge_obj(builder, 'E-id',
1784
interesting_files=['c'])
1785
entries = list(merge_obj._entries_lca())
1786
root_id = 'a-root-id'
1787
self.assertEqual([('b-id', True,
1788
((root_id, [root_id, root_id]), root_id, root_id),
1789
((u'b', [u'b', u'b']), u'b', u'c'),
1790
((False, [False, False]), False, False)),
1793
def test_interesting_file_in_base(self):
1794
# This renamed the file, but it should still match the entry in BASE
1795
builder = self.get_builder()
1796
builder.build_snapshot('A-id', None,
1797
[('add', (u'', 'a-root-id', 'directory', None)),
1798
('add', (u'a', 'a-id', 'file', 'content\n')),
1799
('add', (u'c', 'c-id', 'file', 'content\n'))])
1800
builder.build_snapshot('B-id', ['A-id'],
1801
[('rename', ('c', 'b'))])
1802
builder.build_snapshot('C-id', ['A-id'],
1803
[('rename', ('c', 'b'))])
1804
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1805
[('modify', ('a-id', 'new-content\n')),
1806
('modify', ('c-id', 'new-content\n'))])
1807
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1808
merge_obj = self.make_merge_obj(builder, 'E-id',
1809
interesting_files=['c'])
1810
entries = list(merge_obj._entries_lca())
1811
root_id = 'a-root-id'
1812
self.assertEqual([('c-id', True,
1813
((root_id, [root_id, root_id]), root_id, root_id),
1814
((u'c', [u'b', u'b']), u'b', u'b'),
1815
((False, [False, False]), False, False)),
1818
def test_interesting_file_in_lca(self):
1819
# This renamed the file, but it should still match the entry in LCA
1820
builder = self.get_builder()
1821
builder.build_snapshot('A-id', None,
1822
[('add', (u'', 'a-root-id', 'directory', None)),
1823
('add', (u'a', 'a-id', 'file', 'content\n')),
1824
('add', (u'b', 'b-id', 'file', 'content\n'))])
1825
builder.build_snapshot('B-id', ['A-id'],
1826
[('rename', ('b', 'c'))])
1827
builder.build_snapshot('C-id', ['A-id'], [])
1828
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1829
[('modify', ('a-id', 'new-content\n')),
1830
('modify', ('b-id', 'new-content\n'))])
1831
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1832
[('rename', ('c', 'b'))])
1833
merge_obj = self.make_merge_obj(builder, 'E-id',
1834
interesting_files=['c'])
1835
entries = list(merge_obj._entries_lca())
1836
root_id = 'a-root-id'
1837
self.assertEqual([('b-id', True,
1838
((root_id, [root_id, root_id]), root_id, root_id),
1839
((u'b', [u'c', u'b']), u'b', u'b'),
1840
((False, [False, False]), False, False)),
1843
def test_interesting_ids(self):
1844
# Two files modified, but we should filter one of them
1845
builder = self.get_builder()
1846
builder.build_snapshot('A-id', None,
1847
[('add', (u'', 'a-root-id', 'directory', None)),
1848
('add', (u'a', 'a-id', 'file', 'content\n')),
1849
('add', (u'b', 'b-id', 'file', 'content\n'))])
1850
builder.build_snapshot('B-id', ['A-id'], [])
1851
builder.build_snapshot('C-id', ['A-id'], [])
1852
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1853
[('modify', ('a-id', 'new-content\n')),
1854
('modify', ('b-id', 'new-content\n'))])
1855
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1856
merge_obj = self.make_merge_obj(builder, 'E-id',
1857
interesting_ids=['b-id'])
1858
entries = list(merge_obj._entries_lca())
1859
root_id = 'a-root-id'
1860
self.assertEqual([('b-id', True,
1861
((root_id, [root_id, root_id]), root_id, root_id),
1862
((u'b', [u'b', u'b']), u'b', u'b'),
1863
((False, [False, False]), False, False)),
1868
class TestMergerEntriesLCAOnDisk(tests.TestCaseWithTransport):
1870
def get_builder(self):
1871
builder = self.make_branch_builder('path')
1872
builder.start_series()
1873
self.addCleanup(builder.finish_series)
1876
def get_wt_from_builder(self, builder):
1877
"""Get a real WorkingTree from the builder."""
1878
the_branch = builder.get_branch()
1879
wt = the_branch.bzrdir.create_workingtree()
1880
# Note: This is a little bit ugly, but we are holding the branch
1881
# write-locked as part of the build process, and we would like to
1882
# maintain that. So we just force the WT to re-use the same
1884
wt._branch = the_branch
1886
self.addCleanup(wt.unlock)
1889
def do_merge(self, builder, other_revision_id):
1890
wt = self.get_wt_from_builder(builder)
1891
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1892
wt, other_revision_id)
1893
merger.merge_type = _mod_merge.Merge3Merger
1894
return wt, merger.do_merge()
1896
def test_simple_lca(self):
1897
builder = self.get_builder()
1898
builder.build_snapshot('A-id', None,
1899
[('add', (u'', 'a-root-id', 'directory', None)),
1900
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1901
builder.build_snapshot('C-id', ['A-id'], [])
1902
builder.build_snapshot('B-id', ['A-id'], [])
1903
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1904
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1905
[('modify', ('a-id', 'a\nb\nc\nd\ne\nf\n'))])
1906
wt, conflicts = self.do_merge(builder, 'E-id')
1907
self.assertEqual(0, conflicts)
1908
# The merge should have simply update the contents of 'a'
1909
self.assertEqual('a\nb\nc\nd\ne\nf\n', wt.get_file_text('a-id'))
1911
def test_conflict_without_lca(self):
1912
# This test would cause a merge conflict, unless we use the lca trees
1913
# to determine the real ancestry
1916
# B C Path renamed to 'bar' in B
1920
# D E Path at 'bar' in D and E
1922
# F Path at 'baz' in F, which supersedes 'bar' and 'foo'
1923
builder = self.get_builder()
1924
builder.build_snapshot('A-id', None,
1925
[('add', (u'', 'a-root-id', 'directory', None)),
1926
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1927
builder.build_snapshot('C-id', ['A-id'], [])
1928
builder.build_snapshot('B-id', ['A-id'],
1929
[('rename', ('foo', 'bar'))])
1930
builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
1931
[('rename', ('foo', 'bar'))])
1932
builder.build_snapshot('F-id', ['E-id'],
1933
[('rename', ('bar', 'baz'))])
1934
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1935
wt, conflicts = self.do_merge(builder, 'F-id')
1936
self.assertEqual(0, conflicts)
1937
# The merge should simply recognize that the final rename takes
1939
self.assertEqual('baz', wt.id2path('foo-id'))
1941
def test_other_deletes_lca_renames(self):
1942
# This test would cause a merge conflict, unless we use the lca trees
1943
# to determine the real ancestry
1946
# B C Path renamed to 'bar' in B
1950
# D E Path at 'bar' in D and E
1953
builder = self.get_builder()
1954
builder.build_snapshot('A-id', None,
1955
[('add', (u'', 'a-root-id', 'directory', None)),
1956
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1957
builder.build_snapshot('C-id', ['A-id'], [])
1958
builder.build_snapshot('B-id', ['A-id'],
1959
[('rename', ('foo', 'bar'))])
1960
builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
1961
[('rename', ('foo', 'bar'))])
1962
builder.build_snapshot('F-id', ['E-id'],
1963
[('unversion', 'foo-id')])
1964
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1965
wt, conflicts = self.do_merge(builder, 'F-id')
1966
self.assertEqual(0, conflicts)
1967
self.assertRaises(errors.NoSuchId, wt.id2path, 'foo-id')
1969
def test_executable_changes(self):
1978
# F Executable bit changed
1979
builder = self.get_builder()
1980
builder.build_snapshot('A-id', None,
1981
[('add', (u'', 'a-root-id', 'directory', None)),
1982
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1983
builder.build_snapshot('C-id', ['A-id'], [])
1984
builder.build_snapshot('B-id', ['A-id'], [])
1985
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1986
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1987
# Have to use a real WT, because BranchBuilder doesn't support exec bit
1988
wt = self.get_wt_from_builder(builder)
1989
tt = transform.TreeTransform(wt)
1991
tt.set_executability(True, tt.trans_id_tree_file_id('foo-id'))
1996
self.assertTrue(wt.is_executable('foo-id'))
1997
wt.commit('F-id', rev_id='F-id')
1998
# Reset to D, so that we can merge F
1999
wt.set_parent_ids(['D-id'])
2000
wt.branch.set_last_revision_info(3, 'D-id')
2002
self.assertFalse(wt.is_executable('foo-id'))
2003
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2004
self.assertEqual(0, conflicts)
2005
self.assertTrue(wt.is_executable('foo-id'))
2007
def test_create_symlink(self):
2008
self.requireFeature(tests.SymlinkFeature)
2017
# F Add a symlink 'foo' => 'bar'
2018
# Have to use a real WT, because BranchBuilder and MemoryTree don't
2019
# have symlink support
2020
builder = self.get_builder()
2021
builder.build_snapshot('A-id', None,
2022
[('add', (u'', 'a-root-id', 'directory', None))])
2023
builder.build_snapshot('C-id', ['A-id'], [])
2024
builder.build_snapshot('B-id', ['A-id'], [])
2025
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2026
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2027
# Have to use a real WT, because BranchBuilder doesn't support exec bit
2028
wt = self.get_wt_from_builder(builder)
2029
os.symlink('bar', 'path/foo')
2030
wt.add(['foo'], ['foo-id'])
2031
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2032
wt.commit('add symlink', rev_id='F-id')
2033
# Reset to D, so that we can merge F
2034
wt.set_parent_ids(['D-id'])
2035
wt.branch.set_last_revision_info(3, 'D-id')
2037
self.assertIs(None, wt.path2id('foo'))
2038
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2039
self.assertEqual(0, conflicts)
2040
self.assertEqual('foo-id', wt.path2id('foo'))
2041
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2043
def test_both_sides_revert(self):
2044
# Both sides of a criss-cross revert the text to the lca
2045
# A base, introduces 'foo'
2047
# B C B modifies 'foo', C modifies 'foo'
2049
# D E D reverts to B, E reverts to C
2050
# This should conflict
2051
# This must be done with a real WorkingTree, because normally their
2052
# inventory contains "None" rather than a real sha1
2053
builder = self.get_builder()
2054
builder.build_snapshot('A-id', None,
2055
[('add', (u'', 'a-root-id', 'directory', None)),
2056
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
2057
builder.build_snapshot('B-id', ['A-id'],
2058
[('modify', ('foo-id', 'B content\n'))])
2059
builder.build_snapshot('C-id', ['A-id'],
2060
[('modify', ('foo-id', 'C content\n'))])
2061
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2062
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2063
wt, conflicts = self.do_merge(builder, 'E-id')
2064
self.assertEqual(1, conflicts)
2065
self.assertEqualDiff('<<<<<<< TREE\n'
2069
'>>>>>>> MERGE-SOURCE\n',
2070
wt.get_file_text('foo-id'))
2072
def test_modified_symlink(self):
2073
self.requireFeature(tests.SymlinkFeature)
2074
# A Create symlink foo => bar
2076
# B C B relinks foo => baz
2080
# D E D & E have foo => baz
2082
# F F changes it to bing
2084
# Merging D & F should result in F cleanly overriding D, because D's
2085
# value actually comes from B
2087
# Have to use a real WT, because BranchBuilder and MemoryTree don't
2088
# have symlink support
2089
wt = self.make_branch_and_tree('path')
2091
self.addCleanup(wt.unlock)
2092
os.symlink('bar', 'path/foo')
2093
wt.add(['foo'], ['foo-id'])
2094
wt.commit('add symlink', rev_id='A-id')
2095
os.remove('path/foo')
2096
os.symlink('baz', 'path/foo')
2097
wt.commit('foo => baz', rev_id='B-id')
2098
wt.set_last_revision('A-id')
2099
wt.branch.set_last_revision_info(1, 'A-id')
2101
wt.commit('C', rev_id='C-id')
2102
wt.merge_from_branch(wt.branch, 'B-id')
2103
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2104
wt.commit('E merges C & B', rev_id='E-id')
2105
os.remove('path/foo')
2106
os.symlink('bing', 'path/foo')
2107
wt.commit('F foo => bing', rev_id='F-id')
2108
wt.set_last_revision('B-id')
2109
wt.branch.set_last_revision_info(2, 'B-id')
2111
wt.merge_from_branch(wt.branch, 'C-id')
2112
wt.commit('D merges B & C', rev_id='D-id')
2113
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2114
self.expectFailure("Merge3Merger doesn't use lcas for symlink content",
2115
self.assertEqual, 0, conflicts)
2116
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2118
def test_renamed_symlink(self):
2119
self.requireFeature(tests.SymlinkFeature)
2120
# A Create symlink foo => bar
2122
# B C B renames foo => barry
2126
# D E D & E have barry
2128
# F F renames barry to blah
2130
# Merging D & F should result in F cleanly overriding D, because D's
2131
# value actually comes from B
2133
wt = self.make_branch_and_tree('path')
2135
self.addCleanup(wt.unlock)
2136
os.symlink('bar', 'path/foo')
2137
wt.add(['foo'], ['foo-id'])
2138
wt.commit('A add symlink', rev_id='A-id')
2139
wt.rename_one('foo', 'barry')
2140
wt.commit('B foo => barry', rev_id='B-id')
2141
wt.set_last_revision('A-id')
2142
wt.branch.set_last_revision_info(1, 'A-id')
2144
wt.commit('C', rev_id='C-id')
2145
wt.merge_from_branch(wt.branch, 'B-id')
2146
self.assertEqual('barry', wt.id2path('foo-id'))
2147
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2148
wt.commit('E merges C & B', rev_id='E-id')
2149
wt.rename_one('barry', 'blah')
2150
wt.commit('F barry => blah', rev_id='F-id')
2151
wt.set_last_revision('B-id')
2152
wt.branch.set_last_revision_info(2, 'B-id')
2154
wt.merge_from_branch(wt.branch, 'C-id')
2155
wt.commit('D merges B & C', rev_id='D-id')
2156
self.assertEqual('barry', wt.id2path('foo-id'))
2157
# Check the output of the Merger object directly
2158
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2160
merger.merge_type = _mod_merge.Merge3Merger
2161
merge_obj = merger.make_merger()
2162
root_id = wt.path2id('')
2163
entries = list(merge_obj._entries_lca())
2164
# No content change, just a path change
2165
self.assertEqual([('foo-id', False,
2166
((root_id, [root_id, root_id]), root_id, root_id),
2167
((u'foo', [u'barry', u'foo']), u'blah', u'barry'),
2168
((False, [False, False]), False, False)),
2170
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2171
self.assertEqual(0, conflicts)
2172
self.assertEqual('blah', wt.id2path('foo-id'))
2174
def test_symlink_no_content_change(self):
2175
self.requireFeature(tests.SymlinkFeature)
2176
# A Create symlink foo => bar
2178
# B C B relinks foo => baz
2182
# D E D & E have foo => baz
2184
# F F has foo => bing
2186
# Merging E into F should not cause a conflict, because E doesn't have
2187
# a content change relative to the LCAs (it does relative to A)
2188
wt = self.make_branch_and_tree('path')
2190
self.addCleanup(wt.unlock)
2191
os.symlink('bar', 'path/foo')
2192
wt.add(['foo'], ['foo-id'])
2193
wt.commit('add symlink', rev_id='A-id')
2194
os.remove('path/foo')
2195
os.symlink('baz', 'path/foo')
2196
wt.commit('foo => baz', rev_id='B-id')
2197
wt.set_last_revision('A-id')
2198
wt.branch.set_last_revision_info(1, 'A-id')
2200
wt.commit('C', rev_id='C-id')
2201
wt.merge_from_branch(wt.branch, 'B-id')
2202
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2203
wt.commit('E merges C & B', rev_id='E-id')
2204
wt.set_last_revision('B-id')
2205
wt.branch.set_last_revision_info(2, 'B-id')
2207
wt.merge_from_branch(wt.branch, 'C-id')
2208
wt.commit('D merges B & C', rev_id='D-id')
2209
os.remove('path/foo')
2210
os.symlink('bing', 'path/foo')
2211
wt.commit('F foo => bing', rev_id='F-id')
2213
# Check the output of the Merger object directly
2214
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2216
merger.merge_type = _mod_merge.Merge3Merger
2217
merge_obj = merger.make_merger()
2218
# Nothing interesting happened in OTHER relative to BASE
2219
self.assertEqual([], list(merge_obj._entries_lca()))
2220
# Now do a real merge, just to test the rest of the stack
2221
conflicts = wt.merge_from_branch(wt.branch, to_revision='E-id')
2222
self.assertEqual(0, conflicts)
2223
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2225
def test_symlink_this_changed_kind(self):
2226
self.requireFeature(tests.SymlinkFeature)
2229
# B C B creates symlink foo => bar
2233
# D E D changes foo into a file, E has foo => bing
2235
# Mostly, this is trying to test that we don't try to os.readlink() on
2236
# a file, or when there is nothing there
2237
wt = self.make_branch_and_tree('path')
2239
self.addCleanup(wt.unlock)
2240
wt.commit('base', rev_id='A-id')
2241
os.symlink('bar', 'path/foo')
2242
wt.add(['foo'], ['foo-id'])
2243
wt.commit('add symlink foo => bar', rev_id='B-id')
2244
wt.set_last_revision('A-id')
2245
wt.branch.set_last_revision_info(1, 'A-id')
2247
wt.commit('C', rev_id='C-id')
2248
wt.merge_from_branch(wt.branch, 'B-id')
2249
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2250
os.remove('path/foo')
2251
# We have to change the link in E, or it won't try to do a comparison
2252
os.symlink('bing', 'path/foo')
2253
wt.commit('E merges C & B, overrides to bing', rev_id='E-id')
2254
wt.set_last_revision('B-id')
2255
wt.branch.set_last_revision_info(2, 'B-id')
2257
wt.merge_from_branch(wt.branch, 'C-id')
2258
os.remove('path/foo')
2259
self.build_tree_contents([('path/foo', 'file content\n')])
2260
# XXX: workaround, WT doesn't detect kind changes unless you do
2262
list(wt.iter_changes(wt.basis_tree()))
2263
wt.commit('D merges B & C, makes it a file', rev_id='D-id')
2265
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2267
merger.merge_type = _mod_merge.Merge3Merger
2268
merge_obj = merger.make_merger()
2269
entries = list(merge_obj._entries_lca())
2270
root_id = wt.path2id('')
2271
self.assertEqual([('foo-id', True,
2272
((None, [root_id, None]), root_id, root_id),
2273
((None, [u'foo', None]), u'foo', u'foo'),
2274
((None, [False, None]), False, False)),
2277
def test_symlink_all_wt(self):
2278
"""Check behavior if all trees are Working Trees."""
2279
self.requireFeature(tests.SymlinkFeature)
2280
# The big issue is that entry.symlink_target is None for WorkingTrees.
2281
# So we need to make sure we handle that case correctly.
2284
# B C B relinks foo => baz
2286
# D E D & E have foo => baz
2288
# F F changes it to bing
2289
# Merging D & F should result in F cleanly overriding D, because D's
2290
# value actually comes from B
2292
wt = self.make_branch_and_tree('path')
2294
self.addCleanup(wt.unlock)
2295
os.symlink('bar', 'path/foo')
2296
wt.add(['foo'], ['foo-id'])
2297
wt.commit('add symlink', rev_id='A-id')
2298
os.remove('path/foo')
2299
os.symlink('baz', 'path/foo')
2300
wt.commit('foo => baz', rev_id='B-id')
2301
wt.set_last_revision('A-id')
2302
wt.branch.set_last_revision_info(1, 'A-id')
2304
wt.commit('C', rev_id='C-id')
2305
wt.merge_from_branch(wt.branch, 'B-id')
2306
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2307
wt.commit('E merges C & B', rev_id='E-id')
2308
os.remove('path/foo')
2309
os.symlink('bing', 'path/foo')
2310
wt.commit('F foo => bing', rev_id='F-id')
2311
wt.set_last_revision('B-id')
2312
wt.branch.set_last_revision_info(2, 'B-id')
2314
wt.merge_from_branch(wt.branch, 'C-id')
2315
wt.commit('D merges B & C', rev_id='D-id')
2316
wt_base = wt.bzrdir.sprout('base', 'A-id').open_workingtree()
2318
self.addCleanup(wt_base.unlock)
2319
wt_lca1 = wt.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
2321
self.addCleanup(wt_lca1.unlock)
2322
wt_lca2 = wt.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
2324
self.addCleanup(wt_lca2.unlock)
2325
wt_other = wt.bzrdir.sprout('other', 'F-id').open_workingtree()
2326
wt_other.lock_read()
2327
self.addCleanup(wt_other.unlock)
2328
merge_obj = _mod_merge.Merge3Merger(wt, wt, wt_base,
2329
wt_other, lca_trees=[wt_lca1, wt_lca2], do_merge=False)
2330
entries = list(merge_obj._entries_lca())
2331
root_id = wt.path2id('')
2332
self.assertEqual([('foo-id', True,
2333
((root_id, [root_id, root_id]), root_id, root_id),
2334
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2335
((False, [False, False]), False, False)),
2338
def test_other_reverted_path_to_base(self):
2341
# B C Path at 'bar' in B
2348
builder = self.get_builder()
2349
builder.build_snapshot('A-id', None,
2350
[('add', (u'', 'a-root-id', 'directory', None)),
2351
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2352
builder.build_snapshot('C-id', ['A-id'], [])
2353
builder.build_snapshot('B-id', ['A-id'],
2354
[('rename', ('foo', 'bar'))])
2355
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2356
[('rename', ('foo', 'bar'))]) # merge the rename
2357
builder.build_snapshot('F-id', ['E-id'],
2358
[('rename', ('bar', 'foo'))]) # Rename back to BASE
2359
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2360
wt, conflicts = self.do_merge(builder, 'F-id')
2361
self.assertEqual(0, conflicts)
2362
self.assertEqual('foo', wt.id2path('foo-id'))
2364
def test_other_reverted_content_to_base(self):
2365
builder = self.get_builder()
2366
builder.build_snapshot('A-id', None,
2367
[('add', (u'', 'a-root-id', 'directory', None)),
2368
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2369
builder.build_snapshot('C-id', ['A-id'], [])
2370
builder.build_snapshot('B-id', ['A-id'],
2371
[('modify', ('foo-id', 'B content\n'))])
2372
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2373
[('modify', ('foo-id', 'B content\n'))]) # merge the content
2374
builder.build_snapshot('F-id', ['E-id'],
2375
[('modify', ('foo-id', 'base content\n'))]) # Revert back to BASE
2376
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2377
wt, conflicts = self.do_merge(builder, 'F-id')
2378
self.assertEqual(0, conflicts)
2379
# TODO: We need to use the per-file graph to properly select a BASE
2380
# before this will work. Or at least use the LCA trees to find
2381
# the appropriate content base. (which is B, not A).
2382
self.expectFailure("Merge3Merger doesn't recognize reverted content",
2383
self.assertEqual, 'base content\n', wt.get_file_text('foo-id'))
2385
def test_other_modified_content(self):
2386
builder = self.get_builder()
2387
builder.build_snapshot('A-id', None,
2388
[('add', (u'', 'a-root-id', 'directory', None)),
2389
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2390
builder.build_snapshot('C-id', ['A-id'], [])
2391
builder.build_snapshot('B-id', ['A-id'],
2392
[('modify', ('foo-id', 'B content\n'))])
2393
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2394
[('modify', ('foo-id', 'B content\n'))]) # merge the content
2395
builder.build_snapshot('F-id', ['E-id'],
2396
[('modify', ('foo-id', 'F content\n'))]) # Override B content
2397
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2398
wt, conflicts = self.do_merge(builder, 'F-id')
2399
self.expectFailure("Merge3Merger only uses BASE for content",
2400
self.assertEqual, 'F content\n', wt.get_file_text('foo-id'))
2401
self.assertEqual(0, conflicts)
2402
self.assertEqual('F content\n', wt.get_file_text('foo-id'))
2404
def test_all_wt(self):
2405
"""Check behavior if all trees are Working Trees."""
2406
# The big issue is that entry.revision is None for WorkingTrees. (as is
2407
# entry.text_sha1, etc. So we need to make sure we handle that case
2409
# A Content of 'foo', path of 'a'
2411
# B C B modifies content, C renames 'a' => 'b'
2413
# D E E updates content, renames 'b' => 'c'
2414
builder = self.get_builder()
2415
builder.build_snapshot('A-id', None,
2416
[('add', (u'', 'a-root-id', 'directory', None)),
2417
('add', (u'a', 'a-id', 'file', 'base content\n')),
2418
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2419
builder.build_snapshot('B-id', ['A-id'],
2420
[('modify', ('foo-id', 'B content\n'))])
2421
builder.build_snapshot('C-id', ['A-id'],
2422
[('rename', ('a', 'b'))])
2423
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2424
[('rename', ('b', 'c')),
2425
('modify', ('foo-id', 'E content\n'))])
2426
builder.build_snapshot('D-id', ['B-id', 'C-id'],
2427
[('rename', ('a', 'b'))]) # merged change
2428
wt_this = self.get_wt_from_builder(builder)
2429
wt_base = wt_this.bzrdir.sprout('base', 'A-id').open_workingtree()
2431
self.addCleanup(wt_base.unlock)
2432
wt_lca1 = wt_this.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
2434
self.addCleanup(wt_lca1.unlock)
2435
wt_lca2 = wt_this.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
2437
self.addCleanup(wt_lca2.unlock)
2438
wt_other = wt_this.bzrdir.sprout('other', 'E-id').open_workingtree()
2439
wt_other.lock_read()
2440
self.addCleanup(wt_other.unlock)
2441
merge_obj = _mod_merge.Merge3Merger(wt_this, wt_this, wt_base,
2442
wt_other, lca_trees=[wt_lca1, wt_lca2], do_merge=False)
2443
entries = list(merge_obj._entries_lca())
2444
root_id = 'a-root-id'
2445
self.assertEqual([('a-id', False,
2446
((root_id, [root_id, root_id]), root_id, root_id),
2447
((u'a', [u'a', u'b']), u'c', u'b'),
2448
((False, [False, False]), False, False)),
2450
((root_id, [root_id, root_id]), root_id, root_id),
2451
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2452
((False, [False, False]), False, False)),
2455
def test_nested_tree_unmodified(self):
2456
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2458
wt = self.make_branch_and_tree('tree',
2459
format='dirstate-with-subtree')
2461
self.addCleanup(wt.unlock)
2462
sub_tree = self.make_branch_and_tree('tree/sub-tree',
2463
format='dirstate-with-subtree')
2464
wt.set_root_id('a-root-id')
2465
sub_tree.set_root_id('sub-tree-root')
2466
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2467
sub_tree.add('file')
2468
sub_tree.commit('foo', rev_id='sub-A-id')
2469
wt.add_reference(sub_tree)
2470
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2471
# Now create a criss-cross merge in the parent, without modifying the
2473
wt.commit('B', rev_id='B-id', recursive=None)
2474
wt.set_last_revision('A-id')
2475
wt.branch.set_last_revision_info(1, 'A-id')
2476
wt.commit('C', rev_id='C-id', recursive=None)
2477
wt.merge_from_branch(wt.branch, to_revision='B-id')
2478
wt.commit('E', rev_id='E-id', recursive=None)
2479
wt.set_parent_ids(['B-id', 'C-id'])
2480
wt.branch.set_last_revision_info(2, 'B-id')
2481
wt.commit('D', rev_id='D-id', recursive=None)
2483
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2485
merger.merge_type = _mod_merge.Merge3Merger
2486
merge_obj = merger.make_merger()
2487
entries = list(merge_obj._entries_lca())
2488
self.assertEqual([], entries)
2490
def test_nested_tree_subtree_modified(self):
2491
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2493
wt = self.make_branch_and_tree('tree',
2494
format='dirstate-with-subtree')
2496
self.addCleanup(wt.unlock)
2497
sub_tree = self.make_branch_and_tree('tree/sub',
2498
format='dirstate-with-subtree')
2499
wt.set_root_id('a-root-id')
2500
sub_tree.set_root_id('sub-tree-root')
2501
self.build_tree_contents([('tree/sub/file', 'text1')])
2502
sub_tree.add('file')
2503
sub_tree.commit('foo', rev_id='sub-A-id')
2504
wt.add_reference(sub_tree)
2505
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2506
# Now create a criss-cross merge in the parent, without modifying the
2508
wt.commit('B', rev_id='B-id', recursive=None)
2509
wt.set_last_revision('A-id')
2510
wt.branch.set_last_revision_info(1, 'A-id')
2511
wt.commit('C', rev_id='C-id', recursive=None)
2512
wt.merge_from_branch(wt.branch, to_revision='B-id')
2513
self.build_tree_contents([('tree/sub/file', 'text2')])
2514
sub_tree.commit('modify contents', rev_id='sub-B-id')
2515
wt.commit('E', rev_id='E-id', recursive=None)
2516
wt.set_parent_ids(['B-id', 'C-id'])
2517
wt.branch.set_last_revision_info(2, 'B-id')
2518
wt.commit('D', rev_id='D-id', recursive=None)
2520
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2522
merger.merge_type = _mod_merge.Merge3Merger
2523
merge_obj = merger.make_merger()
2524
entries = list(merge_obj._entries_lca())
2525
# Nothing interesting about this sub-tree, because content changes are
2526
# computed at a higher level
2527
self.assertEqual([], entries)
2529
def test_nested_tree_subtree_renamed(self):
2530
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2532
wt = self.make_branch_and_tree('tree',
2533
format='dirstate-with-subtree')
2535
self.addCleanup(wt.unlock)
2536
sub_tree = self.make_branch_and_tree('tree/sub',
2537
format='dirstate-with-subtree')
2538
wt.set_root_id('a-root-id')
2539
sub_tree.set_root_id('sub-tree-root')
2540
self.build_tree_contents([('tree/sub/file', 'text1')])
2541
sub_tree.add('file')
2542
sub_tree.commit('foo', rev_id='sub-A-id')
2543
wt.add_reference(sub_tree)
2544
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2545
# Now create a criss-cross merge in the parent, without modifying the
2547
wt.commit('B', rev_id='B-id', recursive=None)
2548
wt.set_last_revision('A-id')
2549
wt.branch.set_last_revision_info(1, 'A-id')
2550
wt.commit('C', rev_id='C-id', recursive=None)
2551
wt.merge_from_branch(wt.branch, to_revision='B-id')
2552
wt.rename_one('sub', 'alt_sub')
2553
wt.commit('E', rev_id='E-id', recursive=None)
2554
wt.set_last_revision('B-id')
2556
wt.set_parent_ids(['B-id', 'C-id'])
2557
wt.branch.set_last_revision_info(2, 'B-id')
2558
wt.commit('D', rev_id='D-id', recursive=None)
2560
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2562
merger.merge_type = _mod_merge.Merge3Merger
2563
merge_obj = merger.make_merger()
2564
entries = list(merge_obj._entries_lca())
2565
root_id = 'a-root-id'
2566
self.assertEqual([('sub-tree-root', False,
2567
((root_id, [root_id, root_id]), root_id, root_id),
2568
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2569
((False, [False, False]), False, False)),
2572
def test_nested_tree_subtree_renamed_and_modified(self):
2573
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2575
wt = self.make_branch_and_tree('tree',
2576
format='dirstate-with-subtree')
2578
self.addCleanup(wt.unlock)
2579
sub_tree = self.make_branch_and_tree('tree/sub',
2580
format='dirstate-with-subtree')
2581
wt.set_root_id('a-root-id')
2582
sub_tree.set_root_id('sub-tree-root')
2583
self.build_tree_contents([('tree/sub/file', 'text1')])
2584
sub_tree.add('file')
2585
sub_tree.commit('foo', rev_id='sub-A-id')
2586
wt.add_reference(sub_tree)
2587
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2588
# Now create a criss-cross merge in the parent, without modifying the
2590
wt.commit('B', rev_id='B-id', recursive=None)
2591
wt.set_last_revision('A-id')
2592
wt.branch.set_last_revision_info(1, 'A-id')
2593
wt.commit('C', rev_id='C-id', recursive=None)
2594
wt.merge_from_branch(wt.branch, to_revision='B-id')
2595
self.build_tree_contents([('tree/sub/file', 'text2')])
2596
sub_tree.commit('modify contents', rev_id='sub-B-id')
2597
wt.rename_one('sub', 'alt_sub')
2598
wt.commit('E', rev_id='E-id', recursive=None)
2599
wt.set_last_revision('B-id')
2601
wt.set_parent_ids(['B-id', 'C-id'])
2602
wt.branch.set_last_revision_info(2, 'B-id')
2603
wt.commit('D', rev_id='D-id', recursive=None)
2605
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2607
merger.merge_type = _mod_merge.Merge3Merger
2608
merge_obj = merger.make_merger()
2609
entries = list(merge_obj._entries_lca())
2610
root_id = 'a-root-id'
2611
self.assertEqual([('sub-tree-root', False,
2612
((root_id, [root_id, root_id]), root_id, root_id),
2613
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2614
((False, [False, False]), False, False)),
2618
class TestLCAMultiWay(tests.TestCase):
2620
def assertLCAMultiWay(self, expected, base, lcas, other, this,
2621
allow_overriding_lca=True):
2622
self.assertEqual(expected, _mod_merge.Merge3Merger._lca_multi_way(
2623
(base, lcas), other, this,
2624
allow_overriding_lca=allow_overriding_lca))
2626
def test_other_equal_equal_lcas(self):
2627
"""Test when OTHER=LCA and all LCAs are identical."""
2628
self.assertLCAMultiWay('this',
2629
'bval', ['bval', 'bval'], 'bval', 'bval')
2630
self.assertLCAMultiWay('this',
2631
'bval', ['lcaval', 'lcaval'], 'lcaval', 'bval')
2632
self.assertLCAMultiWay('this',
2633
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', 'bval')
2634
self.assertLCAMultiWay('this',
2635
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', 'tval')
2636
self.assertLCAMultiWay('this',
2637
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', None)
2639
def test_other_equal_this(self):
2640
"""Test when other and this are identical."""
2641
self.assertLCAMultiWay('this',
2642
'bval', ['bval', 'bval'], 'oval', 'oval')
2643
self.assertLCAMultiWay('this',
2644
'bval', ['lcaval', 'lcaval'], 'oval', 'oval')
2645
self.assertLCAMultiWay('this',
2646
'bval', ['cval', 'dval'], 'oval', 'oval')
2647
self.assertLCAMultiWay('this',
2648
'bval', [None, 'lcaval'], 'oval', 'oval')
2649
self.assertLCAMultiWay('this',
2650
None, [None, 'lcaval'], 'oval', 'oval')
2651
self.assertLCAMultiWay('this',
2652
None, ['lcaval', 'lcaval'], 'oval', 'oval')
2653
self.assertLCAMultiWay('this',
2654
None, ['cval', 'dval'], 'oval', 'oval')
2655
self.assertLCAMultiWay('this',
2656
None, ['cval', 'dval'], None, None)
2657
self.assertLCAMultiWay('this',
2658
None, ['cval', 'dval', 'eval', 'fval'], 'oval', 'oval')
2660
def test_no_lcas(self):
2661
self.assertLCAMultiWay('this',
2662
'bval', [], 'bval', 'tval')
2663
self.assertLCAMultiWay('other',
2664
'bval', [], 'oval', 'bval')
2665
self.assertLCAMultiWay('conflict',
2666
'bval', [], 'oval', 'tval')
2667
self.assertLCAMultiWay('this',
2668
'bval', [], 'oval', 'oval')
2670
def test_lca_supersedes_other_lca(self):
2671
"""If one lca == base, the other lca takes precedence"""
2672
self.assertLCAMultiWay('this',
2673
'bval', ['bval', 'lcaval'], 'lcaval', 'tval')
2674
self.assertLCAMultiWay('this',
2675
'bval', ['bval', 'lcaval'], 'lcaval', 'bval')
2676
# This is actually considered a 'revert' because the 'lcaval' in LCAS
2677
# supersedes the BASE val (in the other LCA) but then OTHER reverts it
2679
self.assertLCAMultiWay('other',
2680
'bval', ['bval', 'lcaval'], 'bval', 'lcaval')
2681
self.assertLCAMultiWay('conflict',
2682
'bval', ['bval', 'lcaval'], 'bval', 'tval')
2684
def test_other_and_this_pick_different_lca(self):
2685
# OTHER and THIS resolve the lca conflict in different ways
2686
self.assertLCAMultiWay('conflict',
2687
'bval', ['lca1val', 'lca2val'], 'lca1val', 'lca2val')
2688
self.assertLCAMultiWay('conflict',
2689
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'lca2val')
2690
self.assertLCAMultiWay('conflict',
2691
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'lca2val')
2693
def test_other_in_lca(self):
2694
# OTHER takes a value of one of the LCAs, THIS takes a new value, which
2695
# theoretically supersedes both LCA values and 'wins'
2696
self.assertLCAMultiWay('this',
2697
'bval', ['lca1val', 'lca2val'], 'lca1val', 'newval')
2698
self.assertLCAMultiWay('this',
2699
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'newval')
2700
self.assertLCAMultiWay('conflict',
2701
'bval', ['lca1val', 'lca2val'], 'lca1val', 'newval',
2702
allow_overriding_lca=False)
2703
self.assertLCAMultiWay('conflict',
2704
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'newval',
2705
allow_overriding_lca=False)
2706
# THIS reverted back to BASE, but that is an explicit supersede of all
2708
self.assertLCAMultiWay('this',
2709
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'bval')
2710
self.assertLCAMultiWay('this',
2711
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'bval')
2712
self.assertLCAMultiWay('conflict',
2713
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'bval',
2714
allow_overriding_lca=False)
2715
self.assertLCAMultiWay('conflict',
2716
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'bval',
2717
allow_overriding_lca=False)
2719
def test_this_in_lca(self):
2720
# THIS takes a value of one of the LCAs, OTHER takes a new value, which
2721
# theoretically supersedes both LCA values and 'wins'
2722
self.assertLCAMultiWay('other',
2723
'bval', ['lca1val', 'lca2val'], 'oval', 'lca1val')
2724
self.assertLCAMultiWay('other',
2725
'bval', ['lca1val', 'lca2val'], 'oval', 'lca2val')
2726
self.assertLCAMultiWay('conflict',
2727
'bval', ['lca1val', 'lca2val'], 'oval', 'lca1val',
2728
allow_overriding_lca=False)
2729
self.assertLCAMultiWay('conflict',
2730
'bval', ['lca1val', 'lca2val'], 'oval', 'lca2val',
2731
allow_overriding_lca=False)
2732
# OTHER reverted back to BASE, but that is an explicit supersede of all
2734
self.assertLCAMultiWay('other',
2735
'bval', ['lca1val', 'lca2val', 'lca3val'], 'bval', 'lca3val')
2736
self.assertLCAMultiWay('conflict',
2737
'bval', ['lca1val', 'lca2val', 'lca3val'], 'bval', 'lca3val',
2738
allow_overriding_lca=False)
2740
def test_all_differ(self):
2741
self.assertLCAMultiWay('conflict',
2742
'bval', ['lca1val', 'lca2val'], 'oval', 'tval')
2743
self.assertLCAMultiWay('conflict',
2744
'bval', ['lca1val', 'lca2val', 'lca2val'], 'oval', 'tval')
2745
self.assertLCAMultiWay('conflict',
2746
'bval', ['lca1val', 'lca2val', 'lca3val'], 'oval', 'tval')
added
removed
bzrlib/tests/test_merge.py
