152
134
self.assertEqual(branchb_id, checkout.last_revision())
153
135
self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
155
def test_switch_revision(self):
156
tree = self._create_sample_tree()
157
checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
159
self.assertPathExists('checkout/file-1')
160
self.assertPathDoesNotExist('checkout/file-2')
162
def test_switch_only_revision(self):
163
tree = self._create_sample_tree()
164
checkout = tree.branch.create_checkout('checkout', lightweight=True)
165
self.assertPathExists('checkout/file-1')
166
self.assertPathExists('checkout/file-2')
167
self.run_bzr(['switch', '-r1'], working_dir='checkout')
168
self.assertPathExists('checkout/file-1')
169
self.assertPathDoesNotExist('checkout/file-2')
170
# Check that we don't accept a range
172
['bzr switch --revision takes exactly one revision identifier'],
173
['switch', '-r0..2'], working_dir='checkout')
175
137
def prepare_lightweight_switch(self):
176
138
branch = self.make_branch('branch')
177
139
branch.create_checkout('tree', lightweight=True)
178
osutils.rename('branch', 'branch1')
140
os.rename('branch', 'branch1')
180
142
def test_switch_lightweight_after_branch_moved(self):
181
143
self.prepare_lightweight_switch()
221
183
# The new branch should have been created at the same level as
222
184
# 'branch', because we did not have a '/' segment
223
185
self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
225
def test_create_branch_directory_services(self):
226
branch = self.make_branch('branch')
227
tree = branch.create_checkout('tree', lightweight=True)
228
class FooLookup(object):
229
def look_up(self, name, url):
231
directories.register('foo:', FooLookup, 'Create branches named foo-')
232
self.addCleanup(directories.remove, 'foo:')
233
self.run_bzr('switch -b foo:branch2', working_dir='tree')
234
tree = WorkingTree.open('tree')
235
self.assertEndsWith(tree.branch.base, 'foo-branch2/')
237
def test_switch_with_post_switch_hook(self):
238
from bzrlib import branch as _mod_branch
240
_mod_branch.Branch.hooks.install_named_hook('post_switch',
242
self.make_branch_and_tree('branch')
243
self.run_bzr('branch branch branch2')
244
self.run_bzr('checkout branch checkout')
246
self.assertLength(0, calls)
247
out, err = self.run_bzr('switch ../branch2')
248
self.assertLength(1, calls)
250
def test_switch_lightweight_co_with_post_switch_hook(self):
251
from bzrlib import branch as _mod_branch
253
_mod_branch.Branch.hooks.install_named_hook('post_switch',
255
self.make_branch_and_tree('branch')
256
self.run_bzr('branch branch branch2')
257
self.run_bzr('checkout --lightweight branch checkout')
259
self.assertLength(0, calls)
260
out, err = self.run_bzr('switch ../branch2')
261
self.assertLength(1, calls)
263
def test_switch_lightweight_directory(self):
264
"""Test --directory option"""
266
# create a source branch
267
a_tree = self.make_branch_and_tree('a')
268
self.build_tree_contents([('a/a', 'initial\n')])
270
a_tree.commit(message='initial')
272
# clone and add a differing revision
273
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
274
self.build_tree_contents([('b/a', 'initial\nmore\n')])
275
b_tree.commit(message='more')
277
self.run_bzr('checkout --lightweight a checkout')
278
self.run_bzr('switch --directory checkout b')
279
self.assertFileEqual('initial\nmore\n', 'checkout/a')
282
class TestSwitchParentLocationBase(TestCaseWithTransport):
285
"""Set up a repository and branch ready for testing."""
286
super(TestSwitchParentLocationBase, self).setUp()
287
self.script_runner = script.ScriptRunner()
288
self.script_runner.run_script(self, '''
289
$ bzr init-repo --no-trees repo
292
shared repository: repo
293
$ bzr init repo/trunk
294
Created a repository branch...
295
Using shared repository: ...
298
def assertParent(self, expected_parent, branch):
299
"""Verify that the parent is not None and is set correctly."""
300
actual_parent = branch.get_parent()
301
self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent),
305
class TestSwitchParentLocation(TestSwitchParentLocationBase):
307
def _checkout_and_switch(self, option=''):
308
self.script_runner.run_script(self, '''
309
$ bzr checkout %(option)s repo/trunk checkout
311
$ bzr switch --create-branch switched
312
2>Tree is up to date at revision 0.
313
2>Switched to branch:...switched...
316
bound_branch = branch.Branch.open_containing('checkout')[0]
317
master_branch = branch.Branch.open_containing('repo/switched')[0]
318
return (bound_branch, master_branch)
320
def test_switch_parent_lightweight(self):
321
"""Lightweight checkout using bzr switch."""
322
bb, mb = self._checkout_and_switch(option='--lightweight')
323
self.assertParent('repo/trunk', bb)
324
self.assertParent('repo/trunk', mb)
326
def test_switch_parent_heavyweight(self):
327
"""Heavyweight checkout using bzr switch."""
328
bb, mb = self._checkout_and_switch()
329
self.assertParent('repo/trunk', bb)
330
self.assertParent('repo/trunk', mb)
333
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport):
334
# See https://bugs.launchpad.net/bzr/+bug/812285
335
# "bzr switch --create-branch" can point the new branch's parent to the
336
# master branch, but it doesn't have to open it to do so.
338
def test_switch_create_doesnt_open_master_branch(self):
339
master = self.make_branch_and_tree('master')
341
# Note: not a lightweight checkout
342
checkout = master.branch.create_checkout('checkout')
344
def open_hook(branch):
345
# Just append the final directory of the branch
346
name = branch.base.rstrip('/').rsplit('/', 1)[1]
348
branch.Branch.hooks.install_named_hook('open', open_hook,
350
self.run_bzr('switch --create-branch -d checkout feature')
351
# We only open the master branch 1 time.
352
# This test should be cleaner to write, but see bug:
353
# https://bugs.launchpad.net/bzr/+bug/812295
354
self.assertEqual(1, opened.count('master'))
added
removed
bzrlib/tests/blackbox/test_switch.py
