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
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
36
from bzrlib.tests.script import run_script
37
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
38
38
from bzrlib.workingtree import WorkingTree
41
class TestBranch(TestCaseWithTransport):
41
class TestBranch(ExternalBase):
43
43
def example_branch(self, path='.'):
44
44
tree = self.make_branch_and_tree(path)
174
174
target_stat = os.stat('target/file1')
175
175
self.assertEqual(source_stat, target_stat)
177
def test_branch_files_from(self):
178
source = self.make_branch_and_tree('source')
179
self.build_tree(['source/file1'])
181
source.commit('added file')
182
out, err = self.run_bzr('branch source target --files-from source')
183
self.assertPathExists('target/file1')
185
def test_branch_files_from_hardlink(self):
186
self.requireFeature(HardlinkFeature)
187
source = self.make_branch_and_tree('source')
188
self.build_tree(['source/file1'])
190
source.commit('added file')
191
source.bzrdir.sprout('second')
192
out, err = self.run_bzr('branch source target --files-from second'
194
source_stat = os.stat('source/file1')
195
second_stat = os.stat('second/file1')
196
target_stat = os.stat('target/file1')
197
self.assertNotEqual(source_stat, target_stat)
198
self.assertEqual(second_stat, target_stat)
200
177
def test_branch_standalone(self):
201
178
shared_repo = self.make_repository('repo', shared=True)
202
179
self.example_branch('source')
209
186
def test_branch_no_tree(self):
210
187
self.example_branch('source')
211
188
self.run_bzr('branch --no-tree source target')
212
self.assertPathDoesNotExist('target/hello')
213
self.assertPathDoesNotExist('target/goodbye')
189
self.failIfExists('target/hello')
190
self.failIfExists('target/goodbye')
215
192
def test_branch_into_existing_dir(self):
216
193
self.example_branch('a')
226
203
# force operation
227
204
self.run_bzr('branch a b --use-existing-dir')
228
205
# check conflicts
229
self.assertPathExists('b/hello.moved')
230
self.assertPathDoesNotExist('b/godbye.moved')
206
self.failUnlessExists('b/hello.moved')
207
self.failIfExists('b/godbye.moved')
231
208
# we can't branch into branch
232
209
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
233
210
self.assertEqual('', out)
240
217
b = branch.Branch.open('b')
241
218
self.assertEndsWith(b.get_bound_location(), '/a/')
243
def test_branch_with_post_branch_init_hook(self):
245
branch.Branch.hooks.install_named_hook('post_branch_init',
247
self.assertLength(0, calls)
248
self.example_branch('a')
249
self.assertLength(1, calls)
250
self.run_bzr('branch a b')
251
self.assertLength(2, calls)
253
def test_checkout_with_post_branch_init_hook(self):
255
branch.Branch.hooks.install_named_hook('post_branch_init',
257
self.assertLength(0, calls)
258
self.example_branch('a')
259
self.assertLength(1, calls)
260
self.run_bzr('checkout a b')
261
self.assertLength(2, calls)
263
def test_lightweight_checkout_with_post_branch_init_hook(self):
265
branch.Branch.hooks.install_named_hook('post_branch_init',
267
self.assertLength(0, calls)
268
self.example_branch('a')
269
self.assertLength(1, calls)
270
self.run_bzr('checkout --lightweight a b')
271
self.assertLength(2, calls)
273
def test_branch_fetches_all_tags(self):
274
builder = self.make_branch_builder('source')
275
source = fixtures.build_branch_with_non_ancestral_rev(builder)
276
source.tags.set_tag('tag-a', 'rev-2')
277
# Now source has a tag not in its ancestry. Make a branch from it.
278
self.run_bzr('branch source new-branch')
279
new_branch = branch.Branch.open('new-branch')
280
# The tag is present, and so is its revision.
281
self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))
282
new_branch.repository.get_revision('rev-2')
285
class TestBranchStacked(TestCaseWithTransport):
221
class TestBranchStacked(ExternalBase):
286
222
"""Tests for branch --stacked"""
288
224
def assertRevisionInRepository(self, repo_path, revid):
389
325
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
390
326
'Source branch format does not support stacking, using format:\n'
391
327
' Branch format 7\n'
392
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
393
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
394
328
'Created new stacked branch referring to %s.\n' % (trunk.base,),
404
338
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
405
339
'Source branch format does not support stacking, using format:\n'
406
340
' Branch format 7\n'
407
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
408
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
409
341
'Created new stacked branch referring to %s.\n' % (trunk.base,),
413
class TestSmartServerBranching(TestCaseWithTransport):
345
class TestSmartServerBranching(ExternalBase):
415
347
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
416
348
self.setup_smart_server_with_call_log()
425
357
# being too low. If rpc_count increases, more network roundtrips have
426
358
# become necessary for this use case. Please do not adjust this number
427
359
# upwards without agreement from bzr's network support maintainers.
428
self.assertLength(36, self.hpss_calls)
360
self.assertLength(38, self.hpss_calls)
430
362
def test_branch_from_trivial_branch_streaming_acceptance(self):
431
363
self.setup_smart_server_with_call_log()
440
372
# being too low. If rpc_count increases, more network roundtrips have
441
373
# become necessary for this use case. Please do not adjust this number
442
374
# upwards without agreement from bzr's network support maintainers.
443
self.assertLength(9, self.hpss_calls)
375
self.assertLength(10, self.hpss_calls)
445
377
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
446
378
self.setup_smart_server_with_call_log()
460
392
# being too low. If rpc_count increases, more network roundtrips have
461
393
# become necessary for this use case. Please do not adjust this number
462
394
# upwards without agreement from bzr's network support maintainers.
463
self.assertLength(14, self.hpss_calls)
465
def test_branch_from_branch_with_tags(self):
466
self.setup_smart_server_with_call_log()
467
builder = self.make_branch_builder('source')
468
source = fixtures.build_branch_with_non_ancestral_rev(builder)
469
source.tags.set_tag('tag-a', 'rev-2')
470
source.tags.set_tag('tag-missing', 'missing-rev')
471
# Now source has a tag not in its ancestry. Make a branch from it.
472
self.reset_smart_call_log()
473
out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])
474
# This figure represent the amount of work to perform this use case. It
475
# is entirely ok to reduce this number if a test fails due to rpc_count
476
# being too low. If rpc_count increases, more network roundtrips have
477
# become necessary for this use case. Please do not adjust this number
478
# upwards without agreement from bzr's network support maintainers.
479
self.assertLength(9, self.hpss_calls)
395
self.assertLength(15, self.hpss_calls)
482
398
class TestRemoteBranch(TestCaseWithSFTPServer):
502
418
# Ensure that no working tree what created remotely
503
419
self.assertFalse(t.has('remote/file'))
506
class TestDeprecatedAliases(TestCaseWithTransport):
508
def test_deprecated_aliases(self):
509
"""bzr branch can be called clone or get, but those names are deprecated.
513
for command in ['clone', 'get']:
515
$ bzr %(command)s A B
516
2>The command 'bzr %(command)s' has been deprecated in bzr 2.4. Please use 'bzr branch' instead.
517
2>bzr: ERROR: Not a branch...
added
removed
bzrlib/tests/blackbox/test_branch.py
