← 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-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

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