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
27
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
37
28
from bzrlib.workingtree import WorkingTree
58
49
self.assertFalse(b._transport.has('branch-name'))
59
50
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
52
def test_branch_only_copies_history(self):
128
53
# Knit branches should only push the history for the current revision.
129
54
format = bzrdir.BzrDirMetaFormat1()
168
93
self.build_tree(['source/file1'])
169
94
source.add('file1')
170
95
source.commit('added file')
171
out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
96
self.run_bzr(['branch', 'source', 'target', '--hardlink'])
172
97
source_stat = os.stat('source/file1')
173
98
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)")
99
self.assertEqual(source_stat, target_stat)
184
101
def test_branch_standalone(self):
185
102
shared_repo = self.make_repository('repo', shared=True)
196
113
self.failIfExists('target/hello')
197
114
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)
221
117
class TestBranchStacked(ExternalBase):
222
118
"""Tests for branch --stacked"""
120
def check_shallow_branch(self, branch_revid, stacked_on):
121
"""Assert that the branch 'newbranch' has been published correctly.
123
:param stacked_on: url of a branch this one is stacked upon.
124
:param branch_revid: a revision id that should be the only
125
revision present in the stacked branch, and it should not be in
126
the reference branch.
128
new_branch = branch.Branch.open('newbranch')
129
# The branch refers to the mainline
130
self.assertEqual(stacked_on, new_branch.get_stacked_on_url())
131
# and the branch's work was pushed
132
self.assertTrue(new_branch.repository.has_revision(branch_revid))
133
# The newly committed revision shoud be present in the stacked branch,
134
# but not in the stacked-on branch. Because stacking is set up by the
135
# branch object, if we open the stacked branch's repository directly,
136
# bypassing the branch, we see only what's in the stacked repository.
137
stacked_repo = bzrdir.BzrDir.open('newbranch').open_repository()
138
stacked_repo_revisions = set(stacked_repo.all_revision_ids())
139
if len(stacked_repo_revisions) != 1:
140
self.fail("wrong revisions in stacked repository: %r"
141
% (stacked_repo_revisions,))
224
143
def assertRevisionInRepository(self, repo_path, revid):
225
144
"""Check that a revision is in a repository, disregarding stacking."""
226
145
repo = bzrdir.BzrDir.open(repo_path).open_repository()
248
167
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
249
168
# 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)
169
branch_tree.commit('moar work plz')
253
170
# branching our local branch gives us a new stacked branch pointing at
255
172
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
256
173
self.assertEqual('', out)
257
self.assertEqual('Branched 2 revision(s).\n',
174
self.assertEqual('Branched 1 revision(s).\n',
259
176
# it should have preserved the branch format, and so it should be
260
177
# capable of supporting stacking, but not actually have a stacked_on
284
199
self.assertEqual(branch_tree.branch.base,
285
200
branch.Branch.open('branch2').get_stacked_on_url())
286
201
branch2_tree = WorkingTree.open('branch2')
287
branch2_revid = work_tree.commit('work on second stacked branch')
288
work_tree.branch.push(branch2_tree.branch)
202
branch2_revid = branch2_tree.commit('work on second stacked branch')
289
203
self.assertRevisionInRepository('branch2', branch2_revid)
290
204
self.assertRevisionsInBranchRepository(
291
205
[trunk_revid, branch_revid, branch2_revid],
304
218
self.assertEqual('Created new stacked branch referring to %s.\n' %
305
219
trunk_tree.branch.base, err)
306
220
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())
221
new_tree = WorkingTree.open('newbranch')
222
new_revid = new_tree.commit('new work')
223
self.check_shallow_branch(new_revid, trunk_tree.branch.base)
310
225
def test_branch_stacked_from_smart_server(self):
311
226
# We can branch stacking on a smart server
322
237
['branch', '--stacked', 'trunk', 'shallow'])
323
238
# We should notify the user that we upgraded their format
324
239
self.assertEqualDiff(
325
'Source repository format does not support stacking, using format:\n'
240
'Source format does not support stacking, using format: \'1.6\'\n'
326
241
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
327
'Source branch format does not support stacking, using format:\n'
329
243
'Created new stacked branch referring to %s.\n' % (trunk.base,),
335
249
['branch', '--stacked', 'trunk', 'shallow'])
336
250
# We should notify the user that we upgraded their format
337
251
self.assertEqualDiff(
338
'Source repository format does not support stacking, using format:\n'
252
'Source format does not support stacking, using format:'
253
' \'1.6.1-rich-root\'\n'
339
254
' 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
256
'Created new stacked branch referring to %s.\n' % (trunk.base,),
added
removed
bzrlib/tests/blackbox/test_branch.py
