~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2009, 2010 Canonical Ltd

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

"""Tests for branch.push behaviour."""

from cStringIO import StringIO

from testtools.matchers import (

    Equals,

    MatchesAny,

    )

from bzrlib import (

    branch,

    check,

    controldir,

    errors,

    push,

    symbol_versioning,

    tests,

    vf_repository,

    )

from bzrlib.branch import Branch

from bzrlib.controldir import ControlDir

from bzrlib.memorytree import MemoryTree

from bzrlib.revision import NULL_REVISION

from bzrlib.smart.repository import SmartServerRepositoryGetParentMap

from bzrlib.tests.per_interbranch import (

    TestCaseWithInterBranch,

    )

from bzrlib.tests import test_server

# These tests are based on similar tests in 

# bzrlib.tests.per_branch.test_push.

class TestPush(TestCaseWithInterBranch):

    def test_push_convergence_simple(self):

        # when revisions are pushed, the left-most accessible parents must

        # become the revision-history.

        mine = self.make_from_branch_and_tree('mine')

        mine.commit('1st post', rev_id='P1', allow_pointless=True)

        other = self.sprout_to(mine.bzrdir, 'other').open_workingtree()

        other.commit('my change', rev_id='M1', allow_pointless=True)

        mine.merge_from_branch(other.branch)

        mine.commit('merge my change', rev_id='P2')

        result = mine.branch.push(other.branch)

        self.assertEqual('P2', other.branch.last_revision())

        # result object contains some structured data

        self.assertEqual(result.old_revid, 'M1')

        self.assertEqual(result.new_revid, 'P2')

    def test_push_merged_indirect(self):

        # it should be possible to do a push from one branch into another

        # when the tip of the target was merged into the source branch

        # via a third branch - so its buried in the ancestry and is not

        # directly accessible.

        mine = self.make_from_branch_and_tree('mine')

        mine.commit('1st post', rev_id='P1', allow_pointless=True)

        target = self.sprout_to(mine.bzrdir, 'target').open_workingtree()

        target.commit('my change', rev_id='M1', allow_pointless=True)

        other = self.sprout_to(mine.bzrdir, 'other').open_workingtree()

        other.merge_from_branch(target.branch)

        other.commit('merge my change', rev_id='O2')

        mine.merge_from_branch(other.branch)

        mine.commit('merge other', rev_id='P2')

        mine.branch.push(target.branch)

        self.assertEqual('P2', target.branch.last_revision())

    def test_push_to_checkout_updates_master(self):

        """Pushing into a checkout updates the checkout and the master branch"""

        master_tree = self.make_to_branch_and_tree('master')

        checkout = self.make_to_branch_and_tree('checkout')

        try:

            checkout.branch.bind(master_tree.branch)

        except errors.UpgradeRequired:

            # cant bind this format, the test is irrelevant.

            return

        rev1 = checkout.commit('master')

        other_bzrdir = self.sprout_from(master_tree.branch.bzrdir, 'other')

        other = other_bzrdir.open_workingtree()

        rev2 = other.commit('other commit')

        # now push, which should update both checkout and master.

        other.branch.push(checkout.branch)

        self.assertEqual(rev2, checkout.branch.last_revision())

        self.assertEqual(rev2, master_tree.branch.last_revision())

    def test_push_raises_specific_error_on_master_connection_error(self):

        master_tree = self.make_to_branch_and_tree('master')

        checkout = self.make_to_branch_and_tree('checkout')

        try:

            checkout.branch.bind(master_tree.branch)

        except errors.UpgradeRequired:

            # cant bind this format, the test is irrelevant.

            return

        other_bzrdir = self.sprout_from(master_tree.branch.bzrdir, 'other')

        other = other_bzrdir.open_workingtree()

        # move the branch out of the way on disk to cause a connection

        # error.

        master_tree.bzrdir.destroy_branch()

        # try to push, which should raise a BoundBranchConnectionFailure.

        self.assertRaises(errors.BoundBranchConnectionFailure,

                other.branch.push, checkout.branch)

    def test_push_uses_read_lock(self):

        """Push should only need a read lock on the source side."""

        source = self.make_from_branch_and_tree('source')

        target = self.make_to_branch('target')

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

        source.add(['a'])

        source.commit('a')

        source.branch.lock_read()

        try:

            target.lock_write()

            try:

                source.branch.push(target, stop_revision=source.last_revision())

            finally:

                target.unlock()

        finally:

            source.branch.unlock()

    def test_push_within_repository(self):

        """Push from one branch to another inside the same repository."""

        try:

            repo = self.make_repository('repo', shared=True)

        except (errors.IncompatibleFormat, errors.UninitializableFormat):

            # This Branch format cannot create shared repositories

            return

        # This is a little bit trickier because make_from_branch_and_tree will not

        # re-use a shared repository.

        try:

            a_branch = self.make_from_branch('repo/tree')

        except (errors.UninitializableFormat):

            # Cannot create these branches

            return

        try:

            tree = a_branch.bzrdir.create_workingtree()

        except errors.UnsupportedOperation:

            self.assertFalse(a_branch.bzrdir._format.supports_workingtrees)

            tree = a_branch.create_checkout('repo/tree', lightweight=True)

        except errors.NotLocalUrl:

            if self.vfs_transport_factory is test_server.LocalURLServer:

                # the branch is colocated on disk, we cannot create a checkout.

                # hopefully callers will expect this.

                local_controldir = controldir.ControlDir.open(self.get_vfs_only_url('repo/tree'))

                tree = local_controldir.create_workingtree()

            else:

                tree = a_branch.create_checkout('repo/tree', lightweight=True)

        self.build_tree(['repo/tree/a'])

        tree.add(['a'])

        tree.commit('a')

        to_branch = self.make_to_branch('repo/branch')

        tree.branch.push(to_branch)

        self.assertEqual(tree.branch.last_revision(),

                         to_branch.last_revision())

    def test_push_overwrite_of_non_tip_with_stop_revision(self):

        """Combining the stop_revision and overwrite options works.

        This was <https://bugs.launchpad.net/bzr/+bug/234229>.

        """

        source = self.make_from_branch_and_tree('source')

        target = self.make_to_branch('target')

        source.commit('1st commit')

        source.branch.push(target)

        source.commit('2nd commit', rev_id='rev-2')

        source.commit('3rd commit')

        source.branch.push(target, stop_revision='rev-2', overwrite=True)

        self.assertEqual('rev-2', target.last_revision())

    def test_push_with_default_stacking_does_not_create_broken_branch(self):

        """Pushing a new standalone branch works even when there's a default

        stacking policy at the destination.

        The new branch will preserve the repo format (even if it isn't the

        default for the branch), and will be stacked when the repo format

        allows (which means that the branch format isn't necessarly preserved).

        """

        if isinstance(self.branch_format_from, branch.BranchReferenceFormat):

            # This test could in principle apply to BranchReferenceFormat, but

            # make_branch_builder doesn't support it.

            raise tests.TestSkipped(

                "BranchBuilder can't make reference branches.")

        # Make a branch called "local" in a stackable repository

        # The branch has 3 revisions:

        #   - rev-1, adds a file

        #   - rev-2, no changes

        #   - rev-3, modifies the file.

        repo = self.make_repository('repo', shared=True, format='1.6')

        builder = self.make_from_branch_builder('repo/local')

        builder.start_series()

        builder.build_snapshot('rev-1', None, [

            ('add', ('', 'root-id', 'directory', '')),

            ('add', ('filename', 'f-id', 'file', 'content\n'))])

        builder.build_snapshot('rev-2', ['rev-1'], [])

        builder.build_snapshot('rev-3', ['rev-2'],

            [('modify', ('f-id', 'new-content\n'))])

        builder.finish_series()

        trunk = builder.get_branch()

        # Sprout rev-1 to "trunk", so that we can stack on it.

        trunk.bzrdir.sprout(self.get_url('trunk'), revision_id='rev-1')

        # Set a default stacking policy so that new branches will automatically

        # stack on trunk.

        self.make_bzrdir('.').get_config().set_default_stack_on('trunk')

        # Push rev-2 to a new branch "remote".  It will be stacked on "trunk".

        output = StringIO()

        push._show_push_branch(trunk, 'rev-2', self.get_url('remote'), output)

        # Push rev-3 onto "remote".  If "remote" not stacked and is missing the

        # fulltext record for f-id @ rev-1, then this will fail.

        remote_branch = Branch.open(self.get_url('remote'))

        trunk.push(remote_branch)

        check.check_dwim(remote_branch.base, False, True, True)

    def test_no_get_parent_map_after_insert_stream(self):

        # Effort test for bug 331823

        self.setup_smart_server_with_call_log()

        # Make a local branch with four revisions.  Four revisions because:

        # one to push, one there for _walk_to_common_revisions to find, one we

        # don't want to access, one for luck :)

        if isinstance(self.branch_format_from, branch.BranchReferenceFormat):

            # This test could in principle apply to BranchReferenceFormat, but

            # make_branch_builder doesn't support it.

            raise tests.TestSkipped(

                "BranchBuilder can't make reference branches.")

        try:

            builder = self.make_from_branch_builder('local')

        except (errors.TransportNotPossible, errors.UninitializableFormat):

            raise tests.TestNotApplicable('format not directly constructable')

        builder.start_series()

        builder.build_snapshot('first', None, [

            ('add', ('', 'root-id', 'directory', ''))])

        builder.build_snapshot('second', ['first'], [])

        builder.build_snapshot('third', ['second'], [])

        builder.build_snapshot('fourth', ['third'], [])

        builder.finish_series()

        local = branch.Branch.open(self.get_vfs_only_url('local'))

        # Initial push of three revisions

        remote_bzrdir = local.bzrdir.sprout(

            self.get_url('remote'), revision_id='third')

        remote = remote_bzrdir.open_branch()

        # Push fourth revision

        self.reset_smart_call_log()

        self.disableOptimisticGetParentMap()

        self.assertFalse(local.is_locked())

        local.push(remote)

        hpss_call_names = [item.call.method for item in self.hpss_calls]

        self.assertTrue('Repository.insert_stream_1.19' in hpss_call_names)

        insert_stream_idx = hpss_call_names.index(

            'Repository.insert_stream_1.19')

        calls_after_insert_stream = hpss_call_names[insert_stream_idx:]

        # After inserting the stream the client has no reason to query the

        # remote graph any further.

        bzr_core_trace = Equals(

            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',

             'Branch.set_last_revision_info', 'Branch.unlock'])

        bzr_loom_trace = Equals(

            ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',

             'Branch.set_last_revision_info', 'get', 'Branch.unlock'])

        self.assertThat(calls_after_insert_stream,

            MatchesAny(bzr_core_trace, bzr_loom_trace))

    def disableOptimisticGetParentMap(self):

        # Tweak some class variables to stop remote get_parent_map calls asking

        # for or receiving more data than the caller asked for.

        self.overrideAttr(vf_repository.InterVersionedFileRepository,

                          '_walk_to_common_revisions_batch_size', 1)

        self.overrideAttr(SmartServerRepositoryGetParentMap,

                            'no_extra_results', True)

class TestPushHook(TestCaseWithInterBranch):

    def setUp(self):

        self.hook_calls = []

        super(TestPushHook, self).setUp()

    def capture_post_push_hook(self, result):

        """Capture post push hook calls to self.hook_calls.

        The call is logged, as is some state of the two branches.

        """

        if result.local_branch:

            local_locked = result.local_branch.is_locked()

            local_base = result.local_branch.base

        else:

            local_locked = None

            local_base = None

        self.hook_calls.append(

            ('post_push', result.source_branch, local_base,

             result.master_branch.base,

             result.old_revno, result.old_revid,

             result.new_revno, result.new_revid,

             result.source_branch.is_locked(), local_locked,

             result.master_branch.is_locked()))

    def test_post_push_empty_history(self):

        target = self.make_to_branch('target')

        source = self.make_from_branch('source')

        Branch.hooks.install_named_hook('post_push',

                                        self.capture_post_push_hook, None)

        source.push(target)

        # with nothing there we should still get a notification, and

        # have both branches locked at the notification time.

        self.assertEqual([

            ('post_push', source, None, target.base, 0, NULL_REVISION,

             0, NULL_REVISION, True, None, True)

            ],

            self.hook_calls)

    def test_post_push_bound_branch(self):

        # pushing to a bound branch should pass in the master branch to the

        # hook, allowing the correct number of emails to be sent, while still

        # allowing hooks that want to modify the target to do so to both

        # instances.

        target = self.make_to_branch('target')

        local = self.make_from_branch('local')

        try:

            local.bind(target)

        except errors.UpgradeRequired:

            # We can't bind this format to itself- typically it is the local

            # branch that doesn't support binding.  As of May 2007

            # remotebranches can't be bound.  Let's instead make a new local

            # branch of the default type, which does allow binding.

            # See https://bugs.launchpad.net/bzr/+bug/112020

            local = ControlDir.create_branch_convenience('local2')

            local.bind(target)

        source = self.make_from_branch('source')

        Branch.hooks.install_named_hook('post_push',

                                        self.capture_post_push_hook, None)

        source.push(local)

        # with nothing there we should still get a notification, and

        # have both branches locked at the notification time.

        self.assertEqual([

            ('post_push', source, local.base, target.base, 0, NULL_REVISION,

             0, NULL_REVISION, True, True, True)

            ],

            self.hook_calls)

    def test_post_push_nonempty_history(self):

        target = self.make_to_branch_and_tree('target')

        target.lock_write()

        target.add('')

        rev1 = target.commit('rev 1')

        target.unlock()

        sourcedir = target.branch.bzrdir.clone(self.get_url('source'))

        source = MemoryTree.create_on_branch(sourcedir.open_branch())

        rev2 = source.commit('rev 2')

        Branch.hooks.install_named_hook('post_push',

                                        self.capture_post_push_hook, None)

        source.branch.push(target.branch)

        # with nothing there we should still get a notification, and

        # have both branches locked at the notification time.

        self.assertEqual([

            ('post_push', source.branch, None, target.branch.base, 1, rev1,

             2, rev2, True, None, True)

            ],

            self.hook_calls)