142
153
branchb_id = tree2.commit('bar')
143
154
checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False)
144
155
self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
145
self.assertEqual(branchb_id, checkout.last_revision())
146
self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
156
# Refresh checkout as 'switch' modified it
157
checkout = checkout.bzrdir.open_workingtree()
158
self.assertEqual(branchb_id, checkout.last_revision())
159
self.assertEqual(tree2.branch.base,
160
checkout.branch.get_bound_location())
162
def test_switch_finds_relative_unicode_branch(self):
163
"""Switch will find 'foo' relative to the branch the checkout is of."""
164
self.requireFeature(UnicodeFilenameFeature)
165
self.build_tree(['repo/'])
166
tree1 = self.make_branch_and_tree('repo/brancha')
168
tree2 = self.make_branch_and_tree(u'repo/branch\xe9')
169
tree2.pull(tree1.branch)
170
branchb_id = tree2.commit('bar')
171
checkout = tree1.branch.create_checkout('checkout', lightweight=True)
172
self.run_bzr(['switch', u'branch\xe9'], working_dir='checkout')
173
self.assertEqual(branchb_id, checkout.last_revision())
174
checkout = checkout.bzrdir.open_workingtree()
175
self.assertEqual(tree2.branch.base, checkout.branch.base)
148
177
def test_switch_revision(self):
149
178
tree = self._create_sample_tree()
150
179
checkout = tree.branch.create_checkout('checkout', lightweight=True)
151
180
self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
152
self.failUnlessExists('checkout/file-1')
153
self.failIfExists('checkout/file-2')
181
self.assertPathExists('checkout/file-1')
182
self.assertPathDoesNotExist('checkout/file-2')
184
def test_switch_into_colocated(self):
185
# Create a new colocated branch from an existing non-colocated branch.
186
tree = self.make_branch_and_tree('.', format='development-colo')
187
self.build_tree(['file-1', 'file-2'])
189
revid1 = tree.commit('rev1')
191
revid2 = tree.commit('rev2')
192
self.run_bzr(['switch', '-b', 'anotherbranch'])
194
['', 'anotherbranch'],
195
tree.branch.bzrdir.get_branches().keys())
197
def test_switch_into_unrelated_colocated(self):
198
# Create a new colocated branch from an existing non-colocated branch.
199
tree = self.make_branch_and_tree('.', format='development-colo')
200
self.build_tree(['file-1', 'file-2'])
202
revid1 = tree.commit('rev1')
204
revid2 = tree.commit('rev2')
205
tree.bzrdir.create_branch(name='foo')
206
self.run_bzr_error(['Cannot switch a branch, only a checkout.'],
208
self.run_bzr(['switch', '--force', 'foo'])
210
def test_switch_existing_colocated(self):
211
# Create a branch branch-1 that initially is a checkout of 'foo'
212
# Use switch to change it to 'anotherbranch'
213
repo = self.make_repository('branch-1', format='development-colo')
214
target_branch = repo.bzrdir.create_branch(name='foo')
215
repo.bzrdir.set_branch_reference(target_branch)
216
tree = repo.bzrdir.create_workingtree()
217
self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
219
revid1 = tree.commit('rev1')
221
revid2 = tree.commit('rev2')
222
otherbranch = tree.bzrdir.create_branch(name='anotherbranch')
223
otherbranch.generate_revision_history(revid1)
224
self.run_bzr(['switch', 'anotherbranch'], working_dir='branch-1')
225
tree = WorkingTree.open("branch-1")
226
self.assertEquals(tree.last_revision(), revid1)
227
self.assertEquals(tree.branch.control_url, otherbranch.control_url)
229
def test_switch_new_colocated(self):
230
# Create a branch branch-1 that initially is a checkout of 'foo'
231
# Use switch to create 'anotherbranch' which derives from that
232
repo = self.make_repository('branch-1', format='development-colo')
233
target_branch = repo.bzrdir.create_branch(name='foo')
234
repo.bzrdir.set_branch_reference(target_branch)
235
tree = repo.bzrdir.create_workingtree()
236
self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
238
revid1 = tree.commit('rev1')
239
self.run_bzr(['switch', '-b', 'anotherbranch'], working_dir='branch-1')
240
bzrdir = BzrDir.open("branch-1")
242
set([b.name for b in bzrdir.list_branches()]),
243
set(["foo", "anotherbranch"]))
244
self.assertEquals(bzrdir.open_branch().name, "anotherbranch")
245
self.assertEquals(bzrdir.open_branch().last_revision(), revid1)
247
def test_switch_new_colocated_unicode(self):
248
# Create a branch branch-1 that initially is a checkout of 'foo'
249
# Use switch to create 'branch\xe9' which derives from that
250
self.requireFeature(UnicodeFilenameFeature)
251
repo = self.make_repository('branch-1', format='development-colo')
252
target_branch = repo.bzrdir.create_branch(name='foo')
253
repo.bzrdir.set_branch_reference(target_branch)
254
tree = repo.bzrdir.create_workingtree()
255
self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
257
revid1 = tree.commit('rev1')
258
self.run_bzr(['switch', '-b', u'branch\xe9'], working_dir='branch-1')
259
bzrdir = BzrDir.open("branch-1")
261
set([b.name for b in bzrdir.list_branches()]),
262
set(["foo", u"branch\xe9"]))
263
self.assertEquals(bzrdir.open_branch().name, u"branch\xe9")
264
self.assertEquals(bzrdir.open_branch().last_revision(), revid1)
155
266
def test_switch_only_revision(self):
156
267
tree = self._create_sample_tree()
157
268
checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
self.failUnlessExists('checkout/file-1')
159
self.failUnlessExists('checkout/file-2')
269
self.assertPathExists('checkout/file-1')
270
self.assertPathExists('checkout/file-2')
160
271
self.run_bzr(['switch', '-r1'], working_dir='checkout')
161
self.failUnlessExists('checkout/file-1')
162
self.failIfExists('checkout/file-2')
272
self.assertPathExists('checkout/file-1')
273
self.assertPathDoesNotExist('checkout/file-2')
163
274
# Check that we don't accept a range
164
275
self.run_bzr_error(
165
276
['bzr switch --revision takes exactly one revision identifier'],
270
381
self.run_bzr('checkout --lightweight a checkout')
271
382
self.run_bzr('switch --directory checkout b')
272
383
self.assertFileEqual('initial\nmore\n', 'checkout/a')
386
class TestSwitchParentLocationBase(TestCaseWithTransport):
389
"""Set up a repository and branch ready for testing."""
390
super(TestSwitchParentLocationBase, self).setUp()
391
self.script_runner = script.ScriptRunner()
392
self.script_runner.run_script(self, '''
393
$ bzr init-repo --no-trees repo
396
shared repository: repo
397
$ bzr init repo/trunk
398
Created a repository branch...
399
Using shared repository: ...
402
def assertParent(self, expected_parent, branch):
403
"""Verify that the parent is not None and is set correctly."""
404
actual_parent = branch.get_parent()
405
self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent),
409
class TestSwitchParentLocation(TestSwitchParentLocationBase):
411
def _checkout_and_switch(self, option=''):
412
self.script_runner.run_script(self, '''
413
$ bzr checkout %(option)s repo/trunk checkout
415
$ bzr switch --create-branch switched
416
2>Tree is up to date at revision 0.
417
2>Switched to branch:...switched...
420
bound_branch = branch.Branch.open_containing('checkout')[0]
421
master_branch = branch.Branch.open_containing('repo/switched')[0]
422
return (bound_branch, master_branch)
424
def test_switch_parent_lightweight(self):
425
"""Lightweight checkout using bzr switch."""
426
bb, mb = self._checkout_and_switch(option='--lightweight')
427
self.assertParent('repo/trunk', bb)
428
self.assertParent('repo/trunk', mb)
430
def test_switch_parent_heavyweight(self):
431
"""Heavyweight checkout using bzr switch."""
432
bb, mb = self._checkout_and_switch()
433
self.assertParent('repo/trunk', bb)
434
self.assertParent('repo/trunk', mb)
437
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport):
438
# See https://bugs.launchpad.net/bzr/+bug/812285
439
# "bzr switch --create-branch" can point the new branch's parent to the
440
# master branch, but it doesn't have to open it to do so.
442
def test_switch_create_doesnt_open_master_branch(self):
443
master = self.make_branch_and_tree('master')
445
# Note: not a lightweight checkout
446
checkout = master.branch.create_checkout('checkout')
448
def open_hook(branch):
449
# Just append the final directory of the branch
450
name = branch.base.rstrip('/').rsplit('/', 1)[1]
452
branch.Branch.hooks.install_named_hook('open', open_hook,
454
self.run_bzr('switch --create-branch -d checkout feature')
455
# We only open the master branch 1 time.
456
# This test should be cleaner to write, but see bug:
457
# https://bugs.launchpad.net/bzr/+bug/812295
458
self.assertEqual(1, opened.count('master'))
461
class TestSmartServerSwitch(TestCaseWithTransport):
463
def test_switch_lightweight(self):
464
self.setup_smart_server_with_call_log()
465
t = self.make_branch_and_tree('from')
466
for count in range(9):
467
t.commit(message='commit %d' % count)
468
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
470
self.reset_smart_call_log()
471
self.run_bzr(['switch', self.get_url('from')], working_dir='target')
472
# This figure represent the amount of work to perform this use case. It
473
# is entirely ok to reduce this number if a test fails due to rpc_count
474
# being too low. If rpc_count increases, more network roundtrips have
475
# become necessary for this use case. Please do not adjust this number
476
# upwards without agreement from bzr's network support maintainers.
477
self.assertLength(24, self.hpss_calls)
478
self.assertLength(5, self.hpss_connections)
479
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
added
removed
bzrlib/tests/blackbox/test_switch.py
