~bzr-pqm/bzr/bzr.dev

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