← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-22 08:02:12 UTC
  • mfrom: (6612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160122080212-iz2fcz6n0su5px7g
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

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