← 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: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
19
19
"""Black-box tests for bzr merge.
20
20
"""
21
21
 
 
22
import doctest
22
23
import os
23
24
 
24
 
from bzrlib import merge_directive
25
 
from bzrlib.branch import Branch
26
 
from bzrlib.bzrdir import BzrDir
27
 
from bzrlib.conflicts import ConflictList, ContentsConflict
28
 
from bzrlib.osutils import abspath, file_kind, pathjoin
29
 
from bzrlib.tests.blackbox import ExternalBase
30
 
import bzrlib.urlutils as urlutils
31
 
from bzrlib.workingtree import WorkingTree
32
 
 
33
 
 
34
 
class TestMerge(ExternalBase):
 
25
from testtools import matchers
 
26
 
 
27
from bzrlib import (
 
28
    branch,
 
29
    bzrdir,
 
30
    conflicts,
 
31
    merge_directive,
 
32
    osutils,
 
33
    tests,
 
34
    urlutils,
 
35
    workingtree,
 
36
    )
 
37
from bzrlib.tests import (
 
38
    scenarios,
 
39
    script,
 
40
    )
 
41
 
 
42
 
 
43
load_tests = scenarios.load_tests_apply_scenarios
 
44
 
 
45
 
 
46
class TestMerge(tests.TestCaseWithTransport):
35
47
 
36
48
    def example_branch(self, path='.'):
37
49
        tree = self.make_branch_and_tree(path)
38
50
        self.build_tree_contents([
39
 
            (pathjoin(path, 'hello'), 'foo'),
40
 
            (pathjoin(path, 'goodbye'), 'baz')])
 
51
            (osutils.pathjoin(path, 'hello'), 'foo'),
 
52
            (osutils.pathjoin(path, 'goodbye'), 'baz')])
41
53
        tree.add('hello')
42
54
        tree.commit(message='setup')
43
55
        tree.add('goodbye')
63
75
        return tree, other
64
76
 
65
77
    def test_merge_reprocess(self):
66
 
        d = BzrDir.create_standalone_workingtree('.')
 
78
        d = bzrdir.BzrDir.create_standalone_workingtree('.')
67
79
        d.commit('h')
68
80
        self.run_bzr('merge . --reprocess --merge-type weave')
69
81
 
70
82
    def test_merge(self):
71
 
        from bzrlib.branch import Branch
72
 
 
73
83
        a_tree = self.example_branch('a')
74
84
        ancestor = a_tree.branch.revno()
75
85
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
80
90
        # We can't merge when there are in-tree changes
81
91
        os.chdir('a')
82
92
        self.run_bzr('merge ../b', retcode=3)
83
 
        a = WorkingTree.open('.')
 
93
        a = workingtree.WorkingTree.open('.')
84
94
        a_tip = a.commit("Like an epidemic of u's")
85
95
        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',
86
96
                    retcode=3)
99
109
        self.run_bzr('merge ../b -r last:1')
100
110
        self.check_file_contents('goodbye', 'quux')
101
111
        # Merging a branch pulls its revision into the tree
102
 
        b = Branch.open('../b')
 
112
        b = branch.Branch.open('../b')
103
113
        b_tip = b.last_revision()
104
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
114
        self.assertTrue(a.branch.repository.has_revision(b_tip))
105
115
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
106
116
        a_tree.revert(backups=False)
107
117
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
203
213
        b_tree.commit(message='Modified a.txt')
204
214
        os.chdir('b')
205
215
        self.run_bzr('merge ../a/', retcode=1)
206
 
        self.failUnlessExists('sub/a.txt.THIS')
207
 
        self.failUnlessExists('sub/a.txt.BASE')
 
216
        self.assertPathExists('sub/a.txt.THIS')
 
217
        self.assertPathExists('sub/a.txt.BASE')
208
218
        os.chdir('../a')
209
219
        self.run_bzr('merge ../b/', retcode=1)
210
 
        self.failUnlessExists('sub/a.txt.OTHER')
211
 
        self.failUnlessExists('sub/a.txt.BASE')
 
220
        self.assertPathExists('sub/a.txt.OTHER')
 
221
        self.assertPathExists('sub/a.txt.BASE')
 
222
 
 
223
    def test_conflict_leaves_base_this_other_files(self):
 
224
        tree, other = self.create_conflicting_branches()
 
225
        self.run_bzr('merge ../other', working_dir='tree',
 
226
                     retcode=1)
 
227
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
 
228
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
 
229
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
 
230
 
 
231
    def test_weave_conflict_leaves_base_this_other_files(self):
 
232
        tree, other = self.create_conflicting_branches()
 
233
        self.run_bzr('merge ../other --weave', working_dir='tree',
 
234
                     retcode=1)
 
235
        self.assertFileEqual('a\nb\nc\n', 'tree/fname.BASE')
 
236
        self.assertFileEqual('a\nB\nD\n', 'tree/fname.OTHER')
 
237
        self.assertFileEqual('a\nB\nC\n', 'tree/fname.THIS')
212
238
 
213
239
    def test_merge_remember(self):
214
240
        """Merge changes from one branch to another, test submit location."""
249
275
 
250
276
        base = urlutils.local_path_from_url(branch_a.base)
251
277
        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')
252
 
        self.assertEquals(abspath(branch_b.get_submit_branch()),
253
 
                          abspath(parent))
 
278
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
 
279
                          osutils.abspath(parent))
254
280
        # test implicit --remember when committing new file
255
281
        self.build_tree(['e'])
256
282
        tree_b.add('e')
265
291
        out, err = self.run_bzr('merge ../branch_c --remember')
266
292
        self.assertEquals(out, '')
267
293
        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')
268
 
        self.assertEquals(abspath(branch_b.get_submit_branch()),
269
 
                          abspath(branch_c.bzrdir.root_transport.base))
 
294
        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),
 
295
                          osutils.abspath(branch_c.bzrdir.root_transport.base))
270
296
        # re-open tree as external run_bzr modified it
271
297
        tree_b = branch_b.bzrdir.open_workingtree()
272
298
        tree_b.commit('merge branch_c')
294
320
                                              tree_b.get_parent_ids()[0])
295
321
        self.assertEqualDiff(testament_a.as_text(),
296
322
                         testament_b.as_text())
297
 
        tree_a.set_conflicts(ConflictList())
 
323
        tree_a.set_conflicts(conflicts.ConflictList())
298
324
        tree_a.commit('message')
299
325
        # it is legal to attempt to merge an already-merged bundle
300
326
        output = self.run_bzr('merge ../bundle')[1]
309
335
        tree_a.add(['file_1', 'file_2'])
310
336
        tree_a.commit('commit 1')
311
337
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
312
 
        self.failUnlessExists('b/file_1')
 
338
        self.assertPathExists('b/file_1')
313
339
        tree_a.rename_one('file_1', 'file_i')
314
340
        tree_a.commit('commit 2')
315
341
        tree_a.rename_one('file_2', 'file_ii')
316
342
        ## os.chdir('b')
317
343
        self.run_bzr('merge a --uncommitted -d b')
318
 
        self.failUnlessExists('b/file_1')
319
 
        self.failUnlessExists('b/file_ii')
 
344
        self.assertPathExists('b/file_1')
 
345
        self.assertPathExists('b/file_ii')
320
346
        tree_b.revert()
321
347
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
322
348
                           'merge /a --uncommitted -r1 -d b')
330
356
        tree_a.add(['file1', 'file2'])
331
357
        os.chdir('tree_b')
332
358
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
333
 
        self.failUnlessExists('file1')
334
 
        self.failIfExists('file2')
 
359
        self.assertPathExists('file1')
 
360
        self.assertPathDoesNotExist('file2')
 
361
 
 
362
    def test_merge_nonexistent_file(self):
 
363
        """It should not be possible to merge changes from a file which
 
364
        does not exist."""
 
365
        tree_a = self.make_branch_and_tree('tree_a')
 
366
        self.build_tree_contents([('tree_a/file', 'bar\n')])
 
367
        tree_a.add(['file'])
 
368
        tree_a.commit('commit 1')
 
369
        os.chdir('tree_a')
 
370
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
 
371
                           ['merge', 'non/existing'])
335
372
 
336
373
    def pullable_branch(self):
337
374
        tree_a = self.make_branch_and_tree('a')
338
 
        self.build_tree(['a/file'])
 
375
        self.build_tree_contents([('a/file', 'bar\n')])
339
376
        tree_a.add(['file'])
340
377
        self.id1 = tree_a.commit('commit 1')
341
378
 
342
379
        tree_b = self.make_branch_and_tree('b')
343
380
        tree_b.pull(tree_a.branch)
344
 
        file('b/file', 'wb').write('foo')
 
381
        self.build_tree_contents([('b/file', 'foo\n')])
345
382
        self.id2 = tree_b.commit('commit 2')
346
383
 
347
384
    def test_merge_pull(self):
349
386
        os.chdir('a')
350
387
        (out, err) = self.run_bzr('merge --pull ../b')
351
388
        self.assertContainsRe(out, 'Now on revision 2\\.')
352
 
        tree_a = WorkingTree.open('.')
 
389
        tree_a = workingtree.WorkingTree.open('.')
353
390
        self.assertEqual([self.id2], tree_a.get_parent_ids())
354
391
 
 
392
    def test_merge_pull_preview(self):
 
393
        self.pullable_branch()
 
394
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
 
395
        self.assertThat(out, matchers.DocTestMatches(
 
396
"""=== modified file 'file'
 
397
--- file\t...
 
398
+++ file\t...
 
399
@@ -1,1 +1,1 @@
 
400
-bar
 
401
+foo
 
402
 
 
403
""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))
 
404
        tree_a = workingtree.WorkingTree.open('a')
 
405
        self.assertEqual([self.id1], tree_a.get_parent_ids())
 
406
 
355
407
    def test_merge_kind_change(self):
356
408
        tree_a = self.make_branch_and_tree('tree_a')
357
409
        self.build_tree_contents([('tree_a/file', 'content_1')])
363
415
        tree_a.commit('changed file to directory')
364
416
        os.chdir('tree_b')
365
417
        self.run_bzr('merge ../tree_a')
366
 
        self.assertEqual('directory', file_kind('file'))
 
418
        self.assertEqual('directory', osutils.file_kind('file'))
367
419
        tree_b.revert()
368
 
        self.assertEqual('file', file_kind('file'))
 
420
        self.assertEqual('file', osutils.file_kind('file'))
369
421
        self.build_tree_contents([('file', 'content_2')])
370
422
        tree_b.commit('content change')
371
423
        self.run_bzr('merge ../tree_a', retcode=1)
372
424
        self.assertEqual(tree_b.conflicts(),
373
 
                         [ContentsConflict('file', file_id='file-id')])
 
425
                         [conflicts.ContentsConflict('file',
 
426
                                                     file_id='file-id')])
374
427
 
375
428
    def test_directive_cherrypick(self):
376
429
        source = self.make_branch_and_tree('source')
 
430
        source.commit("nothing")
 
431
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
 
432
        # cherrypick from one branch into another unrelated branch with a
 
433
        # different root id will give shape conflicts.  as a workaround we
 
434
        # make sure they share the same root id.
 
435
        target = source.bzrdir.sprout('target').open_workingtree()
377
436
        self.build_tree(['source/a'])
378
437
        source.add('a')
379
438
        source.commit('Added a', rev_id='rev1')
380
439
        self.build_tree(['source/b'])
381
440
        source.add('b')
382
441
        source.commit('Added b', rev_id='rev2')
383
 
        target = self.make_branch_and_tree('target')
384
442
        target.commit('empty commit')
385
443
        self.write_directive('directive', source.branch, 'target', 'rev2',
386
444
                             'rev1')
387
445
        out, err = self.run_bzr('merge -d target directive')
388
 
        self.failIfExists('target/a')
389
 
        self.failUnlessExists('target/b')
 
446
        self.assertPathDoesNotExist('target/a')
 
447
        self.assertPathExists('target/b')
390
448
        self.assertContainsRe(err, 'Performing cherrypick')
391
449
 
392
450
    def write_directive(self, filename, source, target, revision_id,
427
485
        branch_b.add('file2')
428
486
        branch_b.commit('added file2', rev_id='rev2b')
429
487
        branch_b.merge_from_branch(branch_a.branch)
430
 
        self.failUnlessExists('branch_b/file1')
 
488
        self.assertPathExists('branch_b/file1')
431
489
        branch_b.commit('merged branch_a', rev_id='rev3b')
432
490
 
433
491
        # It works if the revid has an interger revno
434
492
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
435
 
        self.failUnlessExists('target/file1')
436
 
        self.failIfExists('target/file2')
 
493
        self.assertPathExists('target/file1')
 
494
        self.assertPathDoesNotExist('target/file2')
437
495
        target.revert()
438
496
 
439
497
        # It should work if the revid has no integer revno
440
498
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
441
 
        self.failUnlessExists('target/file1')
442
 
        self.failIfExists('target/file2')
 
499
        self.assertPathExists('target/file1')
 
500
        self.assertPathDoesNotExist('target/file2')
443
501
 
444
502
    def assertDirectoryContent(self, directory, entries, message=''):
445
503
        """Assert whether entries (file or directories) exist in a directory.
491
549
        out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
492
550
        self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
493
551
 
494
 
    def test_merge_force(self):
495
 
        tree_a = self.make_branch_and_tree('a')
496
 
        self.build_tree(['a/foo'])
497
 
        tree_a.add(['foo'])
498
 
        tree_a.commit('add file')
499
 
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
500
 
        self.build_tree_contents([('a/foo', 'change 1')])
501
 
        tree_a.commit('change file')
502
 
        tree_b.merge_from_branch(tree_a.branch)
503
 
        tree_a.commit('empty change to allow merge to run')
504
 
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
505
 
 
506
552
    def test_merge_from_submit(self):
507
553
        tree_a = self.make_branch_and_tree('a')
 
554
        tree_a.commit('test')
508
555
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
509
556
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
510
557
        out, err = self.run_bzr(['merge', '-d', 'c'])
515
562
 
516
563
    def test_remember_sets_submit(self):
517
564
        tree_a = self.make_branch_and_tree('a')
 
565
        tree_a.commit('rev1')
518
566
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
519
567
        self.assertIs(tree_b.branch.get_submit_branch(), None)
520
568
 
527
575
        self.assertEqual(tree_b.branch.get_submit_branch(),
528
576
                         tree_a.bzrdir.root_transport.base)
529
577
 
 
578
    def test_no_remember_dont_set_submit(self):
 
579
        tree_a = self.make_branch_and_tree('a')
 
580
        self.build_tree_contents([('a/file', "a\n")])
 
581
        tree_a.add('file')
 
582
        tree_a.commit('rev1')
 
583
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
584
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
585
 
 
586
        # Remember should not happen if using default from parent
 
587
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
 
588
        self.assertEquals(None, tree_b.branch.get_submit_branch())
 
589
 
 
590
        # Remember should not happen if user supplies location but ask for not
 
591
        # remembering it
 
592
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
 
593
        self.assertEqual(None, tree_b.branch.get_submit_branch())
 
594
 
530
595
    def test_weave_cherrypick(self):
531
596
        this_tree = self.make_branch_and_tree('this')
532
597
        self.build_tree_contents([('this/file', "a\n")])
555
620
        tree_a.merge_from_branch(tree_b.branch)
556
621
        self.build_tree_contents([('a/file',
557
622
                                   'base-contents\nthis-contents\n')])
558
 
        tree_a.set_conflicts(ConflictList())
 
623
        tree_a.set_conflicts(conflicts.ConflictList())
559
624
        tree_b.merge_from_branch(tree_a.branch)
560
625
        self.build_tree_contents([('b/file',
561
626
                                   'base-contents\nother-contents\n')])
562
 
        tree_b.set_conflicts(ConflictList())
 
627
        tree_b.set_conflicts(conflicts.ConflictList())
563
628
        tree_a.commit('', rev_id='rev3a')
564
629
        tree_b.commit('', rev_id='rev3b')
565
630
        out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
592
657
        other.add('other_file')
593
658
        other.commit('rev1b')
594
659
        self.run_bzr('merge -d this other -r0..')
595
 
        self.failUnlessExists('this/other_file')
 
660
        self.assertPathExists('this/other_file')
 
661
 
 
662
    def test_merge_interactive_unlocks_branch(self):
 
663
        this = self.make_branch_and_tree('this')
 
664
        this.commit('empty commit')
 
665
        other = this.bzrdir.sprout('other').open_workingtree()
 
666
        other.commit('empty commit 2')
 
667
        self.run_bzr('merge -i -d this other')
 
668
        this.lock_write()
 
669
        this.unlock()
 
670
 
 
671
    def test_merge_fetches_tags(self):
 
672
        """Tags are updated by merge, and revisions named in those tags are
 
673
        fetched.
 
674
        """
 
675
        # Make a source, sprout a target off it
 
676
        builder = self.make_branch_builder('source')
 
677
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
678
        source = builder.get_branch()
 
679
        target_bzrdir = source.bzrdir.sprout('target')
 
680
        # Add a non-ancestry tag to source
 
681
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
 
682
        source.tags.set_tag('tag-a', 'rev-2a')
 
683
        source.set_last_revision_info(1, 'rev-1')
 
684
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
685
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
686
        # Merge from source
 
687
        self.run_bzr('merge -d target source')
 
688
        target = target_bzrdir.open_branch()
 
689
        # The tag is present, and so is its revision.
 
690
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
 
691
        target.repository.get_revision('rev-2a')
 
692
 
 
693
 
 
694
class TestMergeRevisionRange(tests.TestCaseWithTransport):
 
695
 
 
696
    scenarios = (('whole-tree', dict(context='.')),
 
697
                 ('file-only', dict(context='a')))
 
698
 
 
699
    def setUp(self):
 
700
        super(TestMergeRevisionRange, self).setUp()
 
701
        self.tree = self.make_branch_and_tree(".")
 
702
        self.tree.commit('initial commit')
 
703
        for f in ("a", "b"):
 
704
            self.build_tree([f])
 
705
            self.tree.add(f)
 
706
            self.tree.commit("added " + f)
 
707
 
 
708
    def test_merge_reversed_revision_range(self):
 
709
        self.run_bzr("merge -r 2..1 " + self.context)
 
710
        self.assertPathDoesNotExist("a")
 
711
        self.assertPathExists("b")
 
712
 
 
713
 
 
714
class TestMergeScript(script.TestCaseWithTransportAndScript):
 
715
    def test_merge_empty_branch(self):
 
716
        source = self.make_branch_and_tree('source')
 
717
        self.build_tree(['source/a'])
 
718
        source.add('a')
 
719
        source.commit('Added a', rev_id='rev1')
 
720
        target = self.make_branch_and_tree('target')
 
721
        self.run_script("""\
 
722
$ bzr merge -d target source
 
723
2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
 
724
""")
 
725
 
 
726
class TestMergeForce(tests.TestCaseWithTransport):
 
727
 
 
728
    def setUp(self):
 
729
        super(TestMergeForce, self).setUp()
 
730
        self.tree_a = self.make_branch_and_tree('a')
 
731
        self.build_tree(['a/foo'])
 
732
        self.tree_a.add(['foo'])
 
733
        self.tree_a.commit('add file')
 
734
        self.tree_b = self.tree_a.bzrdir.sprout('b').open_workingtree()
 
735
        self.build_tree_contents([('a/foo', 'change 1')])
 
736
        self.tree_a.commit('change file')
 
737
        self.tree_b.merge_from_branch(self.tree_a.branch)
 
738
 
 
739
    def test_merge_force(self):
 
740
        self.tree_a.commit('empty change to allow merge to run')
 
741
        # Second merge on top of the uncommitted one
 
742
        self.run_bzr(['merge', '../a', '--force'], working_dir='b')
 
743
 
 
744
 
 
745
    def test_merge_with_uncommitted_changes(self):
 
746
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
747
                           ['merge', '../a'], working_dir='b')
 
748
 
 
749
    def test_merge_with_pending_merges(self):
 
750
        # Revert the changes keeping the pending merge
 
751
        self.run_bzr(['revert', 'b'])
 
752
        self.run_bzr_error(['Working tree .* has uncommitted changes'],
 
753
                           ['merge', '../a'], working_dir='b')