74
78
url = self.get_url()
75
79
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
80
bdir.create_repository()
77
branch = _mod_branch.BzrBranchFormat5().initialize(bdir)
81
branch = BzrBranchFormat5().initialize(bdir)
78
82
t = self.get_transport()
79
83
self.log("branch instance is %r" % branch)
80
self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
84
self.assert_(isinstance(branch, BzrBranch5))
81
85
self.assertIsDirectory('.', t)
82
86
self.assertIsDirectory('.bzr/branch', t)
83
87
self.assertIsDirectory('.bzr/branch/lock', t)
101
105
# recursive section - that is, it appends the branch name.
104
class SampleBranchFormat(_mod_branch.BranchFormat):
108
class SampleBranchFormat(_mod_branch.BranchFormatMetadir):
105
109
"""A sample format
107
111
this format is initializable, unsupported to aid in testing the
108
112
open and open_downlevel routines.
111
def get_format_string(self):
116
def get_format_string(cls):
112
117
"""See BzrBranchFormat.get_format_string()."""
113
118
return "Sample branch format."
131
137
SampleSupportedBranchFormatString = "Sample supported branch format."
133
139
# And the format class can then reference the constant to avoid skew.
134
class SampleSupportedBranchFormat(_mod_branch.BranchFormat):
140
class SampleSupportedBranchFormat(_mod_branch.BranchFormatMetadir):
135
141
"""A sample supported format."""
137
def get_format_string(self):
144
def get_format_string(cls):
138
145
"""See BzrBranchFormat.get_format_string()."""
139
146
return SampleSupportedBranchFormatString
143
150
t.put_bytes('format', self.get_format_string())
144
151
return 'A branch'
146
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
153
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
154
possible_transports=None):
147
155
return "opened supported branch."
161
169
def initialize(self, a_bzrdir, name=None):
162
170
raise NotImplementedError(self.initialize)
164
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
172
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
173
possible_transports=None):
165
174
raise NotImplementedError(self.open)
177
186
dir = format._matchingbzrdir.initialize(url)
178
187
dir.create_repository()
179
188
format.initialize(dir)
180
found_format = _mod_branch.BranchFormat.find_format(dir)
189
found_format = _mod_branch.BranchFormatMetadir.find_format(dir)
181
190
self.assertIsInstance(found_format, format.__class__)
182
check_format(_mod_branch.BzrBranchFormat5(), "bar")
191
check_format(BzrBranchFormat5(), "bar")
184
193
def test_find_format_factory(self):
185
194
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
192
201
b = _mod_branch.Branch.open(self.get_url())
193
202
self.assertEqual(b, "opened supported branch.")
204
def test_from_string(self):
205
self.assertIsInstance(
206
SampleBranchFormat.from_string("Sample branch format."),
208
self.assertRaises(AssertionError,
209
SampleBranchFormat.from_string, "Different branch format.")
195
211
def test_find_format_not_branch(self):
196
212
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
197
213
self.assertRaises(errors.NotBranchError,
198
_mod_branch.BranchFormat.find_format,
214
_mod_branch.BranchFormatMetadir.find_format,
201
217
def test_find_format_unknown_format(self):
202
218
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
203
219
SampleBranchFormat().initialize(dir)
204
220
self.assertRaises(errors.UnknownFormatError,
205
_mod_branch.BranchFormat.find_format,
221
_mod_branch.BranchFormatMetadir.find_format,
208
def test_register_unregister_format(self):
209
# Test the deprecated format registration functions
210
format = SampleBranchFormat()
212
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
214
format.initialize(dir)
215
# register a format for it.
216
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
217
_mod_branch.BranchFormat.register_format, format)
218
# which branch.Open will refuse (not supported)
219
self.assertRaises(errors.UnsupportedFormatError,
220
_mod_branch.Branch.open, self.get_url())
221
self.make_branch_and_tree('foo')
222
# but open_downlevel will work
225
bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
226
# unregister the format
227
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
228
_mod_branch.BranchFormat.unregister_format, format)
229
self.make_branch_and_tree('bar')
224
def test_find_format_with_features(self):
225
tree = self.make_branch_and_tree('.', format='2a')
226
tree.branch.update_feature_flags({"name": "optional"})
227
found_format = _mod_branch.BranchFormatMetadir.find_format(tree.bzrdir)
228
self.assertIsInstance(found_format, _mod_branch.BranchFormatMetadir)
229
self.assertEquals(found_format.features.get("name"), "optional")
230
tree.branch.update_feature_flags({"name": None})
231
branch = _mod_branch.Branch.open('.')
232
self.assertEquals(branch._format.features, {})
232
235
class TestBranchFormatRegistry(tests.TestCase):
334
337
self.assertPathDoesNotExist('a/.bzr/branch/parent')
335
338
self.assertEqual('http://example.com', branch.get_parent())
336
339
branch.set_push_location('sftp://example.com')
337
config = branch.get_config()._get_branch_data_config()
338
self.assertEqual('sftp://example.com',
339
config.get_user_option('push_location'))
340
conf = branch.get_config_stack()
341
self.assertEqual('sftp://example.com', conf.get('push_location'))
340
342
branch.set_bound_location('ftp://example.com')
341
343
self.assertPathDoesNotExist('a/.bzr/branch/bound')
342
344
self.assertEqual('ftp://example.com', branch.get_bound_location())
344
def test_set_revision_history(self):
345
builder = self.make_branch_builder('.', format=self.get_format_name())
346
builder.build_snapshot('foo', None,
347
[('add', ('', None, 'directory', None))],
349
builder.build_snapshot('bar', None, [], message='bar')
350
branch = builder.get_branch()
352
self.addCleanup(branch.unlock)
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'])
357
self.assertRaises(errors.NotLefthandHistory,
358
self.applyDeprecated, symbol_versioning.deprecated_in((2, 4, 0)),
359
branch.set_revision_history, ['bar'])
361
346
def do_checkout_test(self, lightweight=False):
362
347
tree = self.make_branch_and_tree('source',
363
348
format=self.get_format_name_subtree())
391
376
def test_light_checkout_with_references(self):
392
377
self.do_checkout_test(lightweight=True)
394
def test_set_push(self):
395
branch = self.make_branch('source', format=self.get_format_name())
396
branch.get_config().set_user_option('push_location', 'old',
397
store=config.STORE_LOCATION)
400
warnings.append(args[0] % args[1:])
401
_warning = trace.warning
402
trace.warning = warning
404
branch.set_push_location('new')
406
trace.warning = _warning
407
self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
411
380
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
541
510
self.assertEqual(('path3', 'location3'),
542
511
branch.get_reference_info('file-id'))
513
def _recordParentMapCalls(self, repo):
514
self._parent_map_calls = []
515
orig_get_parent_map = repo.revisions.get_parent_map
516
def get_parent_map(q):
518
self._parent_map_calls.extend([e[0] for e in q])
519
return orig_get_parent_map(q)
520
repo.revisions.get_parent_map = get_parent_map
544
523
class TestBranchReference(tests.TestCaseWithTransport):
545
524
"""Tests for the branch reference facility."""
560
539
self.assertEqual(opened_branch.base, target_branch.base)
562
541
def test_get_reference(self):
563
"""For a BranchReference, get_reference should reutrn the location."""
542
"""For a BranchReference, get_reference should return the location."""
564
543
branch = self.make_branch('target')
565
544
checkout = branch.create_checkout('checkout', lightweight=True)
566
545
reference_url = branch.bzrdir.root_transport.abspath('') + '/'
576
555
def test_constructor(self):
577
556
"""Check that creating a BranchHooks instance has the right defaults."""
578
557
hooks = _mod_branch.BranchHooks()
579
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
580
558
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
581
559
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
582
560
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
647
625
super(TestBranchOptions, self).setUp()
648
626
self.branch = self.make_branch('.')
649
self.config = self.branch.get_config()
627
self.config_stack = self.branch.get_config_stack()
651
629
def check_append_revisions_only(self, expected_value, value=None):
652
630
"""Set append_revisions_only in config and check its interpretation."""
653
631
if value is not None:
654
self.config.set_user_option('append_revisions_only', value)
632
self.config_stack.set('append_revisions_only', value)
655
633
self.assertEqual(expected_value,
656
634
self.branch.get_append_revisions_only())
658
636
def test_valid_append_revisions_only(self):
659
637
self.assertEquals(None,
660
self.config.get_user_option('append_revisions_only'))
638
self.config_stack.get('append_revisions_only'))
661
639
self.check_append_revisions_only(None)
662
640
self.check_append_revisions_only(False, 'False')
663
641
self.check_append_revisions_only(True, 'True')
675
653
self.check_append_revisions_only(None, 'not-a-bool')
676
654
self.assertLength(1, self.warnings)
677
655
self.assertEqual(
678
'Value "not-a-bool" is not a boolean for "append_revisions_only"',
656
'Value "not-a-bool" is not valid for "append_revisions_only"',
679
657
self.warnings[0])
659
def test_use_fresh_values(self):
660
copy = _mod_branch.Branch.open(self.branch.base)
663
copy.get_config_stack().set('foo', 'bar')
666
self.assertFalse(self.branch.is_locked())
667
# Since the branch is locked, the option value won't be saved on disk
668
# so trying to access the config of locked branch via another older
669
# non-locked branch object pointing to the same branch is not supported
670
self.assertEqual(None, self.branch.get_config_stack().get('foo'))
671
# Using a newly created branch object works as expected
672
fresh = _mod_branch.Branch.open(self.branch.base)
673
self.assertEqual('bar', fresh.get_config_stack().get('foo'))
675
def test_set_from_config_get_from_config_stack(self):
676
self.branch.lock_write()
677
self.addCleanup(self.branch.unlock)
678
self.branch.get_config().set_user_option('foo', 'bar')
679
result = self.branch.get_config_stack().get('foo')
680
# https://bugs.launchpad.net/bzr/+bug/948344
681
self.expectFailure('BranchStack uses cache after set_user_option',
682
self.assertEqual, 'bar', result)
684
def test_set_from_config_stack_get_from_config(self):
685
self.branch.lock_write()
686
self.addCleanup(self.branch.unlock)
687
self.branch.get_config_stack().set('foo', 'bar')
688
# Since the branch is locked, the option value won't be saved on disk
689
# so mixing get() and get_user_option() is broken by design.
690
self.assertEqual(None,
691
self.branch.get_config().get_user_option('foo'))
693
def test_set_delays_write_when_branch_is_locked(self):
694
self.branch.lock_write()
695
self.addCleanup(self.branch.unlock)
696
self.branch.get_config_stack().set('foo', 'bar')
697
copy = _mod_branch.Branch.open(self.branch.base)
698
result = copy.get_config_stack().get('foo')
699
# Accessing from a different branch object is like accessing from a
700
# different process: the option has not been saved yet and the new
701
# value cannot be seen.
702
self.assertIs(None, result)
682
705
class TestPullResult(tests.TestCase):
684
def test_pull_result_to_int(self):
685
# to support old code, the pull result can be used as an int
686
r = _mod_branch.PullResult()
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
692
self.assertEqual(self.applyDeprecated(
693
symbol_versioning.deprecated_in((2, 3, 0)),
697
707
def test_report_changed(self):
698
708
r = _mod_branch.PullResult()
699
709
r.old_revid = "old-revid"
added
removed
bzrlib/tests/test_branch.py
