~bzr-pqm/bzr/bzr.dev

2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1
# Copyright (C) 2004, 2005, 2007 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests for branch.push behaviour."""
18
19
import os
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
20
 
2018.5.130 by Robert Collins
Make all branch_implementations tests pass.
21
from bzrlib import bzrdir, errors
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
22
from bzrlib.branch import Branch
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
23
from bzrlib.bzrdir import BzrDir
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
24
from bzrlib.memorytree import MemoryTree
2018.5.97 by Andrew Bennetts
Fix more tests.
25
from bzrlib.remote import RemoteBranch
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
26
from bzrlib.revision import NULL_REVISION
27
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
2018.5.130 by Robert Collins
Make all branch_implementations tests pass.
28
from bzrlib.transport.local import LocalURLServer
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
29
30
31
class TestPush(TestCaseWithBranch):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
32
33
    def test_push_convergence_simple(self):
34
        # when revisions are pushed, the left-most accessible parents must 
35
        # become the revision-history.
36
        mine = self.make_branch_and_tree('mine')
37
        mine.commit('1st post', rev_id='P1', allow_pointless=True)
38
        other = mine.bzrdir.sprout('other').open_workingtree()
39
        other.commit('my change', rev_id='M1', allow_pointless=True)
40
        mine.merge_from_branch(other.branch)
41
        mine.commit('merge my change', rev_id='P2')
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
42
        result = mine.branch.push(other.branch)
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
43
        self.assertEqual(['P1', 'P2'], other.branch.revision_history())
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
44
        # result object contains some structured data
45
        self.assertEqual(result.old_revid, 'M1')
46
        self.assertEqual(result.new_revid, 'P2')
47
        # and it can be treated as an integer for compatibility
48
        self.assertEqual(int(result), 0)
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
49
50
    def test_push_merged_indirect(self):
51
        # it should be possible to do a push from one branch into another
52
        # when the tip of the target was merged into the source branch
53
        # via a third branch - so its buried in the ancestry and is not
54
        # directly accessible.
55
        mine = self.make_branch_and_tree('mine')
56
        mine.commit('1st post', rev_id='P1', allow_pointless=True)
57
        target = mine.bzrdir.sprout('target').open_workingtree()
58
        target.commit('my change', rev_id='M1', allow_pointless=True)
59
        other = mine.bzrdir.sprout('other').open_workingtree()
60
        other.merge_from_branch(target.branch)
61
        other.commit('merge my change', rev_id='O2')
62
        mine.merge_from_branch(other.branch)
63
        mine.commit('merge other', rev_id='P2')
64
        mine.branch.push(target.branch)
65
        self.assertEqual(['P1', 'P2'], target.branch.revision_history())
66
67
    def test_push_to_checkout_updates_master(self):
68
        """Pushing into a checkout updates the checkout and the master branch"""
69
        master_tree = self.make_branch_and_tree('master')
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
70
        checkout = self.make_branch_and_tree('checkout')
71
        try:
72
            checkout.branch.bind(master_tree.branch)
73
        except errors.UpgradeRequired:
74
            # cant bind this format, the test is irrelevant.
75
            return
76
        rev1 = checkout.commit('master')
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
77
78
        other = master_tree.branch.bzrdir.sprout('other').open_workingtree()
79
        rev2 = other.commit('other commit')
80
        # now push, which should update both checkout and master.
81
        other.branch.push(checkout.branch)
82
        self.assertEqual([rev1, rev2], checkout.branch.revision_history())
83
        self.assertEqual([rev1, rev2], master_tree.branch.revision_history())
84
85
    def test_push_raises_specific_error_on_master_connection_error(self):
86
        master_tree = self.make_branch_and_tree('master')
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
87
        checkout = self.make_branch_and_tree('checkout')
88
        try:
89
            checkout.branch.bind(master_tree.branch)
90
        except errors.UpgradeRequired:
91
            # cant bind this format, the test is irrelevant.
92
            return
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
93
        other = master_tree.branch.bzrdir.sprout('other').open_workingtree()
94
        # move the branch out of the way on disk to cause a connection
95
        # error.
96
        os.rename('master', 'master_gone')
97
        # try to push, which should raise a BoundBranchConnectionFailure.
98
        self.assertRaises(errors.BoundBranchConnectionFailure,
99
                other.branch.push, checkout.branch)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
100
2279.1.1 by John Arbash Meinel
Branch.push() only needs a read lock.
101
    def test_push_uses_read_lock(self):
102
        """Push should only need a read lock on the source side."""
103
        source = self.make_branch_and_tree('source')
104
        target = self.make_branch('target')
105
2381.1.3 by Robert Collins
Review feedback.
106
        self.build_tree(['source/a'])
2279.1.1 by John Arbash Meinel
Branch.push() only needs a read lock.
107
        source.add(['a'])
108
        source.commit('a')
109
110
        source.branch.lock_read()
111
        try:
112
            target.lock_write()
113
            try:
114
                source.branch.push(target, stop_revision=source.last_revision())
115
            finally:
116
                target.unlock()
117
        finally:
118
            source.branch.unlock()
119
2279.1.3 by John Arbash Meinel
Switch the test to being a branch_implementation test.
120
    def test_push_within_repository(self):
121
        """Push from one branch to another inside the same repository."""
122
        try:
123
            repo = self.make_repository('repo', shared=True)
124
        except (errors.IncompatibleFormat, errors.UninitializableFormat):
125
            # This Branch format cannot create shared repositories
126
            return
127
        # This is a little bit trickier because make_branch_and_tree will not
128
        # re-use a shared repository.
129
        a_bzrdir = self.make_bzrdir('repo/tree')
130
        try:
131
            a_branch = self.branch_format.initialize(a_bzrdir)
132
        except (errors.UninitializableFormat):
133
            # Cannot create these branches
134
            return
2018.5.97 by Andrew Bennetts
Fix more tests.
135
        try:
136
            tree = a_branch.bzrdir.create_workingtree()
137
        except errors.NotLocalUrl:
2018.5.130 by Robert Collins
Make all branch_implementations tests pass.
138
            if self.vfs_transport_factory is LocalURLServer:
139
                # the branch is colocated on disk, we cannot create a checkout.
140
                # hopefully callers will expect this.
141
                local_controldir= bzrdir.BzrDir.open(self.get_vfs_only_url('repo/tree'))
142
                tree = local_controldir.create_workingtree()
143
            else:
144
                tree = a_branch.create_checkout('repo/tree', lightweight=True)
2381.1.3 by Robert Collins
Review feedback.
145
        self.build_tree(['repo/tree/a'])
2279.1.3 by John Arbash Meinel
Switch the test to being a branch_implementation test.
146
        tree.add(['a'])
147
        tree.commit('a')
148
149
        to_bzrdir = self.make_bzrdir('repo/branch')
150
        to_branch = self.branch_format.initialize(to_bzrdir)
151
        tree.branch.push(to_branch)
152
153
        self.assertEqual(tree.branch.last_revision(),
154
                         to_branch.last_revision())
155
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
156
157
class TestPushHook(TestCaseWithBranch):
158
159
    def setUp(self):
160
        self.hook_calls = []
161
        TestCaseWithBranch.setUp(self)
162
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
163
    def capture_post_push_hook(self, result):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
164
        """Capture post push hook calls to self.hook_calls.
165
        
166
        The call is logged, as is some state of the two branches.
167
        """
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
168
        if result.local_branch:
169
            local_locked = result.local_branch.is_locked()
170
            local_base = result.local_branch.base
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
171
        else:
172
            local_locked = None
173
            local_base = None
174
        self.hook_calls.append(
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
175
            ('post_push', result.source_branch, local_base,
176
             result.master_branch.base,
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
177
             result.old_revno, result.old_revid,
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
178
             result.new_revno, result.new_revid,
179
             result.source_branch.is_locked(), local_locked,
180
             result.master_branch.is_locked()))
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
181
182
    def test_post_push_empty_history(self):
183
        target = self.make_branch('target')
184
        source = self.make_branch('source')
185
        Branch.hooks.install_hook('post_push', self.capture_post_push_hook)
186
        source.push(target)
187
        # with nothing there we should still get a notification, and
188
        # have both branches locked at the notification time.
189
        self.assertEqual([
190
            ('post_push', source, None, target.base, 0, NULL_REVISION,
191
             0, NULL_REVISION, True, None, True)
192
            ],
193
            self.hook_calls)
194
195
    def test_post_push_bound_branch(self):
196
        # pushing to a bound branch should pass in the master branch to the
197
        # hook, allowing the correct number of emails to be sent, while still
198
        # allowing hooks that want to modify the target to do so to both 
199
        # instances.
200
        target = self.make_branch('target')
201
        local = self.make_branch('local')
202
        try:
203
            local.bind(target)
204
        except errors.UpgradeRequired:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
205
            # We can't bind this format to itself- typically it is the local
206
            # branch that doesn't support binding.  As of May 2007
207
            # remotebranches can't be bound.  Let's instead make a new local
208
            # branch of the default type, which does allow binding.
209
            # See https://bugs.launchpad.net/bzr/+bug/112020
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
210
            local = BzrDir.create_branch_convenience('local2')
211
            local.bind(target)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
212
        source = self.make_branch('source')
213
        Branch.hooks.install_hook('post_push', self.capture_post_push_hook)
214
        source.push(local)
215
        # with nothing there we should still get a notification, and
216
        # have both branches locked at the notification time.
217
        self.assertEqual([
218
            ('post_push', source, local.base, target.base, 0, NULL_REVISION,
219
             0, NULL_REVISION, True, True, True)
220
            ],
221
            self.hook_calls)
222
223
    def test_post_push_nonempty_history(self):
224
        target = self.make_branch_and_memory_tree('target')
225
        target.lock_write()
226
        target.add('')
227
        rev1 = target.commit('rev 1')
228
        target.unlock()
229
        sourcedir = target.bzrdir.clone(self.get_url('source'))
230
        source = MemoryTree.create_on_branch(sourcedir.open_branch())
231
        rev2 = source.commit('rev 2')
232
        Branch.hooks.install_hook('post_push', self.capture_post_push_hook)
233
        source.branch.push(target.branch)
234
        # with nothing there we should still get a notification, and
235
        # have both branches locked at the notification time.
236
        self.assertEqual([
237
            ('post_push', source.branch, None, target.branch.base, 1, rev1,
238
             2, rev2, True, None, True)
239
            ],
240
            self.hook_calls)