/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Martin von Gagern
  • Date: 2011-06-01 07:01:17 UTC
  • mto: This revision was merged to the branch mainline in revision 5963.
  • Revision ID: martin.vgagern@gmx.net-20110601070117-3b08kqy51062ep0y
https://launchpad.net/bugs/38655
Allow -s as shorthand for --log-format=short.

This is implemented by allowing a keyword argument named
short_value_switches for the RegistryOption initializer.  It maps long names
to short names.  The newly added short option affects the commands log and
missing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
1
 
# Copyright (C) 2006-2010 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
 
 
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,
32
34
    urlutils,
33
35
    workingtree,
34
36
    )
 
37
from bzrlib.tests import script
35
38
 
36
39
 
37
40
class TestMerge(tests.TestCaseWithTransport):
102
105
        # Merging a branch pulls its revision into the tree
103
106
        b = branch.Branch.open('../b')
104
107
        b_tip = b.last_revision()
105
 
        self.failUnless(a.branch.repository.has_revision(b_tip))
 
108
        self.assertTrue(a.branch.repository.has_revision(b_tip))
106
109
        self.assertEqual([a_tip, b_tip], a.get_parent_ids())
107
110
        a_tree.revert(backups=False)
108
111
        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)
204
207
        b_tree.commit(message='Modified a.txt')
205
208
        os.chdir('b')
206
209
        self.run_bzr('merge ../a/', retcode=1)
207
 
        self.failUnlessExists('sub/a.txt.THIS')
208
 
        self.failUnlessExists('sub/a.txt.BASE')
 
210
        self.assertPathExists('sub/a.txt.THIS')
 
211
        self.assertPathExists('sub/a.txt.BASE')
209
212
        os.chdir('../a')
210
213
        self.run_bzr('merge ../b/', retcode=1)
211
 
        self.failUnlessExists('sub/a.txt.OTHER')
212
 
        self.failUnlessExists('sub/a.txt.BASE')
 
214
        self.assertPathExists('sub/a.txt.OTHER')
 
215
        self.assertPathExists('sub/a.txt.BASE')
213
216
 
214
217
    def test_conflict_leaves_base_this_other_files(self):
215
218
        tree, other = self.create_conflicting_branches()
326
329
        tree_a.add(['file_1', 'file_2'])
327
330
        tree_a.commit('commit 1')
328
331
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
329
 
        self.failUnlessExists('b/file_1')
 
332
        self.assertPathExists('b/file_1')
330
333
        tree_a.rename_one('file_1', 'file_i')
331
334
        tree_a.commit('commit 2')
332
335
        tree_a.rename_one('file_2', 'file_ii')
333
336
        ## os.chdir('b')
334
337
        self.run_bzr('merge a --uncommitted -d b')
335
 
        self.failUnlessExists('b/file_1')
336
 
        self.failUnlessExists('b/file_ii')
 
338
        self.assertPathExists('b/file_1')
 
339
        self.assertPathExists('b/file_ii')
337
340
        tree_b.revert()
338
341
        self.run_bzr_error(('Cannot use --uncommitted and --revision',),
339
342
                           'merge /a --uncommitted -r1 -d b')
347
350
        tree_a.add(['file1', 'file2'])
348
351
        os.chdir('tree_b')
349
352
        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])
350
 
        self.failUnlessExists('file1')
351
 
        self.failIfExists('file2')
 
353
        self.assertPathExists('file1')
 
354
        self.assertPathDoesNotExist('file2')
 
355
 
 
356
    def test_merge_nonexistent_file(self):
 
357
        """It should not be possible to merge changes from a file which
 
358
        does not exist."""
 
359
        tree_a = self.make_branch_and_tree('tree_a')
 
360
        self.build_tree_contents([('tree_a/file', 'bar\n')])
 
361
        tree_a.add(['file'])
 
362
        tree_a.commit('commit 1')
 
363
        os.chdir('tree_a')
 
364
        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
 
365
                           ['merge', 'non/existing'])
352
366
 
353
367
    def pullable_branch(self):
354
368
        tree_a = self.make_branch_and_tree('a')
355
 
        self.build_tree(['a/file'])
 
369
        self.build_tree_contents([('a/file', 'bar\n')])
356
370
        tree_a.add(['file'])
357
371
        self.id1 = tree_a.commit('commit 1')
358
372
 
359
373
        tree_b = self.make_branch_and_tree('b')
360
374
        tree_b.pull(tree_a.branch)
361
 
        file('b/file', 'wb').write('foo')
 
375
        self.build_tree_contents([('b/file', 'foo\n')])
362
376
        self.id2 = tree_b.commit('commit 2')
363
377
 
364
378
    def test_merge_pull(self):
369
383
        tree_a = workingtree.WorkingTree.open('.')
370
384
        self.assertEqual([self.id2], tree_a.get_parent_ids())
371
385
 
 
386
    def test_merge_pull_preview(self):
 
387
        self.pullable_branch()
 
388
        (out, err) = self.run_bzr('merge --pull --preview -d a b')
 
389
        self.assertThat(out, matchers.DocTestMatches(
 
390
"""=== modified file 'file'
 
391
--- file\t...
 
392
+++ file\t...
 
393
@@ -1,1 +1,1 @@
 
394
-bar
 
395
+foo
 
396
 
 
397
""", doctest.ELLIPSIS | doctest.REPORT_UDIFF))
 
398
        tree_a = workingtree.WorkingTree.open('a')
 
399
        self.assertEqual([self.id1], tree_a.get_parent_ids())
 
400
 
372
401
    def test_merge_kind_change(self):
373
402
        tree_a = self.make_branch_and_tree('tree_a')
374
403
        self.build_tree_contents([('tree_a/file', 'content_1')])
393
422
    def test_directive_cherrypick(self):
394
423
        source = self.make_branch_and_tree('source')
395
424
        source.commit("nothing")
396
 
        # see https://bugs.edge.launchpad.net/bzr/+bug/409688 - trying to
 
425
        # see https://bugs.launchpad.net/bzr/+bug/409688 - trying to
397
426
        # cherrypick from one branch into another unrelated branch with a
398
427
        # different root id will give shape conflicts.  as a workaround we
399
428
        # make sure they share the same root id.
408
437
        self.write_directive('directive', source.branch, 'target', 'rev2',
409
438
                             'rev1')
410
439
        out, err = self.run_bzr('merge -d target directive')
411
 
        self.failIfExists('target/a')
412
 
        self.failUnlessExists('target/b')
 
440
        self.assertPathDoesNotExist('target/a')
 
441
        self.assertPathExists('target/b')
413
442
        self.assertContainsRe(err, 'Performing cherrypick')
414
443
 
415
444
    def write_directive(self, filename, source, target, revision_id,
450
479
        branch_b.add('file2')
451
480
        branch_b.commit('added file2', rev_id='rev2b')
452
481
        branch_b.merge_from_branch(branch_a.branch)
453
 
        self.failUnlessExists('branch_b/file1')
 
482
        self.assertPathExists('branch_b/file1')
454
483
        branch_b.commit('merged branch_a', rev_id='rev3b')
455
484
 
456
485
        # It works if the revid has an interger revno
457
486
        self.run_bzr('merge -d target -r revid:rev2a branch_a')
458
 
        self.failUnlessExists('target/file1')
459
 
        self.failIfExists('target/file2')
 
487
        self.assertPathExists('target/file1')
 
488
        self.assertPathDoesNotExist('target/file2')
460
489
        target.revert()
461
490
 
462
491
        # It should work if the revid has no integer revno
463
492
        self.run_bzr('merge -d target -r revid:rev2a branch_b')
464
 
        self.failUnlessExists('target/file1')
465
 
        self.failIfExists('target/file2')
 
493
        self.assertPathExists('target/file1')
 
494
        self.assertPathDoesNotExist('target/file2')
466
495
 
467
496
    def assertDirectoryContent(self, directory, entries, message=''):
468
497
        """Assert whether entries (file or directories) exist in a directory.
516
545
 
517
546
    def test_merge_from_submit(self):
518
547
        tree_a = self.make_branch_and_tree('a')
 
548
        tree_a.commit('test')
519
549
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
520
550
        tree_c = tree_a.bzrdir.sprout('c').open_workingtree()
521
551
        out, err = self.run_bzr(['merge', '-d', 'c'])
526
556
 
527
557
    def test_remember_sets_submit(self):
528
558
        tree_a = self.make_branch_and_tree('a')
 
559
        tree_a.commit('rev1')
529
560
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
530
561
        self.assertIs(tree_b.branch.get_submit_branch(), None)
531
562
 
538
569
        self.assertEqual(tree_b.branch.get_submit_branch(),
539
570
                         tree_a.bzrdir.root_transport.base)
540
571
 
 
572
    def test_no_remember_dont_set_submit(self):
 
573
        tree_a = self.make_branch_and_tree('a')
 
574
        self.build_tree_contents([('a/file', "a\n")])
 
575
        tree_a.add('file')
 
576
        tree_a.commit('rev1')
 
577
        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()
 
578
        self.assertIs(tree_b.branch.get_submit_branch(), None)
 
579
 
 
580
        # Remember should not happen if using default from parent
 
581
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])
 
582
        self.assertEquals(None, tree_b.branch.get_submit_branch())
 
583
 
 
584
        # Remember should not happen if user supplies location but ask for not
 
585
        # remembering it
 
586
        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])
 
587
        self.assertEqual(None, tree_b.branch.get_submit_branch())
 
588
 
541
589
    def test_weave_cherrypick(self):
542
590
        this_tree = self.make_branch_and_tree('this')
543
591
        self.build_tree_contents([('this/file', "a\n")])
603
651
        other.add('other_file')
604
652
        other.commit('rev1b')
605
653
        self.run_bzr('merge -d this other -r0..')
606
 
        self.failUnlessExists('this/other_file')
 
654
        self.assertPathExists('this/other_file')
607
655
 
608
656
    def test_merge_interactive_unlocks_branch(self):
609
657
        this = self.make_branch_and_tree('this')
610
 
        other = self.make_branch_and_tree('other')
611
 
        other.commit('empty commit')
 
658
        this.commit('empty commit')
 
659
        other = this.bzrdir.sprout('other').open_workingtree()
 
660
        other.commit('empty commit 2')
612
661
        self.run_bzr('merge -i -d this other')
613
662
        this.lock_write()
614
663
        this.unlock()
621
670
            tree.commit("added "+f)
622
671
        for context in (".", "", "a"):
623
672
            self.run_bzr("merge -r 1..0 " + context)
624
 
            self.failIfExists("a")
 
673
            self.assertPathDoesNotExist("a")
625
674
            tree.revert()
626
 
            self.failUnlessExists("a")
627
 
 
 
675
            self.assertPathExists("a")
 
676
 
 
677
    def test_merge_fetches_tags(self):
 
678
        """Tags are updated by merge, and revisions named in those tags are
 
679
        fetched.
 
680
        """
 
681
        # Make a source, sprout a target off it
 
682
        builder = self.make_branch_builder('source')
 
683
        builder.build_commit(message="Rev 1", rev_id='rev-1')
 
684
        source = builder.get_branch()
 
685
        target_bzrdir = source.bzrdir.sprout('target')
 
686
        # Add a non-ancestry tag to source
 
687
        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
 
688
        source.tags.set_tag('tag-a', 'rev-2a')
 
689
        source.set_last_revision_info(1, 'rev-1')
 
690
        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
 
691
        # Merge from source
 
692
        self.run_bzr('merge -d target source')
 
693
        target = target_bzrdir.open_branch()
 
694
        # The tag is present, and so is its revision.
 
695
        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
 
696
        target.repository.get_revision('rev-2a')
 
697
 
 
698
class TestMergeScript(script.TestCaseWithTransportAndScript):
 
699
    def test_merge_empty_branch(self):
 
700
        source = self.make_branch_and_tree('source')
 
701
        self.build_tree(['source/a'])
 
702
        source.add('a')
 
703
        source.commit('Added a', rev_id='rev1')
 
704
        target = self.make_branch_and_tree('target')
 
705
        self.run_script("""\
 
706
$ bzr merge -d target source
 
707
2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562
 
708
""")
628
709
 
629
710
class TestMergeForce(tests.TestCaseWithTransport):
630
711