1
# Copyright (C) 2006-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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
18
"""Black-box tests for bzr branch."""
26
revision as _mod_revision,
28
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
29
from bzrlib.tests import TestCaseWithTransport
30
from bzrlib.tests import (
35
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
36
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
37
from bzrlib.workingtree import WorkingTree
40
class TestBranch(TestCaseWithTransport):
42
def example_branch(self, path='.'):
43
tree = self.make_branch_and_tree(path)
44
self.build_tree_contents([(path + '/hello', 'foo')])
46
tree.commit(message='setup')
47
self.build_tree_contents([(path + '/goodbye', 'baz')])
49
tree.commit(message='setup')
51
def test_branch(self):
52
"""Branch from one branch to another."""
53
self.example_branch('a')
54
self.run_bzr('branch a b')
55
b = branch.Branch.open('b')
56
self.run_bzr('branch a c -r 1')
57
# previously was erroneously created by branching
58
self.assertFalse(b._transport.has('branch-name'))
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/")
127
def test_branch_only_copies_history(self):
128
# Knit branches should only push the history for the current revision.
129
format = bzrdir.BzrDirMetaFormat1()
130
format.repository_format = RepositoryFormatKnit1()
131
shared_repo = self.make_repository('repo', format=format, shared=True)
132
shared_repo.set_make_working_trees(True)
134
def make_shared_tree(path):
135
shared_repo.bzrdir.root_transport.mkdir(path)
136
shared_repo.bzrdir.create_branch_convenience('repo/' + path)
137
return WorkingTree.open('repo/' + path)
138
tree_a = make_shared_tree('a')
139
self.build_tree(['repo/a/file'])
141
tree_a.commit('commit a-1', rev_id='a-1')
142
f = open('repo/a/file', 'ab')
143
f.write('more stuff\n')
145
tree_a.commit('commit a-2', rev_id='a-2')
147
tree_b = make_shared_tree('b')
148
self.build_tree(['repo/b/file'])
150
tree_b.commit('commit b-1', rev_id='b-1')
152
self.assertTrue(shared_repo.has_revision('a-1'))
153
self.assertTrue(shared_repo.has_revision('a-2'))
154
self.assertTrue(shared_repo.has_revision('b-1'))
156
# Now that we have a repository with shared files, make sure
157
# that things aren't copied out by a 'branch'
158
self.run_bzr('branch repo/b branch-b')
159
pushed_tree = WorkingTree.open('branch-b')
160
pushed_repo = pushed_tree.branch.repository
161
self.assertFalse(pushed_repo.has_revision('a-1'))
162
self.assertFalse(pushed_repo.has_revision('a-2'))
163
self.assertTrue(pushed_repo.has_revision('b-1'))
165
def test_branch_hardlink(self):
166
self.requireFeature(HardlinkFeature)
167
source = self.make_branch_and_tree('source')
168
self.build_tree(['source/file1'])
170
source.commit('added file')
171
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
172
source_stat = os.stat('source/file1')
173
target_stat = os.stat('target/file1')
174
self.assertEqual(source_stat, target_stat)
176
def test_branch_files_from(self):
177
source = self.make_branch_and_tree('source')
178
self.build_tree(['source/file1'])
180
source.commit('added file')
181
out, err = self.run_bzr('branch source target --files-from source')
182
self.failUnlessExists('target/file1')
184
def test_branch_files_from_hardlink(self):
185
self.requireFeature(HardlinkFeature)
186
source = self.make_branch_and_tree('source')
187
self.build_tree(['source/file1'])
189
source.commit('added file')
190
source.bzrdir.sprout('second')
191
out, err = self.run_bzr('branch source target --files-from second'
193
source_stat = os.stat('source/file1')
194
second_stat = os.stat('second/file1')
195
target_stat = os.stat('target/file1')
196
self.assertNotEqual(source_stat, target_stat)
197
self.assertEqual(second_stat, target_stat)
199
def test_branch_standalone(self):
200
shared_repo = self.make_repository('repo', shared=True)
201
self.example_branch('source')
202
self.run_bzr('branch --standalone source repo/target')
203
b = branch.Branch.open('repo/target')
204
expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
205
self.assertEqual(strip_trailing_slash(b.repository.base),
206
strip_trailing_slash(local_path_to_url(expected_repo_path)))
208
def test_branch_no_tree(self):
209
self.example_branch('source')
210
self.run_bzr('branch --no-tree source target')
211
self.failIfExists('target/hello')
212
self.failIfExists('target/goodbye')
214
def test_branch_into_existing_dir(self):
215
self.example_branch('a')
216
# existing dir with similar files but no .bzr dir
217
self.build_tree_contents([('b/',)])
218
self.build_tree_contents([('b/hello', 'bar')]) # different content
219
self.build_tree_contents([('b/goodbye', 'baz')])# same content
220
# fails without --use-existing-dir
221
out,err = self.run_bzr('branch a b', retcode=3)
222
self.assertEqual('', out)
223
self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',
226
self.run_bzr('branch a b --use-existing-dir')
228
self.failUnlessExists('b/hello.moved')
229
self.failIfExists('b/godbye.moved')
230
# we can't branch into branch
231
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
232
self.assertEqual('', out)
233
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
235
def test_branch_bind(self):
236
self.example_branch('a')
237
out, err = self.run_bzr('branch a b --bind')
238
self.assertEndsWith(err, "New branch bound to a\n")
239
b = branch.Branch.open('b')
240
self.assertEndsWith(b.get_bound_location(), '/a/')
242
def test_branch_with_post_branch_init_hook(self):
244
branch.Branch.hooks.install_named_hook('post_branch_init',
246
self.assertLength(0, calls)
247
self.example_branch('a')
248
self.assertLength(1, calls)
249
self.run_bzr('branch a b')
250
self.assertLength(2, calls)
252
def test_checkout_with_post_branch_init_hook(self):
254
branch.Branch.hooks.install_named_hook('post_branch_init',
256
self.assertLength(0, calls)
257
self.example_branch('a')
258
self.assertLength(1, calls)
259
self.run_bzr('checkout a b')
260
self.assertLength(2, calls)
262
def test_lightweight_checkout_with_post_branch_init_hook(self):
264
branch.Branch.hooks.install_named_hook('post_branch_init',
266
self.assertLength(0, calls)
267
self.example_branch('a')
268
self.assertLength(1, calls)
269
self.run_bzr('checkout --lightweight a b')
270
self.assertLength(2, calls)
272
def test_branch_fetches_all_tags(self):
273
builder = self.make_branch_builder('source')
274
source = fixtures.build_branch_with_non_ancestral_rev(builder)
275
source.tags.set_tag('tag-a', 'rev-2')
276
# Now source has a tag not in its ancestry. Make a branch from it.
277
self.run_bzr('branch source new-branch')
278
new_branch = branch.Branch.open('new-branch')
279
# The tag is present, and so is its revision.
280
self.assertEqual('rev-2', new_branch.tags.lookup_tag('tag-a'))
281
new_branch.repository.get_revision('rev-2')
284
class TestBranchStacked(TestCaseWithTransport):
285
"""Tests for branch --stacked"""
287
def assertRevisionInRepository(self, repo_path, revid):
288
"""Check that a revision is in a repository, disregarding stacking."""
289
repo = bzrdir.BzrDir.open(repo_path).open_repository()
290
self.assertTrue(repo.has_revision(revid))
292
def assertRevisionNotInRepository(self, repo_path, revid):
293
"""Check that a revision is not in a repository, disregarding stacking."""
294
repo = bzrdir.BzrDir.open(repo_path).open_repository()
295
self.assertFalse(repo.has_revision(revid))
297
def assertRevisionsInBranchRepository(self, revid_list, branch_path):
298
repo = branch.Branch.open(branch_path).repository
299
self.assertEqual(set(revid_list),
300
repo.has_revisions(revid_list))
302
def test_branch_stacked_branch_not_stacked(self):
303
"""Branching a stacked branch is not stacked by default"""
305
trunk_tree = self.make_branch_and_tree('target',
307
trunk_tree.commit('mainline')
308
# and a branch from it which is stacked
309
branch_tree = self.make_branch_and_tree('branch',
311
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
312
# with some work on it
313
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
314
work_tree.commit('moar work plz')
315
work_tree.branch.push(branch_tree.branch)
316
# branching our local branch gives us a new stacked branch pointing at
318
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
319
self.assertEqual('', out)
320
self.assertEqual('Branched 2 revision(s).\n',
322
# it should have preserved the branch format, and so it should be
323
# capable of supporting stacking, but not actually have a stacked_on
325
self.assertRaises(errors.NotStacked,
326
bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
328
def test_branch_stacked_branch_stacked(self):
329
"""Asking to stack on a stacked branch does work"""
331
trunk_tree = self.make_branch_and_tree('target',
333
trunk_revid = trunk_tree.commit('mainline')
334
# and a branch from it which is stacked
335
branch_tree = self.make_branch_and_tree('branch',
337
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
338
# with some work on it
339
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
340
branch_revid = work_tree.commit('moar work plz')
341
work_tree.branch.push(branch_tree.branch)
342
# you can chain branches on from there
343
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
344
self.assertEqual('', out)
345
self.assertEqual('Created new stacked branch referring to %s.\n' %
346
branch_tree.branch.base, err)
347
self.assertEqual(branch_tree.branch.base,
348
branch.Branch.open('branch2').get_stacked_on_url())
349
branch2_tree = WorkingTree.open('branch2')
350
branch2_revid = work_tree.commit('work on second stacked branch')
351
work_tree.branch.push(branch2_tree.branch)
352
self.assertRevisionInRepository('branch2', branch2_revid)
353
self.assertRevisionsInBranchRepository(
354
[trunk_revid, branch_revid, branch2_revid],
357
def test_branch_stacked(self):
359
trunk_tree = self.make_branch_and_tree('mainline',
361
original_revid = trunk_tree.commit('mainline')
362
self.assertRevisionInRepository('mainline', original_revid)
363
# and a branch from it which is stacked
364
out, err = self.run_bzr(['branch', '--stacked', 'mainline',
366
self.assertEqual('', out)
367
self.assertEqual('Created new stacked branch referring to %s.\n' %
368
trunk_tree.branch.base, err)
369
self.assertRevisionNotInRepository('newbranch', original_revid)
370
new_branch = branch.Branch.open('newbranch')
371
self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
373
def test_branch_stacked_from_smart_server(self):
374
# We can branch stacking on a smart server
375
self.transport_server = test_server.SmartTCPServer_for_testing
376
trunk = self.make_branch('mainline', format='1.9')
377
out, err = self.run_bzr(
378
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
380
def test_branch_stacked_from_non_stacked_format(self):
381
"""The origin format doesn't support stacking"""
382
trunk = self.make_branch('trunk', format='pack-0.92')
383
out, err = self.run_bzr(
384
['branch', '--stacked', 'trunk', 'shallow'])
385
# We should notify the user that we upgraded their format
386
self.assertEqualDiff(
387
'Source repository format does not support stacking, using format:\n'
388
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
389
'Source branch format does not support stacking, using format:\n'
391
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
392
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
393
'Created new stacked branch referring to %s.\n' % (trunk.base,),
396
def test_branch_stacked_from_rich_root_non_stackable(self):
397
trunk = self.make_branch('trunk', format='rich-root-pack')
398
out, err = self.run_bzr(
399
['branch', '--stacked', 'trunk', 'shallow'])
400
# We should notify the user that we upgraded their format
401
self.assertEqualDiff(
402
'Source repository format does not support stacking, using format:\n'
403
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
404
'Source branch format does not support stacking, using format:\n'
406
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
407
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
408
'Created new stacked branch referring to %s.\n' % (trunk.base,),
412
class TestSmartServerBranching(TestCaseWithTransport):
414
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
415
self.setup_smart_server_with_call_log()
416
t = self.make_branch_and_tree('from')
417
for count in range(9):
418
t.commit(message='commit %d' % count)
419
self.reset_smart_call_log()
420
out, err = self.run_bzr(['branch', self.get_url('from'),
421
self.get_url('target')])
422
# This figure represent the amount of work to perform this use case. It
423
# is entirely ok to reduce this number if a test fails due to rpc_count
424
# being too low. If rpc_count increases, more network roundtrips have
425
# become necessary for this use case. Please do not adjust this number
426
# upwards without agreement from bzr's network support maintainers.
427
self.assertLength(36, self.hpss_calls)
429
def test_branch_from_trivial_branch_streaming_acceptance(self):
430
self.setup_smart_server_with_call_log()
431
t = self.make_branch_and_tree('from')
432
for count in range(9):
433
t.commit(message='commit %d' % count)
434
self.reset_smart_call_log()
435
out, err = self.run_bzr(['branch', self.get_url('from'),
437
# This figure represent the amount of work to perform this use case. It
438
# is entirely ok to reduce this number if a test fails due to rpc_count
439
# being too low. If rpc_count increases, more network roundtrips have
440
# become necessary for this use case. Please do not adjust this number
441
# upwards without agreement from bzr's network support maintainers.
442
self.assertLength(9, self.hpss_calls)
444
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
445
self.setup_smart_server_with_call_log()
446
t = self.make_branch_and_tree('trunk')
447
for count in range(8):
448
t.commit(message='commit %d' % count)
449
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
451
local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
452
local_tree.commit('feature change')
453
local_tree.branch.push(tree2.branch)
454
self.reset_smart_call_log()
455
out, err = self.run_bzr(['branch', self.get_url('feature'),
457
# This figure represent the amount of work to perform this use case. It
458
# is entirely ok to reduce this number if a test fails due to rpc_count
459
# being too low. If rpc_count increases, more network roundtrips have
460
# become necessary for this use case. Please do not adjust this number
461
# upwards without agreement from bzr's network support maintainers.
462
self.assertLength(14, self.hpss_calls)
464
def test_branch_from_branch_with_tags(self):
465
self.setup_smart_server_with_call_log()
466
builder = self.make_branch_builder('source')
467
source = fixtures.build_branch_with_non_ancestral_rev(builder)
468
source.tags.set_tag('tag-a', 'rev-2')
469
source.tags.set_tag('tag-missing', 'missing-rev')
470
# Now source has a tag not in its ancestry. Make a branch from it.
471
self.reset_smart_call_log()
472
out, err = self.run_bzr(['branch', self.get_url('source'), 'target'])
473
# This figure represent the amount of work to perform this use case. It
474
# is entirely ok to reduce this number if a test fails due to rpc_count
475
# being too low. If rpc_count increases, more network roundtrips have
476
# become necessary for this use case. Please do not adjust this number
477
# upwards without agreement from bzr's network support maintainers.
478
self.assertLength(9, self.hpss_calls)
481
class TestRemoteBranch(TestCaseWithSFTPServer):
484
super(TestRemoteBranch, self).setUp()
485
tree = self.make_branch_and_tree('branch')
486
self.build_tree_contents([('branch/file', 'file content\n')])
488
tree.commit('file created')
490
def test_branch_local_remote(self):
491
self.run_bzr(['branch', 'branch', self.get_url('remote')])
492
t = self.get_transport()
493
# Ensure that no working tree what created remotely
494
self.assertFalse(t.has('remote/file'))
496
def test_branch_remote_remote(self):
497
# Light cheat: we access the branch remotely
498
self.run_bzr(['branch', self.get_url('branch'),
499
self.get_url('remote')])
500
t = self.get_transport()
501
# Ensure that no working tree what created remotely
502
self.assertFalse(t.has('remote/file'))
added
removed
bzrlib/tests/blackbox/test_branch.py
