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