1
# Copyright (C) 2006-2011 Canonical Ltd
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.
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.
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Tests for the Branch facility that are not interface tests.
19
For interface tests see `tests/per_branch/*.py`.
21
For concrete class tests see this file, and for meta-branch tests
25
from cStringIO import StringIO
28
branch as _mod_branch,
39
class TestDefaultFormat(tests.TestCase):
41
def test_default_format(self):
42
# update this if you change the default branch format
43
self.assertIsInstance(_mod_branch.format_registry.get_default(),
44
_mod_branch.BzrBranchFormat7)
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
48
# set, but at the moment that's not true -- mbp 20070814 --
49
# https://bugs.launchpad.net/bzr/+bug/132376
51
_mod_branch.format_registry.get_default(),
52
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
54
def test_get_set_default_format(self):
55
# set the format and then set it back again
56
old_format = _mod_branch.format_registry.get_default()
57
_mod_branch.format_registry.set_default(SampleBranchFormat())
59
# the default branch format is used by the meta dir format
60
# which is not the default bzrdir format at this point
61
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
62
result = dir.create_branch()
63
self.assertEqual(result, 'A branch')
65
_mod_branch.format_registry.set_default(old_format)
66
self.assertEqual(old_format,
67
_mod_branch.format_registry.get_default())
70
class TestBranchFormat5(tests.TestCaseWithTransport):
71
"""Tests specific to branch format 5"""
73
def test_branch_format_5_uses_lockdir(self):
75
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
bdir.create_repository()
77
branch = _mod_branch.BzrBranchFormat5().initialize(bdir)
78
t = self.get_transport()
79
self.log("branch instance is %r" % branch)
80
self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
81
self.assertIsDirectory('.', t)
82
self.assertIsDirectory('.bzr/branch', t)
83
self.assertIsDirectory('.bzr/branch/lock', t)
85
self.addCleanup(branch.unlock)
86
self.assertIsDirectory('.bzr/branch/lock/held', t)
88
def test_set_push_location(self):
89
conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
91
branch = self.make_branch('.', format='knit')
92
branch.set_push_location('foo')
93
local_path = urlutils.local_path_from_url(branch.base[:-1])
94
self.assertFileEqual("# comment\n"
96
"push_location = foo\n"
97
"push_location:policy = norecurse\n" % local_path,
98
config.locations_config_filename())
100
# TODO RBC 20051029 test getting a push location from a branch in a
101
# recursive section - that is, it appends the branch name.
104
class SampleBranchFormat(_mod_branch.BranchFormat):
107
this format is initializable, unsupported to aid in testing the
108
open and open_downlevel routines.
111
def get_format_string(self):
112
"""See BzrBranchFormat.get_format_string()."""
113
return "Sample branch format."
115
def initialize(self, a_bzrdir, name=None, repository=None,
116
append_revisions_only=None):
117
"""Format 4 branches cannot be created."""
118
t = a_bzrdir.get_branch_transport(self, name=name)
119
t.put_bytes('format', self.get_format_string())
122
def is_supported(self):
125
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
126
possible_transports=None):
127
return "opened branch."
130
# Demonstrating how lazy loading is often implemented:
131
# A constant string is created.
132
SampleSupportedBranchFormatString = "Sample supported branch format."
134
# And the format class can then reference the constant to avoid skew.
135
class SampleSupportedBranchFormat(_mod_branch.BranchFormat):
136
"""A sample supported format."""
138
def get_format_string(self):
139
"""See BzrBranchFormat.get_format_string()."""
140
return SampleSupportedBranchFormatString
142
def initialize(self, a_bzrdir, name=None, append_revisions_only=None):
143
t = a_bzrdir.get_branch_transport(self, name=name)
144
t.put_bytes('format', self.get_format_string())
147
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
148
possible_transports=None):
149
return "opened supported branch."
152
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
153
"""A sample format that is not usable in a metadir."""
155
def get_format_string(self):
156
# This format is not usable in a metadir.
159
def network_name(self):
160
# Network name always has to be provided.
163
def initialize(self, a_bzrdir, name=None):
164
raise NotImplementedError(self.initialize)
166
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
167
possible_transports=None):
168
raise NotImplementedError(self.open)
171
class TestBzrBranchFormat(tests.TestCaseWithTransport):
172
"""Tests for the BzrBranchFormat facility."""
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.
177
# this is not quite the same as
178
self.build_tree(["foo/", "bar/"])
179
def check_format(format, url):
180
dir = format._matchingbzrdir.initialize(url)
181
dir.create_repository()
182
format.initialize(dir)
183
found_format = _mod_branch.BranchFormat.find_format(dir)
184
self.assertIsInstance(found_format, format.__class__)
185
check_format(_mod_branch.BzrBranchFormat5(), "bar")
187
def test_find_format_factory(self):
188
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
189
SampleSupportedBranchFormat().initialize(dir)
190
factory = _mod_branch.MetaDirBranchFormatFactory(
191
SampleSupportedBranchFormatString,
192
"bzrlib.tests.test_branch", "SampleSupportedBranchFormat")
193
_mod_branch.format_registry.register(factory)
194
self.addCleanup(_mod_branch.format_registry.remove, factory)
195
b = _mod_branch.Branch.open(self.get_url())
196
self.assertEqual(b, "opened supported branch.")
198
def test_find_format_not_branch(self):
199
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
200
self.assertRaises(errors.NotBranchError,
201
_mod_branch.BranchFormat.find_format,
204
def test_find_format_unknown_format(self):
205
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
206
SampleBranchFormat().initialize(dir)
207
self.assertRaises(errors.UnknownFormatError,
208
_mod_branch.BranchFormat.find_format,
211
def test_register_unregister_format(self):
212
# Test the deprecated format registration functions
213
format = SampleBranchFormat()
215
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
217
format.initialize(dir)
218
# register a format for it.
219
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
220
_mod_branch.BranchFormat.register_format, format)
221
# which branch.Open will refuse (not supported)
222
self.assertRaises(errors.UnsupportedFormatError,
223
_mod_branch.Branch.open, self.get_url())
224
self.make_branch_and_tree('foo')
225
# but open_downlevel will work
228
bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
229
# unregister the format
230
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
231
_mod_branch.BranchFormat.unregister_format, format)
232
self.make_branch_and_tree('bar')
235
class TestBranchFormatRegistry(tests.TestCase):
238
super(TestBranchFormatRegistry, self).setUp()
239
self.registry = _mod_branch.BranchFormatRegistry()
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())
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.")
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())
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())
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)
277
#Used by TestMetaDirBranchFormatFactory
278
FakeLazyFormat = None
281
class TestMetaDirBranchFormatFactory(tests.TestCase):
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())
288
def test_call_loads(self):
289
# __call__ is used by the network_format_registry interface to get a
291
global FakeLazyFormat
293
factory = _mod_branch.MetaDirBranchFormatFactory(None,
294
"bzrlib.tests.test_branch", "FakeLazyFormat")
295
self.assertRaises(AttributeError, factory)
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())
305
class TestBranch67(object):
306
"""Common tests for both branch 6 and 7 which are mostly the same."""
308
def get_format_name(self):
309
raise NotImplementedError(self.get_format_name)
311
def get_format_name_subtree(self):
312
raise NotImplementedError(self.get_format_name)
315
raise NotImplementedError(self.get_class)
317
def test_creation(self):
318
format = bzrdir.BzrDirMetaFormat1()
319
format.set_branch_format(_mod_branch.BzrBranchFormat6())
320
branch = self.make_branch('a', format=format)
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())
324
branch = _mod_branch.Branch.open('a')
325
self.assertIsInstance(branch, self.get_class())
327
def test_layout(self):
328
branch = self.make_branch('a', format=self.get_format_name())
329
self.assertPathExists('a/.bzr/branch/last-revision')
330
self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
331
self.assertPathDoesNotExist('a/.bzr/branch/references')
333
def test_config(self):
334
"""Ensure that all configuration data is stored in the branch"""
335
branch = self.make_branch('a', format=self.get_format_name())
336
branch.set_parent('http://example.com')
337
self.assertPathDoesNotExist('a/.bzr/branch/parent')
338
self.assertEqual('http://example.com', branch.get_parent())
339
branch.set_push_location('sftp://example.com')
340
config = branch.get_config()._get_branch_data_config()
341
self.assertEqual('sftp://example.com',
342
config.get_user_option('push_location'))
343
branch.set_bound_location('ftp://example.com')
344
self.assertPathDoesNotExist('a/.bzr/branch/bound')
345
self.assertEqual('ftp://example.com', branch.get_bound_location())
347
def test_set_revision_history(self):
348
builder = self.make_branch_builder('.', format=self.get_format_name())
349
builder.build_snapshot('foo', None,
350
[('add', ('', None, 'directory', None))],
352
builder.build_snapshot('bar', None, [], message='bar')
353
branch = builder.get_branch()
355
self.addCleanup(branch.unlock)
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'])
360
self.assertRaises(errors.NotLefthandHistory,
361
self.applyDeprecated, symbol_versioning.deprecated_in((2, 4, 0)),
362
branch.set_revision_history, ['bar'])
364
def do_checkout_test(self, lightweight=False):
365
tree = self.make_branch_and_tree('source',
366
format=self.get_format_name_subtree())
367
subtree = self.make_branch_and_tree('source/subtree',
368
format=self.get_format_name_subtree())
369
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
370
format=self.get_format_name_subtree())
371
self.build_tree(['source/subtree/file',
372
'source/subtree/subsubtree/file'])
373
subsubtree.add('file')
375
subtree.add_reference(subsubtree)
376
tree.add_reference(subtree)
377
tree.commit('a revision')
378
subtree.commit('a subtree file')
379
subsubtree.commit('a subsubtree file')
380
tree.branch.create_checkout('target', lightweight=lightweight)
381
self.assertPathExists('target')
382
self.assertPathExists('target/subtree')
383
self.assertPathExists('target/subtree/file')
384
self.assertPathExists('target/subtree/subsubtree/file')
385
subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
387
self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
389
self.assertEndsWith(subbranch.base, 'target/subtree/subsubtree/')
391
def test_checkout_with_references(self):
392
self.do_checkout_test()
394
def test_light_checkout_with_references(self):
395
self.do_checkout_test(lightweight=True)
397
def test_set_push(self):
398
branch = self.make_branch('source', format=self.get_format_name())
399
branch.get_config().set_user_option('push_location', 'old',
400
store=config.STORE_LOCATION)
403
warnings.append(args[0] % args[1:])
404
_warning = trace.warning
405
trace.warning = warning
407
branch.set_push_location('new')
409
trace.warning = _warning
410
self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
414
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
417
return _mod_branch.BzrBranch6
419
def get_format_name(self):
420
return "dirstate-tags"
422
def get_format_name_subtree(self):
423
return "dirstate-with-subtree"
425
def test_set_stacked_on_url_errors(self):
426
branch = self.make_branch('a', format=self.get_format_name())
427
self.assertRaises(errors.UnstackableBranchFormat,
428
branch.set_stacked_on_url, None)
430
def test_default_stacked_location(self):
431
branch = self.make_branch('a', format=self.get_format_name())
432
self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
435
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
438
return _mod_branch.BzrBranch7
440
def get_format_name(self):
443
def get_format_name_subtree(self):
444
return "development-subtree"
446
def test_set_stacked_on_url_unstackable_repo(self):
447
repo = self.make_repository('a', format='dirstate-tags')
448
control = repo.bzrdir
449
branch = _mod_branch.BzrBranchFormat7().initialize(control)
450
target = self.make_branch('b')
451
self.assertRaises(errors.UnstackableRepositoryFormat,
452
branch.set_stacked_on_url, target.base)
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')
461
def _test_default_stacked_location(self):
462
branch = self.make_branch('a', format=self.get_format_name())
463
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
465
def test_stack_and_unstack(self):
466
branch = self.make_branch('a', format=self.get_format_name())
467
target = self.make_branch_and_tree('b', format=self.get_format_name())
468
branch.set_stacked_on_url(target.branch.base)
469
self.assertEqual(target.branch.base, branch.get_stacked_on_url())
470
revid = target.commit('foo')
471
self.assertTrue(branch.repository.has_revision(revid))
472
branch.set_stacked_on_url(None)
473
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
474
self.assertFalse(branch.repository.has_revision(revid))
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())
479
branch.set_stacked_on_url(target.branch.base)
480
branch = branch.bzrdir.open_branch()
481
revid = target.commit('foo')
482
self.assertTrue(branch.repository.has_revision(revid))
485
class BzrBranch8(tests.TestCaseWithTransport):
487
def make_branch(self, location, format=None):
489
format = bzrdir.format_registry.make_bzrdir('1.9')
490
format.set_branch_format(_mod_branch.BzrBranchFormat8())
491
return tests.TestCaseWithTransport.make_branch(
492
self, location, format=format)
494
def create_branch_with_reference(self):
495
branch = self.make_branch('branch')
496
branch._set_all_reference_info({'file-id': ('path', 'location')})
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
507
def test_reference_info_caching_read_locked(self):
509
branch = self.create_branch_with_reference()
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))
517
def test_reference_info_caching_read_unlocked(self):
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))
525
def test_reference_info_caching_write_locked(self):
527
branch = self.make_branch('branch')
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)
537
def test_reference_info_caches_cleared(self):
538
branch = self.make_branch('branch')
540
branch.set_reference_info('file-id', 'path2', 'location2')
542
doppelganger = _mod_branch.Branch.open('branch')
543
doppelganger.set_reference_info('file-id', 'path3', 'location3')
544
self.assertEqual(('path3', 'location3'),
545
branch.get_reference_info('file-id'))
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):
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
557
class TestBranchReference(tests.TestCaseWithTransport):
558
"""Tests for the branch reference facility."""
560
def test_create_open_reference(self):
561
bzrdirformat = bzrdir.BzrDirMetaFormat1()
562
t = self.get_transport()
564
dir = bzrdirformat.initialize(self.get_url('repo'))
565
dir.create_repository()
566
target_branch = dir.create_branch()
568
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
569
made_branch = _mod_branch.BranchReferenceFormat().initialize(
570
branch_dir, target_branch=target_branch)
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)
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,
584
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
587
class TestHooks(tests.TestCaseWithTransport):
589
def test_constructor(self):
590
"""Check that creating a BranchHooks instance has the right defaults."""
591
hooks = _mod_branch.BranchHooks()
592
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
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)
595
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
596
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
597
self.assertTrue("post_uncommit" in hooks,
598
"post_uncommit not in %s" % hooks)
599
self.assertTrue("post_change_branch_tip" in hooks,
600
"post_change_branch_tip not in %s" % hooks)
601
self.assertTrue("post_branch_init" in hooks,
602
"post_branch_init not in %s" % hooks)
603
self.assertTrue("post_switch" in hooks,
604
"post_switch not in %s" % hooks)
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.
609
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
610
_mod_branch.BranchHooks)
612
def test_post_branch_init_hook(self):
614
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
616
self.assertLength(0, calls)
617
branch = self.make_branch('a')
618
self.assertLength(1, calls)
620
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
621
self.assertTrue(hasattr(params, 'bzrdir'))
622
self.assertTrue(hasattr(params, 'branch'))
624
def test_post_branch_init_hook_repr(self):
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 ')
633
def test_post_switch_hook(self):
634
from bzrlib import switch
636
_mod_branch.Branch.hooks.install_named_hook('post_switch',
638
tree = self.make_branch_and_tree('branch-1')
639
self.build_tree(['branch-1/file-1'])
642
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
643
self.build_tree(['branch-1/file-2'])
645
tree.remove('file-1')
647
checkout = tree.branch.create_checkout('checkout')
648
self.assertLength(0, calls)
649
switch.switch(checkout.bzrdir, to_branch)
650
self.assertLength(1, calls)
652
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
653
self.assertTrue(hasattr(params, 'to_branch'))
654
self.assertTrue(hasattr(params, 'revision_id'))
657
class TestBranchOptions(tests.TestCaseWithTransport):
660
super(TestBranchOptions, self).setUp()
661
self.branch = self.make_branch('.')
662
self.config = self.branch.get_config()
664
def check_append_revisions_only(self, expected_value, value=None):
665
"""Set append_revisions_only in config and check its interpretation."""
666
if value is not None:
667
self.config.set_user_option('append_revisions_only', value)
668
self.assertEqual(expected_value,
669
self.branch.get_append_revisions_only())
671
def test_valid_append_revisions_only(self):
672
self.assertEquals(None,
673
self.config.get_user_option('append_revisions_only'))
674
self.check_append_revisions_only(None)
675
self.check_append_revisions_only(False, 'False')
676
self.check_append_revisions_only(True, 'True')
677
# The following values will cause compatibility problems on projects
678
# using older bzr versions (<2.2) but are accepted
679
self.check_append_revisions_only(False, 'false')
680
self.check_append_revisions_only(True, 'true')
682
def test_invalid_append_revisions_only(self):
683
"""Ensure warning is noted on invalid settings"""
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)
691
'Value "not-a-bool" is not a boolean for "append_revisions_only"',
695
class TestPullResult(tests.TestCase):
697
def test_pull_result_to_int(self):
698
# to support old code, the pull result can be used as an int
699
r = _mod_branch.PullResult()
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
705
self.assertEqual(self.applyDeprecated(
706
symbol_versioning.deprecated_in((2, 3, 0)),
710
def test_report_changed(self):
711
r = _mod_branch.PullResult()
712
r.old_revid = "old-revid"
714
r.new_revid = "new-revid"
718
self.assertEqual("Now on revision 20.\n", f.getvalue())
720
def test_report_unchanged(self):
721
r = _mod_branch.PullResult()
722
r.old_revid = "same-revid"
723
r.new_revid = "same-revid"
726
self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
added
removed
bzrlib/tests/test_branch.py
