1
# Copyright (C) 2005, 2007 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
59
57
# test push for failure without push location set
60
58
os.chdir('branch_a')
61
out = self.run_bzr('push', retcode=3)
59
out = self.runbzr('push', retcode=3)
62
60
self.assertEquals(out,
63
61
('','bzr: ERROR: No push location known or specified.\n'))
65
63
# test not remembered if cannot actually push
66
self.run_bzr('push ../path/which/doesnt/exist', retcode=3)
64
self.run_bzr('push', '../path/which/doesnt/exist', retcode=3)
67
65
out = self.run_bzr('push', retcode=3)
69
67
('', 'bzr: ERROR: No push location known or specified.\n'),
72
70
# test implicit --remember when no push location set, push fails
73
out = self.run_bzr('push ../branch_b', retcode=3)
71
out = self.run_bzr('push', '../branch_b', retcode=3)
74
72
self.assertEquals(out,
75
73
('','bzr: ERROR: These branches have diverged. '
76
'Try using "merge" and then "push".\n'))
74
'Try a merge then push with overwrite.\n'))
77
75
self.assertEquals(abspath(branch_a.get_push_location()),
78
76
abspath(branch_b.bzrdir.root_transport.base))
80
78
# test implicit --remember after resolving previous failure
81
79
uncommit(branch=branch_b, tree=tree_b)
82
80
transport.delete('branch_b/c')
83
out, err = self.run_bzr('push')
81
out = self.run_bzr('push')
84
82
path = branch_a.get_push_location()
85
self.assertEquals(out,
86
'Using saved location: %s\n'
87
'Pushed up to revision 2.\n'
88
% local_path_from_url(path))
90
'All changes applied successfully.\n')
83
self.assertEquals(('Using saved location: %s\n'
84
% (local_path_from_url(path),)
85
, 'All changes applied successfully.\n'
86
'1 revision(s) pushed.\n'), out)
91
87
self.assertEqual(path,
92
88
branch_b.bzrdir.root_transport.base)
93
89
# test explicit --remember
94
self.run_bzr('push ../branch_c --remember')
90
self.run_bzr('push', '../branch_c', '--remember')
95
91
self.assertEquals(branch_a.get_push_location(),
96
92
branch_c.bzrdir.root_transport.base)
98
94
def test_push_without_tree(self):
99
95
# bzr push from a branch that does not have a checkout should work.
100
96
b = self.make_branch('.')
101
out, err = self.run_bzr('push pushed-location')
97
out, err = self.run_bzr('push', 'pushed-location')
102
98
self.assertEqual('', out)
103
self.assertEqual('Created new branch.\n', err)
104
b2 = Branch.open('pushed-location')
99
self.assertEqual('0 revision(s) pushed.\n', err)
100
b2 = bzrlib.branch.Branch.open('pushed-location')
105
101
self.assertEndsWith(b2.base, 'pushed-location/')
107
103
def test_push_new_branch_revision_count(self):
150
146
# Now that we have a repository with shared files, make sure
151
147
# that things aren't copied out by a 'push'
152
148
os.chdir('repo/b')
153
self.run_bzr('push ../../push-b')
149
self.run_bzr('push', '../../push-b')
154
150
pushed_tree = WorkingTree.open('../../push-b')
155
151
pushed_repo = pushed_tree.branch.repository
156
152
self.assertFalse(pushed_repo.has_revision('a-1'))
157
153
self.assertFalse(pushed_repo.has_revision('a-2'))
158
154
self.assertTrue(pushed_repo.has_revision('b-1'))
160
def test_push_funky_id(self):
161
t = self.make_branch_and_tree('tree')
163
self.build_tree(['filename'])
164
t.add('filename', 'funky-chars<>%&;"\'')
165
t.commit('commit filename')
166
self.run_bzr('push ../new-tree')
168
def test_push_dash_d(self):
169
t = self.make_branch_and_tree('from')
170
t.commit(allow_pointless=True,
171
message='first commit')
172
self.run_bzr('push -d from to-one')
173
self.failUnlessExists('to-one')
174
self.run_bzr('push -d %s %s'
175
% tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
176
self.failUnlessExists('to-two')
178
def create_simple_tree(self):
179
tree = self.make_branch_and_tree('tree')
180
self.build_tree(['tree/a'])
181
tree.add(['a'], ['a-id'])
182
tree.commit('one', rev_id='r1')
185
def test_push_create_prefix(self):
186
"""'bzr push --create-prefix' will create leading directories."""
187
tree = self.create_simple_tree()
189
self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
192
self.run_bzr('push ../new/tree --create-prefix',
194
new_tree = WorkingTree.open('new/tree')
195
self.assertEqual(tree.last_revision(), new_tree.last_revision())
196
self.failUnlessExists('new/tree/a')
198
def test_push_use_existing(self):
199
"""'bzr push --use-existing-dir' can push into an existing dir.
201
By default, 'bzr push' will not use an existing, non-versioned dir.
203
tree = self.create_simple_tree()
204
self.build_tree(['target/'])
206
self.run_bzr_error(['Target directory ../target already exists',
207
'Supply --use-existing-dir',
209
'push ../target', working_dir='tree')
211
self.run_bzr('push --use-existing-dir ../target',
214
new_tree = WorkingTree.open('target')
215
self.assertEqual(tree.last_revision(), new_tree.last_revision())
216
# The push should have created target/a
217
self.failUnlessExists('target/a')
219
def test_push_onto_repo(self):
220
"""We should be able to 'bzr push' into an existing bzrdir."""
221
tree = self.create_simple_tree()
222
repo = self.make_repository('repo', shared=True)
224
self.run_bzr('push ../repo',
227
# Pushing onto an existing bzrdir will create a repository and
228
# branch as needed, but will only create a working tree if there was
230
self.assertRaises(errors.NoWorkingTree, WorkingTree.open, 'repo')
231
new_branch = Branch.open('repo')
232
self.assertEqual(tree.last_revision(), new_branch.last_revision())
234
def test_push_onto_just_bzrdir(self):
235
"""We don't handle when the target is just a bzrdir.
237
Because you shouldn't be able to create *just* a bzrdir in the wild.
239
# TODO: jam 20070109 Maybe it would be better to create the repository
241
tree = self.create_simple_tree()
242
a_bzrdir = self.make_bzrdir('dir')
244
self.run_bzr_error(['At ../dir you have a valid .bzr control'],
added
removed
bzrlib/tests/blackbox/test_push.py
