/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_branch.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 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
16
16
 
17
17
"""Tests for the Branch facility that are not interface  tests.
18
18
 
19
 
For interface tests see tests/per_branch/*.py.
 
19
For interface tests see `tests/per_branch/*.py`.
20
20
 
21
21
For concrete class tests see this file, and for meta-branch tests
22
22
also see this file.
23
23
"""
24
24
 
25
 
from cStringIO import StringIO
26
 
 
27
 
from bzrlib import (
 
25
from .. import (
28
26
    branch as _mod_branch,
29
 
    bzrdir,
30
27
    config,
 
28
    controldir,
31
29
    errors,
32
30
    tests,
33
31
    trace,
34
 
    transport,
35
32
    urlutils,
36
33
    )
 
34
from ..bzr import (
 
35
    branch as _mod_bzrbranch,
 
36
    bzrdir,
 
37
    )
 
38
from ..bzr.fullhistory import (
 
39
    BzrBranch5,
 
40
    BzrBranchFormat5,
 
41
    )
 
42
from ..sixish import (
 
43
    BytesIO,
 
44
    )
 
45
 
 
46
 
 
47
class TestErrors(tests.TestCase):
 
48
 
 
49
    def test_unstackable_branch_format(self):
 
50
        format = u'foo'
 
51
        url = "/foo"
 
52
        error = _mod_branch.UnstackableBranchFormat(format, url)
 
53
        self.assertEqualDiff(
 
54
            "The branch '/foo'(foo) is not a stackable format. "
 
55
            "You will need to upgrade the branch to permit branch stacking.",
 
56
            str(error))
37
57
 
38
58
 
39
59
class TestDefaultFormat(tests.TestCase):
40
60
 
41
61
    def test_default_format(self):
42
62
        # update this if you change the default branch format
43
 
        self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
44
 
                _mod_branch.BzrBranchFormat7)
 
63
        self.assertIsInstance(_mod_branch.format_registry.get_default(),
 
64
                _mod_bzrbranch.BzrBranchFormat7)
45
65
 
46
66
    def test_default_format_is_same_as_bzrdir_default(self):
47
67
        # XXX: it might be nice if there was only one place the default was
48
68
        # set, but at the moment that's not true -- mbp 20070814 --
49
69
        # https://bugs.launchpad.net/bzr/+bug/132376
50
70
        self.assertEqual(
51
 
            _mod_branch.BranchFormat.get_default_format(),
 
71
            _mod_branch.format_registry.get_default(),
52
72
            bzrdir.BzrDirFormat.get_default_format().get_branch_format())
53
73
 
54
74
    def test_get_set_default_format(self):
55
75
        # set the format and then set it back again
56
 
        old_format = _mod_branch.BranchFormat.get_default_format()
57
 
        _mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
 
76
        old_format = _mod_branch.format_registry.get_default()
 
77
        _mod_branch.format_registry.set_default(
 
78
            SampleBranchFormat())
58
79
        try:
59
80
            # the default branch format is used by the meta dir format
60
81
            # which is not the default bzrdir format at this point
62
83
            result = dir.create_branch()
63
84
            self.assertEqual(result, 'A branch')
64
85
        finally:
65
 
            _mod_branch.BranchFormat.set_default_format(old_format)
 
86
            _mod_branch.format_registry.set_default(old_format)
66
87
        self.assertEqual(old_format,
67
 
                         _mod_branch.BranchFormat.get_default_format())
 
88
                         _mod_branch.format_registry.get_default())
68
89
 
69
90
 
70
91
class TestBranchFormat5(tests.TestCaseWithTransport):
74
95
        url = self.get_url()
75
96
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
97
        bdir.create_repository()
77
 
        branch = bdir.create_branch()
 
98
        branch = BzrBranchFormat5().initialize(bdir)
78
99
        t = self.get_transport()
79
100
        self.log("branch instance is %r" % branch)
80
 
        self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
 
101
        self.assertTrue(isinstance(branch, BzrBranch5))
81
102
        self.assertIsDirectory('.', t)
82
103
        self.assertIsDirectory('.bzr/branch', t)
83
104
        self.assertIsDirectory('.bzr/branch/lock', t)
86
107
        self.assertIsDirectory('.bzr/branch/lock/held', t)
87
108
 
88
109
    def test_set_push_location(self):
89
 
        from bzrlib.config import (locations_config_filename,
90
 
                                   ensure_config_dir_exists)
91
 
        ensure_config_dir_exists()
92
 
        fn = locations_config_filename()
93
 
        # write correct newlines to locations.conf
94
 
        # by default ConfigObj uses native line-endings for new files
95
 
        # but uses already existing line-endings if file is not empty
96
 
        f = open(fn, 'wb')
97
 
        try:
98
 
            f.write('# comment\n')
99
 
        finally:
100
 
            f.close()
 
110
        conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
101
111
 
102
112
        branch = self.make_branch('.', format='knit')
103
113
        branch.set_push_location('foo')
104
114
        local_path = urlutils.local_path_from_url(branch.base[:-1])
105
 
        self.assertFileEqual("# comment\n"
106
 
                             "[%s]\n"
107
 
                             "push_location = foo\n"
108
 
                             "push_location:policy = norecurse\n" % local_path,
109
 
                             fn)
 
115
        self.assertFileEqual(b"# comment\n"
 
116
                             b"[%s]\n"
 
117
                             b"push_location = foo\n"
 
118
                             b"push_location:policy = norecurse\n" % local_path,
 
119
                             config.locations_config_filename())
110
120
 
111
121
    # TODO RBC 20051029 test getting a push location from a branch in a
112
122
    # recursive section - that is, it appends the branch name.
113
123
 
114
124
 
115
 
class SampleBranchFormat(_mod_branch.BranchFormat):
 
125
class SampleBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
116
126
    """A sample format
117
127
 
118
128
    this format is initializable, unsupported to aid in testing the
119
129
    open and open_downlevel routines.
120
130
    """
121
131
 
122
 
    def get_format_string(self):
 
132
    @classmethod
 
133
    def get_format_string(cls):
123
134
        """See BzrBranchFormat.get_format_string()."""
124
 
        return "Sample branch format."
 
135
        return b"Sample branch format."
125
136
 
126
 
    def initialize(self, a_bzrdir, name=None):
 
137
    def initialize(self, a_controldir, name=None, repository=None,
 
138
                   append_revisions_only=None):
127
139
        """Format 4 branches cannot be created."""
128
 
        t = a_bzrdir.get_branch_transport(self, name=name)
 
140
        t = a_controldir.get_branch_transport(self, name=name)
129
141
        t.put_bytes('format', self.get_format_string())
130
142
        return 'A branch'
131
143
 
132
144
    def is_supported(self):
133
145
        return False
134
146
 
135
 
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
 
147
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
148
             possible_transports=None):
136
149
        return "opened branch."
137
150
 
138
151
 
 
152
# Demonstrating how lazy loading is often implemented:
 
153
# A constant string is created.
 
154
SampleSupportedBranchFormatString = b"Sample supported branch format."
 
155
 
 
156
# And the format class can then reference the constant to avoid skew.
 
157
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
 
158
    """A sample supported format."""
 
159
 
 
160
    @classmethod
 
161
    def get_format_string(cls):
 
162
        """See BzrBranchFormat.get_format_string()."""
 
163
        return SampleSupportedBranchFormatString
 
164
 
 
165
    def initialize(self, a_controldir, name=None, append_revisions_only=None):
 
166
        t = a_controldir.get_branch_transport(self, name=name)
 
167
        t.put_bytes('format', self.get_format_string())
 
168
        return 'A branch'
 
169
 
 
170
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
171
             possible_transports=None):
 
172
        return "opened supported branch."
 
173
 
 
174
 
 
175
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
 
176
    """A sample format that is not usable in a metadir."""
 
177
 
 
178
    def get_format_string(self):
 
179
        # This format is not usable in a metadir.
 
180
        return None
 
181
 
 
182
    def network_name(self):
 
183
        # Network name always has to be provided.
 
184
        return "extra"
 
185
 
 
186
    def initialize(self, a_controldir, name=None):
 
187
        raise NotImplementedError(self.initialize)
 
188
 
 
189
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
190
             possible_transports=None):
 
191
        raise NotImplementedError(self.open)
 
192
 
 
193
 
139
194
class TestBzrBranchFormat(tests.TestCaseWithTransport):
140
195
    """Tests for the BzrBranchFormat facility."""
141
196
 
145
200
        # this is not quite the same as
146
201
        self.build_tree(["foo/", "bar/"])
147
202
        def check_format(format, url):
148
 
            dir = format._matchingbzrdir.initialize(url)
 
203
            dir = format._matchingcontroldir.initialize(url)
149
204
            dir.create_repository()
150
205
            format.initialize(dir)
151
 
            found_format = _mod_branch.BranchFormat.find_format(dir)
152
 
            self.failUnless(isinstance(found_format, format.__class__))
153
 
        check_format(_mod_branch.BzrBranchFormat5(), "bar")
 
206
            found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
 
207
            self.assertIsInstance(found_format, format.__class__)
 
208
        check_format(BzrBranchFormat5(), "bar")
 
209
 
 
210
    def test_from_string(self):
 
211
        self.assertIsInstance(
 
212
            SampleBranchFormat.from_string(b"Sample branch format."),
 
213
            SampleBranchFormat)
 
214
        self.assertRaises(AssertionError,
 
215
            SampleBranchFormat.from_string, b"Different branch format.")
154
216
 
155
217
    def test_find_format_not_branch(self):
156
218
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
157
219
        self.assertRaises(errors.NotBranchError,
158
 
                          _mod_branch.BranchFormat.find_format,
 
220
                          _mod_bzrbranch.BranchFormatMetadir.find_format,
159
221
                          dir)
160
222
 
161
223
    def test_find_format_unknown_format(self):
162
224
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
163
225
        SampleBranchFormat().initialize(dir)
164
226
        self.assertRaises(errors.UnknownFormatError,
165
 
                          _mod_branch.BranchFormat.find_format,
 
227
                          _mod_bzrbranch.BranchFormatMetadir.find_format,
166
228
                          dir)
167
229
 
 
230
    def test_find_format_with_features(self):
 
231
        tree = self.make_branch_and_tree('.', format='2a')
 
232
        tree.branch.update_feature_flags({b"name": b"optional"})
 
233
        found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(tree.controldir)
 
234
        self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
 
235
        self.assertEqual(found_format.features.get(b"name"), b"optional")
 
236
        tree.branch.update_feature_flags({b"name": None})
 
237
        branch = _mod_branch.Branch.open('.')
 
238
        self.assertEqual(branch._format.features, {})
 
239
 
 
240
 
 
241
class TestBranchFormatRegistry(tests.TestCase):
 
242
 
 
243
    def setUp(self):
 
244
        super(TestBranchFormatRegistry, self).setUp()
 
245
        self.registry = _mod_branch.BranchFormatRegistry()
 
246
 
 
247
    def test_default(self):
 
248
        self.assertIs(None, self.registry.get_default())
 
249
        format = SampleBranchFormat()
 
250
        self.registry.set_default(format)
 
251
        self.assertEqual(format, self.registry.get_default())
 
252
 
168
253
    def test_register_unregister_format(self):
169
254
        format = SampleBranchFormat()
170
 
        # make a control dir
171
 
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
172
 
        # make a branch
173
 
        format.initialize(dir)
174
 
        # register a format for it.
175
 
        _mod_branch.BranchFormat.register_format(format)
176
 
        # which branch.Open will refuse (not supported)
177
 
        self.assertRaises(errors.UnsupportedFormatError,
178
 
                          _mod_branch.Branch.open, self.get_url())
179
 
        self.make_branch_and_tree('foo')
180
 
        # but open_downlevel will work
181
 
        self.assertEqual(
182
 
            format.open(dir),
183
 
            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
184
 
        # unregister the format
185
 
        _mod_branch.BranchFormat.unregister_format(format)
186
 
        self.make_branch_and_tree('bar')
 
255
        self.registry.register(format)
 
256
        self.assertEqual(format,
 
257
            self.registry.get(b"Sample branch format."))
 
258
        self.registry.remove(format)
 
259
        self.assertRaises(KeyError, self.registry.get,
 
260
            b"Sample branch format.")
 
261
 
 
262
    def test_get_all(self):
 
263
        format = SampleBranchFormat()
 
264
        self.assertEqual([], self.registry._get_all())
 
265
        self.registry.register(format)
 
266
        self.assertEqual([format], self.registry._get_all())
 
267
 
 
268
    def test_register_extra(self):
 
269
        format = SampleExtraBranchFormat()
 
270
        self.assertEqual([], self.registry._get_all())
 
271
        self.registry.register_extra(format)
 
272
        self.assertEqual([format], self.registry._get_all())
 
273
 
 
274
    def test_register_extra_lazy(self):
 
275
        self.assertEqual([], self.registry._get_all())
 
276
        self.registry.register_extra_lazy("breezy.tests.test_branch",
 
277
            "SampleExtraBranchFormat")
 
278
        formats = self.registry._get_all()
 
279
        self.assertEqual(1, len(formats))
 
280
        self.assertIsInstance(formats[0], SampleExtraBranchFormat)
187
281
 
188
282
 
189
283
class TestBranch67(object):
200
294
 
201
295
    def test_creation(self):
202
296
        format = bzrdir.BzrDirMetaFormat1()
203
 
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
 
297
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat6())
204
298
        branch = self.make_branch('a', format=format)
205
299
        self.assertIsInstance(branch, self.get_class())
206
300
        branch = self.make_branch('b', format=self.get_format_name())
210
304
 
211
305
    def test_layout(self):
212
306
        branch = self.make_branch('a', format=self.get_format_name())
213
 
        self.failUnlessExists('a/.bzr/branch/last-revision')
214
 
        self.failIfExists('a/.bzr/branch/revision-history')
215
 
        self.failIfExists('a/.bzr/branch/references')
 
307
        self.assertPathExists('a/.bzr/branch/last-revision')
 
308
        self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
 
309
        self.assertPathDoesNotExist('a/.bzr/branch/references')
216
310
 
217
311
    def test_config(self):
218
312
        """Ensure that all configuration data is stored in the branch"""
219
313
        branch = self.make_branch('a', format=self.get_format_name())
220
 
        branch.set_parent('http://bazaar-vcs.org')
221
 
        self.failIfExists('a/.bzr/branch/parent')
222
 
        self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
223
 
        branch.set_push_location('sftp://bazaar-vcs.org')
224
 
        config = branch.get_config()._get_branch_data_config()
225
 
        self.assertEqual('sftp://bazaar-vcs.org',
226
 
                         config.get_user_option('push_location'))
227
 
        branch.set_bound_location('ftp://bazaar-vcs.org')
228
 
        self.failIfExists('a/.bzr/branch/bound')
229
 
        self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
230
 
 
231
 
    def test_set_revision_history(self):
232
 
        builder = self.make_branch_builder('.', format=self.get_format_name())
233
 
        builder.build_snapshot('foo', None,
234
 
            [('add', ('', None, 'directory', None))],
235
 
            message='foo')
236
 
        builder.build_snapshot('bar', None, [], message='bar')
237
 
        branch = builder.get_branch()
238
 
        branch.lock_write()
239
 
        self.addCleanup(branch.unlock)
240
 
        branch.set_revision_history(['foo', 'bar'])
241
 
        branch.set_revision_history(['foo'])
242
 
        self.assertRaises(errors.NotLefthandHistory,
243
 
                          branch.set_revision_history, ['bar'])
 
314
        branch.set_parent('http://example.com')
 
315
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
 
316
        self.assertEqual('http://example.com', branch.get_parent())
 
317
        branch.set_push_location('sftp://example.com')
 
318
        conf = branch.get_config_stack()
 
319
        self.assertEqual('sftp://example.com', conf.get('push_location'))
 
320
        branch.set_bound_location('ftp://example.com')
 
321
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
 
322
        self.assertEqual('ftp://example.com', branch.get_bound_location())
244
323
 
245
324
    def do_checkout_test(self, lightweight=False):
246
325
        tree = self.make_branch_and_tree('source',
259
338
        subtree.commit('a subtree file')
260
339
        subsubtree.commit('a subsubtree file')
261
340
        tree.branch.create_checkout('target', lightweight=lightweight)
262
 
        self.failUnlessExists('target')
263
 
        self.failUnlessExists('target/subtree')
264
 
        self.failUnlessExists('target/subtree/file')
265
 
        self.failUnlessExists('target/subtree/subsubtree/file')
 
341
        self.assertPathExists('target')
 
342
        self.assertPathExists('target/subtree')
 
343
        self.assertPathExists('target/subtree/file')
 
344
        self.assertPathExists('target/subtree/subsubtree/file')
266
345
        subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
267
346
        if lightweight:
268
347
            self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
275
354
    def test_light_checkout_with_references(self):
276
355
        self.do_checkout_test(lightweight=True)
277
356
 
278
 
    def test_set_push(self):
279
 
        branch = self.make_branch('source', format=self.get_format_name())
280
 
        branch.get_config().set_user_option('push_location', 'old',
281
 
            store=config.STORE_LOCATION)
282
 
        warnings = []
283
 
        def warning(*args):
284
 
            warnings.append(args[0] % args[1:])
285
 
        _warning = trace.warning
286
 
        trace.warning = warning
287
 
        try:
288
 
            branch.set_push_location('new')
289
 
        finally:
290
 
            trace.warning = _warning
291
 
        self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
292
 
                         'locations.conf')
293
 
 
294
357
 
295
358
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
296
359
 
297
360
    def get_class(self):
298
 
        return _mod_branch.BzrBranch6
 
361
        return _mod_bzrbranch.BzrBranch6
299
362
 
300
363
    def get_format_name(self):
301
364
        return "dirstate-tags"
305
368
 
306
369
    def test_set_stacked_on_url_errors(self):
307
370
        branch = self.make_branch('a', format=self.get_format_name())
308
 
        self.assertRaises(errors.UnstackableBranchFormat,
 
371
        self.assertRaises(_mod_branch.UnstackableBranchFormat,
309
372
            branch.set_stacked_on_url, None)
310
373
 
311
374
    def test_default_stacked_location(self):
312
375
        branch = self.make_branch('a', format=self.get_format_name())
313
 
        self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
 
376
        self.assertRaises(_mod_branch.UnstackableBranchFormat, branch.get_stacked_on_url)
314
377
 
315
378
 
316
379
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
317
380
 
318
381
    def get_class(self):
319
 
        return _mod_branch.BzrBranch7
 
382
        return _mod_bzrbranch.BzrBranch7
320
383
 
321
384
    def get_format_name(self):
322
385
        return "1.9"
326
389
 
327
390
    def test_set_stacked_on_url_unstackable_repo(self):
328
391
        repo = self.make_repository('a', format='dirstate-tags')
329
 
        control = repo.bzrdir
330
 
        branch = _mod_branch.BzrBranchFormat7().initialize(control)
 
392
        control = repo.controldir
 
393
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
331
394
        target = self.make_branch('b')
332
395
        self.assertRaises(errors.UnstackableRepositoryFormat,
333
396
            branch.set_stacked_on_url, target.base)
334
397
 
335
398
    def test_clone_stacked_on_unstackable_repo(self):
336
399
        repo = self.make_repository('a', format='dirstate-tags')
337
 
        control = repo.bzrdir
338
 
        branch = _mod_branch.BzrBranchFormat7().initialize(control)
 
400
        control = repo.controldir
 
401
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
339
402
        # Calling clone should not raise UnstackableRepositoryFormat.
340
403
        cloned_bzrdir = control.clone('cloned')
341
404
 
358
421
        branch = self.make_branch('a', format=self.get_format_name())
359
422
        target = self.make_branch_and_tree('b', format=self.get_format_name())
360
423
        branch.set_stacked_on_url(target.branch.base)
361
 
        branch = branch.bzrdir.open_branch()
 
424
        branch = branch.controldir.open_branch()
362
425
        revid = target.commit('foo')
363
426
        self.assertTrue(branch.repository.has_revision(revid))
364
427
 
367
430
 
368
431
    def make_branch(self, location, format=None):
369
432
        if format is None:
370
 
            format = bzrdir.format_registry.make_bzrdir('1.9')
371
 
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
 
433
            format = controldir.format_registry.make_controldir('1.9')
 
434
            format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
372
435
        return tests.TestCaseWithTransport.make_branch(
373
436
            self, location, format=format)
374
437
 
375
438
    def create_branch_with_reference(self):
376
439
        branch = self.make_branch('branch')
377
 
        branch._set_all_reference_info({'file-id': ('path', 'location')})
 
440
        branch._set_all_reference_info({'path': ('location', b'file-id')})
378
441
        return branch
379
442
 
380
443
    @staticmethod
391
454
        branch.lock_read()
392
455
        self.addCleanup(branch.unlock)
393
456
        self.instrument_branch(branch, gets)
394
 
        branch.get_reference_info('file-id')
395
 
        branch.get_reference_info('file-id')
 
457
        branch.get_reference_info('path')
 
458
        branch.get_reference_info('path')
396
459
        self.assertEqual(1, len(gets))
397
460
 
398
461
    def test_reference_info_caching_read_unlocked(self):
399
462
        gets = []
400
463
        branch = self.create_branch_with_reference()
401
464
        self.instrument_branch(branch, gets)
402
 
        branch.get_reference_info('file-id')
403
 
        branch.get_reference_info('file-id')
 
465
        branch.get_reference_info('path')
 
466
        branch.get_reference_info('path')
404
467
        self.assertEqual(2, len(gets))
405
468
 
406
469
    def test_reference_info_caching_write_locked(self):
409
472
        branch.lock_write()
410
473
        self.instrument_branch(branch, gets)
411
474
        self.addCleanup(branch.unlock)
412
 
        branch._set_all_reference_info({'file-id': ('path2', 'location2')})
413
 
        path, location = branch.get_reference_info('file-id')
 
475
        branch._set_all_reference_info({'path2': ('location2', b'file-id')})
 
476
        location, file_id = branch.get_reference_info('path2')
414
477
        self.assertEqual(0, len(gets))
415
 
        self.assertEqual('path2', path)
 
478
        self.assertEqual(b'file-id', file_id)
416
479
        self.assertEqual('location2', location)
417
480
 
418
481
    def test_reference_info_caches_cleared(self):
419
482
        branch = self.make_branch('branch')
420
 
        branch.lock_write()
421
 
        branch.set_reference_info('file-id', 'path2', 'location2')
422
 
        branch.unlock()
 
483
        with branch.lock_write():
 
484
            branch.set_reference_info('path2', 'location2', b'file-id')
423
485
        doppelganger = _mod_branch.Branch.open('branch')
424
 
        doppelganger.set_reference_info('file-id', 'path3', 'location3')
425
 
        self.assertEqual(('path3', 'location3'),
426
 
                         branch.get_reference_info('file-id'))
 
486
        doppelganger.set_reference_info('path3', 'location3', b'file-id')
 
487
        self.assertEqual(('location3', b'file-id'),
 
488
                         branch.get_reference_info('path3'))
 
489
 
 
490
    def _recordParentMapCalls(self, repo):
 
491
        self._parent_map_calls = []
 
492
        orig_get_parent_map = repo.revisions.get_parent_map
 
493
        def get_parent_map(q):
 
494
            q = list(q)
 
495
            self._parent_map_calls.extend([e[0] for e in q])
 
496
            return orig_get_parent_map(q)
 
497
        repo.revisions.get_parent_map = get_parent_map
 
498
 
427
499
 
428
500
class TestBranchReference(tests.TestCaseWithTransport):
429
501
    """Tests for the branch reference facility."""
430
502
 
431
503
    def test_create_open_reference(self):
432
504
        bzrdirformat = bzrdir.BzrDirMetaFormat1()
433
 
        t = transport.get_transport(self.get_url('.'))
 
505
        t = self.get_transport()
434
506
        t.mkdir('repo')
435
507
        dir = bzrdirformat.initialize(self.get_url('repo'))
436
508
        dir.create_repository()
437
509
        target_branch = dir.create_branch()
438
510
        t.mkdir('branch')
439
511
        branch_dir = bzrdirformat.initialize(self.get_url('branch'))
440
 
        made_branch = _mod_branch.BranchReferenceFormat().initialize(
 
512
        made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
441
513
            branch_dir, target_branch=target_branch)
442
514
        self.assertEqual(made_branch.base, target_branch.base)
443
515
        opened_branch = branch_dir.open_branch()
444
516
        self.assertEqual(opened_branch.base, target_branch.base)
445
517
 
446
518
    def test_get_reference(self):
447
 
        """For a BranchReference, get_reference should reutrn the location."""
 
519
        """For a BranchReference, get_reference should return the location."""
448
520
        branch = self.make_branch('target')
449
521
        checkout = branch.create_checkout('checkout', lightweight=True)
450
 
        reference_url = branch.bzrdir.root_transport.abspath('') + '/'
 
522
        reference_url = branch.controldir.root_transport.abspath('') + '/'
451
523
        # if the api for create_checkout changes to return different checkout types
452
524
        # then this file read will fail.
453
 
        self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
 
525
        self.assertFileEqual(reference_url.encode('utf-8'),
 
526
                             'checkout/.bzr/branch/location')
454
527
        self.assertEqual(reference_url,
455
 
            _mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
 
528
            _mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.controldir))
456
529
 
457
530
 
458
531
class TestHooks(tests.TestCaseWithTransport):
460
533
    def test_constructor(self):
461
534
        """Check that creating a BranchHooks instance has the right defaults."""
462
535
        hooks = _mod_branch.BranchHooks()
463
 
        self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
464
536
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
465
537
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
466
538
        self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
489
561
        self.assertLength(1, calls)
490
562
        params = calls[0]
491
563
        self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
492
 
        self.assertTrue(hasattr(params, 'bzrdir'))
 
564
        self.assertTrue(hasattr(params, 'controldir'))
493
565
        self.assertTrue(hasattr(params, 'branch'))
494
566
 
 
567
    def test_post_branch_init_hook_repr(self):
 
568
        param_reprs = []
 
569
        _mod_branch.Branch.hooks.install_named_hook('post_branch_init',
 
570
            lambda params: param_reprs.append(repr(params)), None)
 
571
        branch = self.make_branch('a')
 
572
        self.assertLength(1, param_reprs)
 
573
        param_repr = param_reprs[0]
 
574
        self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
 
575
 
495
576
    def test_post_switch_hook(self):
496
 
        from bzrlib import switch
 
577
        from .. import switch
497
578
        calls = []
498
579
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
499
580
            calls.append, None)
501
582
        self.build_tree(['branch-1/file-1'])
502
583
        tree.add('file-1')
503
584
        tree.commit('rev1')
504
 
        to_branch = tree.bzrdir.sprout('branch-2').open_branch()
 
585
        to_branch = tree.controldir.sprout('branch-2').open_branch()
505
586
        self.build_tree(['branch-1/file-2'])
506
587
        tree.add('file-2')
507
588
        tree.remove('file-1')
508
589
        tree.commit('rev2')
509
590
        checkout = tree.branch.create_checkout('checkout')
510
591
        self.assertLength(0, calls)
511
 
        switch.switch(checkout.bzrdir, to_branch)
 
592
        switch.switch(checkout.controldir, to_branch)
512
593
        self.assertLength(1, calls)
513
594
        params = calls[0]
514
595
        self.assertIsInstance(params, _mod_branch.SwitchHookParams)
521
602
    def setUp(self):
522
603
        super(TestBranchOptions, self).setUp()
523
604
        self.branch = self.make_branch('.')
524
 
        self.config = self.branch.get_config()
 
605
        self.config_stack = self.branch.get_config_stack()
525
606
 
526
607
    def check_append_revisions_only(self, expected_value, value=None):
527
608
        """Set append_revisions_only in config and check its interpretation."""
528
609
        if value is not None:
529
 
            self.config.set_user_option('append_revisions_only', value)
 
610
            self.config_stack.set('append_revisions_only', value)
530
611
        self.assertEqual(expected_value,
531
 
                         self.branch._get_append_revisions_only())
 
612
                         self.branch.get_append_revisions_only())
532
613
 
533
614
    def test_valid_append_revisions_only(self):
534
 
        self.assertEquals(None,
535
 
                          self.config.get_user_option('append_revisions_only'))
 
615
        self.assertEqual(None,
 
616
                          self.config_stack.get('append_revisions_only'))
536
617
        self.check_append_revisions_only(None)
537
618
        self.check_append_revisions_only(False, 'False')
538
619
        self.check_append_revisions_only(True, 'True')
550
631
        self.check_append_revisions_only(None, 'not-a-bool')
551
632
        self.assertLength(1, self.warnings)
552
633
        self.assertEqual(
553
 
            'Value "not-a-bool" is not a boolean for "append_revisions_only"',
 
634
            'Value "not-a-bool" is not valid for "append_revisions_only"',
554
635
            self.warnings[0])
555
636
 
 
637
    def test_use_fresh_values(self):
 
638
        copy = _mod_branch.Branch.open(self.branch.base)
 
639
        copy.lock_write()
 
640
        try:
 
641
            copy.get_config_stack().set('foo', 'bar')
 
642
        finally:
 
643
            copy.unlock()
 
644
        self.assertFalse(self.branch.is_locked())
 
645
        # Since the branch is locked, the option value won't be saved on disk
 
646
        # so trying to access the config of locked branch via another older
 
647
        # non-locked branch object pointing to the same branch is not supported
 
648
        self.assertEqual(None, self.branch.get_config_stack().get('foo'))
 
649
        # Using a newly created branch object works as expected
 
650
        fresh = _mod_branch.Branch.open(self.branch.base)
 
651
        self.assertEqual('bar', fresh.get_config_stack().get('foo'))
 
652
 
 
653
    def test_set_from_config_get_from_config_stack(self):
 
654
        self.branch.lock_write()
 
655
        self.addCleanup(self.branch.unlock)
 
656
        self.branch.get_config().set_user_option('foo', 'bar')
 
657
        result = self.branch.get_config_stack().get('foo')
 
658
        # https://bugs.launchpad.net/bzr/+bug/948344
 
659
        self.expectFailure('BranchStack uses cache after set_user_option',
 
660
                           self.assertEqual, 'bar', result)
 
661
 
 
662
    def test_set_from_config_stack_get_from_config(self):
 
663
        self.branch.lock_write()
 
664
        self.addCleanup(self.branch.unlock)
 
665
        self.branch.get_config_stack().set('foo', 'bar')
 
666
        # Since the branch is locked, the option value won't be saved on disk
 
667
        # so mixing get() and get_user_option() is broken by design.
 
668
        self.assertEqual(None,
 
669
                         self.branch.get_config().get_user_option('foo'))
 
670
 
 
671
    def test_set_delays_write_when_branch_is_locked(self):
 
672
        self.branch.lock_write()
 
673
        self.addCleanup(self.branch.unlock)
 
674
        self.branch.get_config_stack().set('foo', 'bar')
 
675
        copy = _mod_branch.Branch.open(self.branch.base)
 
676
        result = copy.get_config_stack().get('foo')
 
677
        # Accessing from a different branch object is like accessing from a
 
678
        # different process: the option has not been saved yet and the new
 
679
        # value cannot be seen.
 
680
        self.assertIs(None, result)
 
681
 
556
682
 
557
683
class TestPullResult(tests.TestCase):
558
684
 
559
 
    def test_pull_result_to_int(self):
560
 
        # to support old code, the pull result can be used as an int
561
 
        r = _mod_branch.PullResult()
562
 
        r.old_revno = 10
563
 
        r.new_revno = 20
564
 
        # this usage of results is not recommended for new code (because it
565
 
        # doesn't describe very well what happened), but for api stability
566
 
        # it's still supported
567
 
        a = "%d revisions pulled" % r
568
 
        self.assertEqual(a, "10 revisions pulled")
569
 
 
570
685
    def test_report_changed(self):
571
686
        r = _mod_branch.PullResult()
572
 
        r.old_revid = "old-revid"
 
687
        r.old_revid = b"old-revid"
573
688
        r.old_revno = 10
574
 
        r.new_revid = "new-revid"
 
689
        r.new_revid = b"new-revid"
575
690
        r.new_revno = 20
576
 
        f = StringIO()
 
691
        f = BytesIO()
577
692
        r.report(f)
578
 
        self.assertEqual("Now on revision 20.\n", f.getvalue())
 
693
        self.assertEqual(b"Now on revision 20.\n", f.getvalue())
 
694
        self.assertEqual(b"Now on revision 20.\n", f.getvalue())
579
695
 
580
696
    def test_report_unchanged(self):
581
697
        r = _mod_branch.PullResult()
582
 
        r.old_revid = "same-revid"
583
 
        r.new_revid = "same-revid"
584
 
        f = StringIO()
 
698
        r.old_revid = b"same-revid"
 
699
        r.new_revid = b"same-revid"
 
700
        f = BytesIO()
585
701
        r.report(f)
586
 
        self.assertEqual("No revisions to pull.\n", f.getvalue())
587
 
 
588
 
 
589
 
class _StubLockable(object):
590
 
    """Helper for TestRunWithWriteLockedTarget."""
591
 
 
592
 
    def __init__(self, calls, unlock_exc=None):
593
 
        self.calls = calls
594
 
        self.unlock_exc = unlock_exc
595
 
 
596
 
    def lock_write(self):
597
 
        self.calls.append('lock_write')
598
 
 
599
 
    def unlock(self):
600
 
        self.calls.append('unlock')
601
 
        if self.unlock_exc is not None:
602
 
            raise self.unlock_exc
603
 
 
604
 
 
605
 
class _ErrorFromCallable(Exception):
606
 
    """Helper for TestRunWithWriteLockedTarget."""
607
 
 
608
 
 
609
 
class _ErrorFromUnlock(Exception):
610
 
    """Helper for TestRunWithWriteLockedTarget."""
611
 
 
612
 
 
613
 
class TestRunWithWriteLockedTarget(tests.TestCase):
614
 
    """Tests for _run_with_write_locked_target."""
615
 
 
616
 
    def setUp(self):
617
 
        tests.TestCase.setUp(self)
618
 
        self._calls = []
619
 
 
620
 
    def func_that_returns_ok(self):
621
 
        self._calls.append('func called')
622
 
        return 'ok'
623
 
 
624
 
    def func_that_raises(self):
625
 
        self._calls.append('func called')
626
 
        raise _ErrorFromCallable()
627
 
 
628
 
    def test_success_unlocks(self):
629
 
        lockable = _StubLockable(self._calls)
630
 
        result = _mod_branch._run_with_write_locked_target(
631
 
            lockable, self.func_that_returns_ok)
632
 
        self.assertEqual('ok', result)
633
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
634
 
 
635
 
    def test_exception_unlocks_and_propagates(self):
636
 
        lockable = _StubLockable(self._calls)
637
 
        self.assertRaises(_ErrorFromCallable,
638
 
                          _mod_branch._run_with_write_locked_target,
639
 
                          lockable, self.func_that_raises)
640
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
641
 
 
642
 
    def test_callable_succeeds_but_error_during_unlock(self):
643
 
        lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
644
 
        self.assertRaises(_ErrorFromUnlock,
645
 
                          _mod_branch._run_with_write_locked_target,
646
 
                          lockable, self.func_that_returns_ok)
647
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
648
 
 
649
 
    def test_error_during_unlock_does_not_mask_original_error(self):
650
 
        lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
651
 
        self.assertRaises(_ErrorFromCallable,
652
 
                          _mod_branch._run_with_write_locked_target,
653
 
                          lockable, self.func_that_raises)
654
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
655
 
 
656
 
 
 
702
        self.assertEqual(b"No revisions or tags to pull.\n", f.getvalue())