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