13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
"""Black-box tests for bzr branch."""
22
from bzrlib import (branch, bzrdir, errors, repository)
27
revision as _mod_revision,
23
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
24
30
from bzrlib.tests.blackbox import ExternalBase
25
from bzrlib.tests import HardlinkFeature
31
from bzrlib.tests import (
26
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
27
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
28
38
from bzrlib.workingtree import WorkingTree
49
59
self.assertFalse(b._transport.has('branch-name'))
50
60
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
62
def test_branch_switch_no_branch(self):
63
# No branch in the current directory:
64
# => new branch will be created, but switch fails
65
self.example_branch('a')
66
self.make_repository('current')
67
self.run_bzr_error(['No WorkingTree exists for'],
68
'branch --switch ../a ../b', working_dir='current')
69
a = branch.Branch.open('a')
70
b = branch.Branch.open('b')
71
self.assertEqual(a.last_revision(), b.last_revision())
73
def test_branch_switch_no_wt(self):
74
# No working tree in the current directory:
75
# => new branch will be created, but switch fails and the current
76
# branch is unmodified
77
self.example_branch('a')
78
self.make_branch('current')
79
self.run_bzr_error(['No WorkingTree exists for'],
80
'branch --switch ../a ../b', working_dir='current')
81
a = branch.Branch.open('a')
82
b = branch.Branch.open('b')
83
self.assertEqual(a.last_revision(), b.last_revision())
84
work = branch.Branch.open('current')
85
self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
87
def test_branch_switch_no_checkout(self):
88
# Standalone branch in the current directory:
89
# => new branch will be created, but switch fails and the current
90
# branch is unmodified
91
self.example_branch('a')
92
self.make_branch_and_tree('current')
93
self.run_bzr_error(['Cannot switch a branch, only a checkout'],
94
'branch --switch ../a ../b', working_dir='current')
95
a = branch.Branch.open('a')
96
b = branch.Branch.open('b')
97
self.assertEqual(a.last_revision(), b.last_revision())
98
work = branch.Branch.open('current')
99
self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
101
def test_branch_switch_checkout(self):
102
# Checkout in the current directory:
103
# => new branch will be created and checkout bound to the new branch
104
self.example_branch('a')
105
self.run_bzr('checkout a current')
106
out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
107
a = branch.Branch.open('a')
108
b = branch.Branch.open('b')
109
self.assertEqual(a.last_revision(), b.last_revision())
110
work = WorkingTree.open('current')
111
self.assertEndsWith(work.branch.get_bound_location(), '/b/')
112
self.assertContainsRe(err, "Switched to branch: .*/b/")
114
def test_branch_switch_lightweight_checkout(self):
115
# Lightweight checkout in the current directory:
116
# => new branch will be created and lightweight checkout pointed to
118
self.example_branch('a')
119
self.run_bzr('checkout --lightweight a current')
120
out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
121
a = branch.Branch.open('a')
122
b = branch.Branch.open('b')
123
self.assertEqual(a.last_revision(), b.last_revision())
124
work = WorkingTree.open('current')
125
self.assertEndsWith(work.branch.base, '/b/')
126
self.assertContainsRe(err, "Switched to branch: .*/b/")
52
128
def test_branch_only_copies_history(self):
53
129
# Knit branches should only push the history for the current revision.
54
130
format = bzrdir.BzrDirMetaFormat1()
107
183
self.assertEqual(strip_trailing_slash(b.repository.base),
108
184
strip_trailing_slash(local_path_to_url(expected_repo_path)))
186
def test_branch_no_tree(self):
187
self.example_branch('source')
188
self.run_bzr('branch --no-tree source target')
189
self.failIfExists('target/hello')
190
self.failIfExists('target/goodbye')
192
def test_branch_into_existing_dir(self):
193
self.example_branch('a')
194
# existing dir with similar files but no .bzr dir
195
self.build_tree_contents([('b/',)])
196
self.build_tree_contents([('b/hello', 'bar')]) # different content
197
self.build_tree_contents([('b/goodbye', 'baz')])# same content
198
# fails without --use-existing-dir
199
out,err = self.run_bzr('branch a b', retcode=3)
200
self.assertEqual('', out)
201
self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',
204
self.run_bzr('branch a b --use-existing-dir')
206
self.failUnlessExists('b/hello.moved')
207
self.failIfExists('b/godbye.moved')
208
# we can't branch into branch
209
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
210
self.assertEqual('', out)
211
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
213
def test_branch_bind(self):
214
self.example_branch('a')
215
out, err = self.run_bzr('branch a b --bind')
216
self.assertEndsWith(err, "New branch bound to a\n")
217
b = branch.Branch.open('b')
218
self.assertEndsWith(b.get_bound_location(), '/a/')
111
221
class TestBranchStacked(ExternalBase):
112
222
"""Tests for branch --stacked"""
114
def check_shallow_branch(self, branch_revid, stacked_on):
115
"""Assert that the branch 'newbranch' has been published correctly.
117
:param stacked_on: url of a branch this one is stacked upon.
118
:param branch_revid: a revision id that should be the only
119
revision present in the stacked branch, and it should not be in
120
the reference branch.
122
new_branch = branch.Branch.open('newbranch')
123
# The branch refers to the mainline
124
self.assertEqual(stacked_on, new_branch.get_stacked_on_url())
125
# and the branch's work was pushed
126
self.assertTrue(new_branch.repository.has_revision(branch_revid))
127
# The newly committed revision shoud be present in the stacked branch,
128
# but not in the stacked-on branch. Because stacking is set up by the
129
# branch object, if we open the stacked branch's repository directly,
130
# bypassing the branch, we see only what's in the stacked repository.
131
stacked_repo = bzrdir.BzrDir.open('newbranch').open_repository()
132
stacked_repo_revisions = set(stacked_repo.all_revision_ids())
133
if len(stacked_repo_revisions) != 1:
134
self.fail("wrong revisions in stacked repository: %r"
135
% (stacked_repo_revisions,))
137
224
def assertRevisionInRepository(self, repo_path, revid):
138
225
"""Check that a revision is in a repository, disregarding stacking."""
139
226
repo = bzrdir.BzrDir.open(repo_path).open_repository()
153
240
"""Branching a stacked branch is not stacked by default"""
154
241
# We have a mainline
155
242
trunk_tree = self.make_branch_and_tree('target',
156
format='development')
157
244
trunk_tree.commit('mainline')
158
245
# and a branch from it which is stacked
159
246
branch_tree = self.make_branch_and_tree('branch',
160
format='development')
161
248
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
162
249
# with some work on it
163
branch_tree.commit('moar work plz')
250
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
251
work_tree.commit('moar work plz')
252
work_tree.branch.push(branch_tree.branch)
164
253
# branching our local branch gives us a new stacked branch pointing at
166
255
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
167
256
self.assertEqual('', out)
168
self.assertEqual('Branched 1 revision(s).\n',
257
self.assertEqual('Branched 2 revision(s).\n',
170
259
# it should have preserved the branch format, and so it should be
171
260
# capable of supporting stacking, but not actually have a stacked_on
177
266
"""Asking to stack on a stacked branch does work"""
178
267
# We have a mainline
179
268
trunk_tree = self.make_branch_and_tree('target',
180
format='development')
181
270
trunk_revid = trunk_tree.commit('mainline')
182
271
# and a branch from it which is stacked
183
272
branch_tree = self.make_branch_and_tree('branch',
184
format='development')
185
274
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
186
275
# with some work on it
187
branch_revid = branch_tree.commit('moar work plz')
276
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
277
branch_revid = work_tree.commit('moar work plz')
278
work_tree.branch.push(branch_tree.branch)
188
279
# you can chain branches on from there
189
280
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
190
281
self.assertEqual('', out)
193
284
self.assertEqual(branch_tree.branch.base,
194
285
branch.Branch.open('branch2').get_stacked_on_url())
195
286
branch2_tree = WorkingTree.open('branch2')
196
branch2_revid = branch2_tree.commit('work on second stacked branch')
287
branch2_revid = work_tree.commit('work on second stacked branch')
288
work_tree.branch.push(branch2_tree.branch)
197
289
self.assertRevisionInRepository('branch2', branch2_revid)
198
290
self.assertRevisionsInBranchRepository(
199
291
[trunk_revid, branch_revid, branch2_revid],
212
304
self.assertEqual('Created new stacked branch referring to %s.\n' %
213
305
trunk_tree.branch.base, err)
214
306
self.assertRevisionNotInRepository('newbranch', original_revid)
215
new_tree = WorkingTree.open('newbranch')
216
new_revid = new_tree.commit('new work')
217
self.check_shallow_branch(new_revid, trunk_tree.branch.base)
307
new_branch = branch.Branch.open('newbranch')
308
self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
219
310
def test_branch_stacked_from_smart_server(self):
220
311
# We can branch stacking on a smart server
221
from bzrlib.smart.server import SmartTCPServer_for_testing
222
self.transport_server = SmartTCPServer_for_testing
223
trunk = self.make_branch('mainline', format='development')
312
self.transport_server = test_server.SmartTCPServer_for_testing
313
trunk = self.make_branch('mainline', format='1.9')
224
314
out, err = self.run_bzr(
225
315
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
231
321
['branch', '--stacked', 'trunk', 'shallow'])
232
322
# We should notify the user that we upgraded their format
233
323
self.assertEqualDiff(
234
'Source format does not support stacking, using format: \'1.6\'\n'
324
'Source repository format does not support stacking, using format:\n'
235
325
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
326
'Source branch format does not support stacking, using format:\n'
328
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
329
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
237
330
'Created new stacked branch referring to %s.\n' % (trunk.base,),
243
336
['branch', '--stacked', 'trunk', 'shallow'])
244
337
# We should notify the user that we upgraded their format
245
338
self.assertEqualDiff(
246
'Source format does not support stacking, using format:'
247
' \'1.6.1-rich-root\'\n'
339
'Source repository format does not support stacking, using format:\n'
248
340
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
341
'Source branch format does not support stacking, using format:\n'
343
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
344
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
250
345
'Created new stacked branch referring to %s.\n' % (trunk.base,),
349
class TestSmartServerBranching(ExternalBase):
351
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
352
self.setup_smart_server_with_call_log()
353
t = self.make_branch_and_tree('from')
354
for count in range(9):
355
t.commit(message='commit %d' % count)
356
self.reset_smart_call_log()
357
out, err = self.run_bzr(['branch', self.get_url('from'),
358
self.get_url('target')])
359
# This figure represent the amount of work to perform this use case. It
360
# is entirely ok to reduce this number if a test fails due to rpc_count
361
# being too low. If rpc_count increases, more network roundtrips have
362
# become necessary for this use case. Please do not adjust this number
363
# upwards without agreement from bzr's network support maintainers.
364
self.assertLength(38, self.hpss_calls)
366
def test_branch_from_trivial_branch_streaming_acceptance(self):
367
self.setup_smart_server_with_call_log()
368
t = self.make_branch_and_tree('from')
369
for count in range(9):
370
t.commit(message='commit %d' % count)
371
self.reset_smart_call_log()
372
out, err = self.run_bzr(['branch', self.get_url('from'),
374
# This figure represent the amount of work to perform this use case. It
375
# is entirely ok to reduce this number if a test fails due to rpc_count
376
# being too low. If rpc_count increases, more network roundtrips have
377
# become necessary for this use case. Please do not adjust this number
378
# upwards without agreement from bzr's network support maintainers.
379
self.assertLength(10, self.hpss_calls)
381
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
382
self.setup_smart_server_with_call_log()
383
t = self.make_branch_and_tree('trunk')
384
for count in range(8):
385
t.commit(message='commit %d' % count)
386
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
388
local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
389
local_tree.commit('feature change')
390
local_tree.branch.push(tree2.branch)
391
self.reset_smart_call_log()
392
out, err = self.run_bzr(['branch', self.get_url('feature'),
394
# This figure represent the amount of work to perform this use case. It
395
# is entirely ok to reduce this number if a test fails due to rpc_count
396
# being too low. If rpc_count increases, more network roundtrips have
397
# become necessary for this use case. Please do not adjust this number
398
# upwards without agreement from bzr's network support maintainers.
399
self.assertLength(15, self.hpss_calls)
255
402
class TestRemoteBranch(TestCaseWithSFTPServer):
added
removed
bzrlib/tests/blackbox/test_branch.py
