5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2007-2011 Canonical Ltd
|
2363.5.11
by Aaron Bentley
All info tests pass |
2 |
#
|
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.
|
|
7 |
#
|
|
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.
|
|
12 |
#
|
|
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
2363.5.11
by Aaron Bentley
All info tests pass |
16 |
|
2804.4.3
by Alexander Belchenko
fix for test_info-tests: using osutils.getcwd instead of os.getcwd (sigh) |
17 |
import sys |
2363.5.11
by Aaron Bentley
All info tests pass |
18 |
|
2363.5.2
by Aaron Bentley
Implement layout description |
19 |
from bzrlib import ( |
2363.5.5
by Aaron Bentley
add info.describe_format |
20 |
branch as _mod_branch, |
2363.5.2
by Aaron Bentley
Implement layout description |
21 |
bzrdir, |
22 |
info, |
|
23 |
tests, |
|
2363.5.5
by Aaron Bentley
add info.describe_format |
24 |
workingtree, |
25 |
repository as _mod_repository, |
|
2363.5.2
by Aaron Bentley
Implement layout description |
26 |
)
|
27 |
||
28 |
||
29 |
class TestInfo(tests.TestCaseWithTransport): |
|
30 |
||
31 |
def test_describe_standalone_layout(self): |
|
32 |
tree = self.make_branch_and_tree('tree') |
|
33 |
self.assertEqual('Empty control directory', info.describe_layout()) |
|
34 |
self.assertEqual('Unshared repository with trees', |
|
35 |
info.describe_layout(tree.branch.repository)) |
|
36 |
tree.branch.repository.set_make_working_trees(False) |
|
37 |
self.assertEqual('Unshared repository', |
|
38 |
info.describe_layout(tree.branch.repository)) |
|
39 |
self.assertEqual('Standalone branch', |
|
40 |
info.describe_layout(tree.branch.repository, tree.branch)) |
|
41 |
self.assertEqual('Standalone branchless tree', |
|
42 |
info.describe_layout(tree.branch.repository, None, tree)) |
|
43 |
self.assertEqual('Standalone tree', |
|
44 |
info.describe_layout(tree.branch.repository, tree.branch, tree)) |
|
45 |
tree.branch.bind(tree.branch) |
|
46 |
self.assertEqual('Bound branch', |
|
47 |
info.describe_layout(tree.branch.repository, tree.branch)) |
|
48 |
self.assertEqual('Checkout', |
|
49 |
info.describe_layout(tree.branch.repository, tree.branch, tree)) |
|
50 |
checkout = tree.branch.create_checkout('checkout', lightweight=True) |
|
51 |
self.assertEqual('Lightweight checkout', |
|
52 |
info.describe_layout(checkout.branch.repository, checkout.branch, |
|
53 |
checkout)) |
|
54 |
||
55 |
def test_describe_repository_layout(self): |
|
56 |
repository = self.make_repository('.', shared=True) |
|
57 |
tree = bzrdir.BzrDir.create_branch_convenience('tree', |
|
58 |
force_new_tree=True).bzrdir.open_workingtree() |
|
59 |
self.assertEqual('Shared repository with trees', |
|
60 |
info.describe_layout(tree.branch.repository)) |
|
61 |
repository.set_make_working_trees(False) |
|
62 |
self.assertEqual('Shared repository', |
|
63 |
info.describe_layout(tree.branch.repository)) |
|
64 |
self.assertEqual('Repository branch', |
|
65 |
info.describe_layout(tree.branch.repository, tree.branch)) |
|
66 |
self.assertEqual('Repository branchless tree', |
|
67 |
info.describe_layout(tree.branch.repository, None, tree)) |
|
68 |
self.assertEqual('Repository tree', |
|
69 |
info.describe_layout(tree.branch.repository, tree.branch, tree)) |
|
70 |
tree.branch.bind(tree.branch) |
|
71 |
self.assertEqual('Repository checkout', |
|
72 |
info.describe_layout(tree.branch.repository, tree.branch, tree)) |
|
73 |
checkout = tree.branch.create_checkout('checkout', lightweight=True) |
|
2363.5.4
by Aaron Bentley
Eliminate the concept of a 'repository lightweight checkout' |
74 |
self.assertEqual('Lightweight checkout', |
2363.5.2
by Aaron Bentley
Implement layout description |
75 |
info.describe_layout(checkout.branch.repository, checkout.branch, |
76 |
checkout)) |
|
2363.5.5
by Aaron Bentley
add info.describe_format |
77 |
|
78 |
def assertTreeDescription(self, format): |
|
2363.5.22
by Aaron Bentley
Restructure tests |
79 |
"""Assert a tree's format description matches expectations"""
|
2363.5.6
by Aaron Bentley
Add short format description |
80 |
self.make_branch_and_tree('%s_tree' % format, format=format) |
2363.5.5
by Aaron Bentley
add info.describe_format |
81 |
tree = workingtree.WorkingTree.open('%s_tree' % format) |
82 |
self.assertEqual(format, info.describe_format(tree.bzrdir, |
|
83 |
tree.branch.repository, tree.branch, tree)) |
|
84 |
||
2363.5.6
by Aaron Bentley
Add short format description |
85 |
def assertCheckoutDescription(self, format, expected=None): |
2363.5.22
by Aaron Bentley
Restructure tests |
86 |
"""Assert a checkout's format description matches expectations"""
|
2363.5.6
by Aaron Bentley
Add short format description |
87 |
if expected is None: |
88 |
expected = format |
|
89 |
branch = self.make_branch('%s_cobranch' % format, format=format) |
|
90 |
# this ought to be easier...
|
|
91 |
branch.create_checkout('%s_co' % format, |
|
92 |
lightweight=True).bzrdir.destroy_workingtree() |
|
93 |
control = bzrdir.BzrDir.open('%s_co' % format) |
|
2363.5.13
by Aaron Bentley
Fix environment pollution with assertCheckoutDescription |
94 |
old_format = control._format.workingtree_format |
95 |
try: |
|
96 |
control._format.workingtree_format = \ |
|
97 |
bzrdir.format_registry.make_bzrdir(format).workingtree_format |
|
98 |
control.create_workingtree() |
|
99 |
tree = workingtree.WorkingTree.open('%s_co' % format) |
|
2592.4.2
by Martin Pool
exempt experimental-* formats from test_describe_checkout_format |
100 |
format_description = info.describe_format(tree.bzrdir, |
101 |
tree.branch.repository, tree.branch, tree) |
|
102 |
self.assertEqual(expected, format_description, |
|
103 |
"checkout of format called %r was described as %r" % |
|
104 |
(expected, format_description)) |
|
2363.5.13
by Aaron Bentley
Fix environment pollution with assertCheckoutDescription |
105 |
finally: |
106 |
control._format.workingtree_format = old_format |
|
2363.5.6
by Aaron Bentley
Add short format description |
107 |
|
2363.5.5
by Aaron Bentley
add info.describe_format |
108 |
def assertBranchDescription(self, format, expected=None): |
2363.5.22
by Aaron Bentley
Restructure tests |
109 |
"""Assert branch's format description matches expectations"""
|
2363.5.5
by Aaron Bentley
add info.describe_format |
110 |
if expected is None: |
111 |
expected = format |
|
2363.5.6
by Aaron Bentley
Add short format description |
112 |
self.make_branch('%s_branch' % format, format=format) |
2363.5.5
by Aaron Bentley
add info.describe_format |
113 |
branch = _mod_branch.Branch.open('%s_branch' % format) |
114 |
self.assertEqual(expected, info.describe_format(branch.bzrdir, |
|
115 |
branch.repository, branch, None)) |
|
116 |
||
117 |
def assertRepoDescription(self, format, expected=None): |
|
2363.5.22
by Aaron Bentley
Restructure tests |
118 |
"""Assert repository's format description matches expectations"""
|
2363.5.5
by Aaron Bentley
add info.describe_format |
119 |
if expected is None: |
120 |
expected = format |
|
2363.5.6
by Aaron Bentley
Add short format description |
121 |
self.make_repository('%s_repo' % format, format=format) |
2363.5.5
by Aaron Bentley
add info.describe_format |
122 |
repo = _mod_repository.Repository.open('%s_repo' % format) |
123 |
self.assertEqual(expected, info.describe_format(repo.bzrdir, |
|
124 |
repo, None, None)) |
|
125 |
||
2363.5.22
by Aaron Bentley
Restructure tests |
126 |
def test_describe_tree_format(self): |
2363.5.5
by Aaron Bentley
add info.describe_format |
127 |
for key in bzrdir.format_registry.keys(): |
3152.2.2
by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to |
128 |
if key in bzrdir.format_registry.aliases(): |
2363.5.5
by Aaron Bentley
add info.describe_format |
129 |
continue
|
130 |
self.assertTreeDescription(key) |
|
131 |
||
2363.5.22
by Aaron Bentley
Restructure tests |
132 |
def test_describe_checkout_format(self): |
2363.5.5
by Aaron Bentley
add info.describe_format |
133 |
for key in bzrdir.format_registry.keys(): |
3152.2.2
by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to |
134 |
if key in bzrdir.format_registry.aliases(): |
135 |
# Aliases will not describe correctly in the UI because the
|
|
136 |
# real format is found.
|
|
137 |
continue
|
|
138 |
# legacy: weave does not support checkouts
|
|
139 |
if key == 'weave': |
|
140 |
continue
|
|
141 |
if bzrdir.format_registry.get_info(key).experimental: |
|
142 |
# We don't require that experimental formats support checkouts
|
|
143 |
# or describe correctly in the UI.
|
|
2363.5.6
by Aaron Bentley
Add short format description |
144 |
continue
|
4976.2.1
by Ian Clatworthy
Hide most storage formats |
145 |
if bzrdir.format_registry.get_info(key).hidden: |
146 |
continue
|
|
2363.5.6
by Aaron Bentley
Add short format description |
147 |
expected = None |
4977.1.2
by Ian Clatworthy
(igc) Fix comparison bug in format name tests (trivial) |
148 |
if key in ('pack-0.92',): |
4976.2.1
by Ian Clatworthy
Hide most storage formats |
149 |
expected = 'pack-0.92' |
3586.2.6
by Ian Clatworthy
add 1.7 and 1.7-rich-root formats |
150 |
elif key in ('knit', 'metaweave'): |
5582.10.96
by Jelmer Vernooij
Support running without plugins. |
151 |
if 'metaweave' in bzrdir.format_registry: |
152 |
expected = 'knit or metaweave' |
|
153 |
else: |
|
154 |
expected = 'knit' |
|
4210.4.1
by Ian Clatworthy
replace experimental development-wt5 formats with 1.14 formats |
155 |
elif key in ('1.14', '1.14-rich-root'): |
4265.1.1
by John Arbash Meinel
Merge the a couple rev older brisbane-core into bzr.dev, most things are resolve in favor of bzr.dev |
156 |
expected = '1.14 or 1.14-rich-root' |
2363.5.6
by Aaron Bentley
Add short format description |
157 |
self.assertCheckoutDescription(key, expected) |
158 |
||
2363.5.22
by Aaron Bentley
Restructure tests |
159 |
def test_describe_branch_format(self): |
2363.5.6
by Aaron Bentley
Add short format description |
160 |
for key in bzrdir.format_registry.keys(): |
3152.2.2
by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to |
161 |
if key in bzrdir.format_registry.aliases(): |
2363.5.5
by Aaron Bentley
add info.describe_format |
162 |
continue
|
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
163 |
if bzrdir.format_registry.get_info(key).hidden: |
164 |
continue
|
|
2363.5.5
by Aaron Bentley
add info.describe_format |
165 |
expected = None |
166 |
if key in ('dirstate', 'knit'): |
|
2363.5.17
by Aaron Bentley
Change separator from '/' to 'or' |
167 |
expected = 'dirstate or knit' |
4977.1.2
by Ian Clatworthy
(igc) Fix comparison bug in format name tests (trivial) |
168 |
elif key in ('1.14',): |
4976.2.1
by Ian Clatworthy
Hide most storage formats |
169 |
expected = '1.14' |
4977.1.2
by Ian Clatworthy
(igc) Fix comparison bug in format name tests (trivial) |
170 |
elif key in ('1.14-rich-root',): |
4976.2.1
by Ian Clatworthy
Hide most storage formats |
171 |
expected = '1.14-rich-root' |
2363.5.5
by Aaron Bentley
add info.describe_format |
172 |
self.assertBranchDescription(key, expected) |
173 |
||
2363.5.22
by Aaron Bentley
Restructure tests |
174 |
def test_describe_repo_format(self): |
2363.5.5
by Aaron Bentley
add info.describe_format |
175 |
for key in bzrdir.format_registry.keys(): |
3152.2.2
by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to |
176 |
if key in bzrdir.format_registry.aliases(): |
2363.5.5
by Aaron Bentley
add info.describe_format |
177 |
continue
|
4210.4.2
by Ian Clatworthy
split filtered views support out into WorkingTreeFormat6 |
178 |
if bzrdir.format_registry.get_info(key).hidden: |
179 |
continue
|
|
2363.5.5
by Aaron Bentley
add info.describe_format |
180 |
expected = None |
181 |
if key in ('dirstate', 'knit', 'dirstate-tags'): |
|
2363.5.17
by Aaron Bentley
Change separator from '/' to 'or' |
182 |
expected = 'dirstate or dirstate-tags or knit' |
4977.1.2
by Ian Clatworthy
(igc) Fix comparison bug in format name tests (trivial) |
183 |
elif key in ('1.14',): |
4976.2.1
by Ian Clatworthy
Hide most storage formats |
184 |
expected = '1.14' |
4977.1.2
by Ian Clatworthy
(igc) Fix comparison bug in format name tests (trivial) |
185 |
elif key in ('1.14-rich-root',): |
4976.2.1
by Ian Clatworthy
Hide most storage formats |
186 |
expected = '1.14-rich-root' |
2363.5.5
by Aaron Bentley
add info.describe_format |
187 |
self.assertRepoDescription(key, expected) |
188 |
||
5582.10.96
by Jelmer Vernooij
Support running without plugins. |
189 |
format = bzrdir.format_registry.make_bzrdir('knit') |
2363.5.5
by Aaron Bentley
add info.describe_format |
190 |
format.set_branch_format(_mod_branch.BzrBranchFormat6()) |
191 |
tree = self.make_branch_and_tree('unknown', format=format) |
|
192 |
self.assertEqual('unnamed', info.describe_format(tree.bzrdir, |
|
193 |
tree.branch.repository, tree.branch, tree)) |
|
2363.5.18
by Aaron Bentley
Get all tests passing |
194 |
|
195 |
def test_gather_location_standalone(self): |
|
196 |
tree = self.make_branch_and_tree('tree') |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
197 |
self.assertEqual([('branch root', tree.bzrdir.root_transport.base)], |
2363.5.18
by Aaron Bentley
Get all tests passing |
198 |
info.gather_location_info(tree.branch.repository, tree.branch, |
199 |
tree)) |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
200 |
self.assertEqual([('branch root', tree.bzrdir.root_transport.base)], |
2363.5.18
by Aaron Bentley
Get all tests passing |
201 |
info.gather_location_info(tree.branch.repository, tree.branch)) |
202 |
return tree |
|
203 |
||
204 |
def test_gather_location_repo(self): |
|
205 |
srepo = self.make_repository('shared', shared=True) |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
206 |
self.assertEqual([('shared repository', |
207 |
srepo.bzrdir.root_transport.base)], |
|
2363.5.18
by Aaron Bentley
Get all tests passing |
208 |
info.gather_location_info(srepo)) |
209 |
urepo = self.make_repository('unshared') |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
210 |
self.assertEqual([('repository', |
211 |
urepo.bzrdir.root_transport.base)], |
|
2363.5.18
by Aaron Bentley
Get all tests passing |
212 |
info.gather_location_info(urepo)) |
213 |
||
214 |
def test_gather_location_repo_branch(self): |
|
215 |
srepo = self.make_repository('shared', shared=True) |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
216 |
self.assertEqual([('shared repository', |
217 |
srepo.bzrdir.root_transport.base)], |
|
2363.5.18
by Aaron Bentley
Get all tests passing |
218 |
info.gather_location_info(srepo)) |
219 |
tree = self.make_branch_and_tree('shared/tree') |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
220 |
self.assertEqual([('shared repository', |
221 |
srepo.bzrdir.root_transport.base), |
|
1551.15.41
by Aaron Bentley
Make info provide more related brances, and format all branches nicely |
222 |
('repository branch', tree.branch.base)], |
2363.5.25
by Aaron Bentley
Update deprecations to 0.18.0 |
223 |
info.gather_location_info(srepo, tree.branch, tree)) |
2363.5.18
by Aaron Bentley
Get all tests passing |
224 |
|
2363.5.22
by Aaron Bentley
Restructure tests |
225 |
def test_gather_location_light_checkout(self): |
2363.5.18
by Aaron Bentley
Get all tests passing |
226 |
tree = self.make_branch_and_tree('tree') |
227 |
lcheckout = tree.branch.create_checkout('lcheckout', lightweight=True) |
|
228 |
self.assertEqual( |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
229 |
[('light checkout root', lcheckout.bzrdir.root_transport.base), |
230 |
('checkout of branch', tree.bzrdir.root_transport.base)], |
|
2363.5.22
by Aaron Bentley
Restructure tests |
231 |
self.gather_tree_location_info(lcheckout)) |
232 |
||
233 |
def test_gather_location_heavy_checkout(self): |
|
234 |
tree = self.make_branch_and_tree('tree') |
|
235 |
checkout = tree.branch.create_checkout('checkout') |
|
236 |
self.assertEqual( |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
237 |
[('checkout root', checkout.bzrdir.root_transport.base), |
238 |
('checkout of branch', tree.bzrdir.root_transport.base)], |
|
2363.5.22
by Aaron Bentley
Restructure tests |
239 |
self.gather_tree_location_info(checkout)) |
240 |
light_checkout = checkout.branch.create_checkout('light_checkout', |
|
241 |
lightweight=True) |
|
242 |
self.assertEqual( |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
243 |
[('light checkout root', |
244 |
light_checkout.bzrdir.root_transport.base), |
|
245 |
('checkout root', checkout.bzrdir.root_transport.base), |
|
246 |
('checkout of branch', tree.bzrdir.root_transport.base)], |
|
2363.5.22
by Aaron Bentley
Restructure tests |
247 |
self.gather_tree_location_info(light_checkout) |
248 |
)
|
|
249 |
||
250 |
def test_gather_location_shared_repo_checkout(self): |
|
251 |
tree = self.make_branch_and_tree('tree') |
|
2363.5.18
by Aaron Bentley
Get all tests passing |
252 |
srepo = self.make_repository('shared', shared=True) |
2363.5.22
by Aaron Bentley
Restructure tests |
253 |
shared_checkout = tree.branch.create_checkout('shared/checkout') |
2363.5.18
by Aaron Bentley
Get all tests passing |
254 |
self.assertEqual( |
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
255 |
[('repository checkout root', |
256 |
shared_checkout.bzrdir.root_transport.base), |
|
257 |
('checkout of branch', tree.bzrdir.root_transport.base), |
|
258 |
('shared repository', srepo.bzrdir.root_transport.base)], |
|
2363.5.22
by Aaron Bentley
Restructure tests |
259 |
self.gather_tree_location_info(shared_checkout)) |
260 |
||
261 |
def gather_tree_location_info(self, tree): |
|
262 |
return info.gather_location_info(tree.branch.repository, tree.branch, |
|
263 |
tree) |
|
2363.5.19
by Aaron Bentley
Add support for bound branches |
264 |
|
265 |
def test_gather_location_bound(self): |
|
266 |
branch = self.make_branch('branch') |
|
267 |
bound_branch = self.make_branch('bound_branch') |
|
268 |
bound_branch.bind(branch) |
|
269 |
self.assertEqual( |
|
2363.5.23
by Aaron Bentley
Output 2-tuples from gather_locations |
270 |
[('branch root', bound_branch.bzrdir.root_transport.base), |
271 |
('bound to branch', branch.bzrdir.root_transport.base)], |
|
2363.5.19
by Aaron Bentley
Add support for bound branches |
272 |
info.gather_location_info(bound_branch.repository, bound_branch) |
273 |
)
|
|
1551.15.41
by Aaron Bentley
Make info provide more related brances, and format all branches nicely |
274 |
|
275 |
def test_location_list(self): |
|
2804.4.3
by Alexander Belchenko
fix for test_info-tests: using osutils.getcwd instead of os.getcwd (sigh) |
276 |
if sys.platform == 'win32': |
277 |
raise tests.TestSkipped('Windows-unfriendly test') |
|
1551.15.41
by Aaron Bentley
Make info provide more related brances, and format all branches nicely |
278 |
locs = info.LocationList('/home/foo') |
279 |
locs.add_url('a', 'file:///home/foo/') |
|
280 |
locs.add_url('b', 'file:///home/foo/bar/') |
|
281 |
locs.add_url('c', 'file:///home/bar/bar') |
|
282 |
locs.add_url('d', 'http://example.com/example/') |
|
283 |
locs.add_url('e', None) |
|
1551.15.43
by Aaron Bentley
Provide ways of getting at unicode-clean output |
284 |
self.assertEqual(locs.locs, [('a', '.'), |
1551.15.41
by Aaron Bentley
Make info provide more related brances, and format all branches nicely |
285 |
('b', 'bar'), |
286 |
('c', '/home/bar/bar'), |
|
287 |
('d', 'http://example.com/example/')]) |
|
1551.15.43
by Aaron Bentley
Provide ways of getting at unicode-clean output |
288 |
self.assertEqualDiff(' a: .\n b: bar\n c: /home/bar/bar\n' |
289 |
' d: http://example.com/example/\n', |
|
290 |
''.join(locs.get_lines())) |
|
1551.15.41
by Aaron Bentley
Make info provide more related brances, and format all branches nicely |
291 |
|
292 |
def test_gather_related_braches(self): |
|
293 |
branch = self.make_branch('.') |
|
294 |
branch.set_public_branch('baz') |
|
295 |
branch.set_push_location('bar') |
|
296 |
branch.set_parent('foo') |
|
297 |
branch.set_submit_branch('qux') |
|
298 |
self.assertEqual( |
|
299 |
[('public branch', 'baz'), ('push branch', 'bar'), |
|
300 |
('parent branch', 'foo'), ('submit branch', 'qux')], |
|
1551.15.43
by Aaron Bentley
Provide ways of getting at unicode-clean output |
301 |
info._gather_related_branches(branch).locs) |