45
55
b = branch.Branch.open('b')
46
56
self.run_bzr('branch a c -r 1')
47
57
# previously was erroneously created by branching
48
self.assertFalse(b.control_files._transport.has('branch-name'))
58
self.assertFalse(b._transport.has('branch-name'))
49
59
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/")
51
127
def test_branch_only_copies_history(self):
52
128
# Knit branches should only push the history for the current revision.
53
129
format = bzrdir.BzrDirMetaFormat1()
92
168
self.build_tree(['source/file1'])
93
169
source.add('file1')
94
170
source.commit('added file')
95
self.run_bzr(['branch', 'source', 'target', '--hardlink'])
171
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
96
172
source_stat = os.stat('source/file1')
97
173
target_stat = os.stat('target/file1')
98
174
self.assertEqual(source_stat, target_stat)
176
def test_branch_standalone(self):
177
shared_repo = self.make_repository('repo', shared=True)
178
self.example_branch('source')
179
self.run_bzr('branch --standalone source repo/target')
180
b = branch.Branch.open('repo/target')
181
expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
182
self.assertEqual(strip_trailing_slash(b.repository.base),
183
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)
213
class TestBranchStacked(ExternalBase):
214
"""Tests for branch --stacked"""
216
def assertRevisionInRepository(self, repo_path, revid):
217
"""Check that a revision is in a repository, disregarding stacking."""
218
repo = bzrdir.BzrDir.open(repo_path).open_repository()
219
self.assertTrue(repo.has_revision(revid))
221
def assertRevisionNotInRepository(self, repo_path, revid):
222
"""Check that a revision is not in a repository, disregarding stacking."""
223
repo = bzrdir.BzrDir.open(repo_path).open_repository()
224
self.assertFalse(repo.has_revision(revid))
226
def assertRevisionsInBranchRepository(self, revid_list, branch_path):
227
repo = branch.Branch.open(branch_path).repository
228
self.assertEqual(set(revid_list),
229
repo.has_revisions(revid_list))
231
def test_branch_stacked_branch_not_stacked(self):
232
"""Branching a stacked branch is not stacked by default"""
234
trunk_tree = self.make_branch_and_tree('target',
236
trunk_tree.commit('mainline')
237
# and a branch from it which is stacked
238
branch_tree = self.make_branch_and_tree('branch',
240
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
241
# with some work on it
242
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
243
work_tree.commit('moar work plz')
244
work_tree.branch.push(branch_tree.branch)
245
# branching our local branch gives us a new stacked branch pointing at
247
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
248
self.assertEqual('', out)
249
self.assertEqual('Branched 2 revision(s).\n',
251
# it should have preserved the branch format, and so it should be
252
# capable of supporting stacking, but not actually have a stacked_on
254
self.assertRaises(errors.NotStacked,
255
bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
257
def test_branch_stacked_branch_stacked(self):
258
"""Asking to stack on a stacked branch does work"""
260
trunk_tree = self.make_branch_and_tree('target',
262
trunk_revid = trunk_tree.commit('mainline')
263
# and a branch from it which is stacked
264
branch_tree = self.make_branch_and_tree('branch',
266
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
267
# with some work on it
268
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
269
branch_revid = work_tree.commit('moar work plz')
270
work_tree.branch.push(branch_tree.branch)
271
# you can chain branches on from there
272
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
273
self.assertEqual('', out)
274
self.assertEqual('Created new stacked branch referring to %s.\n' %
275
branch_tree.branch.base, err)
276
self.assertEqual(branch_tree.branch.base,
277
branch.Branch.open('branch2').get_stacked_on_url())
278
branch2_tree = WorkingTree.open('branch2')
279
branch2_revid = work_tree.commit('work on second stacked branch')
280
work_tree.branch.push(branch2_tree.branch)
281
self.assertRevisionInRepository('branch2', branch2_revid)
282
self.assertRevisionsInBranchRepository(
283
[trunk_revid, branch_revid, branch2_revid],
286
def test_branch_stacked(self):
288
trunk_tree = self.make_branch_and_tree('mainline',
290
original_revid = trunk_tree.commit('mainline')
291
self.assertRevisionInRepository('mainline', original_revid)
292
# and a branch from it which is stacked
293
out, err = self.run_bzr(['branch', '--stacked', 'mainline',
295
self.assertEqual('', out)
296
self.assertEqual('Created new stacked branch referring to %s.\n' %
297
trunk_tree.branch.base, err)
298
self.assertRevisionNotInRepository('newbranch', original_revid)
299
new_branch = branch.Branch.open('newbranch')
300
self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
302
def test_branch_stacked_from_smart_server(self):
303
# We can branch stacking on a smart server
304
from bzrlib.smart.server import SmartTCPServer_for_testing
305
self.transport_server = SmartTCPServer_for_testing
306
trunk = self.make_branch('mainline', format='1.9')
307
out, err = self.run_bzr(
308
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
310
def test_branch_stacked_from_non_stacked_format(self):
311
"""The origin format doesn't support stacking"""
312
trunk = self.make_branch('trunk', format='pack-0.92')
313
out, err = self.run_bzr(
314
['branch', '--stacked', 'trunk', 'shallow'])
315
# We should notify the user that we upgraded their format
316
self.assertEqualDiff(
317
'Source repository format does not support stacking, using format:\n'
318
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
319
'Source branch format does not support stacking, using format:\n'
321
'Created new stacked branch referring to %s.\n' % (trunk.base,),
324
def test_branch_stacked_from_rich_root_non_stackable(self):
325
trunk = self.make_branch('trunk', format='rich-root-pack')
326
out, err = self.run_bzr(
327
['branch', '--stacked', 'trunk', 'shallow'])
328
# We should notify the user that we upgraded their format
329
self.assertEqualDiff(
330
'Source repository format does not support stacking, using format:\n'
331
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
332
'Source branch format does not support stacking, using format:\n'
334
'Created new stacked branch referring to %s.\n' % (trunk.base,),
338
class TestSmartServerBranching(ExternalBase):
340
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
341
self.setup_smart_server_with_call_log()
342
t = self.make_branch_and_tree('from')
343
for count in range(9):
344
t.commit(message='commit %d' % count)
345
self.reset_smart_call_log()
346
out, err = self.run_bzr(['branch', self.get_url('from'),
347
self.get_url('target')])
348
# This figure represent the amount of work to perform this use case. It
349
# is entirely ok to reduce this number if a test fails due to rpc_count
350
# being too low. If rpc_count increases, more network roundtrips have
351
# become necessary for this use case. Please do not adjust this number
352
# upwards without agreement from bzr's network support maintainers.
353
self.assertLength(38, self.hpss_calls)
355
def test_branch_from_trivial_branch_streaming_acceptance(self):
356
self.setup_smart_server_with_call_log()
357
t = self.make_branch_and_tree('from')
358
for count in range(9):
359
t.commit(message='commit %d' % count)
360
self.reset_smart_call_log()
361
out, err = self.run_bzr(['branch', self.get_url('from'),
363
# This figure represent the amount of work to perform this use case. It
364
# is entirely ok to reduce this number if a test fails due to rpc_count
365
# being too low. If rpc_count increases, more network roundtrips have
366
# become necessary for this use case. Please do not adjust this number
367
# upwards without agreement from bzr's network support maintainers.
368
self.assertLength(10, self.hpss_calls)
370
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
371
self.setup_smart_server_with_call_log()
372
t = self.make_branch_and_tree('trunk')
373
for count in range(8):
374
t.commit(message='commit %d' % count)
375
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
377
local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
378
local_tree.commit('feature change')
379
local_tree.branch.push(tree2.branch)
380
self.reset_smart_call_log()
381
out, err = self.run_bzr(['branch', self.get_url('feature'),
383
# This figure represent the amount of work to perform this use case. It
384
# is entirely ok to reduce this number if a test fails due to rpc_count
385
# being too low. If rpc_count increases, more network roundtrips have
386
# become necessary for this use case. Please do not adjust this number
387
# upwards without agreement from bzr's network support maintainers.
388
self.assertLength(15, self.hpss_calls)
101
391
class TestRemoteBranch(TestCaseWithSFTPServer):
added
removed
bzrlib/tests/blackbox/test_branch.py
