1
# Copyright (C) 2005, 2006 Canonical Ltd
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.
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.
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
18
"""Black-box tests for bzr pull."""
23
from bzrlib.branch import Branch
24
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.uncommit import uncommit
26
from bzrlib import urlutils
29
class TestPull(ExternalBase):
31
def example_branch(test):
33
file('hello', 'wt').write('foo')
34
test.runbzr('add hello')
35
test.runbzr('commit -m setup hello')
36
file('goodbye', 'wt').write('baz')
37
test.runbzr('add goodbye')
38
test.runbzr('commit -m setup goodbye')
41
"""Pull changes from one branch to another."""
46
self.runbzr('pull', retcode=3)
47
self.runbzr('missing', retcode=3)
48
self.runbzr('missing .')
49
self.runbzr('missing')
50
# this will work on windows because we check for the same branch
51
# in pull - if it fails, it is a regression
53
self.runbzr('pull /', retcode=3)
54
if sys.platform not in ('win32', 'cygwin'):
58
self.runbzr('branch a b')
62
self.runbzr('add subdir')
63
self.runbzr('commit -m blah --unchanged')
66
b = Branch.open('../b')
67
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
68
self.runbzr('pull ../b')
69
self.assertEquals(a.revision_history(), b.revision_history())
70
self.runbzr('commit -m blah2 --unchanged')
72
self.runbzr('commit -m blah3 --unchanged')
74
self.runbzr('pull ../a', retcode=3)
76
self.runbzr('branch b overwriteme')
77
os.chdir('overwriteme')
78
self.runbzr('pull --overwrite ../a')
79
overwritten = Branch.open('.')
80
self.assertEqual(overwritten.revision_history(),
83
self.runbzr('merge ../b')
84
self.runbzr('commit -m blah4 --unchanged')
85
os.chdir('../b/subdir')
86
self.runbzr('pull ../../a')
87
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
88
self.runbzr('commit -m blah5 --unchanged')
89
self.runbzr('commit -m blah6 --unchanged')
91
self.runbzr('pull ../a')
93
self.runbzr('commit -m blah7 --unchanged')
94
self.runbzr('merge ../b')
95
self.runbzr('commit -m blah8 --unchanged')
96
self.runbzr('pull ../b')
97
self.runbzr('pull ../b')
99
def test_pull_dash_d(self):
102
self.example_branch()
103
self.runbzr('init ../b')
104
self.runbzr('init ../c')
105
# pull into that branch
106
self.runbzr('pull -d ../b .')
107
# pull into a branch specified by a url
108
c_url = urlutils.local_path_to_url('../c')
109
self.assertStartsWith(c_url, 'file://')
110
self.runbzr('pull -d %s .' % c_url)
112
def test_pull_revision(self):
113
"""Pull some changes from one branch to another."""
117
self.example_branch()
118
file('hello2', 'wt').write('foo')
119
self.runbzr('add hello2')
120
self.runbzr('commit -m setup hello2')
121
file('goodbye2', 'wt').write('baz')
122
self.runbzr('add goodbye2')
123
self.runbzr('commit -m setup goodbye2')
126
self.runbzr('branch -r 1 a b')
128
self.runbzr('pull -r 2')
129
a = Branch.open('../a')
131
self.assertEquals(a.revno(),4)
132
self.assertEquals(b.revno(),2)
133
self.runbzr('pull -r 3')
134
self.assertEquals(b.revno(),3)
135
self.runbzr('pull -r 4')
136
self.assertEquals(a.revision_history(), b.revision_history())
139
def test_overwrite_uptodate(self):
140
# Make sure pull --overwrite overwrites
141
# even if the target branch has merged
142
# everything already.
145
def get_rh(expected_len):
146
rh = self.capture('revision-history')
147
# Make sure we don't have trailing empty revisions
148
rh = rh.strip().split('\n')
149
self.assertEqual(len(rh), expected_len)
155
open('foo', 'wb').write('original\n')
157
bzr('commit', '-m', 'initial commit')
160
bzr('branch', 'a', 'b')
163
open('foo', 'wb').write('changed\n')
164
bzr('commit', '-m', 'later change')
166
open('foo', 'wb').write('another\n')
167
bzr('commit', '-m', 'a third change')
169
rev_history_a = get_rh(3)
173
bzr('commit', '-m', 'merge')
175
rev_history_b = get_rh(2)
177
bzr('pull', '--overwrite', '../a')
178
rev_history_b = get_rh(3)
180
self.assertEqual(rev_history_b, rev_history_a)
182
def test_overwrite_children(self):
183
# Make sure pull --overwrite sets the revision-history
184
# to be identical to the pull source, even if we have convergence
187
def get_rh(expected_len):
188
rh = self.capture('revision-history')
189
# Make sure we don't have trailing empty revisions
190
rh = rh.strip().split('\n')
191
self.assertEqual(len(rh), expected_len)
197
open('foo', 'wb').write('original\n')
199
bzr('commit', '-m', 'initial commit')
202
bzr('branch', 'a', 'b')
205
open('foo', 'wb').write('changed\n')
206
bzr('commit', '-m', 'later change')
208
open('foo', 'wb').write('another\n')
209
bzr('commit', '-m', 'a third change')
211
rev_history_a = get_rh(3)
215
bzr('commit', '-m', 'merge')
217
rev_history_b = get_rh(2)
220
open('foo', 'wb').write('a fourth change\n')
221
bzr('commit', '-m', 'a fourth change')
223
rev_history_a = get_rh(4)
225
# With convergence, we could just pull over the
226
# new change, but with --overwrite, we want to switch our history
228
bzr('pull', '--overwrite', '../a')
229
rev_history_b = get_rh(4)
231
self.assertEqual(rev_history_b, rev_history_a)
233
def test_pull_remember(self):
234
"""Pull changes from one branch to another and test parent location."""
235
transport = self.get_transport()
236
tree_a = self.make_branch_and_tree('branch_a')
237
branch_a = tree_a.branch
238
self.build_tree(['branch_a/a'])
240
tree_a.commit('commit a')
241
tree_b = branch_a.bzrdir.sprout('branch_b').open_workingtree()
242
branch_b = tree_b.branch
243
tree_c = branch_a.bzrdir.sprout('branch_c').open_workingtree()
244
branch_c = tree_c.branch
245
self.build_tree(['branch_a/b'])
247
tree_a.commit('commit b')
249
parent = branch_b.get_parent()
250
branch_b.set_parent(None)
251
self.assertEqual(None, branch_b.get_parent())
252
# test pull for failure without parent set
254
out = self.runbzr('pull', retcode=3)
255
self.assertEquals(out,
256
('','bzr: ERROR: No pull location known or specified.\n'))
257
# test implicit --remember when no parent set, this pull conflicts
258
self.build_tree(['d'])
260
tree_b.commit('commit d')
261
out = self.runbzr('pull ../branch_a', retcode=3)
262
self.assertEquals(out,
263
('','bzr: ERROR: These branches have diverged.'
264
' Use the merge command to reconcile them.\n'))
265
self.assertEquals(branch_b.get_parent(), parent)
266
# test implicit --remember after resolving previous failure
267
uncommit(branch=branch_b, tree=tree_b)
268
transport.delete('branch_b/d')
270
self.assertEquals(branch_b.get_parent(), parent)
271
# test explicit --remember
272
self.runbzr('pull ../branch_c --remember')
273
self.assertEquals(branch_b.get_parent(),
274
branch_c.bzrdir.root_transport.base)
276
def test_pull_bundle(self):
277
from bzrlib.testament import Testament
278
# Build up 2 trees and prepare for a pull
279
tree_a = self.make_branch_and_tree('branch_a')
280
f = open('branch_a/a', 'wb')
284
tree_a.commit('message')
286
tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
288
# Make a change to 'a' that 'b' can pull
289
f = open('branch_a/a', 'wb')
292
tree_a.commit('message')
294
# Create the bundle for 'b' to pull
296
bundle_file = open('../bundle', 'wb')
297
bundle_file.write(self.run_bzr('bundle', '../branch_b')[0])
300
os.chdir('../branch_b')
301
out, err = self.run_bzr('pull', '../bundle')
302
self.assertEqual(out,
303
'Now on revision 2.\n')
304
self.assertEqual(err,
305
' M a\nAll changes applied successfully.\n')
307
self.assertEqualDiff(tree_a.branch.revision_history(),
308
tree_b.branch.revision_history())
310
testament_a = Testament.from_revision(tree_a.branch.repository,
311
tree_a.get_parent_ids()[0])
312
testament_b = Testament.from_revision(tree_b.branch.repository,
313
tree_b.get_parent_ids()[0])
314
self.assertEqualDiff(testament_a.as_text(),
315
testament_b.as_text())
317
# it is legal to attempt to pull an already-merged bundle
318
out, err = self.run_bzr('pull', '../bundle')
319
self.assertEqual(err, '')
320
self.assertEqual(out, 'No revisions to pull.\n')
added
removed
bzrlib/tests/blackbox/test_pull.py
