/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6614.1.1 by Vincent Ladeuil
Fix assert_ being deprecated by using assertTrue.
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
7
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
12
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
16
17
"""Tests for the Branch facility that are not interface  tests.
18
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
19
For interface tests see `tests/per_branch/*.py`.
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
20
21
For concrete class tests see this file, and for meta-branch tests
22
also see this file.
23
"""
24
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
25
from .. import (
2230.3.3 by Aaron Bentley
Add more config testing
26
    branch as _mod_branch,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
27
    config,
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
28
    controldir,
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
29
    errors,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
30
    tests,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
31
    trace,
2230.3.3 by Aaron Bentley
Add more config testing
32
    urlutils,
33
    )
6670.4.1 by Jelmer Vernooij
Update imports.
34
from ..bzr import (
35
    branch as _mod_bzrbranch,
36
    bzrdir,
37
    )
38
from ..bzr.fullhistory import (
6517.1.6 by Jelmer Vernooij
Fix remaining tests.
39
    BzrBranch5,
40
    BzrBranchFormat5,
41
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
42
from ..sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
43
    BytesIO,
44
    )
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
45
3445.2.1 by John Arbash Meinel
Add tests for Branch.missing_revisions and deprecate it.
46
6734.1.22 by Jelmer Vernooij
review comments.
47
class TestErrors(tests.TestCase):
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
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))
57
58
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
59
class TestDefaultFormat(tests.TestCase):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
60
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
61
    def test_default_format(self):
62
        # update this if you change the default branch format
6213.1.16 by Jelmer Vernooij
Feature support in repository.
63
        self.assertIsInstance(_mod_branch.format_registry.get_default(),
6653.1.6 by Jelmer Vernooij
Fix some more imports.
64
                _mod_bzrbranch.BzrBranchFormat7)
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
65
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
66
    def test_default_format_is_same_as_bzrdir_default(self):
67
        # XXX: it might be nice if there was only one place the default was
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
68
        # set, but at the moment that's not true -- mbp 20070814 --
2696.3.8 by Martin Pool
doc
69
        # https://bugs.launchpad.net/bzr/+bug/132376
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
70
        self.assertEqual(
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
71
            _mod_branch.format_registry.get_default(),
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
72
            bzrdir.BzrDirFormat.get_default_format().get_branch_format())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
73
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
74
    def test_get_set_default_format(self):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
75
        # set the format and then set it back again
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
76
        old_format = _mod_branch.format_registry.get_default()
6653.1.9 by Jelmer Vernooij
Fix set_default.
77
        _mod_branch.format_registry.set_default(
78
            SampleBranchFormat())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
79
        try:
80
            # the default branch format is used by the meta dir format
81
            # which is not the default bzrdir format at this point
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
82
            dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
83
            result = dir.create_branch()
84
            self.assertEqual(result, 'A branch')
85
        finally:
6653.1.9 by Jelmer Vernooij
Fix set_default.
86
            _mod_branch.format_registry.set_default(old_format)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
87
        self.assertEqual(old_format,
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
88
                         _mod_branch.format_registry.get_default())
1508.1.25 by Robert Collins
Update per review comments.
89
90
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
91
class TestBranchFormat5(tests.TestCaseWithTransport):
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
92
    """Tests specific to branch format 5"""
93
94
    def test_branch_format_5_uses_lockdir(self):
95
        url = self.get_url()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
96
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
97
        bdir.create_repository()
6517.1.6 by Jelmer Vernooij
Fix remaining tests.
98
        branch = BzrBranchFormat5().initialize(bdir)
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
99
        t = self.get_transport()
100
        self.log("branch instance is %r" % branch)
6614.1.1 by Vincent Ladeuil
Fix assert_ being deprecated by using assertTrue.
101
        self.assertTrue(isinstance(branch, BzrBranch5))
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
102
        self.assertIsDirectory('.', t)
103
        self.assertIsDirectory('.bzr/branch', t)
104
        self.assertIsDirectory('.bzr/branch/lock', t)
1553.5.73 by Martin Pool
Additional test that Branch5 uses lockdir properly
105
        branch.lock_write()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
106
        self.addCleanup(branch.unlock)
107
        self.assertIsDirectory('.bzr/branch/lock/held', t)
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
108
2230.3.3 by Aaron Bentley
Add more config testing
109
    def test_set_push_location(self):
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
110
        conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
2839.3.1 by Alexander Belchenko
provide non-empty locations.conf for test_branch.TestBranchFormat5.test_set_push_location
111
2230.3.3 by Aaron Bentley
Add more config testing
112
        branch = self.make_branch('.', format='knit')
113
        branch.set_push_location('foo')
114
        local_path = urlutils.local_path_from_url(branch.base[:-1])
2839.3.1 by Alexander Belchenko
provide non-empty locations.conf for test_branch.TestBranchFormat5.test_set_push_location
115
        self.assertFileEqual("# comment\n"
116
                             "[%s]\n"
2230.3.3 by Aaron Bentley
Add more config testing
117
                             "push_location = foo\n"
3221.7.1 by Matt Nordhoff
Upgrade ConfigObj to version 4.5.1.
118
                             "push_location:policy = norecurse\n" % local_path,
5345.1.11 by Vincent Ladeuil
Cleanup bt.test_branch.
119
                             config.locations_config_filename())
2230.3.3 by Aaron Bentley
Add more config testing
120
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
121
    # TODO RBC 20051029 test getting a push location from a branch in a
2230.3.3 by Aaron Bentley
Add more config testing
122
    # recursive section - that is, it appends the branch name.
123
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
124
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
125
class SampleBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
126
    """A sample format
127
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
128
    this format is initializable, unsupported to aid in testing the
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
129
    open and open_downlevel routines.
130
    """
131
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
132
    @classmethod
133
    def get_format_string(cls):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
134
        """See BzrBranchFormat.get_format_string()."""
135
        return "Sample branch format."
136
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
137
    def initialize(self, a_controldir, name=None, repository=None,
6123.9.15 by Jelmer Vernooij
More test fixes.
138
                   append_revisions_only=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
139
        """Format 4 branches cannot be created."""
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
140
        t = a_controldir.get_branch_transport(self, name=name)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
141
        t.put_bytes('format', self.get_format_string())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
142
        return 'A branch'
143
144
    def is_supported(self):
145
        return False
146
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
147
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
148
             possible_transports=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
149
        return "opened branch."
150
151
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
152
# Demonstrating how lazy loading is often implemented:
153
# A constant string is created.
154
SampleSupportedBranchFormatString = "Sample supported branch format."
155
156
# And the format class can then reference the constant to avoid skew.
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
157
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
158
    """A sample supported format."""
159
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
160
    @classmethod
161
    def get_format_string(cls):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
162
        """See BzrBranchFormat.get_format_string()."""
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
163
        return SampleSupportedBranchFormatString
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
164
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
165
    def initialize(self, a_controldir, name=None, append_revisions_only=None):
166
        t = a_controldir.get_branch_transport(self, name=name)
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
167
        t.put_bytes('format', self.get_format_string())
168
        return 'A branch'
169
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
170
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
171
             possible_transports=None):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
172
        return "opened supported branch."
173
174
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
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
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
186
    def initialize(self, a_controldir, name=None):
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
187
        raise NotImplementedError(self.initialize)
188
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
189
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
190
             possible_transports=None):
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
191
        raise NotImplementedError(self.open)
192
193
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
194
class TestBzrBranchFormat(tests.TestCaseWithTransport):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
195
    """Tests for the BzrBranchFormat facility."""
196
197
    def test_find_format(self):
198
        # is the right format object found for a branch?
199
        # create a branch with a few known format objects.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
200
        # this is not quite the same as
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
201
        self.build_tree(["foo/", "bar/"])
202
        def check_format(format, url):
6746.2.1 by Jelmer Vernooij
Rename matchingbzrdir to matchingcontroldir.
203
            dir = format._matchingcontroldir.initialize(url)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
204
            dir.create_repository()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
205
            format.initialize(dir)
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
206
            found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
207
            self.assertIsInstance(found_format, format.__class__)
6517.1.6 by Jelmer Vernooij
Fix remaining tests.
208
        check_format(BzrBranchFormat5(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
209
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
210
    def test_from_string(self):
211
        self.assertIsInstance(
212
            SampleBranchFormat.from_string("Sample branch format."),
213
            SampleBranchFormat)
6213.1.54 by Jelmer Vernooij
Fix tests.
214
        self.assertRaises(AssertionError,
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
215
            SampleBranchFormat.from_string, "Different branch format.")
216
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
217
    def test_find_format_not_branch(self):
218
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
219
        self.assertRaises(errors.NotBranchError,
6653.1.2 by Jelmer Vernooij
Fix imports.
220
                          _mod_bzrbranch.BranchFormatMetadir.find_format,
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
221
                          dir)
222
223
    def test_find_format_unknown_format(self):
224
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
225
        SampleBranchFormat().initialize(dir)
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
226
        self.assertRaises(errors.UnknownFormatError,
6653.1.2 by Jelmer Vernooij
Fix imports.
227
                          _mod_bzrbranch.BranchFormatMetadir.find_format,
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
228
                          dir)
229
6213.1.13 by Jelmer Vernooij
make some methods class methods.
230
    def test_find_format_with_features(self):
231
        tree = self.make_branch_and_tree('.', format='2a')
6213.1.57 by Jelmer Vernooij
Add Branch.update_features.
232
        tree.branch.update_feature_flags({"name": "optional"})
6653.6.4 by Jelmer Vernooij
Merge trunk.
233
        found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(tree.controldir)
6653.1.2 by Jelmer Vernooij
Fix imports.
234
        self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
235
        self.assertEqual(found_format.features.get("name"), "optional")
6213.1.57 by Jelmer Vernooij
Add Branch.update_features.
236
        tree.branch.update_feature_flags({"name": None})
237
        branch = _mod_branch.Branch.open('.')
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
238
        self.assertEqual(branch._format.features, {})
6213.1.13 by Jelmer Vernooij
make some methods class methods.
239
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
240
5662.2.6 by Jelmer Vernooij
add more tests.
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)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
251
        self.assertEqual(format, self.registry.get_default())
5662.2.6 by Jelmer Vernooij
add more tests.
252
253
    def test_register_unregister_format(self):
254
        format = SampleBranchFormat()
255
        self.registry.register(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
256
        self.assertEqual(format,
5662.2.6 by Jelmer Vernooij
add more tests.
257
            self.registry.get("Sample branch format."))
258
        self.registry.remove(format)
259
        self.assertRaises(KeyError, self.registry.get,
260
            "Sample branch format.")
261
262
    def test_get_all(self):
263
        format = SampleBranchFormat()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
264
        self.assertEqual([], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
265
        self.registry.register(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
266
        self.assertEqual([format], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
267
268
    def test_register_extra(self):
269
        format = SampleExtraBranchFormat()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
270
        self.assertEqual([], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
271
        self.registry.register_extra(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
272
        self.assertEqual([format], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
273
274
    def test_register_extra_lazy(self):
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
275
        self.assertEqual([], self.registry._get_all())
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
276
        self.registry.register_extra_lazy("breezy.tests.test_branch",
5662.2.6 by Jelmer Vernooij
add more tests.
277
            "SampleExtraBranchFormat")
278
        formats = self.registry._get_all()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
279
        self.assertEqual(1, len(formats))
5662.2.6 by Jelmer Vernooij
add more tests.
280
        self.assertIsInstance(formats[0], SampleExtraBranchFormat)
281
282
3221.11.2 by Robert Collins
Create basic stackable branch facility.
283
class TestBranch67(object):
284
    """Common tests for both branch 6 and 7 which are mostly the same."""
285
286
    def get_format_name(self):
287
        raise NotImplementedError(self.get_format_name)
288
289
    def get_format_name_subtree(self):
290
        raise NotImplementedError(self.get_format_name)
291
292
    def get_class(self):
293
        raise NotImplementedError(self.get_class)
2230.3.1 by Aaron Bentley
Get branch6 creation working
294
295
    def test_creation(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
296
        format = bzrdir.BzrDirMetaFormat1()
6653.1.6 by Jelmer Vernooij
Fix some more imports.
297
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat6())
2230.3.1 by Aaron Bentley
Get branch6 creation working
298
        branch = self.make_branch('a', format=format)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
299
        self.assertIsInstance(branch, self.get_class())
300
        branch = self.make_branch('b', format=self.get_format_name())
301
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
302
        branch = _mod_branch.Branch.open('a')
3221.11.2 by Robert Collins
Create basic stackable branch facility.
303
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
304
305
    def test_layout(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
306
        branch = self.make_branch('a', format=self.get_format_name())
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
307
        self.assertPathExists('a/.bzr/branch/last-revision')
308
        self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
309
        self.assertPathDoesNotExist('a/.bzr/branch/references')
2230.3.1 by Aaron Bentley
Get branch6 creation working
310
2230.3.3 by Aaron Bentley
Add more config testing
311
    def test_config(self):
312
        """Ensure that all configuration data is stored in the branch"""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
313
        branch = self.make_branch('a', format=self.get_format_name())
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
314
        branch.set_parent('http://example.com')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
315
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
316
        self.assertEqual('http://example.com', branch.get_parent())
317
        branch.set_push_location('sftp://example.com')
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
318
        conf = branch.get_config_stack()
319
        self.assertEqual('sftp://example.com', conf.get('push_location'))
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
320
        branch.set_bound_location('ftp://example.com')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
321
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
5560.2.1 by Vincent Ladeuil
Fix the remaining references to http://bazaar-vcs.org (except the explicitly historical ones).
322
        self.assertEqual('ftp://example.com', branch.get_bound_location())
2230.3.3 by Aaron Bentley
Add more config testing
323
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
324
    def do_checkout_test(self, lightweight=False):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
325
        tree = self.make_branch_and_tree('source',
326
            format=self.get_format_name_subtree())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
327
        subtree = self.make_branch_and_tree('source/subtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
328
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
329
        subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
330
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
331
        self.build_tree(['source/subtree/file',
332
                         'source/subtree/subsubtree/file'])
333
        subsubtree.add('file')
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
334
        subtree.add('file')
2100.3.25 by Aaron Bentley
add subsubtree to test
335
        subtree.add_reference(subsubtree)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
336
        tree.add_reference(subtree)
337
        tree.commit('a revision')
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
338
        subtree.commit('a subtree file')
2100.3.25 by Aaron Bentley
add subsubtree to test
339
        subsubtree.commit('a subsubtree file')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
340
        tree.branch.create_checkout('target', lightweight=lightweight)
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
341
        self.assertPathExists('target')
342
        self.assertPathExists('target/subtree')
343
        self.assertPathExists('target/subtree/file')
344
        self.assertPathExists('target/subtree/subsubtree/file')
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
345
        subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
346
        if lightweight:
347
            self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
348
        else:
349
            self.assertEndsWith(subbranch.base, 'target/subtree/subsubtree/')
350
351
    def test_checkout_with_references(self):
352
        self.do_checkout_test()
353
354
    def test_light_checkout_with_references(self):
355
        self.do_checkout_test(lightweight=True)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
356
3445.2.1 by John Arbash Meinel
Add tests for Branch.missing_revisions and deprecate it.
357
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
358
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
359
360
    def get_class(self):
6653.1.6 by Jelmer Vernooij
Fix some more imports.
361
        return _mod_bzrbranch.BzrBranch6
3221.11.2 by Robert Collins
Create basic stackable branch facility.
362
363
    def get_format_name(self):
364
        return "dirstate-tags"
365
366
    def get_format_name_subtree(self):
367
        return "dirstate-with-subtree"
368
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
369
    def test_set_stacked_on_url_errors(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
370
        branch = self.make_branch('a', format=self.get_format_name())
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
371
        self.assertRaises(_mod_branch.UnstackableBranchFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
372
            branch.set_stacked_on_url, None)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
373
374
    def test_default_stacked_location(self):
375
        branch = self.make_branch('a', format=self.get_format_name())
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
376
        self.assertRaises(_mod_branch.UnstackableBranchFormat, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
377
378
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
379
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
380
381
    def get_class(self):
6653.1.6 by Jelmer Vernooij
Fix some more imports.
382
        return _mod_bzrbranch.BzrBranch7
3221.11.2 by Robert Collins
Create basic stackable branch facility.
383
384
    def get_format_name(self):
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
385
        return "1.9"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
386
387
    def get_format_name_subtree(self):
388
        return "development-subtree"
389
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
390
    def test_set_stacked_on_url_unstackable_repo(self):
3221.11.6 by Robert Collins
Stackable branch fixes.
391
        repo = self.make_repository('a', format='dirstate-tags')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
392
        control = repo.controldir
6653.1.6 by Jelmer Vernooij
Fix some more imports.
393
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
394
        target = self.make_branch('b')
395
        self.assertRaises(errors.UnstackableRepositoryFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
396
            branch.set_stacked_on_url, target.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
397
3242.3.21 by Jonathan Lange
Preserve stacking in clone
398
    def test_clone_stacked_on_unstackable_repo(self):
399
        repo = self.make_repository('a', format='dirstate-tags')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
400
        control = repo.controldir
6653.1.6 by Jelmer Vernooij
Fix some more imports.
401
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
3242.3.21 by Jonathan Lange
Preserve stacking in clone
402
        # Calling clone should not raise UnstackableRepositoryFormat.
403
        cloned_bzrdir = control.clone('cloned')
404
3221.11.2 by Robert Collins
Create basic stackable branch facility.
405
    def _test_default_stacked_location(self):
406
        branch = self.make_branch('a', format=self.get_format_name())
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
407
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
408
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
409
    def test_stack_and_unstack(self):
410
        branch = self.make_branch('a', format=self.get_format_name())
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
411
        target = self.make_branch_and_tree('b', format=self.get_format_name())
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
412
        branch.set_stacked_on_url(target.branch.base)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
413
        self.assertEqual(target.branch.base, branch.get_stacked_on_url())
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
414
        revid = target.commit('foo')
415
        self.assertTrue(branch.repository.has_revision(revid))
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
416
        branch.set_stacked_on_url(None)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
417
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
418
        self.assertFalse(branch.repository.has_revision(revid))
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
419
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
420
    def test_open_opens_stacked_reference(self):
421
        branch = self.make_branch('a', format=self.get_format_name())
422
        target = self.make_branch_and_tree('b', format=self.get_format_name())
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
423
        branch.set_stacked_on_url(target.branch.base)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
424
        branch = branch.controldir.open_branch()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
425
        revid = target.commit('foo')
426
        self.assertTrue(branch.repository.has_revision(revid))
427
3221.11.2 by Robert Collins
Create basic stackable branch facility.
428
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
429
class BzrBranch8(tests.TestCaseWithTransport):
4273.1.15 by Aaron Bentley
Add reference_info caching.
430
431
    def make_branch(self, location, format=None):
432
        if format is None:
6653.6.5 by Jelmer Vernooij
Rename make_bzrdir to make_controldir.
433
            format = controldir.format_registry.make_controldir('1.9')
6653.1.6 by Jelmer Vernooij
Fix some more imports.
434
            format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
435
        return tests.TestCaseWithTransport.make_branch(
436
            self, location, format=format)
4273.1.15 by Aaron Bentley
Add reference_info caching.
437
438
    def create_branch_with_reference(self):
439
        branch = self.make_branch('branch')
440
        branch._set_all_reference_info({'file-id': ('path', 'location')})
441
        return branch
442
443
    @staticmethod
444
    def instrument_branch(branch, gets):
445
        old_get = branch._transport.get
446
        def get(*args, **kwargs):
447
            gets.append((args, kwargs))
448
            return old_get(*args, **kwargs)
449
        branch._transport.get = get
450
451
    def test_reference_info_caching_read_locked(self):
452
        gets = []
453
        branch = self.create_branch_with_reference()
454
        branch.lock_read()
455
        self.addCleanup(branch.unlock)
456
        self.instrument_branch(branch, gets)
457
        branch.get_reference_info('file-id')
458
        branch.get_reference_info('file-id')
459
        self.assertEqual(1, len(gets))
460
461
    def test_reference_info_caching_read_unlocked(self):
462
        gets = []
463
        branch = self.create_branch_with_reference()
464
        self.instrument_branch(branch, gets)
465
        branch.get_reference_info('file-id')
466
        branch.get_reference_info('file-id')
467
        self.assertEqual(2, len(gets))
468
469
    def test_reference_info_caching_write_locked(self):
470
        gets = []
471
        branch = self.make_branch('branch')
472
        branch.lock_write()
473
        self.instrument_branch(branch, gets)
474
        self.addCleanup(branch.unlock)
475
        branch._set_all_reference_info({'file-id': ('path2', 'location2')})
476
        path, location = branch.get_reference_info('file-id')
477
        self.assertEqual(0, len(gets))
478
        self.assertEqual('path2', path)
479
        self.assertEqual('location2', location)
480
481
    def test_reference_info_caches_cleared(self):
482
        branch = self.make_branch('branch')
483
        branch.lock_write()
484
        branch.set_reference_info('file-id', 'path2', 'location2')
485
        branch.unlock()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
486
        doppelganger = _mod_branch.Branch.open('branch')
4273.1.15 by Aaron Bentley
Add reference_info caching.
487
        doppelganger.set_reference_info('file-id', 'path3', 'location3')
488
        self.assertEqual(('path3', 'location3'),
489
                         branch.get_reference_info('file-id'))
490
6165.4.11 by Jelmer Vernooij
More test fixes.
491
    def _recordParentMapCalls(self, repo):
492
        self._parent_map_calls = []
493
        orig_get_parent_map = repo.revisions.get_parent_map
494
        def get_parent_map(q):
495
            q = list(q)
496
            self._parent_map_calls.extend([e[0] for e in q])
497
            return orig_get_parent_map(q)
498
        repo.revisions.get_parent_map = get_parent_map
499
500
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
501
class TestBranchReference(tests.TestCaseWithTransport):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
502
    """Tests for the branch reference facility."""
503
504
    def test_create_open_reference(self):
505
        bzrdirformat = bzrdir.BzrDirMetaFormat1()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
506
        t = self.get_transport()
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
507
        t.mkdir('repo')
508
        dir = bzrdirformat.initialize(self.get_url('repo'))
509
        dir.create_repository()
510
        target_branch = dir.create_branch()
511
        t.mkdir('branch')
512
        branch_dir = bzrdirformat.initialize(self.get_url('branch'))
6653.1.2 by Jelmer Vernooij
Fix imports.
513
        made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
514
            branch_dir, target_branch=target_branch)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
515
        self.assertEqual(made_branch.base, target_branch.base)
516
        opened_branch = branch_dir.open_branch()
517
        self.assertEqual(opened_branch.base, target_branch.base)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
518
519
    def test_get_reference(self):
6437.7.3 by Jelmer Vernooij
Use ControlDir.set_branch_reference.
520
        """For a BranchReference, get_reference should return the location."""
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
521
        branch = self.make_branch('target')
522
        checkout = branch.create_checkout('checkout', lightweight=True)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
523
        reference_url = branch.controldir.root_transport.abspath('') + '/'
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
524
        # if the api for create_checkout changes to return different checkout types
525
        # then this file read will fail.
526
        self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
527
        self.assertEqual(reference_url,
6653.6.4 by Jelmer Vernooij
Merge trunk.
528
            _mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.controldir))
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
529
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
530
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
531
class TestHooks(tests.TestCaseWithTransport):
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
532
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
533
    def test_constructor(self):
534
        """Check that creating a BranchHooks instance has the right defaults."""
5622.3.15 by Jelmer Vernooij
Fix branch hooks constructor test.
535
        hooks = _mod_branch.BranchHooks()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
536
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
537
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
538
        self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
539
        self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
540
        self.assertTrue("post_uncommit" in hooks,
541
                        "post_uncommit not in %s" % hooks)
3331.1.4 by James Henstridge
Adjust my tests to pass with Ian's API.
542
        self.assertTrue("post_change_branch_tip" in hooks,
543
                        "post_change_branch_tip not in %s" % hooks)
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
544
        self.assertTrue("post_branch_init" in hooks,
545
                        "post_branch_init not in %s" % hooks)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
546
        self.assertTrue("post_switch" in hooks,
547
                        "post_switch not in %s" % hooks)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
548
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
549
    def test_installed_hooks_are_BranchHooks(self):
550
        """The installed hooks object should be a BranchHooks."""
551
        # the installed hooks are saved in self._preserved_hooks.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
552
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
553
                              _mod_branch.BranchHooks)
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
554
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
555
    def test_post_branch_init_hook(self):
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
556
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
557
        _mod_branch.Branch.hooks.install_named_hook('post_branch_init',
558
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
559
        self.assertLength(0, calls)
560
        branch = self.make_branch('a')
561
        self.assertLength(1, calls)
562
        params = calls[0]
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
563
        self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
6653.6.3 by Jelmer Vernooij
Fix last tests.
564
        self.assertTrue(hasattr(params, 'controldir'))
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
565
        self.assertTrue(hasattr(params, 'branch'))
566
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
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
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
576
    def test_post_switch_hook(self):
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
577
        from .. import switch
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
578
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
579
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
580
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
581
        tree = self.make_branch_and_tree('branch-1')
582
        self.build_tree(['branch-1/file-1'])
583
        tree.add('file-1')
584
        tree.commit('rev1')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
585
        to_branch = tree.controldir.sprout('branch-2').open_branch()
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
586
        self.build_tree(['branch-1/file-2'])
587
        tree.add('file-2')
588
        tree.remove('file-1')
589
        tree.commit('rev2')
590
        checkout = tree.branch.create_checkout('checkout')
591
        self.assertLength(0, calls)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
592
        switch.switch(checkout.controldir, to_branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
593
        self.assertLength(1, calls)
594
        params = calls[0]
595
        self.assertIsInstance(params, _mod_branch.SwitchHookParams)
596
        self.assertTrue(hasattr(params, 'to_branch'))
597
        self.assertTrue(hasattr(params, 'revision_id'))
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
598
5176.1.1 by Vincent Ladeuil
Warn if a config variable can't be interpreted as a boolean
599
600
class TestBranchOptions(tests.TestCaseWithTransport):
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
601
4989.2.5 by Vincent Ladeuil
Clarify tests.
602
    def setUp(self):
603
        super(TestBranchOptions, self).setUp()
604
        self.branch = self.make_branch('.')
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
605
        self.config_stack = self.branch.get_config_stack()
4989.2.5 by Vincent Ladeuil
Clarify tests.
606
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
607
    def check_append_revisions_only(self, expected_value, value=None):
608
        """Set append_revisions_only in config and check its interpretation."""
4989.2.5 by Vincent Ladeuil
Clarify tests.
609
        if value is not None:
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
610
            self.config_stack.set('append_revisions_only', value)
4989.2.5 by Vincent Ladeuil
Clarify tests.
611
        self.assertEqual(expected_value,
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
612
                         self.branch.get_append_revisions_only())
4989.2.5 by Vincent Ladeuil
Clarify tests.
613
614
    def test_valid_append_revisions_only(self):
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
615
        self.assertEqual(None,
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
616
                          self.config_stack.get('append_revisions_only'))
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
617
        self.check_append_revisions_only(None)
618
        self.check_append_revisions_only(False, 'False')
619
        self.check_append_revisions_only(True, 'True')
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
620
        # The following values will cause compatibility problems on projects
621
        # using older bzr versions (<2.2) but are accepted
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
622
        self.check_append_revisions_only(False, 'false')
623
        self.check_append_revisions_only(True, 'true')
4989.2.5 by Vincent Ladeuil
Clarify tests.
624
625
    def test_invalid_append_revisions_only(self):
4989.2.9 by Brian de Alwis
Revert append_revisions_only to only allow 'True' and 'False' to
626
        """Ensure warning is noted on invalid settings"""
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
627
        self.warnings = []
628
        def warning(*args):
629
            self.warnings.append(args[0] % args[1:])
630
        self.overrideAttr(trace, 'warning', warning)
631
        self.check_append_revisions_only(None, 'not-a-bool')
632
        self.assertLength(1, self.warnings)
633
        self.assertEqual(
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
634
            'Value "not-a-bool" is not valid for "append_revisions_only"',
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
635
            self.warnings[0])
4989.2.5 by Vincent Ladeuil
Clarify tests.
636
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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())
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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'))
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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')
6480.1.2 by Aaron Bentley
Updates from review.
657
        result = self.branch.get_config_stack().get('foo')
6480.1.3 by Aaron Bentley
Mention bugs in comments.
658
        # https://bugs.launchpad.net/bzr/+bug/948344
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
659
        self.expectFailure('BranchStack uses cache after set_user_option',
6480.1.2 by Aaron Bentley
Updates from review.
660
                           self.assertEqual, 'bar', result)
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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')
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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,
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
669
                         self.branch.get_config().get_user_option('foo'))
670
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
671
    def test_set_delays_write_when_branch_is_locked(self):
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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)
6480.1.2 by Aaron Bentley
Updates from review.
676
        result = copy.get_config_stack().get('foo')
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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)
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
681
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
682
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
683
class TestPullResult(tests.TestCase):
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
684
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
685
    def test_report_changed(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
686
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
687
        r.old_revid = "old-revid"
688
        r.old_revno = 10
689
        r.new_revid = "new-revid"
690
        r.new_revno = 20
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
691
        f = BytesIO()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
692
        r.report(f)
693
        self.assertEqual("Now on revision 20.\n", f.getvalue())
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
694
        self.assertEqual("Now on revision 20.\n", f.getvalue())
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
695
696
    def test_report_unchanged(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
697
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
698
        r.old_revid = "same-revid"
699
        r.new_revid = "same-revid"
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
700
        f = BytesIO()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
701
        r.report(f)
6112.4.7 by Jelmer Vernooij
Fix tests.
702
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())