1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
|
# Copyright (C) 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for Branch.get_stacked_on_url and set_stacked_on_url."""
from bzrlib import (
bzrdir,
errors,
)
from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestNotApplicable, KnownFailure
from bzrlib.tests.branch_implementations import TestCaseWithBranch
class TestStacking(TestCaseWithBranch):
def test_get_set_stacked_on_url(self):
# branches must either:
# raise UnstackableBranchFormat or
# raise UnstackableRepositoryFormat or
# permit stacking to be done and then return the stacked location.
branch = self.make_branch('branch')
target = self.make_branch('target')
old_format_errors = (
errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat,
)
try:
branch.set_stacked_on_url(target.base)
except old_format_errors:
# if the set failed, so must the get
self.assertRaises(old_format_errors, branch.get_stacked_on_url)
return
# now we have a stacked branch:
self.assertEqual(target.base, branch.get_stacked_on_url())
branch.set_stacked_on_url(None)
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
def test_get_set_stacked_on_relative(self):
# Branches can be stacked on other branches using relative paths.
branch = self.make_branch('branch')
target = self.make_branch('target')
old_format_errors = (
errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat,
)
try:
branch.set_stacked_on_url('../target')
except old_format_errors:
# if the set failed, so must the get
self.assertRaises(old_format_errors, branch.get_stacked_on_url)
return
self.assertEqual('../target', branch.get_stacked_on_url())
def assertRevisionInRepository(self, repo_path, revid):
"""Check that a revision is in a repository, disregarding stacking."""
repo = bzrdir.BzrDir.open(repo_path).open_repository()
self.assertTrue(repo.has_revision(revid))
def assertRevisionNotInRepository(self, repo_path, revid):
"""Check that a revision is not in a repository, disregarding stacking."""
repo = bzrdir.BzrDir.open(repo_path).open_repository()
self.assertFalse(repo.has_revision(revid))
def test_get_graph_stacked(self):
"""A stacked repository shows the graph of its parent."""
trunk_tree = self.make_branch_and_tree('mainline')
trunk_revid = trunk_tree.commit('mainline')
# make a new branch, and stack on the existing one. we don't use
# sprout(stacked=True) here because if that is buggy and copies data
# it would cause a false pass of this test.
new_branch = self.make_branch('new_branch')
try:
new_branch.set_stacked_on_url(trunk_tree.branch.base)
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat), e:
raise TestNotApplicable(e)
# reading the graph from the stacked branch's repository should see
# data from the stacked-on branch
new_repo = new_branch.repository
new_repo.lock_read()
try:
self.assertEqual(new_repo.get_parent_map([trunk_revid]),
{trunk_revid: (NULL_REVISION, )})
finally:
new_repo.unlock()
def test_sprout_stacked(self):
# We have a mainline
trunk_tree = self.make_branch_and_tree('mainline')
trunk_revid = trunk_tree.commit('mainline')
# and make branch from it which is stacked
try:
new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat), e:
raise TestNotApplicable(e)
# stacked repository
self.assertRevisionNotInRepository('newbranch', trunk_revid)
new_tree = new_dir.open_workingtree()
new_branch_revid = new_tree.commit('something local')
self.assertRevisionNotInRepository('mainline', new_branch_revid)
self.assertRevisionInRepository('newbranch', new_branch_revid)
def test_unstack_fetches(self):
"""Removing the stacked-on branch pulls across all data"""
# We have a mainline
trunk_tree = self.make_branch_and_tree('mainline')
trunk_revid = trunk_tree.commit('revision on mainline')
# and make branch from it which is stacked
try:
new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat), e:
raise TestNotApplicable(e)
# stacked repository
self.assertRevisionNotInRepository('newbranch', trunk_revid)
# now when we unstack that should implicitly fetch, to make sure that
# the branch will still work
new_branch = new_dir.open_branch()
new_branch.set_stacked_on_url(None)
self.assertRevisionInRepository('newbranch', trunk_revid)
# of course it's still in the mainline
self.assertRevisionInRepository('mainline', trunk_revid)
# and now we're no longer stacked
self.assertRaises(errors.NotStacked,
new_branch.get_stacked_on_url)
def prepare_for_clone(self):
tree = self.make_branch_and_tree('stacked-on')
tree.commit('Added foo')
stacked_bzrdir = tree.branch.bzrdir.sprout(
'stacked', tree.branch.last_revision(), stacked=True)
return stacked_bzrdir
def test_clone_from_stacked_branch_preserve_stacking(self):
# We can clone from the bzrdir of a stacked branch. If
# preserve_stacking is True, the cloned branch is stacked on the
# same branch as the original.
try:
stacked_bzrdir = self.prepare_for_clone()
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
# not a testable combination.
return
cloned_bzrdir = stacked_bzrdir.clone('cloned', preserve_stacking=True)
try:
self.assertEqual(
stacked_bzrdir.open_branch().get_stacked_on_url(),
cloned_bzrdir.open_branch().get_stacked_on_url())
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
pass
def test_clone_from_stacked_branch_no_preserve_stacking(self):
try:
stacked_bzrdir = self.prepare_for_clone()
except (errors.UnstackableBranchFormat,
errors.UnstackableRepositoryFormat):
# not a testable combination.
return
cloned_unstacked_bzrdir = stacked_bzrdir.clone('cloned-unstacked',
preserve_stacking=False)
unstacked_branch = cloned_unstacked_bzrdir.open_branch()
self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
unstacked_branch.get_stacked_on_url)
def test_no_op_preserve_stacking(self):
"""With no stacking, preserve_stacking should be a no-op."""
branch = self.make_branch('source')
cloned_bzrdir = branch.bzrdir.clone('cloned', preserve_stacking=True)
self.assertRaises((errors.NotStacked, errors.UnstackableBranchFormat),
cloned_bzrdir.open_branch().get_stacked_on_url)
def test_sprout_stacking_policy_handling(self):
"""Obey policy where possible, ignore otherwise."""
stack_on = self.make_branch('stack-on')
parent_bzrdir = self.make_bzrdir('.', format='default')
parent_bzrdir.get_config().set_default_stack_on('stack-on')
source = self.make_branch('source')
target = source.bzrdir.sprout('target').open_branch()
try:
self.assertEqual('../stack-on', target.get_stacked_on_url())
except errors.UnstackableBranchFormat:
pass
def test_clone_stacking_policy_handling(self):
"""Obey policy where possible, ignore otherwise."""
stack_on = self.make_branch('stack-on')
parent_bzrdir = self.make_bzrdir('.', format='default')
parent_bzrdir.get_config().set_default_stack_on('stack-on')
source = self.make_branch('source')
target = source.bzrdir.clone('target').open_branch()
try:
self.assertEqual('../stack-on', target.get_stacked_on_url())
except errors.UnstackableBranchFormat:
pass
def prepare_stacked_on_fetch(self):
stack_on = self.make_branch_and_tree('stack-on')
stack_on.commit('first commit', rev_id='rev1')
try:
stacked_dir = stack_on.bzrdir.sprout('stacked', stacked=True)
except (errors.UnstackableRepositoryFormat,
errors.UnstackableBranchFormat):
raise TestNotApplicable('Format does not support stacking.')
unstacked = self.make_repository('unstacked')
return stacked_dir.open_workingtree(), unstacked
def test_fetch_copies_from_stacked_on(self):
stacked, unstacked = self.prepare_stacked_on_fetch()
unstacked.fetch(stacked.branch.repository, 'rev1')
unstacked.get_revision('rev1')
def test_fetch_copies_from_stacked_on_and_stacked(self):
stacked, unstacked = self.prepare_stacked_on_fetch()
stacked.commit('second commit', rev_id='rev2')
unstacked.fetch(stacked.branch.repository, 'rev2')
unstacked.get_revision('rev1')
unstacked.get_revision('rev2')
|