← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-11 15:04:23 UTC
  • mfrom: (5848.1.1 2.4-cython-first)
  • Revision ID: pqm@pqm.ubuntu.com-20110511150423-tpm1ablukqalkvim
(jameinel) Default to using Cython for compiling code,
 rather than Pyrex. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
26
26
 
27
27
from bzrlib import (
28
28
    branch,
 
29
    bzrdir,
29
30
    conflicts,
30
 
    controldir,
31
31
    merge_directive,
32
32
    osutils,
33
33
    tests,
34
34
    urlutils,
35
35
    workingtree,
36
36
    )
37
 
from bzrlib.tests import (
38
 
    scenarios,
39
 
    script,
40
 
    )
41
 
 
42
 
 
43
 
load_tests = scenarios.load_tests_apply_scenarios
44
37
 
45
38
 
46
39
class TestMerge(tests.TestCaseWithTransport):
75
68
        return tree, other
76
69
 
77
70
    def test_merge_reprocess(self):
78
 
        d = controldir.ControlDir.create_standalone_workingtree('.')
 
71
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
79
72
        d.commit('h')
80
73
        self.run_bzr('merge . --reprocess --merge-type weave')
81
74
 
88
81
 
89
82
        self.build_tree_contents([('a/hello', 'quuux')])
90
83
        # We can't merge when there are in-tree changes
91
 
        self.run_bzr('merge ../b', retcode=3, working_dir='a')
92
 
        a = workingtree.WorkingTree.open('a')
 
84
        os.chdir('a')
 
85
        self.run_bzr('merge ../b', retcode=3)
 
86
        a = workingtree.WorkingTree.open('.')
93
87
        a_tip = a.commit("Like an epidemic of u's")
94
 
 
95
 
        def run_merge_then_revert(args, retcode=None, working_dir='a'):
96
 
            self.run_bzr(['merge', '../b', '-r', 'last:1..last:1'] + args,
97
 
                         retcode=retcode, working_dir=working_dir)
98
 
            if retcode != 3:
99
 
                a_tree.revert(backups=False)
100
 
 
101
 
        run_merge_then_revert(['--merge-type', 'bloof'], retcode=3)
102
 
        run_merge_then_revert(['--merge-type', 'merge3'])
103
 
        run_merge_then_revert(['--merge-type', 'weave'])
104
 
        run_merge_then_revert(['--merge-type', 'lca'])
 
88
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
 
89
                    retcode=3)
 
90
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')
 
91
        a_tree.revert(backups=False)
 
92
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')
 
93
        a_tree.revert(backups=False)
 
94
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')
 
95
        a_tree.revert(backups=False)
105
96
        self.run_bzr_error(['Show-base is not supported for this merge type'],
106
97
                           'merge ../b -r last:1..last:1 --merge-type weave'
107
 
                           ' --show-base', working_dir='a')
108
 
        a_tree.revert(backups=False)
109
 
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess',
110
 
                     working_dir='a')
111
 
        a_tree.revert(backups=False)
112
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
113
 
        self.check_file_contents('a/goodbye', 'quux')
 
98
                           ' --show-base')
 
99
        a_tree.revert(backups=False)
 
100
        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')
 
101
        a_tree.revert(backups=False)
 
102
        self.run_bzr('merge ../b -r last:1')
 
103
        self.check_file_contents('goodbye', 'quux')
114
104
        # Merging a branch pulls its revision into the tree
115
 
        b = branch.Branch.open('b')
 
105
        b = branch.Branch.open('../b')
116
106
        b_tip = b.last_revision()
117
107
        self.assertTrue(a.branch.repository.has_revision(b_tip))
118
108
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
119
109
        a_tree.revert(backups=False)
120
 
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,
121
 
                                working_dir='a')
 
110
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
122
111
        self.assertTrue("Not a branch" in err)
123
112
        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'
124
 
                    %(ancestor,b.revno()), working_dir='a')
125
 
        self.assertEqual(a.get_parent_ids(),
 
113
                    %(ancestor,b.revno()))
 
114
        self.assertEquals(a.get_parent_ids(),
126
115
                          [a.branch.last_revision(), b.last_revision()])
127
 
        self.check_file_contents('a/goodbye', 'quux')
 
116
        self.check_file_contents('goodbye', 'quux')
128
117
        a_tree.revert(backups=False)
129
 
        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')
130
 
        self.assertEqual(a.get_parent_ids(),
 
118
        self.run_bzr('merge -r revno:%d:../b'%b.revno())
 
119
        self.assertEquals(a.get_parent_ids(),
131
120
                          [a.branch.last_revision(), b.last_revision()])
132
121
        a_tip = a.commit('merged')
133
 
        self.run_bzr('merge ../b -r last:1', working_dir='a')
 
122
        self.run_bzr('merge ../b -r last:1')
134
123
        self.assertEqual([a_tip], a.get_parent_ids())
135
124
 
136
125
    def test_merge_defaults_to_reprocess(self):
215
204
            ('b/b.txt', 'hello\nsomething\n'),
216
205
            ('b/sub/c.txt', 'hello\nsomething\n')])
217
206
        b_tree.commit(message='Modified a.txt')
218
 
 
219
 
        self.run_bzr('merge ../a/', retcode=1, working_dir='b')
220
 
        self.assertPathExists('b/sub/a.txt.THIS')
221
 
        self.assertPathExists('b/sub/a.txt.BASE')
222
 
 
223
 
        self.run_bzr('merge ../b/', retcode=1, working_dir='a')
224
 
        self.assertPathExists('a/sub/a.txt.OTHER')
225
 
        self.assertPathExists('a/sub/a.txt.BASE')
 
207
        os.chdir('b')
 
208
        self.run_bzr('merge ../a/', retcode=1)
 
209
        self.assertPathExists('sub/a.txt.THIS')
 
210
        self.assertPathExists('sub/a.txt.BASE')
 
211
        os.chdir('../a')
 
212
        self.run_bzr('merge ../b/', retcode=1)
 
213
        self.assertPathExists('sub/a.txt.OTHER')
 
214
        self.assertPathExists('sub/a.txt.BASE')
226
215
 
227
216
    def test_conflict_leaves_base_this_other_files(self):
228
217
        tree, other = self.create_conflicting_branches()
262
251
        branch_b.set_parent(None)
263
252
        self.assertEqual(None, branch_b.get_parent())
264
253
        # test merge for failure without parent set
265
 
        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')
266
 
        self.assertEqual(out,
 
254
        os.chdir('branch_b')
 
255
        out = self.run_bzr('merge', retcode=3)
 
256
        self.assertEquals(out,
267
257
                ('','bzr: ERROR: No location specified or remembered\n'))
268
258
 
269
259
        # test uncommitted changes
270
 
        self.build_tree(['branch_b/d'])
 
260
        self.build_tree(['d'])
271
261
        tree_b.add('d')
272
262
        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],
273
 
                           'merge', working_dir='branch_b')
 
263
                           'merge')
274
264
 
275
265
        # merge should now pass and implicitly remember merge location
276
266
        tree_b.commit('commit d')
277
 
        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')
 
267
        out, err = self.run_bzr('merge ../branch_a')
278
268
 
279
269
        base = urlutils.local_path_from_url(branch_a.base)
280
270
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
281
 
        # re-open branch as external run_bzr modified it
282
 
        branch_b = branch_b.bzrdir.open_branch()
283
 
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
 
271
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
284
272
                          osutils.abspath(parent))
285
273
        # test implicit --remember when committing new file
286
 
        self.build_tree(['branch_b/e'])
 
274
        self.build_tree(['e'])
287
275
        tree_b.add('e')
288
276
        tree_b.commit('commit e')
289
 
        out, err = self.run_bzr('merge', working_dir='branch_b')
290
 
        self.assertStartsWith(
291
 
            err, 'Merging from remembered submit location %s\n' % (base,))
 
277
        out, err = self.run_bzr('merge')
 
278
        self.assertStartsWith(err,
 
279
                          'Merging from remembered submit location %s\n' % (base,))
292
280
        # re-open tree as external run_bzr modified it
293
281
        tree_b = branch_b.bzrdir.open_workingtree()
294
282
        tree_b.commit('merge branch_a')
295
283
        # test explicit --remember
296
 
        out, err = self.run_bzr('merge ../branch_c --remember',
297
 
                                working_dir='branch_b')
298
 
        self.assertEqual(out, '')
299
 
        self.assertEqual(err, '+N  c\nAll changes applied successfully.\n')
300
 
        # re-open branch as external run_bzr modified it
301
 
        branch_b = branch_b.bzrdir.open_branch()
302
 
        self.assertEqual(osutils.abspath(branch_b.get_submit_branch()),
 
284
        out, err = self.run_bzr('merge ../branch_c --remember')
 
285
        self.assertEquals(out, '')
 
286
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
 
287
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
303
288
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
304
289
        # re-open tree as external run_bzr modified it
305
290
        tree_b = branch_b.bzrdir.open_workingtree()
318
303
 
319
304
        self.build_tree_contents([('branch_b/a', 'goodbye')])
320
305
        tree_b.commit('message')
321
 
        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
322
 
        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
 
306
        os.chdir('branch_b')
 
307
        self.run_bzr('bundle ../branch_a -o ../bundle')
 
308
        os.chdir('../branch_a')
 
309
        self.run_bzr('merge ../bundle', retcode=1)
323
310
        testament_a = Testament.from_revision(tree_a.branch.repository,
324
311
                                              tree_b.get_parent_ids()[0])
325
312
        testament_b = Testament.from_revision(tree_b.branch.repository,
329
316
        tree_a.set_conflicts(conflicts.ConflictList())
330
317
        tree_a.commit('message')
331
318
        # it is legal to attempt to merge an already-merged bundle
332
 
        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]
 
319
        output = self.run_bzr('merge ../bundle')[1]
333
320
        # but it does nothing
334
321
        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())
335
 
        self.assertEqual('Nothing to do.\n', err)
 
322
        self.assertEqual('Nothing to do.\n', output)
336
323
 
337
324
    def test_merge_uncommitted(self):
338
325
        """Check that merge --uncommitted behaves properly"""
345
332
        tree_a.rename_one('file_1', 'file_i')
346
333
        tree_a.commit('commit 2')
347
334
        tree_a.rename_one('file_2', 'file_ii')
 
335
        ## os.chdir('b')
348
336
        self.run_bzr('merge a --uncommitted -d b')
349
337
        self.assertPathExists('b/file_1')
350
338
        self.assertPathExists('b/file_ii')
359
347
        tree_a.bzrdir.sprout('tree_b')
360
348
        self.build_tree(['tree_a/file1', 'tree_a/file2'])
361
349
        tree_a.add(['file1', 'file2'])
362
 
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'],
363
 
                     working_dir='tree_b')
364
 
        self.assertPathExists('tree_b/file1')
365
 
        self.assertPathDoesNotExist('tree_b/file2')
366
 
 
367
 
    def test_merge_nonexistent_file(self):
368
 
        """It should not be possible to merge changes from a file which
369
 
        does not exist."""
370
 
        tree_a = self.make_branch_and_tree('tree_a')
371
 
        self.build_tree_contents([('tree_a/file', 'bar\n')])
372
 
        tree_a.add(['file'])
373
 
        tree_a.commit('commit 1')
374
 
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
375
 
                           ['merge', 'non/existing'], working_dir='tree_a')
 
350
        os.chdir('tree_b')
 
351
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
 
352
        self.assertPathExists('file1')
 
353
        self.assertPathDoesNotExist('file2')
376
354
 
377
355
    def pullable_branch(self):
378
356
        tree_a = self.make_branch_and_tree('a')
387
365
 
388
366
    def test_merge_pull(self):
389
367
        self.pullable_branch()
390
 
        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')
 
368
        os.chdir('a')
 
369
        (out, err) = self.run_bzr('merge --pull ../b')
391
370
        self.assertContainsRe(out, 'Now on revision 2\\.')
392
 
        tree_a = workingtree.WorkingTree.open('a')
 
371
        tree_a = workingtree.WorkingTree.open('.')
393
372
        self.assertEqual([self.id2], tree_a.get_parent_ids())
394
373
 
395
374
    def test_merge_pull_preview(self):
416
395
        os.unlink('tree_a/file')
417
396
        self.build_tree(['tree_a/file/'])
418
397
        tree_a.commit('changed file to directory')
419
 
        self.run_bzr('merge ../tree_a', working_dir='tree_b')
420
 
        self.assertEqual('directory', osutils.file_kind('tree_b/file'))
 
398
        os.chdir('tree_b')
 
399
        self.run_bzr('merge ../tree_a')
 
400
        self.assertEqual('directory', osutils.file_kind('file'))
421
401
        tree_b.revert()
422
 
        self.assertEqual('file', osutils.file_kind('tree_b/file'))
423
 
        self.build_tree_contents([('tree_b/file', 'content_2')])
 
402
        self.assertEqual('file', osutils.file_kind('file'))
 
403
        self.build_tree_contents([('file', 'content_2')])
424
404
        tree_b.commit('content change')
425
 
        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
 
405
        self.run_bzr('merge ../tree_a', retcode=1)
426
406
        self.assertEqual(tree_b.conflicts(),
427
407
                         [conflicts.ContentsConflict('file',
428
408
                                                     file_id='file-id')])
553
533
 
554
534
    def test_merge_from_submit(self):
555
535
        tree_a = self.make_branch_and_tree('a')
556
 
        tree_a.commit('test')
557
536
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
558
537
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
559
538
        out, err = self.run_bzr(['merge', '-d', 'c'])
560
 
        self.assertContainsRe(err,
561
 
                              'Merging from remembered parent location .*a\/')
562
 
        tree_c.branch.lock_write()
563
 
        try:
564
 
            tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
565
 
        finally:
566
 
            tree_c.branch.unlock()
 
539
        self.assertContainsRe(err, 'Merging from remembered parent location .*a\/')
 
540
        tree_c.branch.set_submit_branch(tree_b.bzrdir.root_transport.base)
567
541
        out, err = self.run_bzr(['merge', '-d', 'c'])
568
 
        self.assertContainsRe(err,
569
 
                              'Merging from remembered submit location .*b\/')
 
542
        self.assertContainsRe(err, 'Merging from remembered submit location .*b\/')
570
543
 
571
544
    def test_remember_sets_submit(self):
572
545
        tree_a = self.make_branch_and_tree('a')
573
 
        tree_a.commit('rev1')
574
546
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
575
547
        self.assertIs(tree_b.branch.get_submit_branch(), None)
576
548
 
577
549
        # Remember should not happen if using default from parent
578
550
        out, err = self.run_bzr(['merge', '-d', 'b'])
579
 
        refreshed = workingtree.WorkingTree.open('b')
580
 
        self.assertIs(refreshed.branch.get_submit_branch(), None)
 
551
        self.assertIs(tree_b.branch.get_submit_branch(), None)
581
552
 
582
553
        # Remember should happen if user supplies location
583
554
        out, err = self.run_bzr(['merge', '-d', 'b', 'a'])
584
 
        refreshed = workingtree.WorkingTree.open('b')
585
 
        self.assertEqual(refreshed.branch.get_submit_branch(),
 
555
        self.assertEqual(tree_b.branch.get_submit_branch(),
586
556
                         tree_a.bzrdir.root_transport.base)
587
557
 
588
 
    def test_no_remember_dont_set_submit(self):
589
 
        tree_a = self.make_branch_and_tree('a')
590
 
        self.build_tree_contents([('a/file', "a\n")])
591
 
        tree_a.add('file')
592
 
        tree_a.commit('rev1')
593
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
594
 
        self.assertIs(tree_b.branch.get_submit_branch(), None)
595
 
 
596
 
        # Remember should not happen if using default from parent
597
 
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
598
 
        self.assertEqual(None, tree_b.branch.get_submit_branch())
599
 
 
600
 
        # Remember should not happen if user supplies location but ask for not
601
 
        # remembering it
602
 
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
603
 
        self.assertEqual(None, tree_b.branch.get_submit_branch())
604
 
 
605
558
    def test_weave_cherrypick(self):
606
559
        this_tree = self.make_branch_and_tree('this')
607
560
        self.build_tree_contents([('this/file', "a\n")])
671
624
 
672
625
    def test_merge_interactive_unlocks_branch(self):
673
626
        this = self.make_branch_and_tree('this')
674
 
        this.commit('empty commit')
675
 
        other = this.bzrdir.sprout('other').open_workingtree()
676
 
        other.commit('empty commit 2')
 
627
        other = self.make_branch_and_tree('other')
 
628
        other.commit('empty commit')
677
629
        self.run_bzr('merge -i -d this other')
678
630
        this.lock_write()
679
631
        this.unlock()
680
632
 
 
633
    def test_merge_reversed_revision_range(self):
 
634
        tree = self.make_branch_and_tree(".")
 
635
        for f in ("a", "b"):
 
636
            self.build_tree([f])
 
637
            tree.add(f)
 
638
            tree.commit("added "+f)
 
639
        for context in (".", "", "a"):
 
640
            self.run_bzr("merge -r 1..0 " + context)
 
641
            self.assertPathDoesNotExist("a")
 
642
            tree.revert()
 
643
            self.assertPathExists("a")
 
644
 
681
645
    def test_merge_fetches_tags(self):
682
646
        """Tags are updated by merge, and revisions named in those tags are
683
647
        fetched.
691
655
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
692
656
        source.tags.set_tag('tag-a', 'rev-2a')
693
657
        source.set_last_revision_info(1, 'rev-1')
694
 
        source.get_config_stack().set('branch.fetch_tags', True)
695
658
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
696
659
        # Merge from source
697
660
        self.run_bzr('merge -d target source')
701
664
        target.repository.get_revision('rev-2a')
702
665
 
703
666
 
704
 
class TestMergeRevisionRange(tests.TestCaseWithTransport):
705
 
 
706
 
    scenarios = (('whole-tree', dict(context='.')),
707
 
                 ('file-only', dict(context='a')))
708
 
 
709
 
    def setUp(self):
710
 
        super(TestMergeRevisionRange, self).setUp()
711
 
        self.tree = self.make_branch_and_tree(".")
712
 
        self.tree.commit('initial commit')
713
 
        for f in ("a", "b"):
714
 
            self.build_tree([f])
715
 
            self.tree.add(f)
716
 
            self.tree.commit("added " + f)
717
 
 
718
 
    def test_merge_reversed_revision_range(self):
719
 
        self.run_bzr("merge -r 2..1 " + self.context)
720
 
        self.assertPathDoesNotExist("a")
721
 
        self.assertPathExists("b")
722
 
 
723
 
 
724
 
class TestMergeScript(script.TestCaseWithTransportAndScript):
725
 
    def test_merge_empty_branch(self):
726
 
        source = self.make_branch_and_tree('source')
727
 
        self.build_tree(['source/a'])
728
 
        source.add('a')
729
 
        source.commit('Added a', rev_id='rev1')
730
 
        target = self.make_branch_and_tree('target')
731
 
        self.run_script("""\
732
 
$ bzr merge -d target source
733
 
2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
734
 
""")
735
 
 
736
667
class TestMergeForce(tests.TestCaseWithTransport):
737
668
 
738
669
    def setUp(self):