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