26
27
revision as _mod_revision,
28
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
29
from bzrlib.tests import TestCaseWithTransport
30
from bzrlib.tests.blackbox import ExternalBase
30
31
from bzrlib.tests import (
36
from bzrlib.tests.blackbox import test_switch
37
35
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
38
from bzrlib.tests.script import run_script
39
36
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
40
37
from bzrlib.workingtree import WorkingTree
43
class TestBranch(TestCaseWithTransport):
40
class TestBranch(ExternalBase):
45
42
def example_branch(self, path='.'):
46
43
tree = self.make_branch_and_tree(path)
61
58
self.assertFalse(b._transport.has('branch-name'))
62
59
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
64
def test_branch_broken_pack(self):
65
"""branching with a corrupted pack file."""
66
self.example_branch('a')
67
#now add some random corruption
68
fname = 'a/.bzr/repository/packs/' + os.listdir('a/.bzr/repository/packs')[0]
69
with open(fname, 'rb+') as f:
72
self.run_bzr_error(['Corruption while decompressing repository file'],
73
'branch a b', retcode=3)
75
61
def test_branch_switch_no_branch(self):
76
62
# No branch in the current directory:
77
63
# => new branch will be created, but switch fails
187
173
target_stat = os.stat('target/file1')
188
174
self.assertEqual(source_stat, target_stat)
190
def test_branch_files_from(self):
191
source = self.make_branch_and_tree('source')
192
self.build_tree(['source/file1'])
194
source.commit('added file')
195
out, err = self.run_bzr('branch source target --files-from source')
196
self.assertPathExists('target/file1')
198
def test_branch_files_from_hardlink(self):
199
self.requireFeature(HardlinkFeature)
200
source = self.make_branch_and_tree('source')
201
self.build_tree(['source/file1'])
203
source.commit('added file')
204
source.bzrdir.sprout('second')
205
out, err = self.run_bzr('branch source target --files-from second'
207
source_stat = os.stat('source/file1')
208
second_stat = os.stat('second/file1')
209
target_stat = os.stat('target/file1')
210
self.assertNotEqual(source_stat, target_stat)
211
self.assertEqual(second_stat, target_stat)
213
176
def test_branch_standalone(self):
214
177
shared_repo = self.make_repository('repo', shared=True)
215
178
self.example_branch('source')
222
185
def test_branch_no_tree(self):
223
186
self.example_branch('source')
224
187
self.run_bzr('branch --no-tree source target')
225
self.assertPathDoesNotExist('target/hello')
226
self.assertPathDoesNotExist('target/goodbye')
188
self.failIfExists('target/hello')
189
self.failIfExists('target/goodbye')
228
191
def test_branch_into_existing_dir(self):
229
192
self.example_branch('a')
239
202
# force operation
240
203
self.run_bzr('branch a b --use-existing-dir')
241
204
# check conflicts
242
self.assertPathExists('b/hello.moved')
243
self.assertPathDoesNotExist('b/godbye.moved')
205
self.failUnlessExists('b/hello.moved')
206
self.failIfExists('b/godbye.moved')
244
207
# we can't branch into branch
245
208
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
246
209
self.assertEqual('', out)
253
216
b = branch.Branch.open('b')
254
217
self.assertEndsWith(b.get_bound_location(), '/a/')
256
def test_branch_with_post_branch_init_hook(self):
258
branch.Branch.hooks.install_named_hook('post_branch_init',
260
self.assertLength(0, calls)
261
self.example_branch('a')
262
self.assertLength(1, calls)
263
self.run_bzr('branch a b')
264
self.assertLength(2, calls)
266
def test_checkout_with_post_branch_init_hook(self):
268
branch.Branch.hooks.install_named_hook('post_branch_init',
270
self.assertLength(0, calls)
271
self.example_branch('a')
272
self.assertLength(1, calls)
273
self.run_bzr('checkout a b')
274
self.assertLength(2, calls)
276
def test_lightweight_checkout_with_post_branch_init_hook(self):
278
branch.Branch.hooks.install_named_hook('post_branch_init',
280
self.assertLength(0, calls)
281
self.example_branch('a')
282
self.assertLength(1, calls)
283
self.run_bzr('checkout --lightweight a b')
284
self.assertLength(2, calls)
286
def test_branch_fetches_all_tags(self):
287
builder = self.make_branch_builder('source')
288
source = fixtures.build_branch_with_non_ancestral_rev(builder)
289
source.tags.set_tag('tag-a', 'rev-2')
290
# Now source has a tag not in its ancestry. Make a branch from it.
291
self.run_bzr('branch source new-branch')
292
new_branch = branch.Branch.open('new-branch')
293
# The tag is present, and so is its revision.
294
self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))
295
new_branch.repository.get_revision('rev-2')
298
class TestBranchStacked(TestCaseWithTransport):
220
class TestBranchStacked(ExternalBase):
299
221
"""Tests for branch --stacked"""
301
223
def assertRevisionInRepository(self, repo_path, revid):
387
309
def test_branch_stacked_from_smart_server(self):
388
310
# We can branch stacking on a smart server
389
self.transport_server = test_server.SmartTCPServer_for_testing
311
from bzrlib.smart.server import SmartTCPServer_for_testing
312
self.transport_server = SmartTCPServer_for_testing
390
313
trunk = self.make_branch('mainline', format='1.9')
391
314
out, err = self.run_bzr(
392
315
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
402
325
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
403
326
'Source branch format does not support stacking, using format:\n'
404
327
' Branch format 7\n'
405
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
406
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
407
328
'Created new stacked branch referring to %s.\n' % (trunk.base,),
417
338
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
418
339
'Source branch format does not support stacking, using format:\n'
419
340
' Branch format 7\n'
420
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
421
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
422
341
'Created new stacked branch referring to %s.\n' % (trunk.base,),
426
class TestSmartServerBranching(TestCaseWithTransport):
345
class TestSmartServerBranching(ExternalBase):
428
347
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
429
348
self.setup_smart_server_with_call_log()
438
357
# being too low. If rpc_count increases, more network roundtrips have
439
358
# become necessary for this use case. Please do not adjust this number
440
359
# upwards without agreement from bzr's network support maintainers.
441
self.assertLength(36, self.hpss_calls)
360
self.assertLength(38, self.hpss_calls)
443
362
def test_branch_from_trivial_branch_streaming_acceptance(self):
444
363
self.setup_smart_server_with_call_log()
453
372
# being too low. If rpc_count increases, more network roundtrips have
454
373
# become necessary for this use case. Please do not adjust this number
455
374
# upwards without agreement from bzr's network support maintainers.
456
self.assertLength(9, self.hpss_calls)
375
self.assertLength(10, self.hpss_calls)
458
377
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
459
378
self.setup_smart_server_with_call_log()
473
392
# being too low. If rpc_count increases, more network roundtrips have
474
393
# become necessary for this use case. Please do not adjust this number
475
394
# upwards without agreement from bzr's network support maintainers.
476
self.assertLength(14, self.hpss_calls)
478
def test_branch_from_branch_with_tags(self):
479
self.setup_smart_server_with_call_log()
480
builder = self.make_branch_builder('source')
481
source = fixtures.build_branch_with_non_ancestral_rev(builder)
482
source.tags.set_tag('tag-a', 'rev-2')
483
source.tags.set_tag('tag-missing', 'missing-rev')
484
# Now source has a tag not in its ancestry. Make a branch from it.
485
self.reset_smart_call_log()
486
out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])
487
# This figure represent the amount of work to perform this use case. It
488
# is entirely ok to reduce this number if a test fails due to rpc_count
489
# being too low. If rpc_count increases, more network roundtrips have
490
# become necessary for this use case. Please do not adjust this number
491
# upwards without agreement from bzr's network support maintainers.
492
self.assertLength(9, self.hpss_calls)
494
def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
495
self.setup_smart_server_with_call_log()
496
t = self.make_branch_and_tree('from')
497
for count in range(9):
498
t.commit(message='commit %d' % count)
499
self.reset_smart_call_log()
500
out, err = self.run_bzr(['branch', '--stacked', self.get_url('from'),
502
# XXX: the number of hpss calls for this case isn't deterministic yet,
503
# so we can't easily assert about the number of calls.
504
#self.assertLength(XXX, self.hpss_calls)
505
# We can assert that none of the calls were readv requests for rix
506
# files, though (demonstrating that at least get_parent_map calls are
507
# not using VFS RPCs).
508
readvs_of_rix_files = [
509
c for c in self.hpss_calls
510
if c.call.method == 'readv' and c.call.args[-1].endswith('.rix')]
511
self.assertLength(0, readvs_of_rix_files)
395
self.assertLength(15, self.hpss_calls)
514
398
class TestRemoteBranch(TestCaseWithSFTPServer):
534
418
# Ensure that no working tree what created remotely
535
419
self.assertFalse(t.has('remote/file'))
538
class TestDeprecatedAliases(TestCaseWithTransport):
540
def test_deprecated_aliases(self):
541
"""bzr branch can be called clone or get, but those names are deprecated.
545
for command in ['clone', 'get']:
547
$ bzr %(command)s A B
548
2>The command 'bzr %(command)s' has been deprecated in bzr 2.4. Please use 'bzr branch' instead.
549
2>bzr: ERROR: Not a branch...
553
class TestBranchParentLocation(test_switch.TestSwitchParentLocationBase):
555
def _checkout_and_branch(self, option=''):
556
self.script_runner.run_script(self, '''
557
$ bzr checkout %(option)s repo/trunk checkout
559
$ bzr branch --switch ../repo/trunk ../repo/branched
560
2>Branched 0 revision(s).
561
2>Tree is up to date at revision 0.
562
2>Switched to branch:...branched...
565
bound_branch = branch.Branch.open_containing('checkout')[0]
566
master_branch = branch.Branch.open_containing('repo/branched')[0]
567
return (bound_branch, master_branch)
569
def test_branch_switch_parent_lightweight(self):
570
"""Lightweight checkout using bzr branch --switch."""
571
bb, mb = self._checkout_and_branch(option='--lightweight')
572
self.assertParent('repo/trunk', bb)
573
self.assertParent('repo/trunk', mb)
575
def test_branch_switch_parent_heavyweight(self):
576
"""Heavyweight checkout using bzr branch --switch."""
577
bb, mb = self._checkout_and_branch()
578
self.assertParent('repo/trunk', bb)
579
self.assertParent('repo/trunk', mb)
added
removed
bzrlib/tests/blackbox/test_branch.py
