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,
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
22
from bzrlib import branch, bzrdir
23
from bzrlib.repository import RepositoryFormatKnit1
30
24
from bzrlib.tests.blackbox import ExternalBase
31
from bzrlib.tests import (
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
38
25
from bzrlib.workingtree import WorkingTree
41
28
class TestBranch(ExternalBase):
43
def example_branch(self, path='.'):
44
tree = self.make_branch_and_tree(path)
45
self.build_tree_contents([(path + '/hello', 'foo')])
47
tree.commit(message='setup')
48
self.build_tree_contents([(path + '/goodbye', 'baz')])
50
tree.commit(message='setup')
30
def example_branch(test):
32
file('hello', 'wt').write('foo')
33
test.runbzr('add hello')
34
test.runbzr('commit -m setup hello')
35
file('goodbye', 'wt').write('baz')
36
test.runbzr('add goodbye')
37
test.runbzr('commit -m setup goodbye')
52
39
def test_branch(self):
53
40
"""Branch from one branch to another."""
54
self.example_branch('a')
55
self.run_bzr('branch a b')
56
b = branch.Branch.open('b')
57
self.run_bzr('branch a c -r 1')
58
# previously was erroneously created by branching
59
self.assertFalse(b._transport.has('branch-name'))
60
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
62
def test_branch_switch_no_branch(self):
63
# No branch in the current directory:
64
# => new branch will be created, but switch fails
65
self.example_branch('a')
66
self.make_repository('current')
67
self.run_bzr_error(['No WorkingTree exists for'],
68
'branch --switch ../a ../b', working_dir='current')
69
a = branch.Branch.open('a')
70
b = branch.Branch.open('b')
71
self.assertEqual(a.last_revision(), b.last_revision())
73
def test_branch_switch_no_wt(self):
74
# No working tree in the current directory:
75
# => new branch will be created, but switch fails and the current
76
# branch is unmodified
77
self.example_branch('a')
78
self.make_branch('current')
79
self.run_bzr_error(['No WorkingTree exists for'],
80
'branch --switch ../a ../b', working_dir='current')
81
a = branch.Branch.open('a')
82
b = branch.Branch.open('b')
83
self.assertEqual(a.last_revision(), b.last_revision())
84
work = branch.Branch.open('current')
85
self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
87
def test_branch_switch_no_checkout(self):
88
# Standalone branch in the current directory:
89
# => new branch will be created, but switch fails and the current
90
# branch is unmodified
91
self.example_branch('a')
92
self.make_branch_and_tree('current')
93
self.run_bzr_error(['Cannot switch a branch, only a checkout'],
94
'branch --switch ../a ../b', working_dir='current')
95
a = branch.Branch.open('a')
96
b = branch.Branch.open('b')
97
self.assertEqual(a.last_revision(), b.last_revision())
98
work = branch.Branch.open('current')
99
self.assertEqual(work.last_revision(), _mod_revision.NULL_REVISION)
101
def test_branch_switch_checkout(self):
102
# Checkout in the current directory:
103
# => new branch will be created and checkout bound to the new branch
104
self.example_branch('a')
105
self.run_bzr('checkout a current')
106
out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
107
a = branch.Branch.open('a')
108
b = branch.Branch.open('b')
109
self.assertEqual(a.last_revision(), b.last_revision())
110
work = WorkingTree.open('current')
111
self.assertEndsWith(work.branch.get_bound_location(), '/b/')
112
self.assertContainsRe(err, "Switched to branch: .*/b/")
114
def test_branch_switch_lightweight_checkout(self):
115
# Lightweight checkout in the current directory:
116
# => new branch will be created and lightweight checkout pointed to
118
self.example_branch('a')
119
self.run_bzr('checkout --lightweight a current')
120
out, err = self.run_bzr('branch --switch ../a ../b', working_dir='current')
121
a = branch.Branch.open('a')
122
b = branch.Branch.open('b')
123
self.assertEqual(a.last_revision(), b.last_revision())
124
work = WorkingTree.open('current')
125
self.assertEndsWith(work.branch.base, '/b/')
126
self.assertContainsRe(err, "Switched to branch: .*/b/")
45
self.runbzr('branch a b')
46
b = branch.Branch.open('b')
47
self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
48
self.runbzr('branch a c -r 1')
50
self.runbzr('commit -m foo --unchanged')
53
def test_branch_basis(self):
54
# ensure that basis really does grab from the basis by having incomplete source
55
tree = self.make_branch_and_tree('commit_tree')
56
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
58
tree.commit('revision 1', rev_id='1')
59
source = self.make_branch_and_tree('source')
60
# this gives us an incomplete repository
61
tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
62
tree.commit('revision 2', rev_id='2', allow_pointless=True)
63
tree.bzrdir.open_branch().copy_content_into(source.branch)
64
tree.copy_content_into(source)
65
self.assertFalse(source.branch.repository.has_revision('2'))
67
self.runbzr('branch source target --basis commit_tree')
68
target = bzrdir.BzrDir.open('target')
69
self.assertEqual('2', target.open_branch().last_revision())
70
self.assertEqual('2', target.open_workingtree().last_revision())
71
self.assertTrue(target.open_branch().repository.has_revision('2'))
128
73
def test_branch_only_copies_history(self):
129
74
# Knit branches should only push the history for the current revision.
157
102
# Now that we have a repository with shared files, make sure
158
103
# that things aren't copied out by a 'branch'
159
self.run_bzr('branch repo/b branch-b')
104
self.run_bzr('branch', 'repo/b', 'branch-b')
160
105
pushed_tree = WorkingTree.open('branch-b')
161
106
pushed_repo = pushed_tree.branch.repository
162
107
self.assertFalse(pushed_repo.has_revision('a-1'))
163
108
self.assertFalse(pushed_repo.has_revision('a-2'))
164
109
self.assertTrue(pushed_repo.has_revision('b-1'))
166
def test_branch_hardlink(self):
167
self.requireFeature(HardlinkFeature)
168
source = self.make_branch_and_tree('source')
169
self.build_tree(['source/file1'])
171
source.commit('added file')
172
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
173
source_stat = os.stat('source/file1')
174
target_stat = os.stat('target/file1')
175
self.assertEqual(source_stat, target_stat)
177
def test_branch_standalone(self):
178
shared_repo = self.make_repository('repo', shared=True)
179
self.example_branch('source')
180
self.run_bzr('branch --standalone source repo/target')
181
b = branch.Branch.open('repo/target')
182
expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
183
self.assertEqual(strip_trailing_slash(b.repository.base),
184
strip_trailing_slash(local_path_to_url(expected_repo_path)))
186
def test_branch_no_tree(self):
187
self.example_branch('source')
188
self.run_bzr('branch --no-tree source target')
189
self.failIfExists('target/hello')
190
self.failIfExists('target/goodbye')
192
def test_branch_into_existing_dir(self):
193
self.example_branch('a')
194
# existing dir with similar files but no .bzr dir
195
self.build_tree_contents([('b/',)])
196
self.build_tree_contents([('b/hello', 'bar')]) # different content
197
self.build_tree_contents([('b/goodbye', 'baz')])# same content
198
# fails without --use-existing-dir
199
out,err = self.run_bzr('branch a b', retcode=3)
200
self.assertEqual('', out)
201
self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',
204
self.run_bzr('branch a b --use-existing-dir')
206
self.failUnlessExists('b/hello.moved')
207
self.failIfExists('b/godbye.moved')
208
# we can't branch into branch
209
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
210
self.assertEqual('', out)
211
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
213
def test_branch_bind(self):
214
self.example_branch('a')
215
out, err = self.run_bzr('branch a b --bind')
216
self.assertEndsWith(err, "New branch bound to a\n")
217
b = branch.Branch.open('b')
218
self.assertEndsWith(b.get_bound_location(), '/a/')
220
def test_branch_with_post_branch_init_hook(self):
222
branch.Branch.hooks.install_named_hook('post_branch_init',
224
self.assertLength(0, calls)
225
self.example_branch('a')
226
self.assertLength(1, calls)
227
self.run_bzr('branch a b')
228
self.assertLength(2, calls)
230
def test_checkout_with_post_branch_init_hook(self):
232
branch.Branch.hooks.install_named_hook('post_branch_init',
234
self.assertLength(0, calls)
235
self.example_branch('a')
236
self.assertLength(1, calls)
237
self.run_bzr('checkout a b')
238
self.assertLength(2, calls)
240
def test_lightweight_checkout_with_post_branch_init_hook(self):
242
branch.Branch.hooks.install_named_hook('post_branch_init',
244
self.assertLength(0, calls)
245
self.example_branch('a')
246
self.assertLength(1, calls)
247
self.run_bzr('checkout --lightweight a b')
248
self.assertLength(2, calls)
251
class TestBranchStacked(ExternalBase):
252
"""Tests for branch --stacked"""
254
def assertRevisionInRepository(self, repo_path, revid):
255
"""Check that a revision is in a repository, disregarding stacking."""
256
repo = bzrdir.BzrDir.open(repo_path).open_repository()
257
self.assertTrue(repo.has_revision(revid))
259
def assertRevisionNotInRepository(self, repo_path, revid):
260
"""Check that a revision is not in a repository, disregarding stacking."""
261
repo = bzrdir.BzrDir.open(repo_path).open_repository()
262
self.assertFalse(repo.has_revision(revid))
264
def assertRevisionsInBranchRepository(self, revid_list, branch_path):
265
repo = branch.Branch.open(branch_path).repository
266
self.assertEqual(set(revid_list),
267
repo.has_revisions(revid_list))
269
def test_branch_stacked_branch_not_stacked(self):
270
"""Branching a stacked branch is not stacked by default"""
272
trunk_tree = self.make_branch_and_tree('target',
274
trunk_tree.commit('mainline')
275
# and a branch from it which is stacked
276
branch_tree = self.make_branch_and_tree('branch',
278
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
279
# with some work on it
280
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
281
work_tree.commit('moar work plz')
282
work_tree.branch.push(branch_tree.branch)
283
# branching our local branch gives us a new stacked branch pointing at
285
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
286
self.assertEqual('', out)
287
self.assertEqual('Branched 2 revision(s).\n',
289
# it should have preserved the branch format, and so it should be
290
# capable of supporting stacking, but not actually have a stacked_on
292
self.assertRaises(errors.NotStacked,
293
bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
295
def test_branch_stacked_branch_stacked(self):
296
"""Asking to stack on a stacked branch does work"""
298
trunk_tree = self.make_branch_and_tree('target',
300
trunk_revid = trunk_tree.commit('mainline')
301
# and a branch from it which is stacked
302
branch_tree = self.make_branch_and_tree('branch',
304
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
305
# with some work on it
306
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
307
branch_revid = work_tree.commit('moar work plz')
308
work_tree.branch.push(branch_tree.branch)
309
# you can chain branches on from there
310
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
311
self.assertEqual('', out)
312
self.assertEqual('Created new stacked branch referring to %s.\n' %
313
branch_tree.branch.base, err)
314
self.assertEqual(branch_tree.branch.base,
315
branch.Branch.open('branch2').get_stacked_on_url())
316
branch2_tree = WorkingTree.open('branch2')
317
branch2_revid = work_tree.commit('work on second stacked branch')
318
work_tree.branch.push(branch2_tree.branch)
319
self.assertRevisionInRepository('branch2', branch2_revid)
320
self.assertRevisionsInBranchRepository(
321
[trunk_revid, branch_revid, branch2_revid],
324
def test_branch_stacked(self):
326
trunk_tree = self.make_branch_and_tree('mainline',
328
original_revid = trunk_tree.commit('mainline')
329
self.assertRevisionInRepository('mainline', original_revid)
330
# and a branch from it which is stacked
331
out, err = self.run_bzr(['branch', '--stacked', 'mainline',
333
self.assertEqual('', out)
334
self.assertEqual('Created new stacked branch referring to %s.\n' %
335
trunk_tree.branch.base, err)
336
self.assertRevisionNotInRepository('newbranch', original_revid)
337
new_branch = branch.Branch.open('newbranch')
338
self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
340
def test_branch_stacked_from_smart_server(self):
341
# We can branch stacking on a smart server
342
self.transport_server = test_server.SmartTCPServer_for_testing
343
trunk = self.make_branch('mainline', format='1.9')
344
out, err = self.run_bzr(
345
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
347
def test_branch_stacked_from_non_stacked_format(self):
348
"""The origin format doesn't support stacking"""
349
trunk = self.make_branch('trunk', format='pack-0.92')
350
out, err = self.run_bzr(
351
['branch', '--stacked', 'trunk', 'shallow'])
352
# We should notify the user that we upgraded their format
353
self.assertEqualDiff(
354
'Source repository format does not support stacking, using format:\n'
355
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
356
'Source branch format does not support stacking, using format:\n'
358
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
359
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
360
'Created new stacked branch referring to %s.\n' % (trunk.base,),
363
def test_branch_stacked_from_rich_root_non_stackable(self):
364
trunk = self.make_branch('trunk', format='rich-root-pack')
365
out, err = self.run_bzr(
366
['branch', '--stacked', 'trunk', 'shallow'])
367
# We should notify the user that we upgraded their format
368
self.assertEqualDiff(
369
'Source repository format does not support stacking, using format:\n'
370
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
371
'Source branch format does not support stacking, using format:\n'
373
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
374
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
375
'Created new stacked branch referring to %s.\n' % (trunk.base,),
379
class TestSmartServerBranching(ExternalBase):
381
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
382
self.setup_smart_server_with_call_log()
383
t = self.make_branch_and_tree('from')
384
for count in range(9):
385
t.commit(message='commit %d' % count)
386
self.reset_smart_call_log()
387
out, err = self.run_bzr(['branch', self.get_url('from'),
388
self.get_url('target')])
389
# This figure represent the amount of work to perform this use case. It
390
# is entirely ok to reduce this number if a test fails due to rpc_count
391
# being too low. If rpc_count increases, more network roundtrips have
392
# become necessary for this use case. Please do not adjust this number
393
# upwards without agreement from bzr's network support maintainers.
394
self.assertLength(38, self.hpss_calls)
396
def test_branch_from_trivial_branch_streaming_acceptance(self):
397
self.setup_smart_server_with_call_log()
398
t = self.make_branch_and_tree('from')
399
for count in range(9):
400
t.commit(message='commit %d' % count)
401
self.reset_smart_call_log()
402
out, err = self.run_bzr(['branch', self.get_url('from'),
404
# This figure represent the amount of work to perform this use case. It
405
# is entirely ok to reduce this number if a test fails due to rpc_count
406
# being too low. If rpc_count increases, more network roundtrips have
407
# become necessary for this use case. Please do not adjust this number
408
# upwards without agreement from bzr's network support maintainers.
409
self.assertLength(10, self.hpss_calls)
411
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
412
self.setup_smart_server_with_call_log()
413
t = self.make_branch_and_tree('trunk')
414
for count in range(8):
415
t.commit(message='commit %d' % count)
416
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
418
local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
419
local_tree.commit('feature change')
420
local_tree.branch.push(tree2.branch)
421
self.reset_smart_call_log()
422
out, err = self.run_bzr(['branch', self.get_url('feature'),
424
# This figure represent the amount of work to perform this use case. It
425
# is entirely ok to reduce this number if a test fails due to rpc_count
426
# being too low. If rpc_count increases, more network roundtrips have
427
# become necessary for this use case. Please do not adjust this number
428
# upwards without agreement from bzr's network support maintainers.
429
self.assertLength(15, self.hpss_calls)
432
class TestRemoteBranch(TestCaseWithSFTPServer):
435
super(TestRemoteBranch, self).setUp()
436
tree = self.make_branch_and_tree('branch')
437
self.build_tree_contents([('branch/file', 'file content\n')])
439
tree.commit('file created')
441
def test_branch_local_remote(self):
442
self.run_bzr(['branch', 'branch', self.get_url('remote')])
443
t = self.get_transport()
444
# Ensure that no working tree what created remotely
445
self.assertFalse(t.has('remote/file'))
447
def test_branch_remote_remote(self):
448
# Light cheat: we access the branch remotely
449
self.run_bzr(['branch', self.get_url('branch'),
450
self.get_url('remote')])
451
t = self.get_transport()
452
# Ensure that no working tree what created remotely
453
self.assertFalse(t.has('remote/file'))
added
removed
bzrlib/tests/blackbox/test_branch.py
