1
1
# Copyright (C) 2005 by Canonical Ltd
2
2
# -*- coding: utf-8 -*-
4
4
# This program is free software; you can redistribute it and/or modify
5
5
# it under the terms of the GNU General Public License as published by
6
6
# the Free Software Foundation; either version 2 of the License, or
7
7
# (at your option) any later version.
9
9
# This program is distributed in the hope that it will be useful,
10
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
12
# GNU General Public License for more details.
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr pull.
19
"""Black-box tests for bzr pull."""
25
24
from bzrlib.branch import Branch
26
25
from bzrlib.tests.blackbox import ExternalBase
26
from bzrlib.uncommit import uncommit
28
29
class TestPull(ExternalBase):
46
47
self.runbzr('missing', retcode=3)
47
48
self.runbzr('missing .')
48
49
self.runbzr('missing')
49
if sys.platform not in ('win32', 'cygwin'):
50
# This is equivalent to doing "bzr pull ."
51
# Which means that bzr creates 2 branches grabbing
52
# the same location, and tries to pull.
53
# However, 2 branches mean 2 locks on the same file
54
# which ultimately implies a deadlock.
55
# (non windows platforms allow multiple locks on the
56
# same file by the same calling process)
50
# this will work on windows because we check for the same branch
51
# in pull - if it fails, it is a regression
58
53
self.runbzr('pull /', retcode=3)
59
54
if sys.platform not in ('win32', 'cygwin'):
60
55
self.runbzr('pull')
101
96
self.runbzr('pull ../b')
102
97
self.runbzr('pull ../b')
99
def test_pull_revision(self):
100
"""Pull some changes from one branch to another."""
104
self.example_branch()
105
file('hello2', 'wt').write('foo')
106
self.runbzr('add hello2')
107
self.runbzr('commit -m setup hello2')
108
file('goodbye2', 'wt').write('baz')
109
self.runbzr('add goodbye2')
110
self.runbzr('commit -m setup goodbye2')
113
self.runbzr('branch -r 1 a b')
115
self.runbzr('pull -r 2')
116
a = Branch.open('../a')
118
self.assertEquals(a.revno(),4)
119
self.assertEquals(b.revno(),2)
120
self.runbzr('pull -r 3')
121
self.assertEquals(b.revno(),3)
122
self.runbzr('pull -r 4')
123
self.assertEquals(a.revision_history(), b.revision_history())
104
126
def test_overwrite_uptodate(self):
105
127
# Make sure pull --overwrite overwrites
106
128
# even if the target branch has merged
196
218
self.assertEqual(rev_history_b, rev_history_a)
220
def test_pull_remember(self):
221
"""Pull changes from one branch to another and test parent location."""
222
transport = self.get_transport()
223
tree_a = self.make_branch_and_tree('branch_a')
224
branch_a = tree_a.branch
225
self.build_tree(['branch_a/a'])
227
tree_a.commit('commit a')
228
tree_b = branch_a.bzrdir.sprout('branch_b').open_workingtree()
229
branch_b = tree_b.branch
230
tree_c = branch_a.bzrdir.sprout('branch_c').open_workingtree()
231
branch_c = tree_c.branch
232
self.build_tree(['branch_a/b'])
234
tree_a.commit('commit b')
236
parent = branch_b.get_parent()
237
branch_b.set_parent(None)
238
self.assertEqual(None, branch_b.get_parent())
239
# test pull for failure without parent set
241
out = self.runbzr('pull', retcode=3)
242
self.assertEquals(out,
243
('','bzr: ERROR: No pull location known or specified.\n'))
244
# test implicit --remember when no parent set, this pull conflicts
245
self.build_tree(['d'])
247
tree_b.commit('commit d')
248
out = self.runbzr('pull ../branch_a', retcode=3)
249
self.assertEquals(out,
250
('','bzr: ERROR: These branches have diverged. Use the merge command to reconcile them.\n'))
251
self.assertEquals(branch_b.get_parent(), parent)
252
# test implicit --remember after resolving previous failure
253
uncommit(branch=branch_b, tree=tree_b)
254
transport.delete('branch_b/d')
256
self.assertEquals(branch_b.get_parent(), parent)
257
# test explicit --remember
258
self.runbzr('pull ../branch_c --remember')
259
self.assertEquals(branch_b.get_parent(),
260
branch_c.bzrdir.root_transport.base)
262
def test_pull_bundle(self):
263
from bzrlib.testament import Testament
264
# Build up 2 trees and prepare for a pull
265
tree_a = self.make_branch_and_tree('branch_a')
266
f = open('branch_a/a', 'wb')
270
tree_a.commit('message')
272
tree_b = tree_a.bzrdir.sprout('branch_b').open_workingtree()
274
# Make a change to 'a' that 'b' can pull
275
f = open('branch_a/a', 'wb')
278
tree_a.commit('message')
280
# Create the bundle for 'b' to pull
282
bundle_file = open('../bundle', 'wb')
283
bundle_file.write(self.run_bzr('bundle', '../branch_b')[0])
286
os.chdir('../branch_b')
287
output = self.run_bzr('pull', '../bundle')
288
self.assertEqual('', output[0])
289
self.assertEqual('All changes applied successfully.\n'
290
'1 revision(s) pulled.\n', output[1])
292
self.assertEqualDiff(tree_a.branch.revision_history(),
293
tree_b.branch.revision_history())
295
testament_a = Testament.from_revision(tree_a.branch.repository,
296
tree_a.last_revision())
297
testament_b = Testament.from_revision(tree_b.branch.repository,
298
tree_b.last_revision())
299
self.assertEqualDiff(testament_a.as_text(),
300
testament_b.as_text())
302
# it is legal to attempt to pull an already-merged bundle
303
output = self.run_bzr('pull', '../bundle')
304
self.assertEqual('', output[0])
305
self.assertEqual('0 revision(s) pulled.\n', output[1])
added
removed
bzrlib/tests/blackbox/test_pull.py
