~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2006-2011 Canonical Ltd

from bzrlib.tests import (

    scenarios,

    script,

    )

 

 

load_tests = scenarios.load_tests_apply_scenarios

    def test_merge_nonexistent_file(self):

        """It should not be possible to merge changes from a file which

        does not exist."""

        tree_a = self.make_branch_and_tree('tree_a')

        self.build_tree_contents([('tree_a/file', 'bar\n')])

        tree_a.add(['file'])

        tree_a.commit('commit 1')

        os.chdir('tree_a')

        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),

                           ['merge', 'non/existing'])

 

        tree_a.commit('test')

        tree_a.commit('rev1')

    def test_no_remember_dont_set_submit(self):

        tree_a = self.make_branch_and_tree('a')

        self.build_tree_contents([('a/file', "a\n")])

        tree_a.add('file')

        tree_a.commit('rev1')

        tree_b = tree_a.bzrdir.sprout('b').open_workingtree()

        self.assertIs(tree_b.branch.get_submit_branch(), None)

 

        # Remember should not happen if using default from parent

        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember'])

        self.assertEquals(None, tree_b.branch.get_submit_branch())

 

        # Remember should not happen if user supplies location but ask for not

        # remembering it

        out, err = self.run_bzr(['merge', '-d', 'b', '--no-remember', 'a'])

        self.assertEqual(None, tree_b.branch.get_submit_branch())

 

        this.commit('empty commit')

        other = this.bzrdir.sprout('other').open_workingtree()

        other.commit('empty commit 2')

    def test_merge_fetches_tags(self):

        """Tags are updated by merge, and revisions named in those tags are

        fetched.

        """

        # Make a source, sprout a target off it

        builder = self.make_branch_builder('source')

        builder.build_commit(message="Rev 1", rev_id='rev-1')

        source = builder.get_branch()

        target_bzrdir = source.bzrdir.sprout('target')

        # Add a non-ancestry tag to source

        builder.build_commit(message="Rev 2a", rev_id='rev-2a')

        source.tags.set_tag('tag-a', 'rev-2a')

        source.set_last_revision_info(1, 'rev-1')

        builder.build_commit(message="Rev 2b", rev_id='rev-2b')

        # Merge from source

        self.run_bzr('merge -d target source')

        target = target_bzrdir.open_branch()

        # The tag is present, and so is its revision.

        self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))

        target.repository.get_revision('rev-2a')

 

 

class TestMergeRevisionRange(tests.TestCaseWithTransport):

 

    scenarios = (('whole-tree', dict(context='.')),

                 ('file-only', dict(context='a')))

 

    def setUp(self):

        super(TestMergeRevisionRange, self).setUp()

        self.tree = self.make_branch_and_tree(".")

        self.tree.commit('initial commit')

            self.tree.add(f)

            self.tree.commit("added " + f)

 

    def test_merge_reversed_revision_range(self):

        self.run_bzr("merge -r 2..1 " + self.context)

        self.assertPathDoesNotExist("a")

        self.assertPathExists("b")

 

 

class TestMergeScript(script.TestCaseWithTransportAndScript):

    def test_merge_empty_branch(self):

        source = self.make_branch_and_tree('source')

        self.build_tree(['source/a'])

        source.add('a')

        source.commit('Added a', rev_id='rev1')

        target = self.make_branch_and_tree('target')

        self.run_script("""\

$ bzr merge -d target source

2>bzr: ERROR: Merging into empty branches not currently supported, https://bugs.launchpad.net/bzr/+bug/308562

""")