/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
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
47
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.
48
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
49
    def test_default_format(self):
50
        # update this if you change the default branch format
6213.1.16 by Jelmer Vernooij
Feature support in repository.
51
        self.assertIsInstance(_mod_branch.format_registry.get_default(),
6653.1.6 by Jelmer Vernooij
Fix some more imports.
52
                _mod_bzrbranch.BzrBranchFormat7)
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
53
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
54
    def test_default_format_is_same_as_bzrdir_default(self):
55
        # 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
56
        # set, but at the moment that's not true -- mbp 20070814 --
2696.3.8 by Martin Pool
doc
57
        # https://bugs.launchpad.net/bzr/+bug/132376
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
58
        self.assertEqual(
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
59
            _mod_branch.format_registry.get_default(),
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
60
            bzrdir.BzrDirFormat.get_default_format().get_branch_format())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
61
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
62
    def test_get_set_default_format(self):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
63
        # set the format and then set it back again
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
64
        old_format = _mod_branch.format_registry.get_default()
6653.1.9 by Jelmer Vernooij
Fix set_default.
65
        _mod_branch.format_registry.set_default(
66
            SampleBranchFormat())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
67
        try:
68
            # the default branch format is used by the meta dir format
69
            # which is not the default bzrdir format at this point
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
70
            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.
71
            result = dir.create_branch()
72
            self.assertEqual(result, 'A branch')
73
        finally:
6653.1.9 by Jelmer Vernooij
Fix set_default.
74
            _mod_branch.format_registry.set_default(old_format)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
75
        self.assertEqual(old_format,
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
76
                         _mod_branch.format_registry.get_default())
1508.1.25 by Robert Collins
Update per review comments.
77
78
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
79
class TestBranchFormat5(tests.TestCaseWithTransport):
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
80
    """Tests specific to branch format 5"""
81
82
    def test_branch_format_5_uses_lockdir(self):
83
        url = self.get_url()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
84
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
85
        bdir.create_repository()
6517.1.6 by Jelmer Vernooij
Fix remaining tests.
86
        branch = BzrBranchFormat5().initialize(bdir)
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
87
        t = self.get_transport()
88
        self.log("branch instance is %r" % branch)
6614.1.1 by Vincent Ladeuil
Fix assert_ being deprecated by using assertTrue.
89
        self.assertTrue(isinstance(branch, BzrBranch5))
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
90
        self.assertIsDirectory('.', t)
91
        self.assertIsDirectory('.bzr/branch', t)
92
        self.assertIsDirectory('.bzr/branch/lock', t)
1553.5.73 by Martin Pool
Additional test that Branch5 uses lockdir properly
93
        branch.lock_write()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
94
        self.addCleanup(branch.unlock)
95
        self.assertIsDirectory('.bzr/branch/lock/held', t)
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
96
2230.3.3 by Aaron Bentley
Add more config testing
97
    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
98
        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
99
2230.3.3 by Aaron Bentley
Add more config testing
100
        branch = self.make_branch('.', format='knit')
101
        branch.set_push_location('foo')
102
        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
103
        self.assertFileEqual("# comment\n"
104
                             "[%s]\n"
2230.3.3 by Aaron Bentley
Add more config testing
105
                             "push_location = foo\n"
3221.7.1 by Matt Nordhoff
Upgrade ConfigObj to version 4.5.1.
106
                             "push_location:policy = norecurse\n" % local_path,
5345.1.11 by Vincent Ladeuil
Cleanup bt.test_branch.
107
                             config.locations_config_filename())
2230.3.3 by Aaron Bentley
Add more config testing
108
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
109
    # TODO RBC 20051029 test getting a push location from a branch in a
2230.3.3 by Aaron Bentley
Add more config testing
110
    # recursive section - that is, it appends the branch name.
111
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
112
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
113
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.
114
    """A sample format
115
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
116
    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.
117
    open and open_downlevel routines.
118
    """
119
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
120
    @classmethod
121
    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.
122
        """See BzrBranchFormat.get_format_string()."""
123
        return "Sample branch format."
124
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
125
    def initialize(self, a_controldir, name=None, repository=None,
6123.9.15 by Jelmer Vernooij
More test fixes.
126
                   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.
127
        """Format 4 branches cannot be created."""
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
128
        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
129
        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.
130
        return 'A branch'
131
132
    def is_supported(self):
133
        return False
134
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
135
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
136
             possible_transports=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
137
        return "opened branch."
138
139
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
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.
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
145
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
146
    """A sample supported format."""
147
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
148
    @classmethod
149
    def get_format_string(cls):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
150
        """See BzrBranchFormat.get_format_string()."""
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
151
        return SampleSupportedBranchFormatString
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
152
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
153
    def initialize(self, a_controldir, name=None, append_revisions_only=None):
154
        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
155
        t.put_bytes('format', self.get_format_string())
156
        return 'A branch'
157
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
158
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
159
             possible_transports=None):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
160
        return "opened supported branch."
161
162
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
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
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
174
    def initialize(self, a_controldir, name=None):
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
175
        raise NotImplementedError(self.initialize)
176
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
177
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
178
             possible_transports=None):
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
179
        raise NotImplementedError(self.open)
180
181
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
182
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.
183
    """Tests for the BzrBranchFormat facility."""
184
185
    def test_find_format(self):
186
        # is the right format object found for a branch?
187
        # create a branch with a few known format objects.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
188
        # 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.
189
        self.build_tree(["foo/", "bar/"])
190
        def check_format(format, url):
191
            dir = format._matchingbzrdir.initialize(url)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
192
            dir.create_repository()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
193
            format.initialize(dir)
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
194
            found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
195
            self.assertIsInstance(found_format, format.__class__)
6517.1.6 by Jelmer Vernooij
Fix remaining tests.
196
        check_format(BzrBranchFormat5(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
197
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
198
    def test_from_string(self):
199
        self.assertIsInstance(
200
            SampleBranchFormat.from_string("Sample branch format."),
201
            SampleBranchFormat)
6213.1.54 by Jelmer Vernooij
Fix tests.
202
        self.assertRaises(AssertionError,
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
203
            SampleBranchFormat.from_string, "Different branch format.")
204
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
205
    def test_find_format_not_branch(self):
206
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
207
        self.assertRaises(errors.NotBranchError,
6653.1.2 by Jelmer Vernooij
Fix imports.
208
                          _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.
209
                          dir)
210
211
    def test_find_format_unknown_format(self):
212
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
213
        SampleBranchFormat().initialize(dir)
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
214
        self.assertRaises(errors.UnknownFormatError,
6653.1.2 by Jelmer Vernooij
Fix imports.
215
                          _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.
216
                          dir)
217
6213.1.13 by Jelmer Vernooij
make some methods class methods.
218
    def test_find_format_with_features(self):
219
        tree = self.make_branch_and_tree('.', format='2a')
6213.1.57 by Jelmer Vernooij
Add Branch.update_features.
220
        tree.branch.update_feature_flags({"name": "optional"})
6653.6.4 by Jelmer Vernooij
Merge trunk.
221
        found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(tree.controldir)
6653.1.2 by Jelmer Vernooij
Fix imports.
222
        self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
223
        self.assertEqual(found_format.features.get("name"), "optional")
6213.1.57 by Jelmer Vernooij
Add Branch.update_features.
224
        tree.branch.update_feature_flags({"name": None})
225
        branch = _mod_branch.Branch.open('.')
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
226
        self.assertEqual(branch._format.features, {})
6213.1.13 by Jelmer Vernooij
make some methods class methods.
227
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.
228
5662.2.6 by Jelmer Vernooij
add more tests.
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)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
239
        self.assertEqual(format, self.registry.get_default())
5662.2.6 by Jelmer Vernooij
add more tests.
240
241
    def test_register_unregister_format(self):
242
        format = SampleBranchFormat()
243
        self.registry.register(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
244
        self.assertEqual(format,
5662.2.6 by Jelmer Vernooij
add more tests.
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()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
252
        self.assertEqual([], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
253
        self.registry.register(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
254
        self.assertEqual([format], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
255
256
    def test_register_extra(self):
257
        format = SampleExtraBranchFormat()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
258
        self.assertEqual([], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
259
        self.registry.register_extra(format)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
260
        self.assertEqual([format], self.registry._get_all())
5662.2.6 by Jelmer Vernooij
add more tests.
261
262
    def test_register_extra_lazy(self):
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
263
        self.assertEqual([], self.registry._get_all())
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
264
        self.registry.register_extra_lazy("breezy.tests.test_branch",
5662.2.6 by Jelmer Vernooij
add more tests.
265
            "SampleExtraBranchFormat")
266
        formats = self.registry._get_all()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
267
        self.assertEqual(1, len(formats))
5662.2.6 by Jelmer Vernooij
add more tests.
268
        self.assertIsInstance(formats[0], SampleExtraBranchFormat)
269
270
3221.11.2 by Robert Collins
Create basic stackable branch facility.
271
class TestBranch67(object):
272
    """Common tests for both branch 6 and 7 which are mostly the same."""
273
274
    def get_format_name(self):
275
        raise NotImplementedError(self.get_format_name)
276
277
    def get_format_name_subtree(self):
278
        raise NotImplementedError(self.get_format_name)
279
280
    def get_class(self):
281
        raise NotImplementedError(self.get_class)
2230.3.1 by Aaron Bentley
Get branch6 creation working
282
283
    def test_creation(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
284
        format = bzrdir.BzrDirMetaFormat1()
6653.1.6 by Jelmer Vernooij
Fix some more imports.
285
        format.set_branch_format(_mod_bzrbranch.BzrBranchFormat6())
2230.3.1 by Aaron Bentley
Get branch6 creation working
286
        branch = self.make_branch('a', format=format)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
287
        self.assertIsInstance(branch, self.get_class())
288
        branch = self.make_branch('b', format=self.get_format_name())
289
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
290
        branch = _mod_branch.Branch.open('a')
3221.11.2 by Robert Collins
Create basic stackable branch facility.
291
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
292
293
    def test_layout(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
294
        branch = self.make_branch('a', format=self.get_format_name())
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
295
        self.assertPathExists('a/.bzr/branch/last-revision')
296
        self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
297
        self.assertPathDoesNotExist('a/.bzr/branch/references')
2230.3.1 by Aaron Bentley
Get branch6 creation working
298
2230.3.3 by Aaron Bentley
Add more config testing
299
    def test_config(self):
300
        """Ensure that all configuration data is stored in the branch"""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
301
        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).
302
        branch.set_parent('http://example.com')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
303
        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).
304
        self.assertEqual('http://example.com', branch.get_parent())
305
        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.
306
        conf = branch.get_config_stack()
307
        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).
308
        branch.set_bound_location('ftp://example.com')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
309
        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).
310
        self.assertEqual('ftp://example.com', branch.get_bound_location())
2230.3.3 by Aaron Bentley
Add more config testing
311
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
312
    def do_checkout_test(self, lightweight=False):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
313
        tree = self.make_branch_and_tree('source',
314
            format=self.get_format_name_subtree())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
315
        subtree = self.make_branch_and_tree('source/subtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
316
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
317
        subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
318
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
319
        self.build_tree(['source/subtree/file',
320
                         'source/subtree/subsubtree/file'])
321
        subsubtree.add('file')
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
322
        subtree.add('file')
2100.3.25 by Aaron Bentley
add subsubtree to test
323
        subtree.add_reference(subsubtree)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
324
        tree.add_reference(subtree)
325
        tree.commit('a revision')
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
326
        subtree.commit('a subtree file')
2100.3.25 by Aaron Bentley
add subsubtree to test
327
        subsubtree.commit('a subsubtree file')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
328
        tree.branch.create_checkout('target', lightweight=lightweight)
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
329
        self.assertPathExists('target')
330
        self.assertPathExists('target/subtree')
331
        self.assertPathExists('target/subtree/file')
332
        self.assertPathExists('target/subtree/subsubtree/file')
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
333
        subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
334
        if lightweight:
335
            self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
336
        else:
337
            self.assertEndsWith(subbranch.base, 'target/subtree/subsubtree/')
338
339
    def test_checkout_with_references(self):
340
        self.do_checkout_test()
341
342
    def test_light_checkout_with_references(self):
343
        self.do_checkout_test(lightweight=True)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
344
3445.2.1 by John Arbash Meinel
Add tests for Branch.missing_revisions and deprecate it.
345
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
346
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
347
348
    def get_class(self):
6653.1.6 by Jelmer Vernooij
Fix some more imports.
349
        return _mod_bzrbranch.BzrBranch6
3221.11.2 by Robert Collins
Create basic stackable branch facility.
350
351
    def get_format_name(self):
352
        return "dirstate-tags"
353
354
    def get_format_name_subtree(self):
355
        return "dirstate-with-subtree"
356
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
357
    def test_set_stacked_on_url_errors(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
358
        branch = self.make_branch('a', format=self.get_format_name())
359
        self.assertRaises(errors.UnstackableBranchFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
360
            branch.set_stacked_on_url, None)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
361
362
    def test_default_stacked_location(self):
363
        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
364
        self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
365
366
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
367
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
368
369
    def get_class(self):
6653.1.6 by Jelmer Vernooij
Fix some more imports.
370
        return _mod_bzrbranch.BzrBranch7
3221.11.2 by Robert Collins
Create basic stackable branch facility.
371
372
    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)
373
        return "1.9"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
374
375
    def get_format_name_subtree(self):
376
        return "development-subtree"
377
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
378
    def test_set_stacked_on_url_unstackable_repo(self):
3221.11.6 by Robert Collins
Stackable branch fixes.
379
        repo = self.make_repository('a', format='dirstate-tags')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
380
        control = repo.controldir
6653.1.6 by Jelmer Vernooij
Fix some more imports.
381
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
382
        target = self.make_branch('b')
383
        self.assertRaises(errors.UnstackableRepositoryFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
384
            branch.set_stacked_on_url, target.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
385
3242.3.21 by Jonathan Lange
Preserve stacking in clone
386
    def test_clone_stacked_on_unstackable_repo(self):
387
        repo = self.make_repository('a', format='dirstate-tags')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
388
        control = repo.controldir
6653.1.6 by Jelmer Vernooij
Fix some more imports.
389
        branch = _mod_bzrbranch.BzrBranchFormat7().initialize(control)
3242.3.21 by Jonathan Lange
Preserve stacking in clone
390
        # Calling clone should not raise UnstackableRepositoryFormat.
391
        cloned_bzrdir = control.clone('cloned')
392
3221.11.2 by Robert Collins
Create basic stackable branch facility.
393
    def _test_default_stacked_location(self):
394
        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
395
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
396
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
397
    def test_stack_and_unstack(self):
398
        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.
399
        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
400
        branch.set_stacked_on_url(target.branch.base)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
401
        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.
402
        revid = target.commit('foo')
403
        self.assertTrue(branch.repository.has_revision(revid))
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
404
        branch.set_stacked_on_url(None)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
405
        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.
406
        self.assertFalse(branch.repository.has_revision(revid))
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
407
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
408
    def test_open_opens_stacked_reference(self):
409
        branch = self.make_branch('a', format=self.get_format_name())
410
        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
411
        branch.set_stacked_on_url(target.branch.base)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
412
        branch = branch.controldir.open_branch()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
413
        revid = target.commit('foo')
414
        self.assertTrue(branch.repository.has_revision(revid))
415
3221.11.2 by Robert Collins
Create basic stackable branch facility.
416
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
417
class BzrBranch8(tests.TestCaseWithTransport):
4273.1.15 by Aaron Bentley
Add reference_info caching.
418
419
    def make_branch(self, location, format=None):
420
        if format is None:
6653.6.5 by Jelmer Vernooij
Rename make_bzrdir to make_controldir.
421
            format = controldir.format_registry.make_controldir('1.9')
6653.1.6 by Jelmer Vernooij
Fix some more imports.
422
            format.set_branch_format(_mod_bzrbranch.BzrBranchFormat8())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
423
        return tests.TestCaseWithTransport.make_branch(
424
            self, location, format=format)
4273.1.15 by Aaron Bentley
Add reference_info caching.
425
426
    def create_branch_with_reference(self):
427
        branch = self.make_branch('branch')
428
        branch._set_all_reference_info({'file-id': ('path', 'location')})
429
        return branch
430
431
    @staticmethod
432
    def instrument_branch(branch, gets):
433
        old_get = branch._transport.get
434
        def get(*args, **kwargs):
435
            gets.append((args, kwargs))
436
            return old_get(*args, **kwargs)
437
        branch._transport.get = get
438
439
    def test_reference_info_caching_read_locked(self):
440
        gets = []
441
        branch = self.create_branch_with_reference()
442
        branch.lock_read()
443
        self.addCleanup(branch.unlock)
444
        self.instrument_branch(branch, gets)
445
        branch.get_reference_info('file-id')
446
        branch.get_reference_info('file-id')
447
        self.assertEqual(1, len(gets))
448
449
    def test_reference_info_caching_read_unlocked(self):
450
        gets = []
451
        branch = self.create_branch_with_reference()
452
        self.instrument_branch(branch, gets)
453
        branch.get_reference_info('file-id')
454
        branch.get_reference_info('file-id')
455
        self.assertEqual(2, len(gets))
456
457
    def test_reference_info_caching_write_locked(self):
458
        gets = []
459
        branch = self.make_branch('branch')
460
        branch.lock_write()
461
        self.instrument_branch(branch, gets)
462
        self.addCleanup(branch.unlock)
463
        branch._set_all_reference_info({'file-id': ('path2', 'location2')})
464
        path, location = branch.get_reference_info('file-id')
465
        self.assertEqual(0, len(gets))
466
        self.assertEqual('path2', path)
467
        self.assertEqual('location2', location)
468
469
    def test_reference_info_caches_cleared(self):
470
        branch = self.make_branch('branch')
471
        branch.lock_write()
472
        branch.set_reference_info('file-id', 'path2', 'location2')
473
        branch.unlock()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
474
        doppelganger = _mod_branch.Branch.open('branch')
4273.1.15 by Aaron Bentley
Add reference_info caching.
475
        doppelganger.set_reference_info('file-id', 'path3', 'location3')
476
        self.assertEqual(('path3', 'location3'),
477
                         branch.get_reference_info('file-id'))
478
6165.4.11 by Jelmer Vernooij
More test fixes.
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
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
489
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.
490
    """Tests for the branch reference facility."""
491
492
    def test_create_open_reference(self):
493
        bzrdirformat = bzrdir.BzrDirMetaFormat1()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
494
        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.
495
        t.mkdir('repo')
496
        dir = bzrdirformat.initialize(self.get_url('repo'))
497
        dir.create_repository()
498
        target_branch = dir.create_branch()
499
        t.mkdir('branch')
500
        branch_dir = bzrdirformat.initialize(self.get_url('branch'))
6653.1.2 by Jelmer Vernooij
Fix imports.
501
        made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
502
            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.
503
        self.assertEqual(made_branch.base, target_branch.base)
504
        opened_branch = branch_dir.open_branch()
505
        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.
506
507
    def test_get_reference(self):
6437.7.3 by Jelmer Vernooij
Use ControlDir.set_branch_reference.
508
        """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.
509
        branch = self.make_branch('target')
510
        checkout = branch.create_checkout('checkout', lightweight=True)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
511
        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.
512
        # if the api for create_checkout changes to return different checkout types
513
        # then this file read will fail.
514
        self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
515
        self.assertEqual(reference_url,
6653.6.4 by Jelmer Vernooij
Merge trunk.
516
            _mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.controldir))
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
517
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
518
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
519
class TestHooks(tests.TestCaseWithTransport):
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
520
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.
521
    def test_constructor(self):
522
        """Check that creating a BranchHooks instance has the right defaults."""
5622.3.15 by Jelmer Vernooij
Fix branch hooks constructor test.
523
        hooks = _mod_branch.BranchHooks()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
524
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
525
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
526
        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
527
        self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
528
        self.assertTrue("post_uncommit" in hooks,
529
                        "post_uncommit not in %s" % hooks)
3331.1.4 by James Henstridge
Adjust my tests to pass with Ian's API.
530
        self.assertTrue("post_change_branch_tip" in hooks,
531
                        "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,
532
        self.assertTrue("post_branch_init" in hooks,
533
                        "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',
534
        self.assertTrue("post_switch" in hooks,
535
                        "post_switch not in %s" % hooks)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
536
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.
537
    def test_installed_hooks_are_BranchHooks(self):
538
        """The installed hooks object should be a BranchHooks."""
539
        # the installed hooks are saved in self._preserved_hooks.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
540
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
541
                              _mod_branch.BranchHooks)
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
542
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
543
    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',
544
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
545
        _mod_branch.Branch.hooks.install_named_hook('post_branch_init',
546
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
547
        self.assertLength(0, calls)
548
        branch = self.make_branch('a')
549
        self.assertLength(1, calls)
550
        params = calls[0]
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
551
        self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
6653.6.3 by Jelmer Vernooij
Fix last tests.
552
        self.assertTrue(hasattr(params, 'controldir'))
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
553
        self.assertTrue(hasattr(params, 'branch'))
554
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
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
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
564
    def test_post_switch_hook(self):
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
565
        from .. import switch
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
566
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
567
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
568
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
569
        tree = self.make_branch_and_tree('branch-1')
570
        self.build_tree(['branch-1/file-1'])
571
        tree.add('file-1')
572
        tree.commit('rev1')
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
573
        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',
574
        self.build_tree(['branch-1/file-2'])
575
        tree.add('file-2')
576
        tree.remove('file-1')
577
        tree.commit('rev2')
578
        checkout = tree.branch.create_checkout('checkout')
579
        self.assertLength(0, calls)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
580
        switch.switch(checkout.controldir, to_branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
581
        self.assertLength(1, calls)
582
        params = calls[0]
583
        self.assertIsInstance(params, _mod_branch.SwitchHookParams)
584
        self.assertTrue(hasattr(params, 'to_branch'))
585
        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()
586
5176.1.1 by Vincent Ladeuil
Warn if a config variable can't be interpreted as a boolean
587
588
class TestBranchOptions(tests.TestCaseWithTransport):
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
589
4989.2.5 by Vincent Ladeuil
Clarify tests.
590
    def setUp(self):
591
        super(TestBranchOptions, self).setUp()
592
        self.branch = self.make_branch('.')
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
593
        self.config_stack = self.branch.get_config_stack()
4989.2.5 by Vincent Ladeuil
Clarify tests.
594
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
595
    def check_append_revisions_only(self, expected_value, value=None):
596
        """Set append_revisions_only in config and check its interpretation."""
4989.2.5 by Vincent Ladeuil
Clarify tests.
597
        if value is not None:
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
598
            self.config_stack.set('append_revisions_only', value)
4989.2.5 by Vincent Ladeuil
Clarify tests.
599
        self.assertEqual(expected_value,
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
600
                         self.branch.get_append_revisions_only())
4989.2.5 by Vincent Ladeuil
Clarify tests.
601
602
    def test_valid_append_revisions_only(self):
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
603
        self.assertEqual(None,
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
604
                          self.config_stack.get('append_revisions_only'))
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
605
        self.check_append_revisions_only(None)
606
        self.check_append_revisions_only(False, 'False')
607
        self.check_append_revisions_only(True, 'True')
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
608
        # The following values will cause compatibility problems on projects
609
        # using older bzr versions (<2.2) but are accepted
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
610
        self.check_append_revisions_only(False, 'false')
611
        self.check_append_revisions_only(True, 'true')
4989.2.5 by Vincent Ladeuil
Clarify tests.
612
613
    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
614
        """Ensure warning is noted on invalid settings"""
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
615
        self.warnings = []
616
        def warning(*args):
617
            self.warnings.append(args[0] % args[1:])
618
        self.overrideAttr(trace, 'warning', warning)
619
        self.check_append_revisions_only(None, 'not-a-bool')
620
        self.assertLength(1, self.warnings)
621
        self.assertEqual(
6372.4.2 by Jelmer Vernooij
Fix remaining tests.
622
            'Value "not-a-bool" is not valid for "append_revisions_only"',
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
623
            self.warnings[0])
4989.2.5 by Vincent Ladeuil
Clarify tests.
624
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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())
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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'))
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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')
6480.1.2 by Aaron Bentley
Updates from review.
645
        result = self.branch.get_config_stack().get('foo')
6480.1.3 by Aaron Bentley
Mention bugs in comments.
646
        # https://bugs.launchpad.net/bzr/+bug/948344
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
647
        self.expectFailure('BranchStack uses cache after set_user_option',
6480.1.2 by Aaron Bentley
Updates from review.
648
                           self.assertEqual, 'bar', result)
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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')
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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,
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
657
                         self.branch.get_config().get_user_option('foo'))
658
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
659
    def test_set_delays_write_when_branch_is_locked(self):
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
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)
6480.1.2 by Aaron Bentley
Updates from review.
664
        result = copy.get_config_stack().get('foo')
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
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)
6480.1.1 by Aaron Bentley
Add tests of ConfigStack caching and interoperation.
669
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
670
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
671
class TestPullResult(tests.TestCase):
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
672
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
673
    def test_report_changed(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
674
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
675
        r.old_revid = "old-revid"
676
        r.old_revno = 10
677
        r.new_revid = "new-revid"
678
        r.new_revno = 20
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
679
        f = BytesIO()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
680
        r.report(f)
681
        self.assertEqual("Now on revision 20.\n", f.getvalue())
6349.2.5 by Jelmer Vernooij
Add test for BranchFormatMetadir.from_string.
682
        self.assertEqual("Now on revision 20.\n", f.getvalue())
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
683
684
    def test_report_unchanged(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
685
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
686
        r.old_revid = "same-revid"
687
        r.new_revid = "same-revid"
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
688
        f = BytesIO()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
689
        r.report(f)
6112.4.7 by Jelmer Vernooij
Fix tests.
690
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())