← 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: Andrew Bennetts
  • Date: 2010-10-08 04:25:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5472.
  • Revision ID: andrew.bennetts@canonical.com-20101008042510-sg9vdhmnggilzxsk
Fix stray TAB in source.

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
23
22
import os
24
23
 
25
 
from testtools import matchers
26
 
 
27
24
from bzrlib import (
28
25
    branch,
29
26
    bzrdir,
30
27
    conflicts,
 
28
    errors,
31
29
    merge_directive,
32
30
    osutils,
33
31
    tests,
104
102
        # Merging a branch pulls its revision into the tree
105
103
        b = branch.Branch.open('../b')
106
104
        b_tip = b.last_revision()
107
 
        self.assertTrue(a.branch.repository.has_revision(b_tip))
 
105
        self.failUnless(a.branch.repository.has_revision(b_tip))
108
106
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
109
107
        a_tree.revert(backups=False)
110
108
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
206
204
        b_tree.commit(message='Modified a.txt')
207
205
        os.chdir('b')
208
206
        self.run_bzr('merge ../a/', retcode=1)
209
 
        self.assertPathExists('sub/a.txt.THIS')
210
 
        self.assertPathExists('sub/a.txt.BASE')
 
207
        self.failUnlessExists('sub/a.txt.THIS')
 
208
        self.failUnlessExists('sub/a.txt.BASE')
211
209
        os.chdir('../a')
212
210
        self.run_bzr('merge ../b/', retcode=1)
213
 
        self.assertPathExists('sub/a.txt.OTHER')
214
 
        self.assertPathExists('sub/a.txt.BASE')
 
211
        self.failUnlessExists('sub/a.txt.OTHER')
 
212
        self.failUnlessExists('sub/a.txt.BASE')
215
213
 
216
214
    def test_conflict_leaves_base_this_other_files(self):
217
215
        tree, other = self.create_conflicting_branches()
328
326
        tree_a.add(['file_1', 'file_2'])
329
327
        tree_a.commit('commit 1')
330
328
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
331
 
        self.assertPathExists('b/file_1')
 
329
        self.failUnlessExists('b/file_1')
332
330
        tree_a.rename_one('file_1', 'file_i')
333
331
        tree_a.commit('commit 2')
334
332
        tree_a.rename_one('file_2', 'file_ii')
335
333
        ## os.chdir('b')
336
334
        self.run_bzr('merge a --uncommitted -d b')
337
 
        self.assertPathExists('b/file_1')
338
 
        self.assertPathExists('b/file_ii')
 
335
        self.failUnlessExists('b/file_1')
 
336
        self.failUnlessExists('b/file_ii')
339
337
        tree_b.revert()
340
338
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
341
339
                           'merge /a --uncommitted -r1 -d b')
349
347
        tree_a.add(['file1', 'file2'])
350
348
        os.chdir('tree_b')
351
349
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
352
 
        self.assertPathExists('file1')
353
 
        self.assertPathDoesNotExist('file2')
 
350
        self.failUnlessExists('file1')
 
351
        self.failIfExists('file2')
354
352
 
355
353
    def pullable_branch(self):
356
354
        tree_a = self.make_branch_and_tree('a')
357
 
        self.build_tree_contents([('a/file', 'bar\n')])
 
355
        self.build_tree(['a/file'])
358
356
        tree_a.add(['file'])
359
357
        self.id1 = tree_a.commit('commit 1')
360
358
 
361
359
        tree_b = self.make_branch_and_tree('b')
362
360
        tree_b.pull(tree_a.branch)
363
 
        self.build_tree_contents([('b/file', 'foo\n')])
 
361
        file('b/file', 'wb').write('foo')
364
362
        self.id2 = tree_b.commit('commit 2')
365
363
 
366
364
    def test_merge_pull(self):
371
369
        tree_a = workingtree.WorkingTree.open('.')
372
370
        self.assertEqual([self.id2], tree_a.get_parent_ids())
373
371
 
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
 
 
389
372
    def test_merge_kind_change(self):
390
373
        tree_a = self.make_branch_and_tree('tree_a')
391
374
        self.build_tree_contents([('tree_a/file', 'content_1')])
425
408
        self.write_directive('directive', source.branch, 'target', 'rev2',
426
409
                             'rev1')
427
410
        out, err = self.run_bzr('merge -d target directive')
428
 
        self.assertPathDoesNotExist('target/a')
429
 
        self.assertPathExists('target/b')
 
411
        self.failIfExists('target/a')
 
412
        self.failUnlessExists('target/b')
430
413
        self.assertContainsRe(err, 'Performing cherrypick')
431
414
 
432
415
    def write_directive(self, filename, source, target, revision_id,
467
450
        branch_b.add('file2')
468
451
        branch_b.commit('added file2', rev_id='rev2b')
469
452
        branch_b.merge_from_branch(branch_a.branch)
470
 
        self.assertPathExists('branch_b/file1')
 
453
        self.failUnlessExists('branch_b/file1')
471
454
        branch_b.commit('merged branch_a', rev_id='rev3b')
472
455
 
473
456
        # It works if the revid has an interger revno
474
457
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
475
 
        self.assertPathExists('target/file1')
476
 
        self.assertPathDoesNotExist('target/file2')
 
458
        self.failUnlessExists('target/file1')
 
459
        self.failIfExists('target/file2')
477
460
        target.revert()
478
461
 
479
462
        # It should work if the revid has no integer revno
480
463
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
481
 
        self.assertPathExists('target/file1')
482
 
        self.assertPathDoesNotExist('target/file2')
 
464
        self.failUnlessExists('target/file1')
 
465
        self.failIfExists('target/file2')
483
466
 
484
467
    def assertDirectoryContent(self, directory, entries, message=''):
485
468
        """Assert whether entries (file or directories) exist in a directory.
620
603
        other.add('other_file')
621
604
        other.commit('rev1b')
622
605
        self.run_bzr('merge -d this other -r0..')
623
 
        self.assertPathExists('this/other_file')
 
606
        self.failUnlessExists('this/other_file')
624
607
 
625
608
    def test_merge_interactive_unlocks_branch(self):
626
609
        this = self.make_branch_and_tree('this')
638
621
            tree.commit("added "+f)
639
622
        for context in (".", "", "a"):
640
623
            self.run_bzr("merge -r 1..0 " + context)
641
 
            self.assertPathDoesNotExist("a")
 
624
            self.failIfExists("a")
642
625
            tree.revert()
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')
 
626
            self.failUnlessExists("a")
665
627
 
666
628
 
667
629
class TestMergeForce(tests.TestCaseWithTransport):