← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

(vila) Fix bzrlib.tests.test_gpg.TestVerify.test_verify_revoked_signature
 with recent versions of gpg. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import sys
18
 
from urllib import quote
19
18
 
20
19
from bzrlib import (
21
20
    branch as _mod_branch,
22
 
    bzrdir,
 
21
    controldir,
23
22
    info,
24
23
    tests,
25
24
    workingtree,
32
31
    def test_describe_standalone_layout(self):
33
32
        tree = self.make_branch_and_tree('tree')
34
33
        self.assertEqual('Empty control directory', info.describe_layout())
35
 
        self.assertEqual('Unshared repository with trees',
36
 
            info.describe_layout(tree.branch.repository))
 
34
        self.assertEqual(
 
35
            'Unshared repository with trees and colocated branches',
 
36
            info.describe_layout(tree.branch.repository, control=tree.bzrdir))
37
37
        tree.branch.repository.set_make_working_trees(False)
38
 
        self.assertEqual('Unshared repository',
39
 
            info.describe_layout(tree.branch.repository))
 
38
        self.assertEqual('Unshared repository with colocated branches',
 
39
            info.describe_layout(tree.branch.repository, control=tree.bzrdir))
40
40
        self.assertEqual('Standalone branch',
41
 
            info.describe_layout(tree.branch.repository, tree.branch))
 
41
            info.describe_layout(tree.branch.repository, tree.branch,
 
42
                control=tree.bzrdir))
42
43
        self.assertEqual('Standalone branchless tree',
43
 
            info.describe_layout(tree.branch.repository, None, tree))
 
44
            info.describe_layout(tree.branch.repository, None, tree,
 
45
                control=tree.bzrdir))
44
46
        self.assertEqual('Standalone tree',
45
 
            info.describe_layout(tree.branch.repository, tree.branch, tree))
 
47
            info.describe_layout(tree.branch.repository, tree.branch, tree,
 
48
                control=tree.bzrdir))
46
49
        tree.branch.bind(tree.branch)
47
50
        self.assertEqual('Bound branch',
48
 
            info.describe_layout(tree.branch.repository, tree.branch))
 
51
            info.describe_layout(tree.branch.repository, tree.branch,
 
52
                control=tree.bzrdir))
49
53
        self.assertEqual('Checkout',
50
 
            info.describe_layout(tree.branch.repository, tree.branch, tree))
 
54
            info.describe_layout(tree.branch.repository, tree.branch, tree,
 
55
                control=tree.bzrdir))
51
56
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
52
57
        self.assertEqual('Lightweight checkout',
53
58
            info.describe_layout(checkout.branch.repository, checkout.branch,
54
 
                                 checkout))
 
59
                                 checkout, control=tree.bzrdir))
55
60
 
56
61
    def test_describe_repository_layout(self):
57
62
        repository = self.make_repository('.', shared=True)
58
 
        tree = bzrdir.BzrDir.create_branch_convenience('tree',
 
63
        tree = controldir.ControlDir.create_branch_convenience('tree',
59
64
            force_new_tree=True).bzrdir.open_workingtree()
60
 
        self.assertEqual('Shared repository with trees',
61
 
            info.describe_layout(tree.branch.repository))
 
65
        self.assertEqual('Shared repository with trees and colocated branches',
 
66
            info.describe_layout(tree.branch.repository, control=tree.bzrdir))
62
67
        repository.set_make_working_trees(False)
63
 
        self.assertEqual('Shared repository',
64
 
            info.describe_layout(tree.branch.repository))
 
68
        self.assertEqual('Shared repository with colocated branches',
 
69
            info.describe_layout(tree.branch.repository, control=tree.bzrdir))
65
70
        self.assertEqual('Repository branch',
66
 
            info.describe_layout(tree.branch.repository, tree.branch))
 
71
            info.describe_layout(tree.branch.repository, tree.branch,
 
72
                control=tree.bzrdir))
67
73
        self.assertEqual('Repository branchless tree',
68
 
            info.describe_layout(tree.branch.repository, None, tree))
 
74
            info.describe_layout(tree.branch.repository, None, tree,
 
75
                control=tree.bzrdir))
69
76
        self.assertEqual('Repository tree',
70
 
            info.describe_layout(tree.branch.repository, tree.branch, tree))
 
77
            info.describe_layout(tree.branch.repository, tree.branch, tree,
 
78
                control=tree.bzrdir))
71
79
        tree.branch.bind(tree.branch)
72
80
        self.assertEqual('Repository checkout',
73
 
            info.describe_layout(tree.branch.repository, tree.branch, tree))
 
81
            info.describe_layout(tree.branch.repository, tree.branch, tree,
 
82
                control=tree.bzrdir))
74
83
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
75
84
        self.assertEqual('Lightweight checkout',
76
85
            info.describe_layout(checkout.branch.repository, checkout.branch,
77
 
                                 checkout))
 
86
                                 checkout, control=tree.bzrdir))
78
87
 
79
88
    def assertTreeDescription(self, format):
80
89
        """Assert a tree's format description matches expectations"""
91
100
        # this ought to be easier...
92
101
        branch.create_checkout('%s_co' % format,
93
102
            lightweight=True).bzrdir.destroy_workingtree()
94
 
        control = bzrdir.BzrDir.open('%s_co' % format)
 
103
        control = controldir.ControlDir.open('%s_co' % format)
95
104
        old_format = control._format.workingtree_format
96
105
        try:
97
106
            control._format.workingtree_format = \
98
 
                bzrdir.format_registry.make_bzrdir(format).workingtree_format
 
107
                controldir.format_registry.make_bzrdir(format).workingtree_format
99
108
            control.create_workingtree()
100
109
            tree = workingtree.WorkingTree.open('%s_co' % format)
101
110
            format_description = info.describe_format(tree.bzrdir,
125
134
            repo, None, None))
126
135
 
127
136
    def test_describe_tree_format(self):
128
 
        for key in bzrdir.format_registry.keys():
129
 
            if key in bzrdir.format_registry.aliases():
 
137
        for key in controldir.format_registry.keys():
 
138
            if key in controldir.format_registry.aliases():
130
139
                continue
131
140
            self.assertTreeDescription(key)
132
141
 
133
142
    def test_describe_checkout_format(self):
134
 
        for key in bzrdir.format_registry.keys():
135
 
            if key in bzrdir.format_registry.aliases():
 
143
        for key in controldir.format_registry.keys():
 
144
            if key in controldir.format_registry.aliases():
136
145
                # Aliases will not describe correctly in the UI because the
137
146
                # real format is found.
138
147
                continue
139
148
            # legacy: weave does not support checkouts
140
149
            if key == 'weave':
141
150
                continue
142
 
            if bzrdir.format_registry.get_info(key).experimental:
 
151
            if controldir.format_registry.get_info(key).experimental:
143
152
                # We don't require that experimental formats support checkouts
144
153
                # or describe correctly in the UI.
145
154
                continue
146
 
            if bzrdir.format_registry.get_info(key).hidden:
 
155
            if controldir.format_registry.get_info(key).hidden:
147
156
                continue
148
157
            expected = None
149
158
            if key in ('pack-0.92',):
150
159
                expected = 'pack-0.92'
151
160
            elif key in ('knit', 'metaweave'):
152
 
                expected = 'knit or metaweave'
 
161
                if 'metaweave' in controldir.format_registry:
 
162
                    expected = 'knit or metaweave'
 
163
                else:
 
164
                    expected = 'knit'
153
165
            elif key in ('1.14', '1.14-rich-root'):
154
166
                expected = '1.14 or 1.14-rich-root'
155
167
            self.assertCheckoutDescription(key, expected)
156
168
 
157
169
    def test_describe_branch_format(self):
158
 
        for key in bzrdir.format_registry.keys():
159
 
            if key in bzrdir.format_registry.aliases():
 
170
        for key in controldir.format_registry.keys():
 
171
            if key in controldir.format_registry.aliases():
160
172
                continue
161
 
            if bzrdir.format_registry.get_info(key).hidden:
 
173
            if controldir.format_registry.get_info(key).hidden:
162
174
                continue
163
175
            expected = None
164
176
            if key in ('dirstate', 'knit'):
170
182
            self.assertBranchDescription(key, expected)
171
183
 
172
184
    def test_describe_repo_format(self):
173
 
        for key in bzrdir.format_registry.keys():
174
 
            if key in bzrdir.format_registry.aliases():
 
185
        for key in controldir.format_registry.keys():
 
186
            if key in controldir.format_registry.aliases():
175
187
                continue
176
 
            if bzrdir.format_registry.get_info(key).hidden:
 
188
            if controldir.format_registry.get_info(key).hidden:
177
189
                continue
178
190
            expected = None
179
191
            if key in ('dirstate', 'knit', 'dirstate-tags'):
184
196
                expected = '1.14-rich-root'
185
197
            self.assertRepoDescription(key, expected)
186
198
 
187
 
        format = bzrdir.format_registry.make_bzrdir('metaweave')
 
199
        format = controldir.format_registry.make_bzrdir('knit')
188
200
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
189
201
        tree = self.make_branch_and_tree('unknown', format=format)
190
202
        self.assertEqual('unnamed', info.describe_format(tree.bzrdir,
191
203
            tree.branch.repository, tree.branch, tree))
192
204
 
 
205
    def test_gather_location_controldir_only(self):
 
206
        bzrdir = self.make_bzrdir('.')
 
207
        self.assertEqual([('control directory', bzrdir.user_url)],
 
208
            info.gather_location_info(control=bzrdir))
 
209
 
193
210
    def test_gather_location_standalone(self):
194
211
        tree = self.make_branch_and_tree('tree')
195
212
        self.assertEqual([('branch root', tree.bzrdir.root_transport.base)],
196
 
            info.gather_location_info(tree.branch.repository, tree.branch,
197
 
                                      tree))
 
213
            info.gather_location_info(
 
214
                tree.branch.repository, tree.branch, tree, control=tree.bzrdir))
198
215
        self.assertEqual([('branch root', tree.bzrdir.root_transport.base)],
199
 
            info.gather_location_info(tree.branch.repository, tree.branch))
 
216
            info.gather_location_info(
 
217
                tree.branch.repository, tree.branch, control=tree.bzrdir))
200
218
        return tree
201
219
 
202
220
    def test_gather_location_repo(self):
203
221
        srepo = self.make_repository('shared', shared=True)
204
 
        self.assertEqual([('shared repository',
205
 
                          srepo.bzrdir.root_transport.base)],
206
 
                          info.gather_location_info(srepo))
 
222
        self.assertEqual(
 
223
            [('shared repository', srepo.bzrdir.root_transport.base)],
 
224
            info.gather_location_info(srepo, control=srepo.bzrdir))
207
225
        urepo = self.make_repository('unshared')
208
 
        self.assertEqual([('repository',
209
 
                          urepo.bzrdir.root_transport.base)],
210
 
                          info.gather_location_info(urepo))
 
226
        self.assertEqual(
 
227
            [('repository', urepo.bzrdir.root_transport.base)],
 
228
            info.gather_location_info(urepo, control=urepo.bzrdir))
211
229
 
212
230
    def test_gather_location_repo_branch(self):
213
231
        srepo = self.make_repository('shared', shared=True)
214
 
        self.assertEqual([('shared repository',
215
 
                          srepo.bzrdir.root_transport.base)],
216
 
                          info.gather_location_info(srepo))
 
232
        self.assertEqual(
 
233
            [('shared repository', srepo.bzrdir.root_transport.base)],
 
234
            info.gather_location_info(srepo, control=srepo.bzrdir))
217
235
        tree = self.make_branch_and_tree('shared/tree')
218
 
        self.assertEqual([('shared repository',
219
 
                          srepo.bzrdir.root_transport.base),
220
 
                          ('repository branch', tree.branch.base)],
221
 
                          info.gather_location_info(srepo, tree.branch, tree))
 
236
        self.assertEqual(
 
237
            [('shared repository', srepo.bzrdir.root_transport.base),
 
238
             ('repository branch', tree.branch.base)],
 
239
            info.gather_location_info(srepo, tree.branch, tree, srepo.bzrdir))
222
240
 
223
241
    def test_gather_location_light_checkout(self):
224
242
        tree = self.make_branch_and_tree('tree')
257
275
             self.gather_tree_location_info(shared_checkout))
258
276
 
259
277
    def gather_tree_location_info(self, tree):
260
 
        return info.gather_location_info(tree.branch.repository, tree.branch,
261
 
                                         tree)
 
278
        return info.gather_location_info(
 
279
            tree.branch.repository, tree.branch, tree, tree.bzrdir)
262
280
 
263
281
    def test_gather_location_bound(self):
264
282
        branch = self.make_branch('branch')
267
285
        self.assertEqual(
268
286
            [('branch root', bound_branch.bzrdir.root_transport.base),
269
287
             ('bound to branch', branch.bzrdir.root_transport.base)],
 
288
            info.gather_location_info(
 
289
                bound_branch.repository, bound_branch, control=bound_branch.bzrdir)
 
290
        )
 
291
 
 
292
    def test_gather_location_bound_in_repository(self):
 
293
        repo = self.make_repository('repo', shared=True)
 
294
        repo.set_make_working_trees(False)
 
295
        branch = self.make_branch('branch')
 
296
        bound_branch = controldir.ControlDir.create_branch_convenience(
 
297
            'repo/bound_branch')
 
298
        bound_branch.bind(branch)
 
299
        self.assertEqual(
 
300
            [('shared repository', bound_branch.repository.bzrdir.user_url),
 
301
             ('repository branch', bound_branch.bzrdir.user_url),
 
302
             ('bound to branch', branch.bzrdir.user_url)],
270
303
            info.gather_location_info(bound_branch.repository, bound_branch)
271
304
        )
272
305
 
289
322
 
290
323
    def test_gather_related_braches(self):
291
324
        branch = self.make_branch('.')
292
 
        branch.set_public_branch('baz')
293
 
        branch.set_push_location('bar')
294
 
        branch.set_parent('foo')
295
 
        branch.set_submit_branch('qux')
 
325
        branch.lock_write()
 
326
        try:
 
327
            branch.set_public_branch('baz')
 
328
            branch.set_push_location('bar')
 
329
            branch.set_parent('foo')
 
330
            branch.set_submit_branch('qux')
 
331
        finally:
 
332
            branch.unlock()
296
333
        self.assertEqual(
297
334
            [('public branch', 'baz'), ('push branch', 'bar'),
298
335
             ('parent branch', 'foo'), ('submit branch', 'qux')],