1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
# Copyright (C) 2004, 2005, 2007, 2009 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 InterBranch.pull behaviour."""
import os
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
from bzrlib import errors
from bzrlib.memorytree import MemoryTree
from bzrlib.revision import NULL_REVISION
from bzrlib.tests.per_interbranch import TestCaseWithInterBranch
# The tests here are based on the tests in
# bzrlib.tests.per_branch.test_pull
class TestPull(TestCaseWithInterBranch):
def test_pull_convergence_simple(self):
# when revisions are pulled, the left-most accessible parents must
# become the revision-history.
parent = self.make_from_branch_and_tree('parent')
parent.commit('1st post', rev_id='P1', allow_pointless=True)
mine = self.sprout_to(parent.bzrdir, 'mine').open_workingtree()
mine.commit('my change', rev_id='M1', allow_pointless=True)
parent.merge_from_branch(mine.branch)
parent.commit('merge my change', rev_id='P2')
mine.pull(parent.branch)
self.assertEqual(['P1', 'P2'], mine.branch.revision_history())
def test_pull_merged_indirect(self):
# it should be possible to do a pull 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.
parent = self.make_from_branch_and_tree('parent')
parent.commit('1st post', rev_id='P1', allow_pointless=True)
mine = self.sprout_to(parent.bzrdir, 'mine').open_workingtree()
mine.commit('my change', rev_id='M1', allow_pointless=True)
other = self.sprout_to(parent.bzrdir, 'other').open_workingtree()
other.merge_from_branch(mine.branch)
other.commit('merge my change', rev_id='O2')
parent.merge_from_branch(other.branch)
parent.commit('merge other', rev_id='P2')
mine.pull(parent.branch)
self.assertEqual(['P1', 'P2'], mine.branch.revision_history())
def test_pull_updates_checkout_and_master(self):
"""Pulling into a checkout updates the checkout and the master branch"""
master_tree = self.make_from_branch_and_tree('master')
rev1 = master_tree.commit('master')
checkout = master_tree.branch.create_checkout('checkout')
other = self.sprout_to(master_tree.branch.bzrdir, 'other').open_workingtree()
rev2 = other.commit('other commit')
# now pull, which should update both checkout and master.
checkout.branch.pull(other.branch)
self.assertEqual([rev1, rev2], checkout.branch.revision_history())
self.assertEqual([rev1, rev2], master_tree.branch.revision_history())
def test_pull_raises_specific_error_on_master_connection_error(self):
master_tree = self.make_from_branch_and_tree('master')
checkout = master_tree.branch.create_checkout('checkout')
other = self.sprout_to(master_tree.branch.bzrdir, 'other').open_branch()
# move the branch out of the way on disk to cause a connection
# error.
os.rename('master', 'master_gone')
# try to pull, which should raise a BoundBranchConnectionFailure.
self.assertRaises(errors.BoundBranchConnectionFailure,
checkout.branch.pull, other)
def test_pull_returns_result(self):
parent = self.make_from_branch_and_tree('parent')
parent.commit('1st post', rev_id='P1')
mine = self.sprout_to(parent.bzrdir, 'mine').open_workingtree()
mine.commit('my change', rev_id='M1')
result = parent.branch.pull(mine.branch)
self.assertIsNot(None, result)
self.assertIs(mine.branch, result.source_branch)
self.assertIs(parent.branch, result.target_branch)
self.assertIs(parent.branch, result.master_branch)
self.assertIs(None, result.local_branch)
self.assertEqual(1, result.old_revno)
self.assertEqual('P1', result.old_revid)
self.assertEqual(2, result.new_revno)
self.assertEqual('M1', result.new_revid)
self.assertEqual(None, result.tag_conflicts)
def test_pull_overwrite(self):
tree_a = self.make_from_branch_and_tree('tree_a')
tree_a.commit('message 1')
tree_b = self.sprout_to(tree_a.bzrdir, 'tree_b').open_workingtree()
tree_a.commit('message 2', rev_id='rev2a')
tree_b.commit('message 2', rev_id='rev2b')
self.assertRaises(errors.DivergedBranches, tree_a.pull, tree_b.branch)
self.assertRaises(errors.DivergedBranches,
tree_a.branch.pull, tree_b.branch,
overwrite=False, stop_revision='rev2b')
# It should not have updated the branch tip, but it should have fetched
# the revision
self.assertEqual('rev2a', tree_a.branch.last_revision())
self.assertTrue(tree_a.branch.repository.has_revision('rev2b'))
tree_a.branch.pull(tree_b.branch, overwrite=True,
stop_revision='rev2b')
self.assertEqual('rev2b', tree_a.branch.last_revision())
self.assertEqual(tree_b.branch.revision_history(),
tree_a.branch.revision_history())
class TestPullHook(TestCaseWithInterBranch):
def setUp(self):
self.hook_calls = []
TestCaseWithInterBranch.setUp(self)
def capture_post_pull_hook(self, result):
"""Capture post pull 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_pull', 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_pull_empty_history(self):
target = self.make_to_branch('target')
source = self.make_from_branch('source')
Branch.hooks.install_named_hook('post_pull',
self.capture_post_pull_hook, None)
target.pull(source)
# with nothing there we should still get a notification, and
# have both branches locked at the notification time.
self.assertEqual([
('post_pull', source, None, target.base, 0, NULL_REVISION,
0, NULL_REVISION, True, None, True)
],
self.hook_calls)
def test_post_pull_bound_branch(self):
# pulling 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 = BzrDir.create_branch_convenience('local2')
local.bind(target)
source = self.make_from_branch('source')
Branch.hooks.install_named_hook('post_pull',
self.capture_post_pull_hook, None)
local.pull(source)
# with nothing there we should still get a notification, and
# have both branches locked at the notification time.
self.assertEqual([
('post_pull', source, local.base, target.base, 0, NULL_REVISION,
0, NULL_REVISION, True, True, True)
],
self.hook_calls)
def test_post_pull_nonempty_history(self):
target = self.make_to_branch_and_memory_tree('target')
target.lock_write()
target.add('')
rev1 = target.commit('rev 1')
target.unlock()
sourcedir = target.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_pull',
self.capture_post_pull_hook, None)
target.branch.pull(source.branch)
# with nothing there we should still get a notification, and
# have both branches locked at the notification time.
self.assertEqual([
('post_pull', source.branch, None, target.branch.base, 1, rev1,
2, rev2, True, None, True)
],
self.hook_calls)
|