/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: Martin
  • Date: 2017-06-27 00:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 6722.
  • Revision ID: gzlist@googlemail.com-20170627005714-64ns3u0x5g866cdp
Adapt StaticTuple tests to change in comparison semantics on Python 3

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