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