← 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-04-18 04:55:00 UTC
  • mfrom: (5784.2.1 754188-apport-test)
  • Revision ID: pqm@pqm.ubuntu.com-20110418045500-ce6lkgyiq7f47q43
(mbp) Rewrite test_report_bug_legacy away from using doctest (see bug
 764188) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
25
25
    branch,
26
26
    bzrdir,
27
27
    conflicts,
28
 
    errors,
29
28
    merge_directive,
30
29
    osutils,
31
30
    tests,
102
101
        # Merging a branch pulls its revision into the tree
103
102
        b = branch.Branch.open('../b')
104
103
        b_tip = b.last_revision()
105
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
104
        self.assertTrue(a.branch.repository.has_revision(b_tip))
106
105
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
107
106
        a_tree.revert(backups=False)
108
107
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
204
203
        b_tree.commit(message='Modified a.txt')
205
204
        os.chdir('b')
206
205
        self.run_bzr('merge ../a/', retcode=1)
207
 
        self.failUnlessExists('sub/a.txt.THIS')
208
 
        self.failUnlessExists('sub/a.txt.BASE')
 
206
        self.assertPathExists('sub/a.txt.THIS')
 
207
        self.assertPathExists('sub/a.txt.BASE')
209
208
        os.chdir('../a')
210
209
        self.run_bzr('merge ../b/', retcode=1)
211
 
        self.failUnlessExists('sub/a.txt.OTHER')
212
 
        self.failUnlessExists('sub/a.txt.BASE')
 
210
        self.assertPathExists('sub/a.txt.OTHER')
 
211
        self.assertPathExists('sub/a.txt.BASE')
213
212
 
214
213
    def test_conflict_leaves_base_this_other_files(self):
215
214
        tree, other = self.create_conflicting_branches()
326
325
        tree_a.add(['file_1', 'file_2'])
327
326
        tree_a.commit('commit 1')
328
327
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
329
 
        self.failUnlessExists('b/file_1')
 
328
        self.assertPathExists('b/file_1')
330
329
        tree_a.rename_one('file_1', 'file_i')
331
330
        tree_a.commit('commit 2')
332
331
        tree_a.rename_one('file_2', 'file_ii')
333
332
        ## os.chdir('b')
334
333
        self.run_bzr('merge a --uncommitted -d b')
335
 
        self.failUnlessExists('b/file_1')
336
 
        self.failUnlessExists('b/file_ii')
 
334
        self.assertPathExists('b/file_1')
 
335
        self.assertPathExists('b/file_ii')
337
336
        tree_b.revert()
338
337
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
339
338
                           'merge /a --uncommitted -r1 -d b')
347
346
        tree_a.add(['file1', 'file2'])
348
347
        os.chdir('tree_b')
349
348
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
350
 
        self.failUnlessExists('file1')
351
 
        self.failIfExists('file2')
 
349
        self.assertPathExists('file1')
 
350
        self.assertPathDoesNotExist('file2')
352
351
 
353
352
    def pullable_branch(self):
354
353
        tree_a = self.make_branch_and_tree('a')
408
407
        self.write_directive('directive', source.branch, 'target', 'rev2',
409
408
                             'rev1')
410
409
        out, err = self.run_bzr('merge -d target directive')
411
 
        self.failIfExists('target/a')
412
 
        self.failUnlessExists('target/b')
 
410
        self.assertPathDoesNotExist('target/a')
 
411
        self.assertPathExists('target/b')
413
412
        self.assertContainsRe(err, 'Performing cherrypick')
414
413
 
415
414
    def write_directive(self, filename, source, target, revision_id,
450
449
        branch_b.add('file2')
451
450
        branch_b.commit('added file2', rev_id='rev2b')
452
451
        branch_b.merge_from_branch(branch_a.branch)
453
 
        self.failUnlessExists('branch_b/file1')
 
452
        self.assertPathExists('branch_b/file1')
454
453
        branch_b.commit('merged branch_a', rev_id='rev3b')
455
454
 
456
455
        # It works if the revid has an interger revno
457
456
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
458
 
        self.failUnlessExists('target/file1')
459
 
        self.failIfExists('target/file2')
 
457
        self.assertPathExists('target/file1')
 
458
        self.assertPathDoesNotExist('target/file2')
460
459
        target.revert()
461
460
 
462
461
        # It should work if the revid has no integer revno
463
462
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
464
 
        self.failUnlessExists('target/file1')
465
 
        self.failIfExists('target/file2')
 
463
        self.assertPathExists('target/file1')
 
464
        self.assertPathDoesNotExist('target/file2')
466
465
 
467
466
    def assertDirectoryContent(self, directory, entries, message=''):
468
467
        """Assert whether entries (file or directories) exist in a directory.
603
602
        other.add('other_file')
604
603
        other.commit('rev1b')
605
604
        self.run_bzr('merge -d this other -r0..')
606
 
        self.failUnlessExists('this/other_file')
 
605
        self.assertPathExists('this/other_file')
607
606
 
608
607
    def test_merge_interactive_unlocks_branch(self):
609
608
        this = self.make_branch_and_tree('this')
621
620
            tree.commit("added "+f)
622
621
        for context in (".", "", "a"):
623
622
            self.run_bzr("merge -r 1..0 " + context)
624
 
            self.failIfExists("a")
 
623
            self.assertPathDoesNotExist("a")
625
624
            tree.revert()
626
 
            self.failUnlessExists("a")
 
625
            self.assertPathExists("a")
 
626
 
 
627
    def test_merge_fetches_tags(self):
 
628
        """Tags are updated by merge, and revisions named in those tags are
 
629
        fetched.
 
630
        """
 
631
        # Make a source, sprout a target off it
 
632
        builder = self.make_branch_builder('source')
 
633
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
634
        source = builder.get_branch()
 
635
        target_bzrdir = source.bzrdir.sprout('target')
 
636
        # Add a non-ancestry tag to source
 
637
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
 
638
        source.tags.set_tag('tag-a', 'rev-2a')
 
639
        source.set_last_revision_info(1, 'rev-1')
 
640
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
641
        # Merge from source
 
642
        self.run_bzr('merge -d target source')
 
643
        target = target_bzrdir.open_branch()
 
644
        # The tag is present, and so is its revision.
 
645
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
 
646
        target.repository.get_revision('rev-2a')
627
647
 
628
648
 
629
649
class TestMergeForce(tests.TestCaseWithTransport):