98
97
target_stat = os.stat('target/file1')
99
98
self.assertEqual(source_stat, target_stat)
101
def test_branch_standalone(self):
102
shared_repo = self.make_repository('repo', shared=True)
103
self.example_branch('source')
104
self.run_bzr('branch --standalone source repo/target')
105
b = branch.Branch.open('repo/target')
106
expected_repo_path = os.path.abspath('repo/target/.bzr/repository')
107
self.assertEqual(strip_trailing_slash(b.repository.base),
108
strip_trailing_slash(local_path_to_url(expected_repo_path)))
111
class TestBranchStacked(ExternalBase):
112
"""Tests for branch --stacked"""
114
def check_shallow_branch(self, branch_revid, stacked_on):
115
"""Assert that the branch 'newbranch' has been published correctly.
117
:param stacked_on: url of a branch this one is stacked upon.
118
:param branch_revid: a revision id that should be the only
119
revision present in the stacked branch, and it should not be in
120
the reference branch.
122
new_branch = branch.Branch.open('newbranch')
123
# The branch refers to the mainline
124
self.assertEqual(stacked_on, new_branch.get_stacked_on_url())
125
# and the branch's work was pushed
126
self.assertTrue(new_branch.repository.has_revision(branch_revid))
127
# The newly committed revision shoud be present in the stacked branch,
128
# but not in the stacked-on branch. Because stacking is set up by the
129
# branch object, if we open the stacked branch's repository directly,
130
# bypassing the branch, we see only what's in the stacked repository.
131
stacked_repo = bzrdir.BzrDir.open('newbranch').open_repository()
132
stacked_repo_revisions = set(stacked_repo.all_revision_ids())
133
if len(stacked_repo_revisions) != 1:
134
self.fail("wrong revisions in stacked repository: %r"
135
% (stacked_repo_revisions,))
137
def assertRevisionInRepository(self, repo_path, revid):
138
"""Check that a revision is in a repository, disregarding stacking."""
139
repo = bzrdir.BzrDir.open(repo_path).open_repository()
140
self.assertTrue(repo.has_revision(revid))
142
def assertRevisionNotInRepository(self, repo_path, revid):
143
"""Check that a revision is not in a repository, disregarding stacking."""
144
repo = bzrdir.BzrDir.open(repo_path).open_repository()
145
self.assertFalse(repo.has_revision(revid))
147
def assertRevisionsInBranchRepository(self, revid_list, branch_path):
148
repo = branch.Branch.open(branch_path).repository
149
self.assertEqual(set(revid_list),
150
repo.has_revisions(revid_list))
152
def test_branch_stacked_branch_not_stacked(self):
153
"""Branching a stacked branch is not stacked by default"""
155
trunk_tree = self.make_branch_and_tree('target',
156
format='development')
157
trunk_tree.commit('mainline')
158
# and a branch from it which is stacked
159
branch_tree = self.make_branch_and_tree('branch',
160
format='development')
161
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
162
# with some work on it
163
branch_tree.commit('moar work plz')
164
# branching our local branch gives us a new stacked branch pointing at
166
out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
167
self.assertEqual('', out)
168
self.assertEqual('Branched 1 revision(s).\n',
170
# it should have preserved the branch format, and so it should be
171
# capable of supporting stacking, but not actually have a stacked_on
173
self.assertRaises(errors.NotStacked,
174
bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
176
def test_branch_stacked_branch_stacked(self):
177
"""Asking to stack on a stacked branch does work"""
179
trunk_tree = self.make_branch_and_tree('target',
180
format='development')
181
trunk_revid = trunk_tree.commit('mainline')
182
# and a branch from it which is stacked
183
branch_tree = self.make_branch_and_tree('branch',
184
format='development')
185
branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
186
# with some work on it
187
branch_revid = branch_tree.commit('moar work plz')
188
# you can chain branches on from there
189
out, err = self.run_bzr(['branch', 'branch', '--stacked', 'branch2'])
190
self.assertEqual('', out)
191
self.assertEqual('Created new stacked branch referring to %s.\n' %
192
branch_tree.branch.base, err)
193
self.assertEqual(branch_tree.branch.base,
194
branch.Branch.open('branch2').get_stacked_on_url())
195
branch2_tree = WorkingTree.open('branch2')
196
branch2_revid = branch2_tree.commit('work on second stacked branch')
197
self.assertRevisionInRepository('branch2', branch2_revid)
198
self.assertRevisionsInBranchRepository(
199
[trunk_revid, branch_revid, branch2_revid],
202
def test_branch_stacked(self):
204
trunk_tree = self.make_branch_and_tree('mainline',
205
format='development')
206
original_revid = trunk_tree.commit('mainline')
207
self.assertRevisionInRepository('mainline', original_revid)
208
# and a branch from it which is stacked
209
out, err = self.run_bzr(['branch', '--stacked', 'mainline',
211
self.assertEqual('', out)
212
self.assertEqual('Created new stacked branch referring to %s.\n' %
213
trunk_tree.branch.base, err)
214
self.assertRevisionNotInRepository('newbranch', original_revid)
215
new_tree = WorkingTree.open('newbranch')
216
new_revid = new_tree.commit('new work')
217
self.check_shallow_branch(new_revid, trunk_tree.branch.base)
219
def test_branch_stacked_from_smart_server(self):
220
# We can branch stacking on a smart server
221
from bzrlib.smart.server import SmartTCPServer_for_testing
222
self.transport_server = SmartTCPServer_for_testing
223
trunk = self.make_branch('mainline', format='development')
224
out, err = self.run_bzr(
225
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
227
def test_branch_stacked_from_non_stacked_format(self):
228
"""The origin format doesn't support stacking"""
229
trunk = self.make_branch('trunk', format='pack-0.92')
230
out, err = self.run_bzr(
231
['branch', '--stacked', 'trunk', 'shallow'])
232
# We should notify the user that we upgraded their format
233
self.assertEqualDiff(
234
'Source format does not support stacking, using format: \'1.6\'\n'
235
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
237
'Created new stacked branch referring to %s.\n' % (trunk.base,),
240
def test_branch_stacked_from_rich_root_non_stackable(self):
241
trunk = self.make_branch('trunk', format='rich-root-pack')
242
out, err = self.run_bzr(
243
['branch', '--stacked', 'trunk', 'shallow'])
244
# We should notify the user that we upgraded their format
245
self.assertEqualDiff(
246
'Source format does not support stacking, using format:'
247
' \'1.6.1-rich-root\'\n'
248
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
250
'Created new stacked branch referring to %s.\n' % (trunk.base,),
255
101
class TestRemoteBranch(TestCaseWithSFTPServer):
added
removed
bzrlib/tests/blackbox/test_branch.py
