6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
1 |
# Copyright (C) 2007-2012 Canonical Ltd
|
2999.1.4
by Ian Clatworthy
more review tweaks including commit of blackbox tests |
2 |
# -*- coding: utf-8 -*-
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
16 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2999.1.4
by Ian Clatworthy
more review tweaks including commit of blackbox tests |
17 |
|
18 |
||
19 |
"""Tests for the switch command of bzr."""
|
|
20 |
||
21 |
import os |
|
22 |
||
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
23 |
from bzrlib.controldir import ControlDir |
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
24 |
from bzrlib import ( |
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
25 |
osutils, |
26 |
urlutils, |
|
27 |
branch, |
|
28 |
)
|
|
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
29 |
from bzrlib.workingtree import WorkingTree |
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
30 |
from bzrlib.tests import ( |
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
31 |
TestCaseWithTransport, |
32 |
script, |
|
33 |
)
|
|
5268.8.18
by Jelmer Vernooij
Use UnicodeFilenameFeature. |
34 |
from bzrlib.tests.features import UnicodeFilenameFeature |
4879.2.1
by Neil Martinsen-Burrell
switch should use directory services when creating a branch |
35 |
from bzrlib.directory_service import directories |
2999.1.4
by Ian Clatworthy
more review tweaks including commit of blackbox tests |
36 |
|
6366.1.5
by Jelmer Vernooij
add test for hpss call / connection count of 'bzr switch'. |
37 |
from bzrlib.tests.matchers import ContainsNoVfsCalls |
38 |
||
5816.6.15
by A. S. Budden
Added erroneously removed blank line. |
39 |
|
5283.4.5
by Martin Pool
Update remaining subclasses of ExternalBase |
40 |
class TestSwitch(TestCaseWithTransport): |
2999.1.4
by Ian Clatworthy
more review tweaks including commit of blackbox tests |
41 |
|
3984.5.14
by Daniel Watkins
Extracted common setup code. |
42 |
def _create_sample_tree(self): |
43 |
tree = self.make_branch_and_tree('branch-1') |
|
44 |
self.build_tree(['branch-1/file-1', 'branch-1/file-2']) |
|
45 |
tree.add('file-1') |
|
46 |
tree.commit('rev1') |
|
47 |
tree.add('file-2') |
|
48 |
tree.commit('rev2') |
|
49 |
return tree |
|
50 |
||
2999.1.4
by Ian Clatworthy
more review tweaks including commit of blackbox tests |
51 |
def test_switch_up_to_date_light_checkout(self): |
52 |
self.make_branch_and_tree('branch') |
|
53 |
self.run_bzr('branch branch branch2') |
|
54 |
self.run_bzr('checkout --lightweight branch checkout') |
|
55 |
os.chdir('checkout') |
|
56 |
out, err = self.run_bzr('switch ../branch2') |
|
57 |
self.assertContainsRe(err, 'Tree is up to date at revision 0.\n') |
|
58 |
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n') |
|
59 |
self.assertEqual('', out) |
|
60 |
||
61 |
def test_switch_out_of_date_light_checkout(self): |
|
62 |
self.make_branch_and_tree('branch') |
|
63 |
self.run_bzr('branch branch branch2') |
|
64 |
self.build_tree(['branch2/file']) |
|
65 |
self.run_bzr('add branch2/file') |
|
66 |
self.run_bzr('commit -m add-file branch2') |
|
67 |
self.run_bzr('checkout --lightweight branch checkout') |
|
68 |
os.chdir('checkout') |
|
69 |
out, err = self.run_bzr('switch ../branch2') |
|
70 |
#self.assertContainsRe(err, '\+N file')
|
|
71 |
self.assertContainsRe(err, 'Updated to revision 1.\n') |
|
72 |
self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n') |
|
73 |
self.assertEqual('', out) |
|
3246.5.1
by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the |
74 |
|
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
75 |
def _test_switch_nick(self, lightweight): |
76 |
"""Check that the nick gets switched too."""
|
|
77 |
tree1 = self.make_branch_and_tree('branch1') |
|
78 |
tree2 = self.make_branch_and_tree('branch2') |
|
79 |
tree2.pull(tree1.branch) |
|
80 |
checkout = tree1.branch.create_checkout('checkout', |
|
81 |
lightweight=lightweight) |
|
82 |
self.assertEqual(checkout.branch.nick, tree1.branch.nick) |
|
83 |
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(), |
|
84 |
False) |
|
85 |
self.run_bzr('switch branch2', working_dir='checkout') |
|
86 |
||
87 |
# we need to get the tree again, otherwise we don't get the new branch
|
|
88 |
checkout = WorkingTree.open('checkout') |
|
89 |
self.assertEqual(checkout.branch.nick, tree2.branch.nick) |
|
90 |
self.assertEqual(checkout.branch.get_config().has_explicit_nickname(), |
|
91 |
False) |
|
92 |
||
3565.6.1
by Marius Kruger
Let 'bzr switch' update the nick too. |
93 |
def test_switch_nick(self): |
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
94 |
self._test_switch_nick(lightweight=False) |
95 |
||
96 |
def test_switch_nick_lightweight(self): |
|
97 |
self._test_switch_nick(lightweight=True) |
|
98 |
||
99 |
def _test_switch_explicit_nick(self, lightweight): |
|
3565.6.1
by Marius Kruger
Let 'bzr switch' update the nick too. |
100 |
"""Check that the nick gets switched too."""
|
101 |
tree1 = self.make_branch_and_tree('branch1') |
|
102 |
tree2 = self.make_branch_and_tree('branch2') |
|
103 |
tree2.pull(tree1.branch) |
|
3565.6.7
by Marius Kruger
* checkouts now use master nick when no explicit nick is set. |
104 |
checkout = tree1.branch.create_checkout('checkout', |
105 |
lightweight=lightweight) |
|
106 |
self.assertEqual(checkout.branch.nick, tree1.branch.nick) |
|
107 |
checkout.branch.nick = "explicit_nick" |
|
108 |
self.assertEqual(checkout.branch.nick, "explicit_nick") |
|
109 |
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(), |
|
110 |
"explicit_nick") |
|
111 |
self.run_bzr('switch branch2', working_dir='checkout') |
|
112 |
||
113 |
# we need to get the tree again, otherwise we don't get the new branch
|
|
114 |
checkout = WorkingTree.open('checkout') |
|
115 |
self.assertEqual(checkout.branch.nick, tree2.branch.nick) |
|
116 |
self.assertEqual(checkout.branch.get_config()._get_explicit_nickname(), |
|
117 |
tree2.branch.nick) |
|
118 |
||
119 |
def test_switch_explicit_nick(self): |
|
120 |
self._test_switch_explicit_nick(lightweight=False) |
|
121 |
||
122 |
def test_switch_explicit_nick_lightweight(self): |
|
123 |
self._test_switch_explicit_nick(lightweight=True) |
|
3565.6.1
by Marius Kruger
Let 'bzr switch' update the nick too. |
124 |
|
3246.5.1
by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the |
125 |
def test_switch_finds_relative_branch(self): |
3565.6.1
by Marius Kruger
Let 'bzr switch' update the nick too. |
126 |
"""Switch will find 'foo' relative to the branch the checkout is of."""
|
3246.5.1
by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the |
127 |
self.build_tree(['repo/']) |
128 |
tree1 = self.make_branch_and_tree('repo/brancha') |
|
129 |
tree1.commit('foo') |
|
130 |
tree2 = self.make_branch_and_tree('repo/branchb') |
|
131 |
tree2.pull(tree1.branch) |
|
132 |
branchb_id = tree2.commit('bar') |
|
133 |
checkout = tree1.branch.create_checkout('checkout', lightweight=True) |
|
134 |
self.run_bzr(['switch', 'branchb'], working_dir='checkout') |
|
135 |
self.assertEqual(branchb_id, checkout.last_revision()) |
|
136 |
checkout = checkout.bzrdir.open_workingtree() |
|
137 |
self.assertEqual(tree2.branch.base, checkout.branch.base) |
|
3602.3.1
by Adrian Wilkins
Test that `bzr switch` finds the sibling of the bound branch of heavy checkout. |
138 |
|
139 |
def test_switch_finds_relative_bound_branch(self): |
|
3602.3.4
by Adrian Wilkins
Improved comments and documentation |
140 |
"""Using switch on a heavy checkout should find master sibling
|
141 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
142 |
The behaviour of lighweight and heavy checkouts should be
|
5816.6.1
by A. S. Budden
Test harness to stimulate Bug #513709: parent being set incorrectly in switch --create-branch. |
143 |
consistent when using the convenient "switch to sibling" feature
|
3602.3.4
by Adrian Wilkins
Improved comments and documentation |
144 |
Both should switch to a sibling of the branch
|
145 |
they are bound to, and not a sibling of themself"""
|
|
146 |
||
3602.3.1
by Adrian Wilkins
Test that `bzr switch` finds the sibling of the bound branch of heavy checkout. |
147 |
self.build_tree(['repo/', |
148 |
'heavyco/']) |
|
149 |
tree1 = self.make_branch_and_tree('repo/brancha') |
|
150 |
tree1.commit('foo') |
|
151 |
tree2 = self.make_branch_and_tree('repo/branchb') |
|
152 |
tree2.pull(tree1.branch) |
|
153 |
branchb_id = tree2.commit('bar') |
|
154 |
checkout = tree1.branch.create_checkout('heavyco/a', lightweight=False) |
|
155 |
self.run_bzr(['switch', 'branchb'], working_dir='heavyco/a') |
|
6404.6.6
by Vincent Ladeuil
Use idioms coherently and add comments to make their purpose clearer. |
156 |
# Refresh checkout as 'switch' modified it
|
157 |
checkout = checkout.bzrdir.open_workingtree() |
|
3602.3.1
by Adrian Wilkins
Test that `bzr switch` finds the sibling of the bound branch of heavy checkout. |
158 |
self.assertEqual(branchb_id, checkout.last_revision()) |
6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
159 |
self.assertEqual(tree2.branch.base, |
160 |
checkout.branch.get_bound_location()) |
|
4354.2.2
by Aaron Bentley
Enable switch --force for lightweight checkouts after moves. |
161 |
|
5268.8.15
by Jelmer Vernooij
Fix switching to unicode branch names. |
162 |
def test_switch_finds_relative_unicode_branch(self): |
163 |
"""Switch will find 'foo' relative to the branch the checkout is of."""
|
|
5268.8.18
by Jelmer Vernooij
Use UnicodeFilenameFeature. |
164 |
self.requireFeature(UnicodeFilenameFeature) |
5268.8.15
by Jelmer Vernooij
Fix switching to unicode branch names. |
165 |
self.build_tree(['repo/']) |
166 |
tree1 = self.make_branch_and_tree('repo/brancha') |
|
167 |
tree1.commit('foo') |
|
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) |
|
176 |
||
177 |
def test_switch_finds_relative_unicode_branch(self): |
|
178 |
"""Switch will find 'foo' relative to the branch the checkout is of."""
|
|
5268.8.18
by Jelmer Vernooij
Use UnicodeFilenameFeature. |
179 |
self.requireFeature(UnicodeFilenameFeature) |
5268.8.15
by Jelmer Vernooij
Fix switching to unicode branch names. |
180 |
self.build_tree(['repo/']) |
181 |
tree1 = self.make_branch_and_tree('repo/brancha') |
|
182 |
tree1.commit('foo') |
|
183 |
tree2 = self.make_branch_and_tree(u'repo/branch\xe9') |
|
184 |
tree2.pull(tree1.branch) |
|
185 |
branchb_id = tree2.commit('bar') |
|
186 |
checkout = tree1.branch.create_checkout('checkout', lightweight=True) |
|
187 |
self.run_bzr(['switch', u'branch\xe9'], working_dir='checkout') |
|
188 |
self.assertEqual(branchb_id, checkout.last_revision()) |
|
189 |
checkout = checkout.bzrdir.open_workingtree() |
|
190 |
self.assertEqual(tree2.branch.base, checkout.branch.base) |
|
191 |
||
3984.5.2
by Daniel Watkins
Added blackbox test. |
192 |
def test_switch_revision(self): |
3984.5.14
by Daniel Watkins
Extracted common setup code. |
193 |
tree = self._create_sample_tree() |
3984.5.2
by Daniel Watkins
Added blackbox test. |
194 |
checkout = tree.branch.create_checkout('checkout', lightweight=True) |
195 |
self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout') |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
196 |
self.assertPathExists('checkout/file-1') |
197 |
self.assertPathDoesNotExist('checkout/file-2') |
|
3984.5.9
by Daniel Watkins
Added test for allowing only revisions to be passed to switch. |
198 |
|
6437.7.5
by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch. |
199 |
def test_switch_into_colocated(self): |
200 |
# Create a new colocated branch from an existing non-colocated branch.
|
|
201 |
tree = self.make_branch_and_tree('.', format='development-colo') |
|
202 |
self.build_tree(['file-1', 'file-2']) |
|
203 |
tree.add('file-1') |
|
204 |
revid1 = tree.commit('rev1') |
|
205 |
tree.add('file-2') |
|
206 |
revid2 = tree.commit('rev2') |
|
207 |
self.run_bzr(['switch', '-b', 'anotherbranch']) |
|
208 |
self.assertEquals( |
|
6437.30.1
by Wouter van Heyst
Stop depending on the particular CPython ordering of dictionary keys when testing the result of BzrDir.get_branches. |
209 |
set(['', 'anotherbranch']), |
210 |
set(tree.branch.bzrdir.get_branches().keys())) |
|
6437.7.5
by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch. |
211 |
|
6437.7.6
by Jelmer Vernooij
Add test for --force argument used in standalone branch. |
212 |
def test_switch_into_unrelated_colocated(self): |
213 |
# Create a new colocated branch from an existing non-colocated branch.
|
|
214 |
tree = self.make_branch_and_tree('.', format='development-colo') |
|
215 |
self.build_tree(['file-1', 'file-2']) |
|
216 |
tree.add('file-1') |
|
217 |
revid1 = tree.commit('rev1') |
|
218 |
tree.add('file-2') |
|
219 |
revid2 = tree.commit('rev2') |
|
220 |
tree.bzrdir.create_branch(name='foo') |
|
221 |
self.run_bzr_error(['Cannot switch a branch, only a checkout.'], |
|
222 |
'switch foo') |
|
223 |
self.run_bzr(['switch', '--force', 'foo']) |
|
224 |
||
5268.8.12
by Jelmer Vernooij
support creating new colocated branches from 'bzr switch -b'. |
225 |
def test_switch_existing_colocated(self): |
5268.8.6
by Jelmer Vernooij
More fixes to test. |
226 |
# Create a branch branch-1 that initially is a checkout of 'foo'
|
227 |
# Use switch to change it to 'anotherbranch'
|
|
228 |
repo = self.make_repository('branch-1', format='development-colo') |
|
229 |
target_branch = repo.bzrdir.create_branch(name='foo') |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
230 |
repo.bzrdir.set_branch_reference(target_branch) |
5268.8.6
by Jelmer Vernooij
More fixes to test. |
231 |
tree = repo.bzrdir.create_workingtree() |
5268.8.5
by Jelmer Vernooij
Add tests for switching to colocated branches. |
232 |
self.build_tree(['branch-1/file-1', 'branch-1/file-2']) |
233 |
tree.add('file-1') |
|
234 |
revid1 = tree.commit('rev1') |
|
235 |
tree.add('file-2') |
|
236 |
revid2 = tree.commit('rev2') |
|
5268.8.6
by Jelmer Vernooij
More fixes to test. |
237 |
otherbranch = tree.bzrdir.create_branch(name='anotherbranch') |
5268.8.5
by Jelmer Vernooij
Add tests for switching to colocated branches. |
238 |
otherbranch.generate_revision_history(revid1) |
239 |
self.run_bzr(['switch', 'anotherbranch'], working_dir='branch-1') |
|
5268.8.10
by Jelmer Vernooij
bzr switch can now switch to colocated branches. |
240 |
tree = WorkingTree.open("branch-1") |
5268.8.5
by Jelmer Vernooij
Add tests for switching to colocated branches. |
241 |
self.assertEquals(tree.last_revision(), revid1) |
5268.8.10
by Jelmer Vernooij
bzr switch can now switch to colocated branches. |
242 |
self.assertEquals(tree.branch.control_url, otherbranch.control_url) |
5268.8.5
by Jelmer Vernooij
Add tests for switching to colocated branches. |
243 |
|
5268.8.12
by Jelmer Vernooij
support creating new colocated branches from 'bzr switch -b'. |
244 |
def test_switch_new_colocated(self): |
245 |
# Create a branch branch-1 that initially is a checkout of 'foo'
|
|
246 |
# Use switch to create 'anotherbranch' which derives from that
|
|
247 |
repo = self.make_repository('branch-1', format='development-colo') |
|
248 |
target_branch = repo.bzrdir.create_branch(name='foo') |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
249 |
repo.bzrdir.set_branch_reference(target_branch) |
5268.8.12
by Jelmer Vernooij
support creating new colocated branches from 'bzr switch -b'. |
250 |
tree = repo.bzrdir.create_workingtree() |
251 |
self.build_tree(['branch-1/file-1', 'branch-1/file-2']) |
|
252 |
tree.add('file-1') |
|
253 |
revid1 = tree.commit('rev1') |
|
254 |
self.run_bzr(['switch', '-b', 'anotherbranch'], working_dir='branch-1') |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
255 |
bzrdir = ControlDir.open("branch-1") |
5268.8.12
by Jelmer Vernooij
support creating new colocated branches from 'bzr switch -b'. |
256 |
self.assertEquals( |
257 |
set([b.name for b in bzrdir.list_branches()]), |
|
258 |
set(["foo", "anotherbranch"])) |
|
259 |
self.assertEquals(bzrdir.open_branch().name, "anotherbranch") |
|
260 |
self.assertEquals(bzrdir.open_branch().last_revision(), revid1) |
|
261 |
||
5268.8.17
by Jelmer Vernooij
Support switching to new unicode colocated branch. |
262 |
def test_switch_new_colocated_unicode(self): |
263 |
# Create a branch branch-1 that initially is a checkout of 'foo'
|
|
264 |
# Use switch to create 'branch\xe9' which derives from that
|
|
5268.8.18
by Jelmer Vernooij
Use UnicodeFilenameFeature. |
265 |
self.requireFeature(UnicodeFilenameFeature) |
5268.8.17
by Jelmer Vernooij
Support switching to new unicode colocated branch. |
266 |
repo = self.make_repository('branch-1', format='development-colo') |
267 |
target_branch = repo.bzrdir.create_branch(name='foo') |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
268 |
repo.bzrdir.set_branch_reference(target_branch) |
5268.8.17
by Jelmer Vernooij
Support switching to new unicode colocated branch. |
269 |
tree = repo.bzrdir.create_workingtree() |
270 |
self.build_tree(['branch-1/file-1', 'branch-1/file-2']) |
|
271 |
tree.add('file-1') |
|
272 |
revid1 = tree.commit('rev1') |
|
273 |
self.run_bzr(['switch', '-b', u'branch\xe9'], working_dir='branch-1') |
|
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
274 |
bzrdir = ControlDir.open("branch-1") |
5268.8.17
by Jelmer Vernooij
Support switching to new unicode colocated branch. |
275 |
self.assertEquals( |
276 |
set([b.name for b in bzrdir.list_branches()]), |
|
277 |
set(["foo", u"branch\xe9"])) |
|
278 |
self.assertEquals(bzrdir.open_branch().name, u"branch\xe9") |
|
279 |
self.assertEquals(bzrdir.open_branch().last_revision(), revid1) |
|
280 |
||
3984.5.9
by Daniel Watkins
Added test for allowing only revisions to be passed to switch. |
281 |
def test_switch_only_revision(self): |
3984.5.14
by Daniel Watkins
Extracted common setup code. |
282 |
tree = self._create_sample_tree() |
3984.5.9
by Daniel Watkins
Added test for allowing only revisions to be passed to switch. |
283 |
checkout = tree.branch.create_checkout('checkout', lightweight=True) |
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
284 |
self.assertPathExists('checkout/file-1') |
285 |
self.assertPathExists('checkout/file-2') |
|
3984.5.9
by Daniel Watkins
Added test for allowing only revisions to be passed to switch. |
286 |
self.run_bzr(['switch', '-r1'], working_dir='checkout') |
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
287 |
self.assertPathExists('checkout/file-1') |
288 |
self.assertPathDoesNotExist('checkout/file-2') |
|
3984.5.15
by Daniel Watkins
Add to test to ensure that we don't accept a range of revisions. |
289 |
# Check that we don't accept a range
|
3984.5.17
by Daniel Watkins
Fixed incorrect call of run_bzr_error. |
290 |
self.run_bzr_error( |
291 |
['bzr switch --revision takes exactly one revision identifier'], |
|
292 |
['switch', '-r0..2'], working_dir='checkout') |
|
3984.5.19
by Andrew Bennetts
Merge lp:bzr, resolving conflicts. |
293 |
|
4354.2.2
by Aaron Bentley
Enable switch --force for lightweight checkouts after moves. |
294 |
def prepare_lightweight_switch(self): |
295 |
branch = self.make_branch('branch') |
|
296 |
branch.create_checkout('tree', lightweight=True) |
|
5186.2.2
by Martin Pool
wrap os.rename to insert the source and destination filenames in any exception that may be raised |
297 |
osutils.rename('branch', 'branch1') |
4354.2.2
by Aaron Bentley
Enable switch --force for lightweight checkouts after moves. |
298 |
|
299 |
def test_switch_lightweight_after_branch_moved(self): |
|
300 |
self.prepare_lightweight_switch() |
|
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
301 |
self.run_bzr('switch --force ../branch1', working_dir='tree') |
4354.2.2
by Aaron Bentley
Enable switch --force for lightweight checkouts after moves. |
302 |
branch_location = WorkingTree.open('tree').branch.base |
303 |
self.assertEndsWith(branch_location, 'branch1/') |
|
304 |
||
305 |
def test_switch_lightweight_after_branch_moved_relative(self): |
|
306 |
self.prepare_lightweight_switch() |
|
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
307 |
self.run_bzr('switch --force branch1', |
6538.1.18
by Aaron Bentley
Add --with-changes flag to switch. |
308 |
working_dir='tree') |
4354.2.2
by Aaron Bentley
Enable switch --force for lightweight checkouts after moves. |
309 |
branch_location = WorkingTree.open('tree').branch.base |
310 |
self.assertEndsWith(branch_location, 'branch1/') |
|
4520.1.1
by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it. |
311 |
|
312 |
def test_create_branch_no_branch(self): |
|
313 |
self.prepare_lightweight_switch() |
|
314 |
self.run_bzr_error(['cannot create branch without source branch'], |
|
315 |
'switch --create-branch ../branch2', working_dir='tree') |
|
316 |
||
317 |
def test_create_branch(self): |
|
318 |
branch = self.make_branch('branch') |
|
319 |
tree = branch.create_checkout('tree', lightweight=True) |
|
320 |
tree.commit('one', rev_id='rev-1') |
|
321 |
self.run_bzr('switch --create-branch ../branch2', working_dir='tree') |
|
322 |
tree = WorkingTree.open('tree') |
|
323 |
self.assertEndsWith(tree.branch.base, '/branch2/') |
|
324 |
||
325 |
def test_create_branch_local(self): |
|
326 |
branch = self.make_branch('branch') |
|
327 |
tree = branch.create_checkout('tree', lightweight=True) |
|
328 |
tree.commit('one', rev_id='rev-1') |
|
329 |
self.run_bzr('switch --create-branch branch2', working_dir='tree') |
|
330 |
tree = WorkingTree.open('tree') |
|
331 |
# The new branch should have been created at the same level as
|
|
332 |
# 'branch', because we did not have a '/' segment
|
|
333 |
self.assertEqual(branch.base[:-1] + '2/', tree.branch.base) |
|
334 |
||
335 |
def test_create_branch_short_name(self): |
|
336 |
branch = self.make_branch('branch') |
|
337 |
tree = branch.create_checkout('tree', lightweight=True) |
|
338 |
tree.commit('one', rev_id='rev-1') |
|
339 |
self.run_bzr('switch -b branch2', working_dir='tree') |
|
340 |
tree = WorkingTree.open('tree') |
|
341 |
# The new branch should have been created at the same level as
|
|
342 |
# 'branch', because we did not have a '/' segment
|
|
343 |
self.assertEqual(branch.base[:-1] + '2/', tree.branch.base) |
|
4879.2.1
by Neil Martinsen-Burrell
switch should use directory services when creating a branch |
344 |
|
345 |
def test_create_branch_directory_services(self): |
|
346 |
branch = self.make_branch('branch') |
|
347 |
tree = branch.create_checkout('tree', lightweight=True) |
|
348 |
class FooLookup(object): |
|
349 |
def look_up(self, name, url): |
|
350 |
return 'foo-'+name |
|
351 |
directories.register('foo:', FooLookup, 'Create branches named foo-') |
|
4879.2.2
by Neil Martinsen-Burrell
add test cleanup per JAMs review |
352 |
self.addCleanup(directories.remove, 'foo:') |
4879.2.1
by Neil Martinsen-Burrell
switch should use directory services when creating a branch |
353 |
self.run_bzr('switch -b foo:branch2', working_dir='tree') |
354 |
tree = WorkingTree.open('tree') |
|
355 |
self.assertEndsWith(tree.branch.base, 'foo-branch2/') |
|
5107.3.6
by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts. |
356 |
|
357 |
def test_switch_with_post_switch_hook(self): |
|
358 |
from bzrlib import branch as _mod_branch |
|
359 |
calls = [] |
|
360 |
_mod_branch.Branch.hooks.install_named_hook('post_switch', |
|
361 |
calls.append, None) |
|
362 |
self.make_branch_and_tree('branch') |
|
363 |
self.run_bzr('branch branch branch2') |
|
364 |
self.run_bzr('checkout branch checkout') |
|
365 |
os.chdir('checkout') |
|
366 |
self.assertLength(0, calls) |
|
367 |
out, err = self.run_bzr('switch ../branch2') |
|
368 |
self.assertLength(1, calls) |
|
369 |
||
370 |
def test_switch_lightweight_co_with_post_switch_hook(self): |
|
371 |
from bzrlib import branch as _mod_branch |
|
372 |
calls = [] |
|
373 |
_mod_branch.Branch.hooks.install_named_hook('post_switch', |
|
374 |
calls.append, None) |
|
375 |
self.make_branch_and_tree('branch') |
|
376 |
self.run_bzr('branch branch branch2') |
|
377 |
self.run_bzr('checkout --lightweight branch checkout') |
|
378 |
os.chdir('checkout') |
|
379 |
self.assertLength(0, calls) |
|
380 |
out, err = self.run_bzr('switch ../branch2') |
|
381 |
self.assertLength(1, calls) |
|
5171.3.13
by Martin von Gagern
Add --directory option to 7 more commands. |
382 |
|
383 |
def test_switch_lightweight_directory(self): |
|
384 |
"""Test --directory option"""
|
|
385 |
||
386 |
# create a source branch
|
|
387 |
a_tree = self.make_branch_and_tree('a') |
|
388 |
self.build_tree_contents([('a/a', 'initial\n')]) |
|
389 |
a_tree.add('a') |
|
390 |
a_tree.commit(message='initial') |
|
391 |
||
392 |
# clone and add a differing revision
|
|
393 |
b_tree = a_tree.bzrdir.sprout('b').open_workingtree() |
|
394 |
self.build_tree_contents([('b/a', 'initial\nmore\n')]) |
|
395 |
b_tree.commit(message='more') |
|
396 |
||
397 |
self.run_bzr('checkout --lightweight a checkout') |
|
398 |
self.run_bzr('switch --directory checkout b') |
|
399 |
self.assertFileEqual('initial\nmore\n', 'checkout/a') |
|
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
400 |
|
6015.7.2
by John Arbash Meinel
Bug #812285. Add an effort test to show that things have improved. |
401 |
|
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
402 |
class TestSwitchParentLocationBase(TestCaseWithTransport): |
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
403 |
|
404 |
def setUp(self): |
|
405 |
"""Set up a repository and branch ready for testing."""
|
|
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
406 |
super(TestSwitchParentLocationBase, self).setUp() |
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
407 |
self.script_runner = script.ScriptRunner() |
408 |
self.script_runner.run_script(self, ''' |
|
409 |
$ bzr init-repo --no-trees repo
|
|
410 |
Shared repository...
|
|
411 |
Location:
|
|
412 |
shared repository: repo
|
|
413 |
$ bzr init repo/trunk
|
|
414 |
Created a repository branch...
|
|
415 |
Using shared repository: ...
|
|
416 |
''') |
|
417 |
||
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
418 |
def assertParent(self, expected_parent, branch): |
5816.6.11
by A. S. Budden
Refactored assertParentCorrect to check the full path. |
419 |
"""Verify that the parent is not None and is set correctly."""
|
420 |
actual_parent = branch.get_parent() |
|
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
421 |
self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent), |
422 |
branch.get_parent()) |
|
423 |
||
424 |
||
425 |
class TestSwitchParentLocation(TestSwitchParentLocationBase): |
|
426 |
||
427 |
def _checkout_and_switch(self, option=''): |
|
5816.6.8
by A. S. Budden
Refactored to use common generation code for lightweight and heavyweight. |
428 |
self.script_runner.run_script(self, ''' |
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
429 |
$ bzr checkout %(option)s repo/trunk checkout |
430 |
$ cd checkout
|
|
431 |
$ bzr switch --create-branch switched
|
|
5816.6.8
by A. S. Budden
Refactored to use common generation code for lightweight and heavyweight. |
432 |
2>Tree is up to date at revision 0.
|
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
433 |
2>Switched to branch:...switched...
|
5816.6.11
by A. S. Budden
Refactored assertParentCorrect to check the full path. |
434 |
$ cd ..
|
5816.6.9
by A. S. Budden
Use locals() instead of kwargs so that parameters are more explicit. |
435 |
''' % locals()) |
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
436 |
bound_branch = branch.Branch.open_containing('checkout')[0] |
437 |
master_branch = branch.Branch.open_containing('repo/switched')[0] |
|
5816.6.12
by A. S. Budden
Check parent branch of both the checkout (light or heavy) and the branch to which it is connected. |
438 |
return (bound_branch, master_branch) |
5816.6.8
by A. S. Budden
Refactored to use common generation code for lightweight and heavyweight. |
439 |
|
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
440 |
def test_switch_parent_lightweight(self): |
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
441 |
"""Lightweight checkout using bzr switch."""
|
442 |
bb, mb = self._checkout_and_switch(option='--lightweight') |
|
443 |
self.assertParent('repo/trunk', bb) |
|
444 |
self.assertParent('repo/trunk', mb) |
|
5816.6.7
by A. S. Budden
Moved test harnesses into test_switch and test_branch as these are the commands that are being tested. |
445 |
|
446 |
def test_switch_parent_heavyweight(self): |
|
5816.7.1
by Vincent Ladeuil
Remove duplication and simplify. |
447 |
"""Heavyweight checkout using bzr switch."""
|
448 |
bb, mb = self._checkout_and_switch() |
|
449 |
self.assertParent('repo/trunk', bb) |
|
450 |
self.assertParent('repo/trunk', mb) |
|
5816.6.11
by A. S. Budden
Refactored assertParentCorrect to check the full path. |
451 |
|
6015.7.2
by John Arbash Meinel
Bug #812285. Add an effort test to show that things have improved. |
452 |
|
453 |
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport): |
|
454 |
# See https://bugs.launchpad.net/bzr/+bug/812285
|
|
455 |
# "bzr switch --create-branch" can point the new branch's parent to the
|
|
456 |
# master branch, but it doesn't have to open it to do so.
|
|
457 |
||
458 |
def test_switch_create_doesnt_open_master_branch(self): |
|
459 |
master = self.make_branch_and_tree('master') |
|
460 |
master.commit('one') |
|
461 |
# Note: not a lightweight checkout
|
|
462 |
checkout = master.branch.create_checkout('checkout') |
|
463 |
opened = [] |
|
464 |
def open_hook(branch): |
|
465 |
# Just append the final directory of the branch
|
|
466 |
name = branch.base.rstrip('/').rsplit('/', 1)[1] |
|
467 |
opened.append(name) |
|
468 |
branch.Branch.hooks.install_named_hook('open', open_hook, |
|
469 |
'open_hook_logger') |
|
470 |
self.run_bzr('switch --create-branch -d checkout feature') |
|
471 |
# We only open the master branch 1 time.
|
|
472 |
# This test should be cleaner to write, but see bug:
|
|
473 |
# https://bugs.launchpad.net/bzr/+bug/812295
|
|
474 |
self.assertEqual(1, opened.count('master')) |
|
6366.1.5
by Jelmer Vernooij
add test for hpss call / connection count of 'bzr switch'. |
475 |
|
476 |
||
477 |
class TestSmartServerSwitch(TestCaseWithTransport): |
|
478 |
||
479 |
def test_switch_lightweight(self): |
|
480 |
self.setup_smart_server_with_call_log() |
|
481 |
t = self.make_branch_and_tree('from') |
|
482 |
for count in range(9): |
|
483 |
t.commit(message='commit %d' % count) |
|
484 |
out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'), |
|
485 |
'target']) |
|
486 |
self.reset_smart_call_log() |
|
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
487 |
self.run_bzr(['switch', self.get_url('from')], working_dir='target') |
6366.1.5
by Jelmer Vernooij
add test for hpss call / connection count of 'bzr switch'. |
488 |
# This figure represent the amount of work to perform this use case. It
|
489 |
# is entirely ok to reduce this number if a test fails due to rpc_count
|
|
490 |
# being too low. If rpc_count increases, more network roundtrips have
|
|
491 |
# become necessary for this use case. Please do not adjust this number
|
|
492 |
# upwards without agreement from bzr's network support maintainers.
|
|
6366.1.6
by Jelmer Vernooij
Merge bzr.dev. |
493 |
self.assertLength(24, self.hpss_calls) |
6437.40.1
by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'. |
494 |
self.assertLength(4, self.hpss_connections) |
6366.1.5
by Jelmer Vernooij
add test for hpss call / connection count of 'bzr switch'. |
495 |
self.assertThat(self.hpss_calls, ContainsNoVfsCalls) |
6538.1.17
by Aaron Bentley
Switch command stores/restores uncommitted changes. |
496 |
|
497 |
||
498 |
class TestSwitchUncommitted(TestCaseWithTransport): |
|
499 |
||
6538.1.18
by Aaron Bentley
Add --with-changes flag to switch. |
500 |
def prepare(self): |
6538.1.17
by Aaron Bentley
Switch command stores/restores uncommitted changes. |
501 |
tree = self.make_branch_and_tree('orig') |
502 |
tree.commit('') |
|
503 |
tree.branch.bzrdir.sprout('new') |
|
504 |
checkout = tree.branch.create_checkout('checkout', lightweight=True) |
|
505 |
self.build_tree(['checkout/a']) |
|
506 |
self.assertPathExists('checkout/a') |
|
507 |
checkout.add('a') |
|
6538.1.34
by Aaron Bentley
Update blackbox test to show storing and restoring in one switch. |
508 |
return checkout |
6538.1.18
by Aaron Bentley
Add --with-changes flag to switch. |
509 |
|
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
510 |
def test_store_and_restore_uncommitted(self): |
6538.1.34
by Aaron Bentley
Update blackbox test to show storing and restoring in one switch. |
511 |
checkout = self.prepare() |
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
512 |
self.run_bzr(['switch', '--store', '-d', 'checkout', 'new']) |
6538.1.34
by Aaron Bentley
Update blackbox test to show storing and restoring in one switch. |
513 |
self.build_tree(['checkout/b']) |
514 |
checkout.add('b') |
|
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
515 |
self.assertPathDoesNotExist('checkout/a') |
6538.1.34
by Aaron Bentley
Update blackbox test to show storing and restoring in one switch. |
516 |
self.assertPathExists('checkout/b') |
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
517 |
self.run_bzr(['switch', '--store', '-d', 'checkout', 'orig']) |
518 |
self.assertPathExists('checkout/a') |
|
6538.1.34
by Aaron Bentley
Update blackbox test to show storing and restoring in one switch. |
519 |
self.assertPathDoesNotExist('checkout/b') |
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
520 |
|
521 |
def test_does_not_store(self): |
|
6538.1.18
by Aaron Bentley
Add --with-changes flag to switch. |
522 |
self.prepare() |
6538.1.17
by Aaron Bentley
Switch command stores/restores uncommitted changes. |
523 |
self.run_bzr(['switch', '-d', 'checkout', 'new']) |
6538.1.30
by Aaron Bentley
Make *not* storing on switch the default. |
524 |
self.assertPathExists('checkout/a') |
525 |
||
526 |
def test_does_not_restore_changes(self): |
|
527 |
self.prepare() |
|
528 |
self.run_bzr(['switch', '--store', '-d', 'checkout', 'new']) |
|
6538.1.17
by Aaron Bentley
Switch command stores/restores uncommitted changes. |
529 |
self.assertPathDoesNotExist('checkout/a') |
530 |
self.run_bzr(['switch', '-d', 'checkout', 'orig']) |
|
6538.1.18
by Aaron Bentley
Add --with-changes flag to switch. |
531 |
self.assertPathDoesNotExist('checkout/a') |