/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 breezy/tests/blackbox/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_merge.py
48
48
    def example_branch(self, path='.'):
49
49
        tree = self.make_branch_and_tree(path)
50
50
        self.build_tree_contents([
51
 
            (osutils.pathjoin(path, 'hello'), 'foo'),
52
 
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
 
51
            (osutils.pathjoin(path, 'hello'), b'foo'),
 
52
            (osutils.pathjoin(path, 'goodbye'), b'baz')])
53
53
        tree.add('hello')
54
54
        tree.commit(message='setup')
55
55
        tree.add('goodbye')
66
66
        builder.build_snapshot(None,
67
67
            [('add', ('', 'root-id', 'directory', None)),
68
68
             ('add', ('fname', 'f-id', 'file', 'a\nb\nc\n'))],
69
 
            revision_id='rev1')
 
69
            revision_id=b'rev1')
70
70
        builder.build_snapshot(['rev1'],
71
71
            [('modify', ('f-id', 'a\nB\nD\n'))],
72
 
            revision_id='rev2other')
 
72
            revision_id=b'rev2other')
73
73
        other = builder.get_branch().controldir.sprout('other').open_branch()
74
74
        builder.build_snapshot(['rev1'],
75
 
            [('modify', ('f-id', 'a\nB\nC\n'))], revision_id='rev2this')
 
75
            [('modify', ('f-id', 'a\nB\nC\n'))], revision_id=b'rev2this')
76
76
        tree = builder.get_branch().create_checkout('tree', lightweight=True)
77
77
        return tree, other
78
78
 
85
85
        a_tree = self.example_branch('a')
86
86
        ancestor = a_tree.branch.revno()
87
87
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
88
 
        self.build_tree_contents([('b/goodbye', 'quux')])
 
88
        self.build_tree_contents([('b/goodbye', b'quux')])
89
89
        b_tree.commit(message="more u's are always good")
90
90
 
91
 
        self.build_tree_contents([('a/hello', 'quuux')])
 
91
        self.build_tree_contents([('a/hello', b'quuux')])
92
92
        # We can't merge when there are in-tree changes
93
93
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
94
94
        a = workingtree.WorkingTree.open('a')
148
148
                             '=======\n'
149
149
                             'D\n'
150
150
                             '>>>>>>> MERGE-SOURCE\n',
151
 
                             tree.get_file_text(tree.id2path('f-id')))
 
151
                             tree.get_file_text(tree.id2path(b'f-id')))
152
152
 
153
153
    def test_merge_explicit_reprocess_show_base(self):
154
154
        tree, other = self.create_conflicting_branches()
170
170
                             'B\n'
171
171
                             'D\n'
172
172
                             '>>>>>>> MERGE-SOURCE\n',
173
 
                             tree.get_file_text(tree.id2path('f-id')))
 
173
                             tree.get_file_text(tree.id2path(b'f-id')))
174
174
 
175
175
    def test_merge_override_show_base(self):
176
176
        tree, other = self.create_conflicting_branches()
188
188
                             'B\n'
189
189
                             'D\n'
190
190
                             '>>>>>>> MERGE-SOURCE\n',
191
 
                             tree.get_file_text(tree.id2path('f-id')))
 
191
                             tree.get_file_text(tree.id2path(b'f-id')))
192
192
 
193
193
    def test_merge_with_missing_file(self):
194
194
        """Merge handles missing file conflicts"""
195
195
        self.build_tree_contents([
196
196
            ('a/',),
197
197
            ('a/sub/',),
198
 
            ('a/sub/a.txt', 'hello\n'),
199
 
            ('a/b.txt', 'hello\n'),
200
 
            ('a/sub/c.txt', 'hello\n')])
 
198
            ('a/sub/a.txt', b'hello\n'),
 
199
            ('a/b.txt', b'hello\n'),
 
200
            ('a/sub/c.txt', b'hello\n')])
201
201
        a_tree = self.make_branch_and_tree('a')
202
202
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
203
203
        a_tree.commit(message='added a')
204
204
        b_tree = a_tree.controldir.sprout('b').open_workingtree()
205
205
        self.build_tree_contents([
206
 
            ('a/sub/a.txt', 'hello\nthere\n'),
207
 
            ('a/b.txt', 'hello\nthere\n'),
208
 
            ('a/sub/c.txt', 'hello\nthere\n')])
 
206
            ('a/sub/a.txt', b'hello\nthere\n'),
 
207
            ('a/b.txt', b'hello\nthere\n'),
 
208
            ('a/sub/c.txt', b'hello\nthere\n')])
209
209
        a_tree.commit(message='Added there')
210
210
        os.remove('a/sub/a.txt')
211
211
        os.remove('a/sub/c.txt')
213
213
        os.remove('a/b.txt')
214
214
        a_tree.commit(message='Removed a.txt')
215
215
        self.build_tree_contents([
216
 
            ('b/sub/a.txt', 'hello\nsomething\n'),
217
 
            ('b/b.txt', 'hello\nsomething\n'),
218
 
            ('b/sub/c.txt', 'hello\nsomething\n')])
 
216
            ('b/sub/a.txt', b'hello\nsomething\n'),
 
217
            ('b/b.txt', b'hello\nsomething\n'),
 
218
            ('b/sub/c.txt', b'hello\nsomething\n')])
219
219
        b_tree.commit(message='Modified a.txt')
220
220
 
221
221
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
310
310
    def test_merge_bundle(self):
311
311
        from breezy.testament import Testament
312
312
        tree_a = self.make_branch_and_tree('branch_a')
313
 
        self.build_tree_contents([('branch_a/a', 'hello')])
 
313
        self.build_tree_contents([('branch_a/a', b'hello')])
314
314
        tree_a.add('a')
315
315
        tree_a.commit('message')
316
316
 
317
317
        tree_b = tree_a.controldir.sprout('branch_b').open_workingtree()
318
 
        self.build_tree_contents([('branch_a/a', 'hey there')])
 
318
        self.build_tree_contents([('branch_a/a', b'hey there')])
319
319
        tree_a.commit('message')
320
320
 
321
 
        self.build_tree_contents([('branch_b/a', 'goodbye')])
 
321
        self.build_tree_contents([('branch_b/a', b'goodbye')])
322
322
        tree_b.commit('message')
323
323
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
324
324
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
370
370
        """It should not be possible to merge changes from a file which
371
371
        does not exist."""
372
372
        tree_a = self.make_branch_and_tree('tree_a')
373
 
        self.build_tree_contents([('tree_a/file', 'bar\n')])
 
373
        self.build_tree_contents([('tree_a/file', b'bar\n')])
374
374
        tree_a.add(['file'])
375
375
        tree_a.commit('commit 1')
376
376
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
378
378
 
379
379
    def pullable_branch(self):
380
380
        tree_a = self.make_branch_and_tree('a')
381
 
        self.build_tree_contents([('a/file', 'bar\n')])
 
381
        self.build_tree_contents([('a/file', b'bar\n')])
382
382
        tree_a.add(['file'])
383
383
        self.id1 = tree_a.commit('commit 1')
384
384
 
385
385
        tree_b = self.make_branch_and_tree('b')
386
386
        tree_b.pull(tree_a.branch)
387
 
        self.build_tree_contents([('b/file', 'foo\n')])
 
387
        self.build_tree_contents([('b/file', b'foo\n')])
388
388
        self.id2 = tree_b.commit('commit 2')
389
389
 
390
390
    def test_merge_pull(self):
411
411
 
412
412
    def test_merge_kind_change(self):
413
413
        tree_a = self.make_branch_and_tree('tree_a')
414
 
        self.build_tree_contents([('tree_a/file', 'content_1')])
415
 
        tree_a.add('file', 'file-id')
 
414
        self.build_tree_contents([('tree_a/file', b'content_1')])
 
415
        tree_a.add('file', b'file-id')
416
416
        tree_a.commit('added file')
417
417
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
418
418
        os.unlink('tree_a/file')
422
422
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
423
423
        tree_b.revert()
424
424
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
425
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
425
        self.build_tree_contents([('tree_b/file', b'content_2')])
426
426
        tree_b.commit('content change')
427
427
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
428
428
        self.assertEqual(tree_b.conflicts(),
439
439
        target = source.controldir.sprout('target').open_workingtree()
440
440
        self.build_tree(['source/a'])
441
441
        source.add('a')
442
 
        source.commit('Added a', rev_id='rev1')
 
442
        source.commit('Added a', rev_id=b'rev1')
443
443
        self.build_tree(['source/b'])
444
444
        source.add('b')
445
 
        source.commit('Added b', rev_id='rev2')
 
445
        source.commit('Added b', rev_id=b'rev2')
446
446
        target.commit('empty commit')
447
447
        self.write_directive('directive', source.branch, 'target', 'rev2',
448
448
                             'rev1')
458
458
            base_revision_id=base_revision_id)
459
459
        if mangle_patch:
460
460
            md.patch = 'asdf\n'
461
 
        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
 
461
        self.build_tree_contents([(filename, b''.join(md.to_lines()))])
462
462
 
463
463
    def test_directive_verify_warning(self):
464
464
        source = self.make_branch_and_tree('source')
465
465
        self.build_tree(['source/a'])
466
466
        source.add('a')
467
 
        source.commit('Added a', rev_id='rev1')
 
467
        source.commit('Added a', rev_id=b'rev1')
468
468
        target = self.make_branch_and_tree('target')
469
469
        target.commit('empty commit')
470
470
        self.write_directive('directive', source.branch, 'target', 'rev1')
483
483
        branch_a = target.controldir.sprout('branch_a').open_workingtree()
484
484
        self.build_tree(['branch_a/file1'])
485
485
        branch_a.add('file1')
486
 
        branch_a.commit('added file1', rev_id='rev2a')
 
486
        branch_a.commit('added file1', rev_id=b'rev2a')
487
487
        branch_b = target.controldir.sprout('branch_b').open_workingtree()
488
488
        self.build_tree(['branch_b/file2'])
489
489
        branch_b.add('file2')
490
 
        branch_b.commit('added file2', rev_id='rev2b')
 
490
        branch_b.commit('added file2', rev_id=b'rev2b')
491
491
        branch_b.merge_from_branch(branch_a.branch)
492
492
        self.assertPathExists('branch_b/file1')
493
 
        branch_b.commit('merged branch_a', rev_id='rev3b')
 
493
        branch_b.commit('merged branch_a', rev_id=b'rev3b')
494
494
 
495
495
        # It works if the revid has an interger revno
496
496
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
523
523
        for f in ('a', 'b', 'c', 'd'):
524
524
            self.build_tree(['source/'+f])
525
525
            source.add(f)
526
 
            source.commit('added '+f, rev_id='rev_'+f)
 
526
            source.commit('added '+f, rev_id=b'rev_'+f)
527
527
        # target branch
528
528
        target = source.controldir.sprout('target', 'rev_a').open_workingtree()
529
529
        self.assertDirectoryContent('target', ['.bzr', 'a'])
541
541
 
542
542
    def test_merge_criss_cross(self):
543
543
        tree_a = self.make_branch_and_tree('a')
544
 
        tree_a.commit('', rev_id='rev1')
 
544
        tree_a.commit('', rev_id=b'rev1')
545
545
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
546
 
        tree_a.commit('', rev_id='rev2a')
547
 
        tree_b.commit('', rev_id='rev2b')
 
546
        tree_a.commit('', rev_id=b'rev2a')
 
547
        tree_b.commit('', rev_id=b'rev2b')
548
548
        tree_a.merge_from_branch(tree_b.branch)
549
549
        tree_b.merge_from_branch(tree_a.branch)
550
 
        tree_a.commit('', rev_id='rev3a')
551
 
        tree_b.commit('', rev_id='rev3b')
 
550
        tree_a.commit('', rev_id=b'rev3a')
 
551
        tree_b.commit('', rev_id=b'rev3b')
552
552
        graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
553
553
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
554
554
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
589
589
 
590
590
    def test_no_remember_dont_set_submit(self):
591
591
        tree_a = self.make_branch_and_tree('a')
592
 
        self.build_tree_contents([('a/file', "a\n")])
 
592
        self.build_tree_contents([('a/file', b"a\n")])
593
593
        tree_a.add('file')
594
594
        tree_a.commit('rev1')
595
595
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
606
606
 
607
607
    def test_weave_cherrypick(self):
608
608
        this_tree = self.make_branch_and_tree('this')
609
 
        self.build_tree_contents([('this/file', "a\n")])
 
609
        self.build_tree_contents([('this/file', b"a\n")])
610
610
        this_tree.add('file')
611
611
        this_tree.commit('rev1')
612
612
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
613
 
        self.build_tree_contents([('other/file', "a\nb\n")])
 
613
        self.build_tree_contents([('other/file', b"a\nb\n")])
614
614
        other_tree.commit('rev2b')
615
 
        self.build_tree_contents([('other/file', "c\na\nb\n")])
 
615
        self.build_tree_contents([('other/file', b"c\na\nb\n")])
616
616
        other_tree.commit('rev3b')
617
617
        self.run_bzr('merge --weave -d this other -r -2..-1')
618
618
        self.assertFileEqual('c\na\n', 'this/file')
619
619
 
620
620
    def test_lca_merge_criss_cross(self):
621
621
        tree_a = self.make_branch_and_tree('a')
622
 
        self.build_tree_contents([('a/file', 'base-contents\n')])
 
622
        self.build_tree_contents([('a/file', b'base-contents\n')])
623
623
        tree_a.add('file')
624
 
        tree_a.commit('', rev_id='rev1')
 
624
        tree_a.commit('', rev_id=b'rev1')
625
625
        tree_b = tree_a.controldir.sprout('b').open_workingtree()
626
626
        self.build_tree_contents([('a/file',
627
 
                                   'base-contents\nthis-contents\n')])
628
 
        tree_a.commit('', rev_id='rev2a')
 
627
                                   b'base-contents\nthis-contents\n')])
 
628
        tree_a.commit('', rev_id=b'rev2a')
629
629
        self.build_tree_contents([('b/file',
630
 
                                   'base-contents\nother-contents\n')])
631
 
        tree_b.commit('', rev_id='rev2b')
 
630
                                   b'base-contents\nother-contents\n')])
 
631
        tree_b.commit('', rev_id=b'rev2b')
632
632
        tree_a.merge_from_branch(tree_b.branch)
633
633
        self.build_tree_contents([('a/file',
634
 
                                   'base-contents\nthis-contents\n')])
 
634
                                   b'base-contents\nthis-contents\n')])
635
635
        tree_a.set_conflicts(conflicts.ConflictList())
636
636
        tree_b.merge_from_branch(tree_a.branch)
637
637
        self.build_tree_contents([('b/file',
638
 
                                   'base-contents\nother-contents\n')])
 
638
                                   b'base-contents\nother-contents\n')])
639
639
        tree_b.set_conflicts(conflicts.ConflictList())
640
 
        tree_a.commit('', rev_id='rev3a')
641
 
        tree_b.commit('', rev_id='rev3b')
 
640
        tree_a.commit('', rev_id=b'rev3a')
 
641
        tree_b.commit('', rev_id=b'rev3b')
642
642
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
643
643
        self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
644
644
                             '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
648
648
        this_tree = self.make_branch_and_tree('this')
649
649
        this_tree.commit('rev1')
650
650
        other_tree = this_tree.controldir.sprout('other').open_workingtree()
651
 
        self.build_tree_contents([('other/file', 'new line')])
 
651
        self.build_tree_contents([('other/file', b'new line')])
652
652
        other_tree.add('file')
653
653
        other_tree.commit('rev2a')
654
654
        this_tree.commit('rev2b')
686
686
        """
687
687
        # Make a source, sprout a target off it
688
688
        builder = self.make_branch_builder('source')
689
 
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
689
        builder.build_commit(message="Rev 1", rev_id=b'rev-1')
690
690
        source = builder.get_branch()
691
691
        target_bzrdir = source.controldir.sprout('target')
692
692
        # Add a non-ancestry tag to source
693
 
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
 
693
        builder.build_commit(message="Rev 2a", rev_id=b'rev-2a')
694
694
        source.tags.set_tag('tag-a', 'rev-2a')
695
695
        source.set_last_revision_info(1, 'rev-1')
696
696
        source.get_config_stack().set('branch.fetch_tags', True)
697
 
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
697
        builder.build_commit(message="Rev 2b", rev_id=b'rev-2b')
698
698
        # Merge from source
699
699
        self.run_bzr('merge -d target source')
700
700
        target = target_bzrdir.open_branch()
728
728
        source = self.make_branch_and_tree('source')
729
729
        self.build_tree(['source/a'])
730
730
        source.add('a')
731
 
        source.commit('Added a', rev_id='rev1')
 
731
        source.commit('Added a', rev_id=b'rev1')
732
732
        target = self.make_branch_and_tree('target')
733
733
        self.run_script("""\
734
734
$ brz merge -d target source
744
744
        self.tree_a.add(['foo'])
745
745
        self.tree_a.commit('add file')
746
746
        self.tree_b = self.tree_a.controldir.sprout('b').open_workingtree()
747
 
        self.build_tree_contents([('a/foo', 'change 1')])
 
747
        self.build_tree_contents([('a/foo', b'change 1')])
748
748
        self.tree_a.commit('change file')
749
749
        self.tree_b.merge_from_branch(self.tree_a.branch)
750
750