← 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-29 11:07:14 UTC
  • mfrom: (5813.1.1 realname-can-be-empty)
  • Revision ID: pqm@pqm.ubuntu.com-20110429110714-wr9f71ea9600lvb6
(jelmer) Allow realname to be empty in tests. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
19
19
"""Black-box tests for bzr merge.
20
20
"""
21
21
 
 
22
import doctest
22
23
import os
23
24
 
 
25
from testtools import matchers
 
26
 
24
27
from bzrlib import (
25
28
    branch,
26
29
    bzrdir,
27
30
    conflicts,
28
 
    errors,
29
31
    merge_directive,
30
32
    osutils,
31
33
    tests,
102
104
        # Merging a branch pulls its revision into the tree
103
105
        b = branch.Branch.open('../b')
104
106
        b_tip = b.last_revision()
105
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
107
        self.assertTrue(a.branch.repository.has_revision(b_tip))
106
108
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
107
109
        a_tree.revert(backups=False)
108
110
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
204
206
        b_tree.commit(message='Modified a.txt')
205
207
        os.chdir('b')
206
208
        self.run_bzr('merge ../a/', retcode=1)
207
 
        self.failUnlessExists('sub/a.txt.THIS')
208
 
        self.failUnlessExists('sub/a.txt.BASE')
 
209
        self.assertPathExists('sub/a.txt.THIS')
 
210
        self.assertPathExists('sub/a.txt.BASE')
209
211
        os.chdir('../a')
210
212
        self.run_bzr('merge ../b/', retcode=1)
211
 
        self.failUnlessExists('sub/a.txt.OTHER')
212
 
        self.failUnlessExists('sub/a.txt.BASE')
 
213
        self.assertPathExists('sub/a.txt.OTHER')
 
214
        self.assertPathExists('sub/a.txt.BASE')
213
215
 
214
216
    def test_conflict_leaves_base_this_other_files(self):
215
217
        tree, other = self.create_conflicting_branches()
326
328
        tree_a.add(['file_1', 'file_2'])
327
329
        tree_a.commit('commit 1')
328
330
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
329
 
        self.failUnlessExists('b/file_1')
 
331
        self.assertPathExists('b/file_1')
330
332
        tree_a.rename_one('file_1', 'file_i')
331
333
        tree_a.commit('commit 2')
332
334
        tree_a.rename_one('file_2', 'file_ii')
333
335
        ## os.chdir('b')
334
336
        self.run_bzr('merge a --uncommitted -d b')
335
 
        self.failUnlessExists('b/file_1')
336
 
        self.failUnlessExists('b/file_ii')
 
337
        self.assertPathExists('b/file_1')
 
338
        self.assertPathExists('b/file_ii')
337
339
        tree_b.revert()
338
340
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
339
341
                           'merge /a --uncommitted -r1 -d b')
347
349
        tree_a.add(['file1', 'file2'])
348
350
        os.chdir('tree_b')
349
351
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
350
 
        self.failUnlessExists('file1')
351
 
        self.failIfExists('file2')
 
352
        self.assertPathExists('file1')
 
353
        self.assertPathDoesNotExist('file2')
352
354
 
353
355
    def pullable_branch(self):
354
356
        tree_a = self.make_branch_and_tree('a')
355
 
        self.build_tree(['a/file'])
 
357
        self.build_tree_contents([('a/file', 'bar\n')])
356
358
        tree_a.add(['file'])
357
359
        self.id1 = tree_a.commit('commit 1')
358
360
 
359
361
        tree_b = self.make_branch_and_tree('b')
360
362
        tree_b.pull(tree_a.branch)
361
 
        file('b/file', 'wb').write('foo')
 
363
        self.build_tree_contents([('b/file', 'foo\n')])
362
364
        self.id2 = tree_b.commit('commit 2')
363
365
 
364
366
    def test_merge_pull(self):
369
371
        tree_a = workingtree.WorkingTree.open('.')
370
372
        self.assertEqual([self.id2], tree_a.get_parent_ids())
371
373
 
 
374
    def test_merge_pull_preview(self):
 
375
        self.pullable_branch()
 
376
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
 
377
        self.assertThat(out, matchers.DocTestMatches(
 
378
"""=== modified file 'file'
 
379
--- file\t...
 
380
+++ file\t...
 
381
@@ -1,1 +1,1 @@
 
382
-bar
 
383
+foo
 
384
 
 
385
""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))
 
386
        tree_a = workingtree.WorkingTree.open('a')
 
387
        self.assertEqual([self.id1], tree_a.get_parent_ids())
 
388
 
372
389
    def test_merge_kind_change(self):
373
390
        tree_a = self.make_branch_and_tree('tree_a')
374
391
        self.build_tree_contents([('tree_a/file', 'content_1')])
408
425
        self.write_directive('directive', source.branch, 'target', 'rev2',
409
426
                             'rev1')
410
427
        out, err = self.run_bzr('merge -d target directive')
411
 
        self.failIfExists('target/a')
412
 
        self.failUnlessExists('target/b')
 
428
        self.assertPathDoesNotExist('target/a')
 
429
        self.assertPathExists('target/b')
413
430
        self.assertContainsRe(err, 'Performing cherrypick')
414
431
 
415
432
    def write_directive(self, filename, source, target, revision_id,
450
467
        branch_b.add('file2')
451
468
        branch_b.commit('added file2', rev_id='rev2b')
452
469
        branch_b.merge_from_branch(branch_a.branch)
453
 
        self.failUnlessExists('branch_b/file1')
 
470
        self.assertPathExists('branch_b/file1')
454
471
        branch_b.commit('merged branch_a', rev_id='rev3b')
455
472
 
456
473
        # It works if the revid has an interger revno
457
474
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
458
 
        self.failUnlessExists('target/file1')
459
 
        self.failIfExists('target/file2')
 
475
        self.assertPathExists('target/file1')
 
476
        self.assertPathDoesNotExist('target/file2')
460
477
        target.revert()
461
478
 
462
479
        # It should work if the revid has no integer revno
463
480
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
464
 
        self.failUnlessExists('target/file1')
465
 
        self.failIfExists('target/file2')
 
481
        self.assertPathExists('target/file1')
 
482
        self.assertPathDoesNotExist('target/file2')
466
483
 
467
484
    def assertDirectoryContent(self, directory, entries, message=''):
468
485
        """Assert whether entries (file or directories) exist in a directory.
603
620
        other.add('other_file')
604
621
        other.commit('rev1b')
605
622
        self.run_bzr('merge -d this other -r0..')
606
 
        self.failUnlessExists('this/other_file')
 
623
        self.assertPathExists('this/other_file')
607
624
 
608
625
    def test_merge_interactive_unlocks_branch(self):
609
626
        this = self.make_branch_and_tree('this')
621
638
            tree.commit("added "+f)
622
639
        for context in (".", "", "a"):
623
640
            self.run_bzr("merge -r 1..0 " + context)
624
 
            self.failIfExists("a")
 
641
            self.assertPathDoesNotExist("a")
625
642
            tree.revert()
626
 
            self.failUnlessExists("a")
 
643
            self.assertPathExists("a")
 
644
 
 
645
    def test_merge_fetches_tags(self):
 
646
        """Tags are updated by merge, and revisions named in those tags are
 
647
        fetched.
 
648
        """
 
649
        # Make a source, sprout a target off it
 
650
        builder = self.make_branch_builder('source')
 
651
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
652
        source = builder.get_branch()
 
653
        target_bzrdir = source.bzrdir.sprout('target')
 
654
        # Add a non-ancestry tag to source
 
655
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
 
656
        source.tags.set_tag('tag-a', 'rev-2a')
 
657
        source.set_last_revision_info(1, 'rev-1')
 
658
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
659
        # Merge from source
 
660
        self.run_bzr('merge -d target source')
 
661
        target = target_bzrdir.open_branch()
 
662
        # The tag is present, and so is its revision.
 
663
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
 
664
        target.repository.get_revision('rev-2a')
627
665
 
628
666
 
629
667
class TestMergeForce(tests.TestCaseWithTransport):