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,
22
from bzrlib import (branch, bzrdir, errors, repository)
29
23
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
30
24
from bzrlib.tests.blackbox import ExternalBase
31
from bzrlib.tests import (
25
from bzrlib.tests import HardlinkFeature
35
26
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
36
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
37
27
from bzrlib.workingtree import WorkingTree
58
48
self.assertFalse(b._transport.has('branch-name'))
59
49
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
51
def test_branch_only_copies_history(self):
128
52
# Knit branches should only push the history for the current revision.
129
53
format = bzrdir.BzrDirMetaFormat1()
168
92
self.build_tree(['source/file1'])
169
93
source.add('file1')
170
94
source.commit('added file')
171
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
95
self.run_bzr(['branch', 'source', 'target', '--hardlink'])
172
96
source_stat = os.stat('source/file1')
173
97
target_stat = os.stat('target/file1')
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)")
184
def test_branch_standalone(self):
185
shared_repo = self.make_repository('repo', shared=True)
186
self.example_branch('source')
187
self.run_bzr('branch --standalone source repo/target')
188
b = branch.Branch.open('repo/target')
189
expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
190
self.assertEqual(strip_trailing_slash(b.repository.base),
191
strip_trailing_slash(local_path_to_url(expected_repo_path)))
193
def test_branch_no_tree(self):
194
self.example_branch('source')
195
self.run_bzr('branch --no-tree source target')
196
self.failIfExists('target/hello')
197
self.failIfExists('target/goodbye')
199
def test_branch_into_existing_dir(self):
200
self.example_branch('a')
201
# existing dir with similar files but no .bzr dir
202
self.build_tree_contents([('b/',)])
203
self.build_tree_contents([('b/hello', 'bar')]) # different content
204
self.build_tree_contents([('b/goodbye', 'baz')])# same content
205
# fails without --use-existing-dir
206
out,err = self.run_bzr('branch a b', retcode=3)
207
self.assertEqual('', out)
208
self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',
211
self.run_bzr('branch a b --use-existing-dir')
213
self.failUnlessExists('b/hello.moved')
214
self.failIfExists('b/godbye.moved')
215
# we can't branch into branch
216
out,err = self.run_bzr('branch a b --use-existing-dir', retcode=3)
217
self.assertEqual('', out)
218
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
98
self.assertEqual(source_stat, target_stat)
221
101
class TestBranchStacked(ExternalBase):
222
102
"""Tests for branch --stacked"""
104
def check_shallow_branch(self, branch_revid, stacked_on):
105
"""Assert that the branch 'newbranch' has been published correctly.
107
:param stacked_on: url of a branch this one is stacked upon.
108
:param branch_revid: a revision id that should be the only
109
revision present in the stacked branch, and it should not be in
110
the reference branch.
112
new_branch = branch.Branch.open('newbranch')
113
# The branch refers to the mainline
114
self.assertEqual(stacked_on, new_branch.get_stacked_on_url())
115
# and the branch's work was pushed
116
self.assertTrue(new_branch.repository.has_revision(branch_revid))
117
# The newly committed revision shoud be present in the stacked branch,
118
# but not in the stacked-on branch. Because stacking is set up by the
119
# branch object, if we open the stacked branch's repository directly,
120
# bypassing the branch, we see only what's in the stacked repository.
121
stacked_repo = bzrdir.BzrDir.open('newbranch').open_repository()
122
stacked_repo_revisions = set(stacked_repo.all_revision_ids())
123
if len(stacked_repo_revisions) != 1:
124
self.fail("wrong revisions in stacked repository: %r"
125
% (stacked_repo_revisions,))
224
127
def assertRevisionInRepository(self, repo_path, revid):
225
128
"""Check that a revision is in a repository, disregarding stacking."""
226
129
repo = bzrdir.BzrDir.open(repo_path).open_repository()
240
143
"""Branching a stacked branch is not stacked by default"""
241
144
# We have a mainline
242
145
trunk_tree = self.make_branch_and_tree('target',
146
format='development')
244
147
trunk_tree.commit('mainline')
245
148
# and a branch from it which is stacked
246
149
branch_tree = self.make_branch_and_tree('branch',
150
format='development')
248
151
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
249
152
# with some work on it
250
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
251
work_tree.commit('moar work plz')
252
work_tree.branch.push(branch_tree.branch)
153
branch_tree.commit('moar work plz')
253
154
# branching our local branch gives us a new stacked branch pointing at
255
156
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
256
157
self.assertEqual('', out)
257
self.assertEqual('Branched 2 revision(s).\n',
158
self.assertEqual('Branched 1 revision(s).\n',
259
160
# it should have preserved the branch format, and so it should be
260
161
# capable of supporting stacking, but not actually have a stacked_on
266
167
"""Asking to stack on a stacked branch does work"""
267
168
# We have a mainline
268
169
trunk_tree = self.make_branch_and_tree('target',
170
format='development')
270
171
trunk_revid = trunk_tree.commit('mainline')
271
172
# and a branch from it which is stacked
272
173
branch_tree = self.make_branch_and_tree('branch',
174
format='development')
274
175
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
275
176
# with some work on it
276
work_tree = trunk_tree.branch.bzrdir.sprout('local').open_workingtree()
277
branch_revid = work_tree.commit('moar work plz')
278
work_tree.branch.push(branch_tree.branch)
177
branch_revid = branch_tree.commit('moar work plz')
279
178
# you can chain branches on from there
280
179
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
281
180
self.assertEqual('', out)
304
202
self.assertEqual('Created new stacked branch referring to %s.\n' %
305
203
trunk_tree.branch.base, err)
306
204
self.assertRevisionNotInRepository('newbranch', original_revid)
307
new_branch = branch.Branch.open('newbranch')
308
self.assertEqual(trunk_tree.branch.base, new_branch.get_stacked_on_url())
205
new_tree = WorkingTree.open('newbranch')
206
new_revid = new_tree.commit('new work')
207
self.check_shallow_branch(new_revid, trunk_tree.branch.base)
310
209
def test_branch_stacked_from_smart_server(self):
311
210
# We can branch stacking on a smart server
312
211
from bzrlib.smart.server import SmartTCPServer_for_testing
313
212
self.transport_server = SmartTCPServer_for_testing
314
trunk = self.make_branch('mainline', format='1.9')
213
trunk = self.make_branch('mainline', format='development')
315
214
out, err = self.run_bzr(
316
215
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
335
233
['branch', '--stacked', 'trunk', 'shallow'])
336
234
# We should notify the user that we upgraded their format
337
235
self.assertEqualDiff(
338
'Source repository format does not support stacking, using format:\n'
236
'Source format does not support stacking, using format:'
237
' \'1.6.1-rich-root\'\n'
339
238
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
340
'Source branch format does not support stacking, using format:\n'
342
240
'Created new stacked branch referring to %s.\n' % (trunk.base,),
346
class TestSmartServerBranching(ExternalBase):
348
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
349
self.setup_smart_server_with_call_log()
350
t = self.make_branch_and_tree('from')
351
for count in range(9):
352
t.commit(message='commit %d' % count)
353
self.reset_smart_call_log()
354
out, err = self.run_bzr(['branch', self.get_url('from'),
355
self.get_url('target')])
356
# This figure represent the amount of work to perform this use case. It
357
# is entirely ok to reduce this number if a test fails due to rpc_count
358
# being too low. If rpc_count increases, more network roundtrips have
359
# become necessary for this use case. Please do not adjust this number
360
# upwards without agreement from bzr's network support maintainers.
361
self.assertLength(38, self.hpss_calls)
363
def test_branch_from_trivial_branch_streaming_acceptance(self):
364
self.setup_smart_server_with_call_log()
365
t = self.make_branch_and_tree('from')
366
for count in range(9):
367
t.commit(message='commit %d' % count)
368
self.reset_smart_call_log()
369
out, err = self.run_bzr(['branch', self.get_url('from'),
371
# This figure represent the amount of work to perform this use case. It
372
# is entirely ok to reduce this number if a test fails due to rpc_count
373
# being too low. If rpc_count increases, more network roundtrips have
374
# become necessary for this use case. Please do not adjust this number
375
# upwards without agreement from bzr's network support maintainers.
376
self.assertLength(10, self.hpss_calls)
378
def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
379
self.setup_smart_server_with_call_log()
380
t = self.make_branch_and_tree('trunk')
381
for count in range(8):
382
t.commit(message='commit %d' % count)
383
tree2 = t.branch.bzrdir.sprout('feature', stacked=True
385
local_tree = t.branch.bzrdir.sprout('local-working').open_workingtree()
386
local_tree.commit('feature change')
387
local_tree.branch.push(tree2.branch)
388
self.reset_smart_call_log()
389
out, err = self.run_bzr(['branch', self.get_url('feature'),
391
# This figure represent the amount of work to perform this use case. It
392
# is entirely ok to reduce this number if a test fails due to rpc_count
393
# being too low. If rpc_count increases, more network roundtrips have
394
# become necessary for this use case. Please do not adjust this number
395
# upwards without agreement from bzr's network support maintainers.
396
self.assertLength(15, self.hpss_calls)
399
245
class TestRemoteBranch(TestCaseWithSFTPServer):
added
removed
bzrlib/tests/blackbox/test_branch.py
