229
261
registry.remove('merge4')
230
262
self.assertFalse('merge4' in [x[0] for x in
231
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
self.assertEqual([], entries)
1386
def test_not_in_other(self):
1387
builder = self.get_builder()
1388
builder.build_snapshot('A-id', None,
1389
[('add', (u'', 'a-root-id', 'directory', None)),
1390
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1391
builder.build_snapshot('B-id', ['A-id'], [])
1392
builder.build_snapshot('C-id', ['A-id'], [])
1393
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1394
[('unversion', 'a-id')])
1395
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1396
merge_obj = self.make_merge_obj(builder, 'E-id')
1398
entries = list(merge_obj._entries_lca())
1399
root_id = 'a-root-id'
1400
self.assertEqual([('a-id', True,
1401
((root_id, [root_id, root_id]), None, root_id),
1402
((u'a', [u'a', u'a']), None, u'a'),
1403
((False, [False, False]), None, False)),
1406
def test_not_in_other_or_lca(self):
1407
# A base, introduces 'foo'
1409
# B C B nothing, C deletes foo
1411
# D E D restores foo (same as B), E leaves it deleted
1413
# A => B, no changes
1414
# A => C, delete foo (C should supersede B)
1415
# C => D, restore foo
1416
# C => E, no changes
1417
# D would then win 'cleanly' and no record would be given
1418
builder = self.get_builder()
1419
builder.build_snapshot('A-id', None,
1420
[('add', (u'', 'a-root-id', 'directory', None)),
1421
('add', (u'foo', 'foo-id', 'file', 'content\n'))])
1422
builder.build_snapshot('B-id', ['A-id'], [])
1423
builder.build_snapshot('C-id', ['A-id'],
1424
[('unversion', 'foo-id')])
1425
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1426
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1427
merge_obj = self.make_merge_obj(builder, 'E-id')
1429
entries = list(merge_obj._entries_lca())
1430
self.assertEqual([], entries)
1432
def test_not_in_other_mod_in_lca1_not_in_lca2(self):
1433
# A base, introduces 'foo'
1435
# B C B changes 'foo', C deletes foo
1437
# D E D restores foo (same as B), E leaves it deleted (as C)
1439
# A => B, modified foo
1440
# A => C, delete foo, C does not supersede B
1441
# B => D, no changes
1442
# C => D, resolve in favor of B
1443
# B => E, resolve in favor of E
1444
# C => E, no changes
1445
# In this case, we have a conflict of how the changes were resolved. E
1446
# picked C and D picked B, so we should issue a conflict
1447
builder = self.get_builder()
1448
builder.build_snapshot('A-id', None,
1449
[('add', (u'', 'a-root-id', 'directory', None)),
1450
('add', (u'foo', 'foo-id', 'file', 'content\n'))])
1451
builder.build_snapshot('B-id', ['A-id'], [
1452
('modify', ('foo-id', 'new-content\n'))])
1453
builder.build_snapshot('C-id', ['A-id'],
1454
[('unversion', 'foo-id')])
1455
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1456
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1457
merge_obj = self.make_merge_obj(builder, 'E-id')
1459
entries = list(merge_obj._entries_lca())
1460
root_id = 'a-root-id'
1461
self.assertEqual([('foo-id', True,
1462
((root_id, [root_id, None]), None, root_id),
1463
((u'foo', [u'foo', None]), None, 'foo'),
1464
((False, [False, None]), None, False)),
1467
def test_only_in_one_lca(self):
1470
# B C B nothing, C add file
1472
# D E D still has nothing, E removes file
1475
# C => D, removed the file
1477
# C => E, removed the file
1478
# Thus D & E have identical changes, and this is a no-op
1481
# A => C, add file, thus C supersedes B
1482
# w/ C=BASE, D=THIS, E=OTHER we have 'happy convergence'
1483
builder = self.get_builder()
1484
builder.build_snapshot('A-id', None,
1485
[('add', (u'', 'a-root-id', 'directory', None))])
1486
builder.build_snapshot('B-id', ['A-id'], [])
1487
builder.build_snapshot('C-id', ['A-id'],
1488
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1489
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1490
[('unversion', 'a-id')])
1491
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1492
merge_obj = self.make_merge_obj(builder, 'E-id')
1494
entries = list(merge_obj._entries_lca())
1495
self.assertEqual([], entries)
1497
def test_only_in_other(self):
1498
builder = self.get_builder()
1499
builder.build_snapshot('A-id', None,
1500
[('add', (u'', 'a-root-id', 'directory', None))])
1501
builder.build_snapshot('B-id', ['A-id'], [])
1502
builder.build_snapshot('C-id', ['A-id'], [])
1503
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1504
[('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1505
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1506
merge_obj = self.make_merge_obj(builder, 'E-id')
1508
entries = list(merge_obj._entries_lca())
1509
root_id = 'a-root-id'
1510
self.assertEqual([('a-id', True,
1511
((None, [None, None]), root_id, None),
1512
((None, [None, None]), u'a', None),
1513
((None, [None, None]), False, None)),
1516
def test_one_lca_supersedes(self):
1517
# One LCA supersedes the other LCAs last modified value, but the
1518
# value is not the same as BASE.
1519
# A base, introduces 'foo', last mod A
1521
# B C B modifies 'foo' (mod B), C does nothing (mod A)
1523
# D E D does nothing (mod B), E updates 'foo' (mod E)
1525
# F G F updates 'foo' (mod F). G does nothing (mod E)
1527
# At this point, G should not be considered to modify 'foo', even
1528
# though its LCAs disagree. This is because the modification in E
1529
# completely supersedes the value in D.
1530
builder = self.get_builder()
1531
builder.build_snapshot('A-id', None,
1532
[('add', (u'', 'a-root-id', 'directory', None)),
1533
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1534
builder.build_snapshot('C-id', ['A-id'], [])
1535
builder.build_snapshot('B-id', ['A-id'],
1536
[('modify', ('foo-id', 'B content\n'))])
1537
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1538
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1539
[('modify', ('foo-id', 'E content\n'))])
1540
builder.build_snapshot('G-id', ['E-id', 'D-id'], [])
1541
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1542
[('modify', ('foo-id', 'F content\n'))])
1543
merge_obj = self.make_merge_obj(builder, 'G-id')
1545
self.assertEqual([], list(merge_obj._entries_lca()))
1547
def test_one_lca_supersedes_path(self):
1548
# Double-criss-cross merge, the ultimate base value is different from
1552
# B C B value 'bar', C = 'foo'
1554
# D E D = 'bar', E supersedes to 'bing'
1556
# F G F = 'bing', G supersedes to 'barry'
1558
# In this case, we technically should not care about the value 'bar' for
1559
# D, because it was clearly superseded by E's 'bing'. The
1560
# per-file/attribute graph would actually look like:
1569
# Because the other side of the merge never modifies the value, it just
1570
# takes the value from the merge.
1572
# ATM this fails because we will prune 'foo' from the LCAs, but we
1573
# won't prune 'bar'. This is getting far off into edge-case land, so we
1574
# aren't supporting it yet.
1576
builder = self.get_builder()
1577
builder.build_snapshot('A-id', None,
1578
[('add', (u'', 'a-root-id', 'directory', None)),
1579
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1580
builder.build_snapshot('C-id', ['A-id'], [])
1581
builder.build_snapshot('B-id', ['A-id'],
1582
[('rename', ('foo', 'bar'))])
1583
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1584
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1585
[('rename', ('foo', 'bing'))]) # override to bing
1586
builder.build_snapshot('G-id', ['E-id', 'D-id'],
1587
[('rename', ('bing', 'barry'))]) # override to barry
1588
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1589
[('rename', ('bar', 'bing'))]) # Merge in E's change
1590
merge_obj = self.make_merge_obj(builder, 'G-id')
1592
self.expectFailure("We don't do an actual heads() check on lca values,"
1593
" or use the per-attribute graph",
1594
self.assertEqual, [], list(merge_obj._entries_lca()))
1596
def test_one_lca_accidentally_pruned(self):
1597
# Another incorrect resolution from the same basic flaw:
1600
# B C B value 'bar', C = 'foo'
1602
# D E D = 'bar', E reverts to 'foo'
1604
# F G F = 'bing', G switches to 'bar'
1606
# 'bar' will not be seen as an interesting change, because 'foo' will
1607
# be pruned from the LCAs, even though it was newly introduced by E
1609
builder = self.get_builder()
1610
builder.build_snapshot('A-id', None,
1611
[('add', (u'', 'a-root-id', 'directory', None)),
1612
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1613
builder.build_snapshot('C-id', ['A-id'], [])
1614
builder.build_snapshot('B-id', ['A-id'],
1615
[('rename', ('foo', 'bar'))])
1616
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1617
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1618
builder.build_snapshot('G-id', ['E-id', 'D-id'],
1619
[('rename', ('foo', 'bar'))])
1620
builder.build_snapshot('F-id', ['D-id', 'E-id'],
1621
[('rename', ('bar', 'bing'))]) # should end up conflicting
1622
merge_obj = self.make_merge_obj(builder, 'G-id')
1624
entries = list(merge_obj._entries_lca())
1625
root_id = 'a-root-id'
1626
self.expectFailure("We prune values from BASE even when relevant.",
1629
((root_id, [root_id, root_id]), root_id, root_id),
1630
((u'foo', [u'bar', u'foo']), u'bar', u'bing'),
1631
((False, [False, False]), False, False)),
1634
def test_both_sides_revert(self):
1635
# Both sides of a criss-cross revert the text to the lca
1636
# A base, introduces 'foo'
1638
# B C B modifies 'foo', C modifies 'foo'
1640
# D E D reverts to B, E reverts to C
1641
# This should conflict
1642
builder = self.get_builder()
1643
builder.build_snapshot('A-id', None,
1644
[('add', (u'', 'a-root-id', 'directory', None)),
1645
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1646
builder.build_snapshot('B-id', ['A-id'],
1647
[('modify', ('foo-id', 'B content\n'))])
1648
builder.build_snapshot('C-id', ['A-id'],
1649
[('modify', ('foo-id', 'C content\n'))])
1650
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1651
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1652
merge_obj = self.make_merge_obj(builder, 'E-id')
1654
entries = list(merge_obj._entries_lca())
1655
root_id = 'a-root-id'
1656
self.assertEqual([('foo-id', True,
1657
((root_id, [root_id, root_id]), root_id, root_id),
1658
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1659
((False, [False, False]), False, False)),
1662
def test_different_lca_resolve_one_side_updates_content(self):
1663
# Both sides converge, but then one side updates the text.
1664
# A base, introduces 'foo'
1666
# B C B modifies 'foo', C modifies 'foo'
1668
# D E D reverts to B, E reverts to C
1670
# F F updates to a new value
1671
# We need to emit an entry for 'foo', because D & E differed on the
1673
builder = self.get_builder()
1674
builder.build_snapshot('A-id', None,
1675
[('add', (u'', 'a-root-id', 'directory', None)),
1676
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1677
builder.build_snapshot('B-id', ['A-id'],
1678
[('modify', ('foo-id', 'B content\n'))])
1679
builder.build_snapshot('C-id', ['A-id'],
1680
[('modify', ('foo-id', 'C content\n'))])
1681
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1682
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1683
builder.build_snapshot('F-id', ['D-id'],
1684
[('modify', ('foo-id', 'F content\n'))])
1685
merge_obj = self.make_merge_obj(builder, 'E-id')
1687
entries = list(merge_obj._entries_lca())
1688
root_id = 'a-root-id'
1689
self.assertEqual([('foo-id', True,
1690
((root_id, [root_id, root_id]), root_id, root_id),
1691
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
1692
((False, [False, False]), False, False)),
1695
def test_same_lca_resolution_one_side_updates_content(self):
1696
# Both sides converge, but then one side updates the text.
1697
# A base, introduces 'foo'
1699
# B C B modifies 'foo', C modifies 'foo'
1701
# D E D and E use C's value
1703
# F F updates to a new value
1704
# I think it is a bug that this conflicts, but we don't have a way to
1705
# detect otherwise. And because of:
1706
# test_different_lca_resolve_one_side_updates_content
1707
# We need to conflict.
1709
builder = self.get_builder()
1710
builder.build_snapshot('A-id', None,
1711
[('add', (u'', 'a-root-id', 'directory', None)),
1712
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
1713
builder.build_snapshot('B-id', ['A-id'],
1714
[('modify', ('foo-id', 'B content\n'))])
1715
builder.build_snapshot('C-id', ['A-id'],
1716
[('modify', ('foo-id', 'C content\n'))])
1717
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1718
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1719
[('modify', ('foo-id', 'C content\n'))]) # Same as E
1720
builder.build_snapshot('F-id', ['D-id'],
1721
[('modify', ('foo-id', 'F content\n'))])
1722
merge_obj = self.make_merge_obj(builder, 'E-id')
1724
entries = list(merge_obj._entries_lca())
1725
self.expectFailure("We don't detect that LCA resolution was the"
1726
" same on both sides",
1727
self.assertEqual, [], entries)
1729
def test_only_path_changed(self):
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
[('rename', (u'a', u'b'))])
1738
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1739
merge_obj = self.make_merge_obj(builder, 'E-id')
1740
entries = list(merge_obj._entries_lca())
1741
root_id = 'a-root-id'
1742
# The content was not changed, only the path
1743
self.assertEqual([('a-id', False,
1744
((root_id, [root_id, root_id]), root_id, root_id),
1745
((u'a', [u'a', u'a']), u'b', u'a'),
1746
((False, [False, False]), False, False)),
1749
def test_kind_changed(self):
1750
# Identical content, except 'D' changes a-id into a directory
1751
builder = self.get_builder()
1752
builder.build_snapshot('A-id', None,
1753
[('add', (u'', 'a-root-id', 'directory', None)),
1754
('add', (u'a', 'a-id', 'file', 'content\n'))])
1755
builder.build_snapshot('B-id', ['A-id'], [])
1756
builder.build_snapshot('C-id', ['A-id'], [])
1757
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1758
[('unversion', 'a-id'),
1759
('add', (u'a', 'a-id', 'directory', None))])
1760
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1761
merge_obj = self.make_merge_obj(builder, 'E-id')
1762
entries = list(merge_obj._entries_lca())
1763
root_id = 'a-root-id'
1764
# Only the kind was changed (content)
1765
self.assertEqual([('a-id', True,
1766
((root_id, [root_id, root_id]), root_id, root_id),
1767
((u'a', [u'a', u'a']), u'a', u'a'),
1768
((False, [False, False]), False, False)),
1771
def test_this_changed_kind(self):
1772
# Identical content, but THIS changes a file to a directory
1773
builder = self.get_builder()
1774
builder.build_snapshot('A-id', None,
1775
[('add', (u'', 'a-root-id', 'directory', None)),
1776
('add', (u'a', 'a-id', 'file', 'content\n'))])
1777
builder.build_snapshot('B-id', ['A-id'], [])
1778
builder.build_snapshot('C-id', ['A-id'], [])
1779
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1780
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1781
[('unversion', 'a-id'),
1782
('add', (u'a', 'a-id', 'directory', None))])
1783
merge_obj = self.make_merge_obj(builder, 'E-id')
1784
entries = list(merge_obj._entries_lca())
1785
# Only the kind was changed (content)
1786
self.assertEqual([], entries)
1788
def test_interesting_files(self):
1789
# Two files modified, but we should filter one of them
1790
builder = self.get_builder()
1791
builder.build_snapshot('A-id', None,
1792
[('add', (u'', 'a-root-id', 'directory', None)),
1793
('add', (u'a', 'a-id', 'file', 'content\n')),
1794
('add', (u'b', 'b-id', 'file', 'content\n'))])
1795
builder.build_snapshot('B-id', ['A-id'], [])
1796
builder.build_snapshot('C-id', ['A-id'], [])
1797
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1798
[('modify', ('a-id', 'new-content\n')),
1799
('modify', ('b-id', 'new-content\n'))])
1800
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1801
merge_obj = self.make_merge_obj(builder, 'E-id',
1802
interesting_files=['b'])
1803
entries = list(merge_obj._entries_lca())
1804
root_id = 'a-root-id'
1805
self.assertEqual([('b-id', True,
1806
((root_id, [root_id, root_id]), root_id, root_id),
1807
((u'b', [u'b', u'b']), u'b', u'b'),
1808
((False, [False, False]), False, False)),
1811
def test_interesting_file_in_this(self):
1812
# This renamed the file, but it should still match the entry in other
1813
builder = self.get_builder()
1814
builder.build_snapshot('A-id', None,
1815
[('add', (u'', 'a-root-id', 'directory', None)),
1816
('add', (u'a', 'a-id', 'file', 'content\n')),
1817
('add', (u'b', 'b-id', 'file', 'content\n'))])
1818
builder.build_snapshot('B-id', ['A-id'], [])
1819
builder.build_snapshot('C-id', ['A-id'], [])
1820
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1821
[('modify', ('a-id', 'new-content\n')),
1822
('modify', ('b-id', 'new-content\n'))])
1823
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1824
[('rename', ('b', 'c'))])
1825
merge_obj = self.make_merge_obj(builder, 'E-id',
1826
interesting_files=['c'])
1827
entries = list(merge_obj._entries_lca())
1828
root_id = 'a-root-id'
1829
self.assertEqual([('b-id', True,
1830
((root_id, [root_id, root_id]), root_id, root_id),
1831
((u'b', [u'b', u'b']), u'b', u'c'),
1832
((False, [False, False]), False, False)),
1835
def test_interesting_file_in_base(self):
1836
# This renamed the file, but it should still match the entry in BASE
1837
builder = self.get_builder()
1838
builder.build_snapshot('A-id', None,
1839
[('add', (u'', 'a-root-id', 'directory', None)),
1840
('add', (u'a', 'a-id', 'file', 'content\n')),
1841
('add', (u'c', 'c-id', 'file', 'content\n'))])
1842
builder.build_snapshot('B-id', ['A-id'],
1843
[('rename', ('c', 'b'))])
1844
builder.build_snapshot('C-id', ['A-id'],
1845
[('rename', ('c', 'b'))])
1846
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1847
[('modify', ('a-id', 'new-content\n')),
1848
('modify', ('c-id', 'new-content\n'))])
1849
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1850
merge_obj = self.make_merge_obj(builder, 'E-id',
1851
interesting_files=['c'])
1852
entries = list(merge_obj._entries_lca())
1853
root_id = 'a-root-id'
1854
self.assertEqual([('c-id', True,
1855
((root_id, [root_id, root_id]), root_id, root_id),
1856
((u'c', [u'b', u'b']), u'b', u'b'),
1857
((False, [False, False]), False, False)),
1860
def test_interesting_file_in_lca(self):
1861
# This renamed the file, but it should still match the entry in LCA
1862
builder = self.get_builder()
1863
builder.build_snapshot('A-id', None,
1864
[('add', (u'', 'a-root-id', 'directory', None)),
1865
('add', (u'a', 'a-id', 'file', 'content\n')),
1866
('add', (u'b', 'b-id', 'file', 'content\n'))])
1867
builder.build_snapshot('B-id', ['A-id'],
1868
[('rename', ('b', 'c'))])
1869
builder.build_snapshot('C-id', ['A-id'], [])
1870
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1871
[('modify', ('a-id', 'new-content\n')),
1872
('modify', ('b-id', 'new-content\n'))])
1873
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1874
[('rename', ('c', 'b'))])
1875
merge_obj = self.make_merge_obj(builder, 'E-id',
1876
interesting_files=['c'])
1877
entries = list(merge_obj._entries_lca())
1878
root_id = 'a-root-id'
1879
self.assertEqual([('b-id', True,
1880
((root_id, [root_id, root_id]), root_id, root_id),
1881
((u'b', [u'c', u'b']), u'b', u'b'),
1882
((False, [False, False]), False, False)),
1885
def test_interesting_ids(self):
1886
# Two files modified, but we should filter one of them
1887
builder = self.get_builder()
1888
builder.build_snapshot('A-id', None,
1889
[('add', (u'', 'a-root-id', 'directory', None)),
1890
('add', (u'a', 'a-id', 'file', 'content\n')),
1891
('add', (u'b', 'b-id', 'file', 'content\n'))])
1892
builder.build_snapshot('B-id', ['A-id'], [])
1893
builder.build_snapshot('C-id', ['A-id'], [])
1894
builder.build_snapshot('E-id', ['C-id', 'B-id'],
1895
[('modify', ('a-id', 'new-content\n')),
1896
('modify', ('b-id', 'new-content\n'))])
1897
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1898
merge_obj = self.make_merge_obj(builder, 'E-id',
1899
interesting_ids=['b-id'])
1900
entries = list(merge_obj._entries_lca())
1901
root_id = 'a-root-id'
1902
self.assertEqual([('b-id', True,
1903
((root_id, [root_id, root_id]), root_id, root_id),
1904
((u'b', [u'b', u'b']), u'b', u'b'),
1905
((False, [False, False]), False, False)),
1910
class TestMergerEntriesLCAOnDisk(tests.TestCaseWithTransport):
1912
def get_builder(self):
1913
builder = self.make_branch_builder('path')
1914
builder.start_series()
1915
self.addCleanup(builder.finish_series)
1918
def get_wt_from_builder(self, builder):
1919
"""Get a real WorkingTree from the builder."""
1920
the_branch = builder.get_branch()
1921
wt = the_branch.bzrdir.create_workingtree()
1922
# Note: This is a little bit ugly, but we are holding the branch
1923
# write-locked as part of the build process, and we would like to
1924
# maintain that. So we just force the WT to re-use the same
1926
wt._branch = the_branch
1928
self.addCleanup(wt.unlock)
1931
def do_merge(self, builder, other_revision_id):
1932
wt = self.get_wt_from_builder(builder)
1933
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
1934
wt, other_revision_id)
1935
merger.merge_type = _mod_merge.Merge3Merger
1936
return wt, merger.do_merge()
1938
def test_simple_lca(self):
1939
builder = self.get_builder()
1940
builder.build_snapshot('A-id', None,
1941
[('add', (u'', 'a-root-id', 'directory', None)),
1942
('add', (u'a', 'a-id', 'file', 'a\nb\nc\n'))])
1943
builder.build_snapshot('C-id', ['A-id'], [])
1944
builder.build_snapshot('B-id', ['A-id'], [])
1945
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
1946
builder.build_snapshot('D-id', ['B-id', 'C-id'],
1947
[('modify', ('a-id', 'a\nb\nc\nd\ne\nf\n'))])
1948
wt, conflicts = self.do_merge(builder, 'E-id')
1949
self.assertEqual(0, conflicts)
1950
# The merge should have simply update the contents of 'a'
1951
self.assertEqual('a\nb\nc\nd\ne\nf\n', wt.get_file_text('a-id'))
1953
def test_conflict_without_lca(self):
1954
# This test would cause a merge conflict, unless we use the lca trees
1955
# to determine the real ancestry
1958
# B C Path renamed to 'bar' in B
1962
# D E Path at 'bar' in D and E
1964
# F Path at 'baz' in F, which supersedes 'bar' and 'foo'
1965
builder = self.get_builder()
1966
builder.build_snapshot('A-id', None,
1967
[('add', (u'', 'a-root-id', 'directory', None)),
1968
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1969
builder.build_snapshot('C-id', ['A-id'], [])
1970
builder.build_snapshot('B-id', ['A-id'],
1971
[('rename', ('foo', 'bar'))])
1972
builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
1973
[('rename', ('foo', 'bar'))])
1974
builder.build_snapshot('F-id', ['E-id'],
1975
[('rename', ('bar', 'baz'))])
1976
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
1977
wt, conflicts = self.do_merge(builder, 'F-id')
1978
self.assertEqual(0, conflicts)
1979
# The merge should simply recognize that the final rename takes
1981
self.assertEqual('baz', wt.id2path('foo-id'))
1983
def test_other_deletes_lca_renames(self):
1984
# This test would cause a merge conflict, unless we use the lca trees
1985
# to determine the real ancestry
1988
# B C Path renamed to 'bar' in B
1992
# D E Path at 'bar' in D and E
1995
builder = self.get_builder()
1996
builder.build_snapshot('A-id', None,
1997
[('add', (u'', 'a-root-id', 'directory', None)),
1998
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
1999
builder.build_snapshot('C-id', ['A-id'], [])
2000
builder.build_snapshot('B-id', ['A-id'],
2001
[('rename', ('foo', 'bar'))])
2002
builder.build_snapshot('E-id', ['C-id', 'B-id'], # merge the rename
2003
[('rename', ('foo', 'bar'))])
2004
builder.build_snapshot('F-id', ['E-id'],
2005
[('unversion', 'foo-id')])
2006
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2007
wt, conflicts = self.do_merge(builder, 'F-id')
2008
self.assertEqual(0, conflicts)
2009
self.assertRaises(errors.NoSuchId, wt.id2path, 'foo-id')
2011
def test_executable_changes(self):
2020
# F Executable bit changed
2021
builder = self.get_builder()
2022
builder.build_snapshot('A-id', None,
2023
[('add', (u'', 'a-root-id', 'directory', None)),
2024
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2025
builder.build_snapshot('C-id', ['A-id'], [])
2026
builder.build_snapshot('B-id', ['A-id'], [])
2027
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2028
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2029
# Have to use a real WT, because BranchBuilder doesn't support exec bit
2030
wt = self.get_wt_from_builder(builder)
2031
tt = transform.TreeTransform(wt)
2033
tt.set_executability(True, tt.trans_id_tree_file_id('foo-id'))
2038
self.assertTrue(wt.is_executable('foo-id'))
2039
wt.commit('F-id', rev_id='F-id')
2040
# Reset to D, so that we can merge F
2041
wt.set_parent_ids(['D-id'])
2042
wt.branch.set_last_revision_info(3, 'D-id')
2044
self.assertFalse(wt.is_executable('foo-id'))
2045
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2046
self.assertEqual(0, conflicts)
2047
self.assertTrue(wt.is_executable('foo-id'))
2049
def test_create_symlink(self):
2050
self.requireFeature(tests.SymlinkFeature)
2059
# F Add a symlink 'foo' => 'bar'
2060
# Have to use a real WT, because BranchBuilder and MemoryTree don't
2061
# have symlink support
2062
builder = self.get_builder()
2063
builder.build_snapshot('A-id', None,
2064
[('add', (u'', 'a-root-id', 'directory', None))])
2065
builder.build_snapshot('C-id', ['A-id'], [])
2066
builder.build_snapshot('B-id', ['A-id'], [])
2067
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2068
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2069
# Have to use a real WT, because BranchBuilder doesn't support exec bit
2070
wt = self.get_wt_from_builder(builder)
2071
os.symlink('bar', 'path/foo')
2072
wt.add(['foo'], ['foo-id'])
2073
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2074
wt.commit('add symlink', rev_id='F-id')
2075
# Reset to D, so that we can merge F
2076
wt.set_parent_ids(['D-id'])
2077
wt.branch.set_last_revision_info(3, 'D-id')
2079
self.assertIs(None, wt.path2id('foo'))
2080
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2081
self.assertEqual(0, conflicts)
2082
self.assertEqual('foo-id', wt.path2id('foo'))
2083
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2085
def test_both_sides_revert(self):
2086
# Both sides of a criss-cross revert the text to the lca
2087
# A base, introduces 'foo'
2089
# B C B modifies 'foo', C modifies 'foo'
2091
# D E D reverts to B, E reverts to C
2092
# This should conflict
2093
# This must be done with a real WorkingTree, because normally their
2094
# inventory contains "None" rather than a real sha1
2095
builder = self.get_builder()
2096
builder.build_snapshot('A-id', None,
2097
[('add', (u'', 'a-root-id', 'directory', None)),
2098
('add', (u'foo', 'foo-id', 'file', 'A content\n'))])
2099
builder.build_snapshot('B-id', ['A-id'],
2100
[('modify', ('foo-id', 'B content\n'))])
2101
builder.build_snapshot('C-id', ['A-id'],
2102
[('modify', ('foo-id', 'C content\n'))])
2103
builder.build_snapshot('E-id', ['C-id', 'B-id'], [])
2104
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2105
wt, conflicts = self.do_merge(builder, 'E-id')
2106
self.assertEqual(1, conflicts)
2107
self.assertEqualDiff('<<<<<<< TREE\n'
2111
'>>>>>>> MERGE-SOURCE\n',
2112
wt.get_file_text('foo-id'))
2114
def test_modified_symlink(self):
2115
self.requireFeature(tests.SymlinkFeature)
2116
# A Create symlink foo => bar
2118
# B C B relinks foo => baz
2122
# D E D & E have foo => baz
2124
# F F changes it to bing
2126
# Merging D & F should result in F cleanly overriding D, because D's
2127
# value actually comes from B
2129
# Have to use a real WT, because BranchBuilder and MemoryTree don't
2130
# have symlink support
2131
wt = self.make_branch_and_tree('path')
2133
self.addCleanup(wt.unlock)
2134
os.symlink('bar', 'path/foo')
2135
wt.add(['foo'], ['foo-id'])
2136
wt.commit('add symlink', rev_id='A-id')
2137
os.remove('path/foo')
2138
os.symlink('baz', 'path/foo')
2139
wt.commit('foo => baz', rev_id='B-id')
2140
wt.set_last_revision('A-id')
2141
wt.branch.set_last_revision_info(1, 'A-id')
2143
wt.commit('C', rev_id='C-id')
2144
wt.merge_from_branch(wt.branch, 'B-id')
2145
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2146
wt.commit('E merges C & B', rev_id='E-id')
2147
os.remove('path/foo')
2148
os.symlink('bing', 'path/foo')
2149
wt.commit('F foo => bing', rev_id='F-id')
2150
wt.set_last_revision('B-id')
2151
wt.branch.set_last_revision_info(2, 'B-id')
2153
wt.merge_from_branch(wt.branch, 'C-id')
2154
wt.commit('D merges B & C', rev_id='D-id')
2155
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2156
self.expectFailure("Merge3Merger doesn't use lcas for symlink content",
2157
self.assertEqual, 0, conflicts)
2158
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2160
def test_renamed_symlink(self):
2161
self.requireFeature(tests.SymlinkFeature)
2162
# A Create symlink foo => bar
2164
# B C B renames foo => barry
2168
# D E D & E have barry
2170
# F F renames barry to blah
2172
# Merging D & F should result in F cleanly overriding D, because D's
2173
# value actually comes from B
2175
wt = self.make_branch_and_tree('path')
2177
self.addCleanup(wt.unlock)
2178
os.symlink('bar', 'path/foo')
2179
wt.add(['foo'], ['foo-id'])
2180
wt.commit('A add symlink', rev_id='A-id')
2181
wt.rename_one('foo', 'barry')
2182
wt.commit('B foo => barry', rev_id='B-id')
2183
wt.set_last_revision('A-id')
2184
wt.branch.set_last_revision_info(1, 'A-id')
2186
wt.commit('C', rev_id='C-id')
2187
wt.merge_from_branch(wt.branch, 'B-id')
2188
self.assertEqual('barry', wt.id2path('foo-id'))
2189
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2190
wt.commit('E merges C & B', rev_id='E-id')
2191
wt.rename_one('barry', 'blah')
2192
wt.commit('F barry => blah', rev_id='F-id')
2193
wt.set_last_revision('B-id')
2194
wt.branch.set_last_revision_info(2, 'B-id')
2196
wt.merge_from_branch(wt.branch, 'C-id')
2197
wt.commit('D merges B & C', rev_id='D-id')
2198
self.assertEqual('barry', wt.id2path('foo-id'))
2199
# Check the output of the Merger object directly
2200
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2202
merger.merge_type = _mod_merge.Merge3Merger
2203
merge_obj = merger.make_merger()
2204
root_id = wt.path2id('')
2205
entries = list(merge_obj._entries_lca())
2206
# No content change, just a path change
2207
self.assertEqual([('foo-id', False,
2208
((root_id, [root_id, root_id]), root_id, root_id),
2209
((u'foo', [u'barry', u'foo']), u'blah', u'barry'),
2210
((False, [False, False]), False, False)),
2212
conflicts = wt.merge_from_branch(wt.branch, to_revision='F-id')
2213
self.assertEqual(0, conflicts)
2214
self.assertEqual('blah', wt.id2path('foo-id'))
2216
def test_symlink_no_content_change(self):
2217
self.requireFeature(tests.SymlinkFeature)
2218
# A Create symlink foo => bar
2220
# B C B relinks foo => baz
2224
# D E D & E have foo => baz
2226
# F F has foo => bing
2228
# Merging E into F should not cause a conflict, because E doesn't have
2229
# a content change relative to the LCAs (it does relative to A)
2230
wt = self.make_branch_and_tree('path')
2232
self.addCleanup(wt.unlock)
2233
os.symlink('bar', 'path/foo')
2234
wt.add(['foo'], ['foo-id'])
2235
wt.commit('add symlink', rev_id='A-id')
2236
os.remove('path/foo')
2237
os.symlink('baz', 'path/foo')
2238
wt.commit('foo => baz', rev_id='B-id')
2239
wt.set_last_revision('A-id')
2240
wt.branch.set_last_revision_info(1, 'A-id')
2242
wt.commit('C', rev_id='C-id')
2243
wt.merge_from_branch(wt.branch, 'B-id')
2244
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2245
wt.commit('E merges C & B', rev_id='E-id')
2246
wt.set_last_revision('B-id')
2247
wt.branch.set_last_revision_info(2, 'B-id')
2249
wt.merge_from_branch(wt.branch, 'C-id')
2250
wt.commit('D merges B & C', rev_id='D-id')
2251
os.remove('path/foo')
2252
os.symlink('bing', 'path/foo')
2253
wt.commit('F foo => bing', rev_id='F-id')
2255
# Check the output of the Merger object directly
2256
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2258
merger.merge_type = _mod_merge.Merge3Merger
2259
merge_obj = merger.make_merger()
2260
# Nothing interesting happened in OTHER relative to BASE
2261
self.assertEqual([], list(merge_obj._entries_lca()))
2262
# Now do a real merge, just to test the rest of the stack
2263
conflicts = wt.merge_from_branch(wt.branch, to_revision='E-id')
2264
self.assertEqual(0, conflicts)
2265
self.assertEqual('bing', wt.get_symlink_target('foo-id'))
2267
def test_symlink_this_changed_kind(self):
2268
self.requireFeature(tests.SymlinkFeature)
2271
# B C B creates symlink foo => bar
2275
# D E D changes foo into a file, E has foo => bing
2277
# Mostly, this is trying to test that we don't try to os.readlink() on
2278
# a file, or when there is nothing there
2279
wt = self.make_branch_and_tree('path')
2281
self.addCleanup(wt.unlock)
2282
wt.commit('base', rev_id='A-id')
2283
os.symlink('bar', 'path/foo')
2284
wt.add(['foo'], ['foo-id'])
2285
wt.commit('add symlink foo => bar', rev_id='B-id')
2286
wt.set_last_revision('A-id')
2287
wt.branch.set_last_revision_info(1, 'A-id')
2289
wt.commit('C', rev_id='C-id')
2290
wt.merge_from_branch(wt.branch, 'B-id')
2291
self.assertEqual('bar', wt.get_symlink_target('foo-id'))
2292
os.remove('path/foo')
2293
# We have to change the link in E, or it won't try to do a comparison
2294
os.symlink('bing', 'path/foo')
2295
wt.commit('E merges C & B, overrides to bing', rev_id='E-id')
2296
wt.set_last_revision('B-id')
2297
wt.branch.set_last_revision_info(2, 'B-id')
2299
wt.merge_from_branch(wt.branch, 'C-id')
2300
os.remove('path/foo')
2301
self.build_tree_contents([('path/foo', 'file content\n')])
2302
# XXX: workaround, WT doesn't detect kind changes unless you do
2304
list(wt.iter_changes(wt.basis_tree()))
2305
wt.commit('D merges B & C, makes it a file', rev_id='D-id')
2307
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2309
merger.merge_type = _mod_merge.Merge3Merger
2310
merge_obj = merger.make_merger()
2311
entries = list(merge_obj._entries_lca())
2312
root_id = wt.path2id('')
2313
self.assertEqual([('foo-id', True,
2314
((None, [root_id, None]), root_id, root_id),
2315
((None, [u'foo', None]), u'foo', u'foo'),
2316
((None, [False, None]), False, False)),
2319
def test_symlink_all_wt(self):
2320
"""Check behavior if all trees are Working Trees."""
2321
self.requireFeature(tests.SymlinkFeature)
2322
# The big issue is that entry.symlink_target is None for WorkingTrees.
2323
# So we need to make sure we handle that case correctly.
2326
# B C B relinks foo => baz
2328
# D E D & E have foo => baz
2330
# F F changes it to bing
2331
# Merging D & F should result in F cleanly overriding D, because D's
2332
# value actually comes from B
2334
wt = self.make_branch_and_tree('path')
2336
self.addCleanup(wt.unlock)
2337
os.symlink('bar', 'path/foo')
2338
wt.add(['foo'], ['foo-id'])
2339
wt.commit('add symlink', rev_id='A-id')
2340
os.remove('path/foo')
2341
os.symlink('baz', 'path/foo')
2342
wt.commit('foo => baz', rev_id='B-id')
2343
wt.set_last_revision('A-id')
2344
wt.branch.set_last_revision_info(1, 'A-id')
2346
wt.commit('C', rev_id='C-id')
2347
wt.merge_from_branch(wt.branch, 'B-id')
2348
self.assertEqual('baz', wt.get_symlink_target('foo-id'))
2349
wt.commit('E merges C & B', rev_id='E-id')
2350
os.remove('path/foo')
2351
os.symlink('bing', 'path/foo')
2352
wt.commit('F foo => bing', rev_id='F-id')
2353
wt.set_last_revision('B-id')
2354
wt.branch.set_last_revision_info(2, 'B-id')
2356
wt.merge_from_branch(wt.branch, 'C-id')
2357
wt.commit('D merges B & C', rev_id='D-id')
2358
wt_base = wt.bzrdir.sprout('base', 'A-id').open_workingtree()
2360
self.addCleanup(wt_base.unlock)
2361
wt_lca1 = wt.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
2363
self.addCleanup(wt_lca1.unlock)
2364
wt_lca2 = wt.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
2366
self.addCleanup(wt_lca2.unlock)
2367
wt_other = wt.bzrdir.sprout('other', 'F-id').open_workingtree()
2368
wt_other.lock_read()
2369
self.addCleanup(wt_other.unlock)
2370
merge_obj = _mod_merge.Merge3Merger(wt, wt, wt_base,
2371
wt_other, lca_trees=[wt_lca1, wt_lca2], do_merge=False)
2372
entries = list(merge_obj._entries_lca())
2373
root_id = wt.path2id('')
2374
self.assertEqual([('foo-id', True,
2375
((root_id, [root_id, root_id]), root_id, root_id),
2376
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2377
((False, [False, False]), False, False)),
2380
def test_other_reverted_path_to_base(self):
2383
# B C Path at 'bar' in B
2390
builder = self.get_builder()
2391
builder.build_snapshot('A-id', None,
2392
[('add', (u'', 'a-root-id', 'directory', None)),
2393
('add', (u'foo', 'foo-id', 'file', 'a\nb\nc\n'))])
2394
builder.build_snapshot('C-id', ['A-id'], [])
2395
builder.build_snapshot('B-id', ['A-id'],
2396
[('rename', ('foo', 'bar'))])
2397
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2398
[('rename', ('foo', 'bar'))]) # merge the rename
2399
builder.build_snapshot('F-id', ['E-id'],
2400
[('rename', ('bar', 'foo'))]) # Rename back to BASE
2401
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2402
wt, conflicts = self.do_merge(builder, 'F-id')
2403
self.assertEqual(0, conflicts)
2404
self.assertEqual('foo', wt.id2path('foo-id'))
2406
def test_other_reverted_content_to_base(self):
2407
builder = self.get_builder()
2408
builder.build_snapshot('A-id', None,
2409
[('add', (u'', 'a-root-id', 'directory', None)),
2410
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2411
builder.build_snapshot('C-id', ['A-id'], [])
2412
builder.build_snapshot('B-id', ['A-id'],
2413
[('modify', ('foo-id', 'B content\n'))])
2414
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2415
[('modify', ('foo-id', 'B content\n'))]) # merge the content
2416
builder.build_snapshot('F-id', ['E-id'],
2417
[('modify', ('foo-id', 'base content\n'))]) # Revert back to BASE
2418
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2419
wt, conflicts = self.do_merge(builder, 'F-id')
2420
self.assertEqual(0, conflicts)
2421
# TODO: We need to use the per-file graph to properly select a BASE
2422
# before this will work. Or at least use the LCA trees to find
2423
# the appropriate content base. (which is B, not A).
2424
self.expectFailure("Merge3Merger doesn't recognize reverted content",
2425
self.assertEqual, 'base content\n', wt.get_file_text('foo-id'))
2427
def test_other_modified_content(self):
2428
builder = self.get_builder()
2429
builder.build_snapshot('A-id', None,
2430
[('add', (u'', 'a-root-id', 'directory', None)),
2431
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2432
builder.build_snapshot('C-id', ['A-id'], [])
2433
builder.build_snapshot('B-id', ['A-id'],
2434
[('modify', ('foo-id', 'B content\n'))])
2435
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2436
[('modify', ('foo-id', 'B content\n'))]) # merge the content
2437
builder.build_snapshot('F-id', ['E-id'],
2438
[('modify', ('foo-id', 'F content\n'))]) # Override B content
2439
builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
2440
wt, conflicts = self.do_merge(builder, 'F-id')
2441
self.expectFailure("Merge3Merger only uses BASE for content",
2442
self.assertEqual, 'F content\n', wt.get_file_text('foo-id'))
2443
self.assertEqual(0, conflicts)
2444
self.assertEqual('F content\n', wt.get_file_text('foo-id'))
2446
def test_all_wt(self):
2447
"""Check behavior if all trees are Working Trees."""
2448
# The big issue is that entry.revision is None for WorkingTrees. (as is
2449
# entry.text_sha1, etc. So we need to make sure we handle that case
2451
# A Content of 'foo', path of 'a'
2453
# B C B modifies content, C renames 'a' => 'b'
2455
# D E E updates content, renames 'b' => 'c'
2456
builder = self.get_builder()
2457
builder.build_snapshot('A-id', None,
2458
[('add', (u'', 'a-root-id', 'directory', None)),
2459
('add', (u'a', 'a-id', 'file', 'base content\n')),
2460
('add', (u'foo', 'foo-id', 'file', 'base content\n'))])
2461
builder.build_snapshot('B-id', ['A-id'],
2462
[('modify', ('foo-id', 'B content\n'))])
2463
builder.build_snapshot('C-id', ['A-id'],
2464
[('rename', ('a', 'b'))])
2465
builder.build_snapshot('E-id', ['C-id', 'B-id'],
2466
[('rename', ('b', 'c')),
2467
('modify', ('foo-id', 'E content\n'))])
2468
builder.build_snapshot('D-id', ['B-id', 'C-id'],
2469
[('rename', ('a', 'b'))]) # merged change
2470
wt_this = self.get_wt_from_builder(builder)
2471
wt_base = wt_this.bzrdir.sprout('base', 'A-id').open_workingtree()
2473
self.addCleanup(wt_base.unlock)
2474
wt_lca1 = wt_this.bzrdir.sprout('b-tree', 'B-id').open_workingtree()
2476
self.addCleanup(wt_lca1.unlock)
2477
wt_lca2 = wt_this.bzrdir.sprout('c-tree', 'C-id').open_workingtree()
2479
self.addCleanup(wt_lca2.unlock)
2480
wt_other = wt_this.bzrdir.sprout('other', 'E-id').open_workingtree()
2481
wt_other.lock_read()
2482
self.addCleanup(wt_other.unlock)
2483
merge_obj = _mod_merge.Merge3Merger(wt_this, wt_this, wt_base,
2484
wt_other, lca_trees=[wt_lca1, wt_lca2], do_merge=False)
2485
entries = list(merge_obj._entries_lca())
2486
root_id = 'a-root-id'
2487
self.assertEqual([('a-id', False,
2488
((root_id, [root_id, root_id]), root_id, root_id),
2489
((u'a', [u'a', u'b']), u'c', u'b'),
2490
((False, [False, False]), False, False)),
2492
((root_id, [root_id, root_id]), root_id, root_id),
2493
((u'foo', [u'foo', u'foo']), u'foo', u'foo'),
2494
((False, [False, False]), False, False)),
2497
def test_nested_tree_unmodified(self):
2498
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2500
wt = self.make_branch_and_tree('tree',
2501
format='dirstate-with-subtree')
2503
self.addCleanup(wt.unlock)
2504
sub_tree = self.make_branch_and_tree('tree/sub-tree',
2505
format='dirstate-with-subtree')
2506
wt.set_root_id('a-root-id')
2507
sub_tree.set_root_id('sub-tree-root')
2508
self.build_tree_contents([('tree/sub-tree/file', 'text1')])
2509
sub_tree.add('file')
2510
sub_tree.commit('foo', rev_id='sub-A-id')
2511
wt.add_reference(sub_tree)
2512
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2513
# Now create a criss-cross merge in the parent, without modifying the
2515
wt.commit('B', rev_id='B-id', recursive=None)
2516
wt.set_last_revision('A-id')
2517
wt.branch.set_last_revision_info(1, 'A-id')
2518
wt.commit('C', rev_id='C-id', recursive=None)
2519
wt.merge_from_branch(wt.branch, to_revision='B-id')
2520
wt.commit('E', rev_id='E-id', recursive=None)
2521
wt.set_parent_ids(['B-id', 'C-id'])
2522
wt.branch.set_last_revision_info(2, 'B-id')
2523
wt.commit('D', rev_id='D-id', recursive=None)
2525
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2527
merger.merge_type = _mod_merge.Merge3Merger
2528
merge_obj = merger.make_merger()
2529
entries = list(merge_obj._entries_lca())
2530
self.assertEqual([], entries)
2532
def test_nested_tree_subtree_modified(self):
2533
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2535
wt = self.make_branch_and_tree('tree',
2536
format='dirstate-with-subtree')
2538
self.addCleanup(wt.unlock)
2539
sub_tree = self.make_branch_and_tree('tree/sub',
2540
format='dirstate-with-subtree')
2541
wt.set_root_id('a-root-id')
2542
sub_tree.set_root_id('sub-tree-root')
2543
self.build_tree_contents([('tree/sub/file', 'text1')])
2544
sub_tree.add('file')
2545
sub_tree.commit('foo', rev_id='sub-A-id')
2546
wt.add_reference(sub_tree)
2547
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2548
# Now create a criss-cross merge in the parent, without modifying the
2550
wt.commit('B', rev_id='B-id', recursive=None)
2551
wt.set_last_revision('A-id')
2552
wt.branch.set_last_revision_info(1, 'A-id')
2553
wt.commit('C', rev_id='C-id', recursive=None)
2554
wt.merge_from_branch(wt.branch, to_revision='B-id')
2555
self.build_tree_contents([('tree/sub/file', 'text2')])
2556
sub_tree.commit('modify contents', rev_id='sub-B-id')
2557
wt.commit('E', rev_id='E-id', recursive=None)
2558
wt.set_parent_ids(['B-id', 'C-id'])
2559
wt.branch.set_last_revision_info(2, 'B-id')
2560
wt.commit('D', rev_id='D-id', recursive=None)
2562
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2564
merger.merge_type = _mod_merge.Merge3Merger
2565
merge_obj = merger.make_merger()
2566
entries = list(merge_obj._entries_lca())
2567
# Nothing interesting about this sub-tree, because content changes are
2568
# computed at a higher level
2569
self.assertEqual([], entries)
2571
def test_nested_tree_subtree_renamed(self):
2572
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2574
wt = self.make_branch_and_tree('tree',
2575
format='dirstate-with-subtree')
2577
self.addCleanup(wt.unlock)
2578
sub_tree = self.make_branch_and_tree('tree/sub',
2579
format='dirstate-with-subtree')
2580
wt.set_root_id('a-root-id')
2581
sub_tree.set_root_id('sub-tree-root')
2582
self.build_tree_contents([('tree/sub/file', 'text1')])
2583
sub_tree.add('file')
2584
sub_tree.commit('foo', rev_id='sub-A-id')
2585
wt.add_reference(sub_tree)
2586
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2587
# Now create a criss-cross merge in the parent, without modifying the
2589
wt.commit('B', rev_id='B-id', recursive=None)
2590
wt.set_last_revision('A-id')
2591
wt.branch.set_last_revision_info(1, 'A-id')
2592
wt.commit('C', rev_id='C-id', recursive=None)
2593
wt.merge_from_branch(wt.branch, to_revision='B-id')
2594
wt.rename_one('sub', 'alt_sub')
2595
wt.commit('E', rev_id='E-id', recursive=None)
2596
wt.set_last_revision('B-id')
2598
wt.set_parent_ids(['B-id', 'C-id'])
2599
wt.branch.set_last_revision_info(2, 'B-id')
2600
wt.commit('D', rev_id='D-id', recursive=None)
2602
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2604
merger.merge_type = _mod_merge.Merge3Merger
2605
merge_obj = merger.make_merger()
2606
entries = list(merge_obj._entries_lca())
2607
root_id = 'a-root-id'
2608
self.assertEqual([('sub-tree-root', False,
2609
((root_id, [root_id, root_id]), root_id, root_id),
2610
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2611
((False, [False, False]), False, False)),
2614
def test_nested_tree_subtree_renamed_and_modified(self):
2615
# Tested with a real WT, because BranchBuilder/MemoryTree don't handle
2617
wt = self.make_branch_and_tree('tree',
2618
format='dirstate-with-subtree')
2620
self.addCleanup(wt.unlock)
2621
sub_tree = self.make_branch_and_tree('tree/sub',
2622
format='dirstate-with-subtree')
2623
wt.set_root_id('a-root-id')
2624
sub_tree.set_root_id('sub-tree-root')
2625
self.build_tree_contents([('tree/sub/file', 'text1')])
2626
sub_tree.add('file')
2627
sub_tree.commit('foo', rev_id='sub-A-id')
2628
wt.add_reference(sub_tree)
2629
wt.commit('set text to 1', rev_id='A-id', recursive=None)
2630
# Now create a criss-cross merge in the parent, without modifying the
2632
wt.commit('B', rev_id='B-id', recursive=None)
2633
wt.set_last_revision('A-id')
2634
wt.branch.set_last_revision_info(1, 'A-id')
2635
wt.commit('C', rev_id='C-id', recursive=None)
2636
wt.merge_from_branch(wt.branch, to_revision='B-id')
2637
self.build_tree_contents([('tree/sub/file', 'text2')])
2638
sub_tree.commit('modify contents', rev_id='sub-B-id')
2639
wt.rename_one('sub', 'alt_sub')
2640
wt.commit('E', rev_id='E-id', recursive=None)
2641
wt.set_last_revision('B-id')
2643
wt.set_parent_ids(['B-id', 'C-id'])
2644
wt.branch.set_last_revision_info(2, 'B-id')
2645
wt.commit('D', rev_id='D-id', recursive=None)
2647
merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
2649
merger.merge_type = _mod_merge.Merge3Merger
2650
merge_obj = merger.make_merger()
2651
entries = list(merge_obj._entries_lca())
2652
root_id = 'a-root-id'
2653
self.assertEqual([('sub-tree-root', False,
2654
((root_id, [root_id, root_id]), root_id, root_id),
2655
((u'sub', [u'sub', u'sub']), u'alt_sub', u'sub'),
2656
((False, [False, False]), False, False)),
2660
class TestLCAMultiWay(tests.TestCase):
2662
def assertLCAMultiWay(self, expected, base, lcas, other, this,
2663
allow_overriding_lca=True):
2664
self.assertEqual(expected, _mod_merge.Merge3Merger._lca_multi_way(
2665
(base, lcas), other, this,
2666
allow_overriding_lca=allow_overriding_lca))
2668
def test_other_equal_equal_lcas(self):
2669
"""Test when OTHER=LCA and all LCAs are identical."""
2670
self.assertLCAMultiWay('this',
2671
'bval', ['bval', 'bval'], 'bval', 'bval')
2672
self.assertLCAMultiWay('this',
2673
'bval', ['lcaval', 'lcaval'], 'lcaval', 'bval')
2674
self.assertLCAMultiWay('this',
2675
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', 'bval')
2676
self.assertLCAMultiWay('this',
2677
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', 'tval')
2678
self.assertLCAMultiWay('this',
2679
'bval', ['lcaval', 'lcaval', 'lcaval'], 'lcaval', None)
2681
def test_other_equal_this(self):
2682
"""Test when other and this are identical."""
2683
self.assertLCAMultiWay('this',
2684
'bval', ['bval', 'bval'], 'oval', 'oval')
2685
self.assertLCAMultiWay('this',
2686
'bval', ['lcaval', 'lcaval'], 'oval', 'oval')
2687
self.assertLCAMultiWay('this',
2688
'bval', ['cval', 'dval'], 'oval', 'oval')
2689
self.assertLCAMultiWay('this',
2690
'bval', [None, 'lcaval'], 'oval', 'oval')
2691
self.assertLCAMultiWay('this',
2692
None, [None, 'lcaval'], 'oval', 'oval')
2693
self.assertLCAMultiWay('this',
2694
None, ['lcaval', 'lcaval'], 'oval', 'oval')
2695
self.assertLCAMultiWay('this',
2696
None, ['cval', 'dval'], 'oval', 'oval')
2697
self.assertLCAMultiWay('this',
2698
None, ['cval', 'dval'], None, None)
2699
self.assertLCAMultiWay('this',
2700
None, ['cval', 'dval', 'eval', 'fval'], 'oval', 'oval')
2702
def test_no_lcas(self):
2703
self.assertLCAMultiWay('this',
2704
'bval', [], 'bval', 'tval')
2705
self.assertLCAMultiWay('other',
2706
'bval', [], 'oval', 'bval')
2707
self.assertLCAMultiWay('conflict',
2708
'bval', [], 'oval', 'tval')
2709
self.assertLCAMultiWay('this',
2710
'bval', [], 'oval', 'oval')
2712
def test_lca_supersedes_other_lca(self):
2713
"""If one lca == base, the other lca takes precedence"""
2714
self.assertLCAMultiWay('this',
2715
'bval', ['bval', 'lcaval'], 'lcaval', 'tval')
2716
self.assertLCAMultiWay('this',
2717
'bval', ['bval', 'lcaval'], 'lcaval', 'bval')
2718
# This is actually considered a 'revert' because the 'lcaval' in LCAS
2719
# supersedes the BASE val (in the other LCA) but then OTHER reverts it
2721
self.assertLCAMultiWay('other',
2722
'bval', ['bval', 'lcaval'], 'bval', 'lcaval')
2723
self.assertLCAMultiWay('conflict',
2724
'bval', ['bval', 'lcaval'], 'bval', 'tval')
2726
def test_other_and_this_pick_different_lca(self):
2727
# OTHER and THIS resolve the lca conflict in different ways
2728
self.assertLCAMultiWay('conflict',
2729
'bval', ['lca1val', 'lca2val'], 'lca1val', 'lca2val')
2730
self.assertLCAMultiWay('conflict',
2731
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'lca2val')
2732
self.assertLCAMultiWay('conflict',
2733
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'lca2val')
2735
def test_other_in_lca(self):
2736
# OTHER takes a value of one of the LCAs, THIS takes a new value, which
2737
# theoretically supersedes both LCA values and 'wins'
2738
self.assertLCAMultiWay('this',
2739
'bval', ['lca1val', 'lca2val'], 'lca1val', 'newval')
2740
self.assertLCAMultiWay('this',
2741
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'newval')
2742
self.assertLCAMultiWay('conflict',
2743
'bval', ['lca1val', 'lca2val'], 'lca1val', 'newval',
2744
allow_overriding_lca=False)
2745
self.assertLCAMultiWay('conflict',
2746
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'newval',
2747
allow_overriding_lca=False)
2748
# THIS reverted back to BASE, but that is an explicit supersede of all
2750
self.assertLCAMultiWay('this',
2751
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'bval')
2752
self.assertLCAMultiWay('this',
2753
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'bval')
2754
self.assertLCAMultiWay('conflict',
2755
'bval', ['lca1val', 'lca2val', 'lca3val'], 'lca1val', 'bval',
2756
allow_overriding_lca=False)
2757
self.assertLCAMultiWay('conflict',
2758
'bval', ['lca1val', 'lca2val', 'bval'], 'lca1val', 'bval',
2759
allow_overriding_lca=False)
2761
def test_this_in_lca(self):
2762
# THIS takes a value of one of the LCAs, OTHER takes a new value, which
2763
# theoretically supersedes both LCA values and 'wins'
2764
self.assertLCAMultiWay('other',
2765
'bval', ['lca1val', 'lca2val'], 'oval', 'lca1val')
2766
self.assertLCAMultiWay('other',
2767
'bval', ['lca1val', 'lca2val'], 'oval', 'lca2val')
2768
self.assertLCAMultiWay('conflict',
2769
'bval', ['lca1val', 'lca2val'], 'oval', 'lca1val',
2770
allow_overriding_lca=False)
2771
self.assertLCAMultiWay('conflict',
2772
'bval', ['lca1val', 'lca2val'], 'oval', 'lca2val',
2773
allow_overriding_lca=False)
2774
# OTHER reverted back to BASE, but that is an explicit supersede of all
2776
self.assertLCAMultiWay('other',
2777
'bval', ['lca1val', 'lca2val', 'lca3val'], 'bval', 'lca3val')
2778
self.assertLCAMultiWay('conflict',
2779
'bval', ['lca1val', 'lca2val', 'lca3val'], 'bval', 'lca3val',
2780
allow_overriding_lca=False)
2782
def test_all_differ(self):
2783
self.assertLCAMultiWay('conflict',
2784
'bval', ['lca1val', 'lca2val'], 'oval', 'tval')
2785
self.assertLCAMultiWay('conflict',
2786
'bval', ['lca1val', 'lca2val', 'lca2val'], 'oval', 'tval')
2787
self.assertLCAMultiWay('conflict',
2788
'bval', ['lca1val', 'lca2val', 'lca3val'], 'oval', 'tval')
added
removed
bzrlib/tests/test_merge.py
