1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
|
# Copyright (C) 2007-2010 Canonical Ltd
# -*- coding: utf-8 -*-
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for the switch command of bzr."""
import os
from bzrlib import (
osutils,
urlutils,
branch,
)
from bzrlib.workingtree import WorkingTree
from bzrlib.tests import (
TestCaseWithTransport,
script,
)
from bzrlib.directory_service import directories
class TestSwitch(TestCaseWithTransport):
def _create_sample_tree(self):
tree = self.make_branch_and_tree('branch-1')
self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
tree.add('file-1')
tree.commit('rev1')
tree.add('file-2')
tree.commit('rev2')
return tree
def test_switch_up_to_date_light_checkout(self):
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.run_bzr('checkout --lightweight branch checkout')
os.chdir('checkout')
out, err = self.run_bzr('switch ../branch2')
self.assertContainsRe(err, 'Tree is up to date at revision 0.\n')
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
self.assertEqual('', out)
def test_switch_out_of_date_light_checkout(self):
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.build_tree(['branch2/file'])
self.run_bzr('add branch2/file')
self.run_bzr('commit -m add-file branch2')
self.run_bzr('checkout --lightweight branch checkout')
os.chdir('checkout')
out, err = self.run_bzr('switch ../branch2')
#self.assertContainsRe(err, '\+N file')
self.assertContainsRe(err, 'Updated to revision 1.\n')
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
self.assertEqual('', out)
def _test_switch_nick(self, lightweight):
"""Check that the nick gets switched too."""
tree1 = self.make_branch_and_tree('branch1')
tree2 = self.make_branch_and_tree('branch2')
tree2.pull(tree1.branch)
checkout = tree1.branch.create_checkout('checkout',
lightweight=lightweight)
self.assertEqual(checkout.branch.nick, tree1.branch.nick)
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
False)
self.run_bzr('switch branch2', working_dir='checkout')
# we need to get the tree again, otherwise we don't get the new branch
checkout = WorkingTree.open('checkout')
self.assertEqual(checkout.branch.nick, tree2.branch.nick)
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(),
False)
def test_switch_nick(self):
self._test_switch_nick(lightweight=False)
def test_switch_nick_lightweight(self):
self._test_switch_nick(lightweight=True)
def _test_switch_explicit_nick(self, lightweight):
"""Check that the nick gets switched too."""
tree1 = self.make_branch_and_tree('branch1')
tree2 = self.make_branch_and_tree('branch2')
tree2.pull(tree1.branch)
checkout = tree1.branch.create_checkout('checkout',
lightweight=lightweight)
self.assertEqual(checkout.branch.nick, tree1.branch.nick)
checkout.branch.nick = "explicit_nick"
self.assertEqual(checkout.branch.nick, "explicit_nick")
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
"explicit_nick")
self.run_bzr('switch branch2', working_dir='checkout')
# we need to get the tree again, otherwise we don't get the new branch
checkout = WorkingTree.open('checkout')
self.assertEqual(checkout.branch.nick, tree2.branch.nick)
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(),
tree2.branch.nick)
def test_switch_explicit_nick(self):
self._test_switch_explicit_nick(lightweight=False)
def test_switch_explicit_nick_lightweight(self):
self._test_switch_explicit_nick(lightweight=True)
def test_switch_finds_relative_branch(self):
"""Switch will find 'foo' relative to the branch the checkout is of."""
self.build_tree(['repo/'])
tree1 = self.make_branch_and_tree('repo/brancha')
tree1.commit('foo')
tree2 = self.make_branch_and_tree('repo/branchb')
tree2.pull(tree1.branch)
branchb_id = tree2.commit('bar')
checkout = tree1.branch.create_checkout('checkout', lightweight=True)
self.run_bzr(['switch', 'branchb'], working_dir='checkout')
self.assertEqual(branchb_id, checkout.last_revision())
checkout = checkout.bzrdir.open_workingtree()
self.assertEqual(tree2.branch.base, checkout.branch.base)
def test_switch_finds_relative_bound_branch(self):
"""Using switch on a heavy checkout should find master sibling
The behaviour of lighweight and heavy checkouts should be
consistent when using the convenient "switch to sibling" feature
Both should switch to a sibling of the branch
they are bound to, and not a sibling of themself"""
self.build_tree(['repo/',
'heavyco/'])
tree1 = self.make_branch_and_tree('repo/brancha')
tree1.commit('foo')
tree2 = self.make_branch_and_tree('repo/branchb')
tree2.pull(tree1.branch)
branchb_id = tree2.commit('bar')
checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False)
self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a')
self.assertEqual(branchb_id, checkout.last_revision())
self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
def test_switch_revision(self):
tree = self._create_sample_tree()
checkout = tree.branch.create_checkout('checkout', lightweight=True)
self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
self.assertPathExists('checkout/file-1')
self.assertPathDoesNotExist('checkout/file-2')
def test_switch_only_revision(self):
tree = self._create_sample_tree()
checkout = tree.branch.create_checkout('checkout', lightweight=True)
self.assertPathExists('checkout/file-1')
self.assertPathExists('checkout/file-2')
self.run_bzr(['switch', '-r1'], working_dir='checkout')
self.assertPathExists('checkout/file-1')
self.assertPathDoesNotExist('checkout/file-2')
# Check that we don't accept a range
self.run_bzr_error(
['bzr switch --revision takes exactly one revision identifier'],
['switch', '-r0..2'], working_dir='checkout')
def prepare_lightweight_switch(self):
branch = self.make_branch('branch')
branch.create_checkout('tree', lightweight=True)
osutils.rename('branch', 'branch1')
def test_switch_lightweight_after_branch_moved(self):
self.prepare_lightweight_switch()
self.run_bzr('switch --force ../branch1', working_dir='tree')
branch_location = WorkingTree.open('tree').branch.base
self.assertEndsWith(branch_location, 'branch1/')
def test_switch_lightweight_after_branch_moved_relative(self):
self.prepare_lightweight_switch()
self.run_bzr('switch --force branch1', working_dir='tree')
branch_location = WorkingTree.open('tree').branch.base
self.assertEndsWith(branch_location, 'branch1/')
def test_create_branch_no_branch(self):
self.prepare_lightweight_switch()
self.run_bzr_error(['cannot create branch without source branch'],
'switch --create-branch ../branch2', working_dir='tree')
def test_create_branch(self):
branch = self.make_branch('branch')
tree = branch.create_checkout('tree', lightweight=True)
tree.commit('one', rev_id='rev-1')
self.run_bzr('switch --create-branch ../branch2', working_dir='tree')
tree = WorkingTree.open('tree')
self.assertEndsWith(tree.branch.base, '/branch2/')
def test_create_branch_local(self):
branch = self.make_branch('branch')
tree = branch.create_checkout('tree', lightweight=True)
tree.commit('one', rev_id='rev-1')
self.run_bzr('switch --create-branch branch2', working_dir='tree')
tree = WorkingTree.open('tree')
# The new branch should have been created at the same level as
# 'branch', because we did not have a '/' segment
self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
def test_create_branch_short_name(self):
branch = self.make_branch('branch')
tree = branch.create_checkout('tree', lightweight=True)
tree.commit('one', rev_id='rev-1')
self.run_bzr('switch -b branch2', working_dir='tree')
tree = WorkingTree.open('tree')
# The new branch should have been created at the same level as
# 'branch', because we did not have a '/' segment
self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
def test_create_branch_directory_services(self):
branch = self.make_branch('branch')
tree = branch.create_checkout('tree', lightweight=True)
class FooLookup(object):
def look_up(self, name, url):
return 'foo-'+name
directories.register('foo:', FooLookup, 'Create branches named foo-')
self.addCleanup(directories.remove, 'foo:')
self.run_bzr('switch -b foo:branch2', working_dir='tree')
tree = WorkingTree.open('tree')
self.assertEndsWith(tree.branch.base, 'foo-branch2/')
def test_switch_with_post_switch_hook(self):
from bzrlib import branch as _mod_branch
calls = []
_mod_branch.Branch.hooks.install_named_hook('post_switch',
calls.append, None)
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.run_bzr('checkout branch checkout')
os.chdir('checkout')
self.assertLength(0, calls)
out, err = self.run_bzr('switch ../branch2')
self.assertLength(1, calls)
def test_switch_lightweight_co_with_post_switch_hook(self):
from bzrlib import branch as _mod_branch
calls = []
_mod_branch.Branch.hooks.install_named_hook('post_switch',
calls.append, None)
self.make_branch_and_tree('branch')
self.run_bzr('branch branch branch2')
self.run_bzr('checkout --lightweight branch checkout')
os.chdir('checkout')
self.assertLength(0, calls)
out, err = self.run_bzr('switch ../branch2')
self.assertLength(1, calls)
def test_switch_lightweight_directory(self):
"""Test --directory option"""
# create a source branch
a_tree = self.make_branch_and_tree('a')
self.build_tree_contents([('a/a', 'initial\n')])
a_tree.add('a')
a_tree.commit(message='initial')
# clone and add a differing revision
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
self.build_tree_contents([('b/a', 'initial\nmore\n')])
b_tree.commit(message='more')
self.run_bzr('checkout --lightweight a checkout')
self.run_bzr('switch --directory checkout b')
self.assertFileEqual('initial\nmore\n', 'checkout/a')
class TestSwitchParentLocationBase(TestCaseWithTransport):
def setUp(self):
"""Set up a repository and branch ready for testing."""
super(TestSwitchParentLocationBase, self).setUp()
self.script_runner = script.ScriptRunner()
self.script_runner.run_script(self, '''
$ bzr init-repo --no-trees repo
Shared repository...
Location:
shared repository: repo
$ bzr init repo/trunk
Created a repository branch...
Using shared repository: ...
''')
def assertParent(self, expected_parent, branch):
"""Verify that the parent is not None and is set correctly."""
actual_parent = branch.get_parent()
self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent),
branch.get_parent())
class TestSwitchParentLocation(TestSwitchParentLocationBase):
def _checkout_and_switch(self, option=''):
self.script_runner.run_script(self, '''
$ bzr checkout %(option)s repo/trunk checkout
$ cd checkout
$ bzr switch --create-branch switched
2>Tree is up to date at revision 0.
2>Switched to branch:...switched...
$ cd ..
''' % locals())
bound_branch = branch.Branch.open_containing('checkout')[0]
master_branch = branch.Branch.open_containing('repo/switched')[0]
return (bound_branch, master_branch)
def test_switch_parent_lightweight(self):
"""Lightweight checkout using bzr switch."""
bb, mb = self._checkout_and_switch(option='--lightweight')
self.assertParent('repo/trunk', bb)
self.assertParent('repo/trunk', mb)
def test_switch_parent_heavyweight(self):
"""Heavyweight checkout using bzr switch."""
bb, mb = self._checkout_and_switch()
self.assertParent('repo/trunk', bb)
self.assertParent('repo/trunk', mb)
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport):
# See https://bugs.launchpad.net/bzr/+bug/812285
# "bzr switch --create-branch" can point the new branch's parent to the
# master branch, but it doesn't have to open it to do so.
def test_switch_create_doesnt_open_master_branch(self):
master = self.make_branch_and_tree('master')
master.commit('one')
# Note: not a lightweight checkout
checkout = master.branch.create_checkout('checkout')
opened = []
def open_hook(branch):
# Just append the final directory of the branch
name = branch.base.rstrip('/').rsplit('/', 1)[1]
opened.append(name)
branch.Branch.hooks.install_named_hook('open', open_hook,
'open_hook_logger')
self.run_bzr('switch --create-branch -d checkout feature')
# We only open the master branch 1 time.
# This test should be cleaner to write, but see bug:
# https://bugs.launchpad.net/bzr/+bug/812295
self.assertEqual(1, opened.count('master'))
|