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 (
35
from bzrlib.tests.features import (
38
from bzrlib.tests.blackbox import test_switch
39
35
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
40
from bzrlib.tests.script import run_script
41
36
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
42
37
from bzrlib.workingtree import WorkingTree
45
class TestBranch(TestCaseWithTransport):
40
class TestBranch(ExternalBase):
47
42
def example_branch(self, path='.'):
48
43
tree = self.make_branch_and_tree(path)
63
58
self.assertFalse(b._transport.has('branch-name'))
64
59
b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
66
def test_branch_broken_pack(self):
67
"""branching with a corrupted pack file."""
68
self.example_branch('a')
69
#now add some random corruption
70
fname = 'a/.bzr/repository/packs/' + os.listdir('a/.bzr/repository/packs')[0]
71
with open(fname, 'rb+') as f:
74
self.run_bzr_error(['Corruption while decompressing repository file'],
75
'branch a b', retcode=3)
77
61
def test_branch_switch_no_branch(self):
78
62
# No branch in the current directory:
79
63
# => new branch will be created, but switch fails
187
171
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
188
172
source_stat = os.stat('source/file1')
189
173
target_stat = os.stat('target/file1')
190
self.assertEqual(source_stat, target_stat)
192
def test_branch_files_from(self):
193
source = self.make_branch_and_tree('source')
194
self.build_tree(['source/file1'])
196
source.commit('added file')
197
out, err = self.run_bzr('branch source target --files-from source')
198
self.assertPathExists('target/file1')
200
def test_branch_files_from_hardlink(self):
201
self.requireFeature(HardlinkFeature)
202
source = self.make_branch_and_tree('source')
203
self.build_tree(['source/file1'])
205
source.commit('added file')
206
source.bzrdir.sprout('second')
207
out, err = self.run_bzr('branch source target --files-from second'
209
source_stat = os.stat('source/file1')
210
second_stat = os.stat('second/file1')
211
target_stat = os.stat('target/file1')
212
self.assertNotEqual(source_stat, target_stat)
213
self.assertEqual(second_stat, target_stat)
174
same_file = (source_stat == target_stat)
178
# https://bugs.edge.launchpad.net/bzr/+bug/408193
179
self.assertContainsRe(err, "hardlinking working copy files is "
180
"not currently supported")
181
raise KnownFailure("--hardlink doesn't work in formats "
182
"that support content filtering (#408193)")
215
184
def test_branch_standalone(self):
216
185
shared_repo = self.make_repository('repo', shared=True)
241
210
# force operation
242
211
self.run_bzr('branch a b --use-existing-dir')
243
212
# check conflicts
244
self.assertPathExists('b/hello.moved')
245
self.assertPathDoesNotExist('b/godbye.moved')
213
self.failUnlessExists('b/hello.moved')
214
self.failIfExists('b/godbye.moved')
246
215
# we can't branch into branch
247
216
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
248
217
self.assertEqual('', out)
249
218
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
251
def test_branch_bind(self):
252
self.example_branch('a')
253
out, err = self.run_bzr('branch a b --bind')
254
self.assertEndsWith(err, "New branch bound to a\n")
255
b = branch.Branch.open('b')
256
self.assertEndsWith(b.get_bound_location(), '/a/')
258
def test_branch_with_post_branch_init_hook(self):
260
branch.Branch.hooks.install_named_hook('post_branch_init',
262
self.assertLength(0, calls)
263
self.example_branch('a')
264
self.assertLength(1, calls)
265
self.run_bzr('branch a b')
266
self.assertLength(2, calls)
268
def test_checkout_with_post_branch_init_hook(self):
270
branch.Branch.hooks.install_named_hook('post_branch_init',
272
self.assertLength(0, calls)
273
self.example_branch('a')
274
self.assertLength(1, calls)
275
self.run_bzr('checkout a b')
276
self.assertLength(2, calls)
278
def test_lightweight_checkout_with_post_branch_init_hook(self):
280
branch.Branch.hooks.install_named_hook('post_branch_init',
282
self.assertLength(0, calls)
283
self.example_branch('a')
284
self.assertLength(1, calls)
285
self.run_bzr('checkout --lightweight a b')
286
self.assertLength(2, calls)
288
def test_branch_fetches_all_tags(self):
289
builder = self.make_branch_builder('source')
290
source = fixtures.build_branch_with_non_ancestral_rev(builder)
291
source.tags.set_tag('tag-a', 'rev-2')
292
source.get_config().set_user_option('branch.fetch_tags', 'True')
293
# Now source has a tag not in its ancestry. Make a branch from it.
294
self.run_bzr('branch source new-branch')
295
new_branch = branch.Branch.open('new-branch')
296
# The tag is present, and so is its revision.
297
self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))
298
new_branch.repository.get_revision('rev-2')
301
class TestBranchStacked(TestCaseWithTransport):
221
class TestBranchStacked(ExternalBase):
302
222
"""Tests for branch --stacked"""
304
224
def assertRevisionInRepository(self, repo_path, revid):
390
310
def test_branch_stacked_from_smart_server(self):
391
311
# We can branch stacking on a smart server
392
self.transport_server = test_server.SmartTCPServer_for_testing
312
from bzrlib.smart.server import SmartTCPServer_for_testing
313
self.transport_server = SmartTCPServer_for_testing
393
314
trunk = self.make_branch('mainline', format='1.9')
394
315
out, err = self.run_bzr(
395
316
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
420
339
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
421
340
'Source branch format does not support stacking, using format:\n'
422
341
' Branch format 7\n'
423
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
424
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
425
342
'Created new stacked branch referring to %s.\n' % (trunk.base,),
429
class TestSmartServerBranching(TestCaseWithTransport):
346
class TestSmartServerBranching(ExternalBase):
431
348
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
432
349
self.setup_smart_server_with_call_log()
441
358
# being too low. If rpc_count increases, more network roundtrips have
442
359
# become necessary for this use case. Please do not adjust this number
443
360
# upwards without agreement from bzr's network support maintainers.
444
self.assertLength(37, self.hpss_calls)
361
self.assertLength(38, self.hpss_calls)
446
363
def test_branch_from_trivial_branch_streaming_acceptance(self):
447
364
self.setup_smart_server_with_call_log()
478
395
# upwards without agreement from bzr's network support maintainers.
479
396
self.assertLength(15, self.hpss_calls)
481
def test_branch_from_branch_with_tags(self):
482
self.setup_smart_server_with_call_log()
483
builder = self.make_branch_builder('source')
484
source = fixtures.build_branch_with_non_ancestral_rev(builder)
485
source.get_config().set_user_option('branch.fetch_tags', 'True')
486
source.tags.set_tag('tag-a', 'rev-2')
487
source.tags.set_tag('tag-missing', 'missing-rev')
488
# Now source has a tag not in its ancestry. Make a branch from it.
489
self.reset_smart_call_log()
490
out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])
491
# This figure represent the amount of work to perform this use case. It
492
# is entirely ok to reduce this number if a test fails due to rpc_count
493
# being too low. If rpc_count increases, more network roundtrips have
494
# become necessary for this use case. Please do not adjust this number
495
# upwards without agreement from bzr's network support maintainers.
496
self.assertLength(10, self.hpss_calls)
498
def test_branch_to_stacked_from_trivial_branch_streaming_acceptance(self):
499
self.setup_smart_server_with_call_log()
500
t = self.make_branch_and_tree('from')
501
for count in range(9):
502
t.commit(message='commit %d' % count)
503
self.reset_smart_call_log()
504
out, err = self.run_bzr(['branch', '--stacked', self.get_url('from'),
506
# XXX: the number of hpss calls for this case isn't deterministic yet,
507
# so we can't easily assert about the number of calls.
508
#self.assertLength(XXX, self.hpss_calls)
509
# We can assert that none of the calls were readv requests for rix
510
# files, though (demonstrating that at least get_parent_map calls are
511
# not using VFS RPCs).
512
readvs_of_rix_files = [
513
c for c in self.hpss_calls
514
if c.call.method == 'readv' and c.call.args[-1].endswith('.rix')]
515
self.assertLength(0, readvs_of_rix_files)
518
399
class TestRemoteBranch(TestCaseWithSFTPServer):
538
419
# Ensure that no working tree what created remotely
539
420
self.assertFalse(t.has('remote/file'))
542
class TestDeprecatedAliases(TestCaseWithTransport):
544
def test_deprecated_aliases(self):
545
"""bzr branch can be called clone or get, but those names are deprecated.
549
for command in ['clone', 'get']:
551
$ bzr %(command)s A B
552
2>The command 'bzr %(command)s' has been deprecated in bzr 2.4. Please use 'bzr branch' instead.
553
2>bzr: ERROR: Not a branch...
557
class TestBranchParentLocation(test_switch.TestSwitchParentLocationBase):
559
def _checkout_and_branch(self, option=''):
560
self.script_runner.run_script(self, '''
561
$ bzr checkout %(option)s repo/trunk checkout
563
$ bzr branch --switch ../repo/trunk ../repo/branched
564
2>Branched 0 revision(s).
565
2>Tree is up to date at revision 0.
566
2>Switched to branch:...branched...
569
bound_branch = branch.Branch.open_containing('checkout')[0]
570
master_branch = branch.Branch.open_containing('repo/branched')[0]
571
return (bound_branch, master_branch)
573
def test_branch_switch_parent_lightweight(self):
574
"""Lightweight checkout using bzr branch --switch."""
575
bb, mb = self._checkout_and_branch(option='--lightweight')
576
self.assertParent('repo/trunk', bb)
577
self.assertParent('repo/trunk', mb)
579
def test_branch_switch_parent_heavyweight(self):
580
"""Heavyweight checkout using bzr branch --switch."""
581
bb, mb = self._checkout_and_branch()
582
self.assertParent('repo/trunk', bb)
583
self.assertParent('repo/trunk', mb)
added
removed
bzrlib/tests/blackbox/test_branch.py
