/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Andrew Bennetts
  • Date: 2008-01-04 03:12:11 UTC
  • mfrom: (3164 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3320.
  • Revision ID: andrew.bennetts@canonical.com-20080104031211-wy4uxo2j4elvip1j
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
138
138
        tree_a.commit(message="hello")
139
139
        dir_b = tree_a.bzrdir.sprout('b')
140
140
        tree_b = dir_b.open_workingtree()
 
141
        tree_b.lock_write()
 
142
        self.addCleanup(tree_b.unlock)
141
143
        tree_a.commit(message="hello again")
142
144
        log = StringIO()
143
145
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(), 
288
290
        merger.do_merge()
289
291
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
290
292
 
 
293
    def test_merge_uncommitted_otherbasis_ancestor_of_thisbasis_weave(self):
 
294
        tree_a = self.make_branch_and_tree('a')
 
295
        self.build_tree(['a/file_1', 'a/file_2'])
 
296
        tree_a.add(['file_1'])
 
297
        tree_a.commit('commit 1')
 
298
        tree_a.add(['file_2'])
 
299
        tree_a.commit('commit 2')
 
300
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
301
        tree_b.rename_one('file_1', 'renamed')
 
302
        merger = _mod_merge.Merger.from_uncommitted(tree_a, tree_b,
 
303
                                                    progress.DummyProgress())
 
304
        merger.merge_type = _mod_merge.WeaveMerger
 
305
        merger.do_merge()
 
306
        self.assertEqual(tree_a.get_parent_ids(), [tree_b.last_revision()])
 
307
 
 
308
    def prepare_cherrypick(self):
 
309
        """Prepare a pair of trees for cherrypicking tests.
 
310
 
 
311
        Both trees have a file, 'file'.
 
312
        rev1 sets content to 'a'.
 
313
        rev2b adds 'b'.
 
314
        rev3b adds 'c'.
 
315
        A full merge of rev2b and rev3b into this_tree would add both 'b' and
 
316
        'c'.  A successful cherrypick of rev2b-rev3b into this_tree will add
 
317
        'c', but not 'b'.
 
318
        """
 
319
        this_tree = self.make_branch_and_tree('this')
 
320
        self.build_tree_contents([('this/file', "a\n")])
 
321
        this_tree.add('file')
 
322
        this_tree.commit('rev1')
 
323
        other_tree = this_tree.bzrdir.sprout('other').open_workingtree()
 
324
        self.build_tree_contents([('other/file', "a\nb\n")])
 
325
        other_tree.commit('rev2b', rev_id='rev2b')
 
326
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
327
        other_tree.commit('rev3b', rev_id='rev3b')
 
328
        this_tree.lock_write()
 
329
        self.addCleanup(this_tree.unlock)
 
330
        return this_tree, other_tree
 
331
 
 
332
    def test_weave_cherrypick(self):
 
333
        this_tree, other_tree = self.prepare_cherrypick()
 
334
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
 
335
            this_tree, 'rev3b', 'rev2b', other_tree.branch)
 
336
        merger.merge_type = _mod_merge.WeaveMerger
 
337
        merger.do_merge()
 
338
        self.assertFileEqual('c\na\n', 'this/file')
 
339
 
 
340
    def test_weave_cannot_reverse_cherrypick(self):
 
341
        this_tree, other_tree = self.prepare_cherrypick()
 
342
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
 
343
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
 
344
        merger.merge_type = _mod_merge.WeaveMerger
 
345
        self.assertRaises(errors.CannotReverseCherrypick, merger.do_merge)
 
346
 
 
347
    def test_merge3_can_reverse_cherrypick(self):
 
348
        this_tree, other_tree = self.prepare_cherrypick()
 
349
        merger = _mod_merge.Merger.from_revision_ids(progress.DummyProgress(),
 
350
            this_tree, 'rev2b', 'rev3b', other_tree.branch)
 
351
        merger.merge_type = _mod_merge.Merge3Merger
 
352
        merger.do_merge()
 
353
 
291
354
 
292
355
class TestPlanMerge(TestCaseWithMemoryTransport):
293
356
 
368
431
                          ('killed-a', 'b\n'),
369
432
                          ('unchanged', 'g\n')],
370
433
                         list(plan))
 
434
 
 
435
    def test_subtract_plans(self):
 
436
        old_plan = [
 
437
        ('unchanged', 'a\n'),
 
438
        ('new-a', 'b\n'),
 
439
        ('killed-a', 'c\n'),
 
440
        ('new-b', 'd\n'),
 
441
        ('new-b', 'e\n'),
 
442
        ('killed-b', 'f\n'),
 
443
        ('killed-b', 'g\n'),
 
444
        ]
 
445
        new_plan = [
 
446
        ('unchanged', 'a\n'),
 
447
        ('new-a', 'b\n'),
 
448
        ('killed-a', 'c\n'),
 
449
        ('new-b', 'd\n'),
 
450
        ('new-b', 'h\n'),
 
451
        ('killed-b', 'f\n'),
 
452
        ('killed-b', 'i\n'),
 
453
        ]
 
454
        subtracted_plan = [
 
455
        ('unchanged', 'a\n'),
 
456
        ('new-a', 'b\n'),
 
457
        ('killed-a', 'c\n'),
 
458
        ('new-b', 'h\n'),
 
459
        ('unchanged', 'f\n'),
 
460
        ('killed-b', 'i\n'),
 
461
        ]
 
462
        self.assertEqual(subtracted_plan,
 
463
            list(_PlanMerge._subtract_plans(old_plan, new_plan)))
 
464
 
 
465
    def setup_merge_with_base(self):
 
466
        self.add_version('COMMON', [], 'abc')
 
467
        self.add_version('THIS', ['COMMON'], 'abcd')
 
468
        self.add_version('BASE', ['COMMON'], 'eabc')
 
469
        self.add_version('OTHER', ['BASE'], 'eafb')
 
470
 
 
471
    def test_plan_merge_with_base(self):
 
472
        self.setup_merge_with_base()
 
473
        plan = self.plan_merge_vf.plan_merge('THIS', 'OTHER', 'BASE')
 
474
        self.assertEqual([('unchanged', 'a\n'),
 
475
                          ('new-b', 'f\n'),
 
476
                          ('unchanged', 'b\n'),
 
477
                          ('killed-b', 'c\n'),
 
478
                          ('new-a', 'd\n')
 
479
                         ], list(plan))
 
480
 
 
481
    def test_plan_lca_merge(self):
 
482
        self.setup_plan_merge()
 
483
        plan = self.plan_merge_vf.plan_lca_merge('B', 'C')
 
484
        self.assertEqual([
 
485
                          ('new-b', 'f\n'),
 
486
                          ('unchanged', 'a\n'),
 
487
                          ('killed-b', 'c\n'),
 
488
                          ('new-a', 'e\n'),
 
489
                          ('new-a', 'h\n'),
 
490
                          ('killed-a', 'b\n'),
 
491
                          ('unchanged', 'g\n')],
 
492
                         list(plan))
 
493
 
 
494
    def test_plan_lca_merge_uncommitted_files(self):
 
495
        self.setup_plan_merge_uncommitted()
 
496
        plan = self.plan_merge_vf.plan_lca_merge('B:', 'C:')
 
497
        self.assertEqual([
 
498
                          ('new-b', 'f\n'),
 
499
                          ('unchanged', 'a\n'),
 
500
                          ('killed-b', 'c\n'),
 
501
                          ('new-a', 'e\n'),
 
502
                          ('new-a', 'h\n'),
 
503
                          ('killed-a', 'b\n'),
 
504
                          ('unchanged', 'g\n')],
 
505
                         list(plan))
 
506
 
 
507
    def test_plan_lca_merge_with_base(self):
 
508
        self.setup_merge_with_base()
 
509
        plan = self.plan_merge_vf.plan_lca_merge('THIS', 'OTHER', 'BASE')
 
510
        self.assertEqual([('unchanged', 'a\n'),
 
511
                          ('new-b', 'f\n'),
 
512
                          ('unchanged', 'b\n'),
 
513
                          ('killed-b', 'c\n'),
 
514
                          ('new-a', 'd\n')
 
515
                         ], list(plan))
 
516
 
 
517
    def test_plan_lca_merge_with_criss_cross(self):
 
518
        self.add_version('ROOT', [], 'abc')
 
519
        # each side makes a change
 
520
        self.add_version('REV1', ['ROOT'], 'abcd')
 
521
        self.add_version('REV2', ['ROOT'], 'abce')
 
522
        # both sides merge, discarding others' changes
 
523
        self.add_version('LCA1', ['REV1', 'REV2'], 'abcd')
 
524
        self.add_version('LCA2', ['REV1', 'REV2'], 'abce')
 
525
        plan = self.plan_merge_vf.plan_lca_merge('LCA1', 'LCA2')
 
526
        self.assertEqual([('unchanged', 'a\n'),
 
527
                          ('unchanged', 'b\n'),
 
528
                          ('unchanged', 'c\n'),
 
529
                          ('conflicted-a', 'd\n'),
 
530
                          ('conflicted-b', 'e\n'),
 
531
                         ], list(plan))