13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""Tests for the BzrDir facility and any format specific tests.
19
For interface contract tests, see tests/per_bzr_dir.
19
For interface contract tests, see tests/bzr_dir_implementations.
24
from StringIO import StringIO
26
28
from bzrlib import (
35
revision as _mod_revision,
38
transport as _mod_transport,
44
39
import bzrlib.branch
45
from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
46
from bzrlib.errors import (
48
NoColocatedBranchSupport,
50
UnsupportedFormatError,
40
from bzrlib.errors import (NotBranchError,
42
UnsupportedFormatError,
52
44
from bzrlib.tests import (
54
46
TestCaseWithMemoryTransport,
55
47
TestCaseWithTransport,
58
51
from bzrlib.tests import(
62
55
from bzrlib.tests.test_http import TestWithTransport_pycurl
63
from bzrlib.transport import (
56
from bzrlib.transport import get_transport
67
57
from bzrlib.transport.http._urllib import HttpTransport_urllib
58
from bzrlib.transport.memory import MemoryServer
68
59
from bzrlib.transport.nosmart import NoSmartTransportDecorator
69
60
from bzrlib.transport.readonly import ReadonlyTransportDecorator
70
from bzrlib.repofmt import knitrepo, knitpack_repo
61
from bzrlib.repofmt import knitrepo, weaverepo
73
64
class TestDefaultFormat(TestCase):
75
66
def test_get_set_default_format(self):
76
67
old_format = bzrdir.BzrDirFormat.get_default_format()
77
# default is BzrDirMetaFormat1
78
self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
79
controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
68
# default is BzrDirFormat6
69
self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
70
bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
80
71
# creating a bzr dir should now create an instrumented dir.
82
73
result = bzrdir.BzrDir.create('memory:///')
83
self.assertIsInstance(result, SampleBzrDir)
74
self.failUnless(isinstance(result, SampleBzrDir))
85
controldir.ControlDirFormat._set_default_format(old_format)
76
bzrdir.BzrDirFormat._set_default_format(old_format)
86
77
self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
89
class DeprecatedBzrDirFormat(bzrdir.BzrDirFormat):
90
"""A deprecated bzr dir format."""
93
80
class TestFormatRegistry(TestCase):
95
82
def make_format_registry(self):
96
my_format_registry = controldir.ControlDirFormatRegistry()
97
my_format_registry.register('deprecated', DeprecatedBzrDirFormat,
98
'Some format. Slower and unawesome and deprecated.',
100
my_format_registry.register_lazy('lazy', 'bzrlib.tests.test_bzrdir',
101
'DeprecatedBzrDirFormat', 'Format registered lazily',
103
bzrdir.register_metadir(my_format_registry, 'knit',
83
my_format_registry = bzrdir.BzrDirFormatRegistry()
84
my_format_registry.register('weave', bzrdir.BzrDirFormat6,
85
'Pre-0.8 format. Slower and does not support checkouts or shared'
86
' repositories', deprecated=True)
87
my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
88
'BzrDirFormat6', 'Format registered lazily', deprecated=True)
89
my_format_registry.register_metadir('knit',
104
90
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
105
91
'Format using knits',
107
93
my_format_registry.set_default('knit')
108
bzrdir.register_metadir(my_format_registry,
94
my_format_registry.register_metadir(
110
96
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
111
97
'Experimental successor to knit. Use at your own risk.',
112
98
branch_format='bzrlib.branch.BzrBranchFormat6',
113
99
experimental=True)
114
bzrdir.register_metadir(my_format_registry,
100
my_format_registry.register_metadir(
116
102
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
117
103
'Experimental successor to knit. Use at your own risk.',
118
104
branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
119
my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
120
'Old format. Slower and does not support things. ', hidden=True)
121
my_format_registry.register_lazy('hiddenlazy', 'bzrlib.tests.test_bzrdir',
122
'DeprecatedBzrDirFormat', 'Format registered lazily',
123
deprecated=True, hidden=True)
105
my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6,
106
'Pre-0.8 format. Slower and does not support checkouts or shared'
107
' repositories', hidden=True)
108
my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir',
109
'BzrDirFormat6', 'Format registered lazily', deprecated=True,
124
111
return my_format_registry
126
113
def test_format_registry(self):
127
114
my_format_registry = self.make_format_registry()
128
115
my_bzrdir = my_format_registry.make_bzrdir('lazy')
129
self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
130
my_bzrdir = my_format_registry.make_bzrdir('deprecated')
131
self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
116
self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
117
my_bzrdir = my_format_registry.make_bzrdir('weave')
118
self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
132
119
my_bzrdir = my_format_registry.make_bzrdir('default')
133
self.assertIsInstance(my_bzrdir.repository_format,
120
self.assertIsInstance(my_bzrdir.repository_format,
134
121
knitrepo.RepositoryFormatKnit1)
135
122
my_bzrdir = my_format_registry.make_bzrdir('knit')
136
self.assertIsInstance(my_bzrdir.repository_format,
123
self.assertIsInstance(my_bzrdir.repository_format,
137
124
knitrepo.RepositoryFormatKnit1)
138
125
my_bzrdir = my_format_registry.make_bzrdir('branch6')
139
126
self.assertIsInstance(my_bzrdir.get_branch_format(),
143
130
my_format_registry = self.make_format_registry()
144
131
self.assertEqual('Format registered lazily',
145
132
my_format_registry.get_help('lazy'))
146
self.assertEqual('Format using knits',
133
self.assertEqual('Format using knits',
147
134
my_format_registry.get_help('knit'))
148
self.assertEqual('Format using knits',
135
self.assertEqual('Format using knits',
149
136
my_format_registry.get_help('default'))
150
self.assertEqual('Some format. Slower and unawesome and deprecated.',
151
my_format_registry.get_help('deprecated'))
137
self.assertEqual('Pre-0.8 format. Slower and does not support'
138
' checkouts or shared repositories',
139
my_format_registry.get_help('weave'))
153
141
def test_help_topic(self):
154
142
topics = help_topics.HelpTopicRegistry()
155
143
registry = self.make_format_registry()
156
topics.register('current-formats', registry.help_topic,
144
topics.register('current-formats', registry.help_topic,
157
145
'Current formats')
158
topics.register('other-formats', registry.help_topic,
146
topics.register('other-formats', registry.help_topic,
160
148
new = topics.get_detail('current-formats')
161
149
rest = topics.get_detail('other-formats')
162
150
experimental, deprecated = rest.split('Deprecated formats')
163
self.assertContainsRe(new, 'formats-help')
164
self.assertContainsRe(new,
151
self.assertContainsRe(new, 'bzr help formats')
152
self.assertContainsRe(new,
165
153
':knit:\n \(native\) \(default\) Format using knits\n')
166
self.assertContainsRe(experimental,
154
self.assertContainsRe(experimental,
167
155
':branch6:\n \(native\) Experimental successor to knit')
168
self.assertContainsRe(deprecated,
156
self.assertContainsRe(deprecated,
169
157
':lazy:\n \(native\) Format registered lazily\n')
170
158
self.assertNotContainsRe(new, 'hidden')
172
160
def test_set_default_repository(self):
173
default_factory = controldir.format_registry.get('default')
174
old_default = [k for k, v in controldir.format_registry.iteritems()
161
default_factory = bzrdir.format_registry.get('default')
162
old_default = [k for k, v in bzrdir.format_registry.iteritems()
175
163
if v == default_factory and k != 'default'][0]
176
controldir.format_registry.set_default_repository('dirstate-with-subtree')
164
bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
178
self.assertIs(controldir.format_registry.get('dirstate-with-subtree'),
179
controldir.format_registry.get('default'))
166
self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
167
bzrdir.format_registry.get('default'))
181
repository.format_registry.get_default().__class__,
169
repository.RepositoryFormat.get_default_format().__class__,
182
170
knitrepo.RepositoryFormatKnit3)
184
controldir.format_registry.set_default_repository(old_default)
172
bzrdir.format_registry.set_default_repository(old_default)
186
174
def test_aliases(self):
187
a_registry = controldir.ControlDirFormatRegistry()
188
a_registry.register('deprecated', DeprecatedBzrDirFormat,
189
'Old format. Slower and does not support stuff',
191
a_registry.register('deprecatedalias', DeprecatedBzrDirFormat,
192
'Old format. Slower and does not support stuff',
193
deprecated=True, alias=True)
194
self.assertEqual(frozenset(['deprecatedalias']), a_registry.aliases())
175
a_registry = bzrdir.BzrDirFormatRegistry()
176
a_registry.register('weave', bzrdir.BzrDirFormat6,
177
'Pre-0.8 format. Slower and does not support checkouts or shared'
178
' repositories', deprecated=True)
179
a_registry.register('weavealias', bzrdir.BzrDirFormat6,
180
'Pre-0.8 format. Slower and does not support checkouts or shared'
181
' repositories', deprecated=True, alias=True)
182
self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
197
185
class SampleBranch(bzrlib.branch.Branch):
278
246
def test_find_format(self):
279
247
# is the right format object found for a branch?
280
248
# create a branch with a few known format objects.
281
bzrdir.BzrProber.formats.register(BzrDirFormatTest1.get_format_string(),
283
self.addCleanup(bzrdir.BzrProber.formats.remove,
284
BzrDirFormatTest1.get_format_string())
285
bzrdir.BzrProber.formats.register(BzrDirFormatTest2.get_format_string(),
287
self.addCleanup(bzrdir.BzrProber.formats.remove,
288
BzrDirFormatTest2.get_format_string())
289
t = self.get_transport()
249
# this is not quite the same as
250
t = get_transport(self.get_url())
290
251
self.build_tree(["foo/", "bar/"], transport=t)
291
252
def check_format(format, url):
292
253
format.initialize(url)
293
t = _mod_transport.get_transport_from_path(url)
254
t = get_transport(url)
294
255
found_format = bzrdir.BzrDirFormat.find_format(t)
295
self.assertIsInstance(found_format, format.__class__)
296
check_format(BzrDirFormatTest1(), "foo")
297
check_format(BzrDirFormatTest2(), "bar")
256
self.failUnless(isinstance(found_format, format.__class__))
257
check_format(bzrdir.BzrDirFormat5(), "foo")
258
check_format(bzrdir.BzrDirFormat6(), "bar")
299
260
def test_find_format_nothing_there(self):
300
261
self.assertRaises(NotBranchError,
301
262
bzrdir.BzrDirFormat.find_format,
302
_mod_transport.get_transport_from_path('.'))
304
265
def test_find_format_unknown_format(self):
305
t = self.get_transport()
266
t = get_transport(self.get_url())
307
268
t.put_bytes('.bzr/branch-format', '')
308
269
self.assertRaises(UnknownFormatError,
309
270
bzrdir.BzrDirFormat.find_format,
310
_mod_transport.get_transport_from_path('.'))
312
273
def test_register_unregister_format(self):
313
274
format = SampleBzrDirFormat()
357
318
def test_create_standalone_working_tree(self):
358
319
format = SampleBzrDirFormat()
359
# note this is deliberately readonly, as this failure should
320
# note this is deliberately readonly, as this failure should
360
321
# occur before any writes.
361
322
self.assertRaises(errors.NotLocalUrl,
362
323
bzrdir.BzrDir.create_standalone_workingtree,
363
324
self.get_readonly_url(), format=format)
364
tree = bzrdir.BzrDir.create_standalone_workingtree('.',
325
tree = bzrdir.BzrDir.create_standalone_workingtree('.',
366
327
self.assertEqual('A tree', tree)
368
329
def test_create_standalone_working_tree_under_shared_repo(self):
369
330
# create standalone working tree always makes a repo.
370
format = controldir.format_registry.make_bzrdir('knit')
331
format = bzrdir.format_registry.make_bzrdir('knit')
371
332
self.make_repository('.', shared=True, format=format)
372
# note this is deliberately readonly, as this failure should
333
# note this is deliberately readonly, as this failure should
373
334
# occur before any writes.
374
335
self.assertRaises(errors.NotLocalUrl,
375
336
bzrdir.BzrDir.create_standalone_workingtree,
376
337
self.get_readonly_url('child'), format=format)
377
tree = bzrdir.BzrDir.create_standalone_workingtree('child',
338
tree = bzrdir.BzrDir.create_standalone_workingtree('child',
379
340
tree.bzrdir.open_repository()
381
342
def test_create_branch_convenience(self):
382
343
# outside a repo the default convenience output is a repo+branch_tree
383
format = controldir.format_registry.make_bzrdir('knit')
344
format = bzrdir.format_registry.make_bzrdir('knit')
384
345
branch = bzrdir.BzrDir.create_branch_convenience('.', format=format)
385
346
branch.bzrdir.open_workingtree()
386
347
branch.bzrdir.open_repository()
388
349
def test_create_branch_convenience_possible_transports(self):
389
350
"""Check that the optional 'possible_transports' is recognized"""
390
format = controldir.format_registry.make_bzrdir('knit')
351
format = bzrdir.format_registry.make_bzrdir('knit')
391
352
t = self.get_transport()
392
353
branch = bzrdir.BzrDir.create_branch_convenience(
393
354
'.', format=format, possible_transports=[t])
504
466
self.assertEqual(child_branch.base,
505
467
new_child.open_branch().get_stacked_on_url())
507
def test_default_stacking_with_stackable_branch_unstackable_repo(self):
508
# Make stackable source branch with an unstackable repo format.
509
source_bzrdir = self.make_bzrdir('source')
510
knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
511
source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
513
# Make a directory with a default stacking policy
514
parent_bzrdir = self.make_bzrdir('parent')
515
stacked_on = self.make_branch('parent/stacked-on', format='pack-0.92')
516
parent_bzrdir.get_config().set_default_stack_on(stacked_on.base)
517
# Clone source into directory
518
target = source_bzrdir.clone(self.get_url('parent/target'))
520
def test_format_initialize_on_transport_ex_stacked_on(self):
521
# trunk is a stackable format. Note that its in the same server area
522
# which is what launchpad does, but not sufficient to exercise the
524
trunk = self.make_branch('trunk', format='1.9')
525
t = self.get_transport('stacked')
526
old_fmt = controldir.format_registry.make_bzrdir('pack-0.92')
527
repo_name = old_fmt.repository_format.network_name()
528
# Should end up with a 1.9 format (stackable)
529
repo, control, require_stacking, repo_policy = \
530
old_fmt.initialize_on_transport_ex(t,
531
repo_format_name=repo_name, stacked_on='../trunk',
534
# Repositories are open write-locked
535
self.assertTrue(repo.is_write_locked())
536
self.addCleanup(repo.unlock)
538
repo = control.open_repository()
539
self.assertIsInstance(control, bzrdir.BzrDir)
540
opened = bzrdir.BzrDir.open(t.base)
541
if not isinstance(old_fmt, remote.RemoteBzrDirFormat):
542
self.assertEqual(control._format.network_name(),
543
old_fmt.network_name())
544
self.assertEqual(control._format.network_name(),
545
opened._format.network_name())
546
self.assertEqual(control.__class__, opened.__class__)
547
self.assertLength(1, repo._fallback_repositories)
549
469
def test_sprout_obeys_stacking_policy(self):
550
470
child_branch, new_child_transport = self.prepare_default_stacking()
551
471
new_child = child_branch.bzrdir.sprout(new_child_transport.base)
806
721
# transport pointing at bzrdir should give a bzrdir with root transport
807
722
# set to the given transport
808
723
control = bzrdir.BzrDir.create(self.get_url())
809
t = self.get_transport()
810
opened_bzrdir = bzrdir.BzrDir.open_from_transport(t)
811
self.assertEqual(t.base, opened_bzrdir.root_transport.base)
724
transport = get_transport(self.get_url())
725
opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
726
self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
812
727
self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
814
729
def test_open_from_transport_no_bzrdir(self):
815
t = self.get_transport()
816
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
730
transport = get_transport(self.get_url())
731
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
818
734
def test_open_from_transport_bzrdir_in_parent(self):
819
735
control = bzrdir.BzrDir.create(self.get_url())
820
t = self.get_transport()
822
t = t.clone('subdir')
823
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
736
transport = get_transport(self.get_url())
737
transport.mkdir('subdir')
738
transport = transport.clone('subdir')
739
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
825
742
def test_sprout_recursive(self):
826
tree = self.make_branch_and_tree('tree1',
827
format='development-subtree')
743
tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
828
744
sub_tree = self.make_branch_and_tree('tree1/subtree',
829
format='development-subtree')
830
sub_tree.set_root_id('subtree-root')
745
format='dirstate-with-subtree')
831
746
tree.add_reference(sub_tree)
832
747
self.build_tree(['tree1/subtree/file'])
833
748
sub_tree.add('file')
834
749
tree.commit('Initial commit')
835
tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
837
self.addCleanup(tree2.unlock)
838
self.assertPathExists('tree2/subtree/file')
839
self.assertEqual('tree-reference', tree2.kind('subtree-root'))
750
tree.bzrdir.sprout('tree2')
751
self.failUnlessExists('tree2/subtree/file')
841
753
def test_cloning_metadir(self):
842
754
"""Ensure that cloning metadir is suitable"""
845
757
branch = self.make_branch('branch', format='knit')
846
758
format = branch.bzrdir.cloning_metadir()
847
759
self.assertIsInstance(format.workingtree_format,
848
workingtree_4.WorkingTreeFormat6)
760
workingtree.WorkingTreeFormat3)
850
762
def test_sprout_recursive_treeless(self):
851
763
tree = self.make_branch_and_tree('tree1',
852
format='development-subtree')
764
format='dirstate-with-subtree')
853
765
sub_tree = self.make_branch_and_tree('tree1/subtree',
854
format='development-subtree')
766
format='dirstate-with-subtree')
855
767
tree.add_reference(sub_tree)
856
768
self.build_tree(['tree1/subtree/file'])
857
769
sub_tree.add('file')
858
770
tree.commit('Initial commit')
859
# The following line force the orhaning to reveal bug #634470
860
tree.branch.get_config_stack().set(
861
'bzr.transform.orphan_policy', 'move')
862
771
tree.bzrdir.destroy_workingtree()
863
# FIXME: subtree/.bzr is left here which allows the test to pass (or
864
# fail :-( ) -- vila 20100909
865
772
repo = self.make_repository('repo', shared=True,
866
format='development-subtree')
773
format='dirstate-with-subtree')
867
774
repo.set_make_working_trees(False)
868
# FIXME: we just deleted the workingtree and now we want to use it ????
869
# At a minimum, we should use tree.branch below (but this fails too
870
# currently) or stop calling this test 'treeless'. Specifically, I've
871
# turn the line below into an assertRaises when 'subtree/.bzr' is
872
# orphaned and sprout tries to access the branch there (which is left
873
# by bzrdir.BzrDirMeta1.destroy_workingtree when it ignores the
874
# [DeletingParent('Not deleting', u'subtree', None)] conflict). See bug
875
# #634470. -- vila 20100909
876
self.assertRaises(errors.NotBranchError,
877
tree.bzrdir.sprout, 'repo/tree2')
878
# self.assertPathExists('repo/tree2/subtree')
879
# self.assertPathDoesNotExist('repo/tree2/subtree/file')
775
tree.bzrdir.sprout('repo/tree2')
776
self.failUnlessExists('repo/tree2/subtree')
777
self.failIfExists('repo/tree2/subtree/file')
881
779
def make_foo_bar_baz(self):
882
780
foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir
887
785
def test_find_bzrdirs(self):
888
786
foo, bar, baz = self.make_foo_bar_baz()
889
t = self.get_transport()
890
self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_bzrdirs(t))
892
def make_fake_permission_denied_transport(self, transport, paths):
893
"""Create a transport that raises PermissionDenied for some paths."""
896
raise errors.PermissionDenied(path)
898
path_filter_server = pathfilter.PathFilteringServer(transport, filter)
899
path_filter_server.start_server()
900
self.addCleanup(path_filter_server.stop_server)
901
path_filter_transport = pathfilter.PathFilteringTransport(
902
path_filter_server, '.')
903
return (path_filter_server, path_filter_transport)
905
def assertBranchUrlsEndWith(self, expect_url_suffix, actual_bzrdirs):
906
"""Check that each branch url ends with the given suffix."""
907
for actual_bzrdir in actual_bzrdirs:
908
self.assertEndsWith(actual_bzrdir.user_url, expect_url_suffix)
910
def test_find_bzrdirs_permission_denied(self):
911
foo, bar, baz = self.make_foo_bar_baz()
912
t = self.get_transport()
913
path_filter_server, path_filter_transport = \
914
self.make_fake_permission_denied_transport(t, ['foo'])
916
self.assertBranchUrlsEndWith('/baz/',
917
bzrdir.BzrDir.find_bzrdirs(path_filter_transport))
919
smart_transport = self.make_smart_server('.',
920
backing_server=path_filter_server)
921
self.assertBranchUrlsEndWith('/baz/',
922
bzrdir.BzrDir.find_bzrdirs(smart_transport))
787
transport = get_transport(self.get_url())
788
self.assertEqualBzrdirs([baz, foo, bar],
789
bzrdir.BzrDir.find_bzrdirs(transport))
924
791
def test_find_bzrdirs_list_current(self):
925
792
def list_current(transport):
926
793
return [s for s in transport.list_dir('') if s != 'baz']
928
795
foo, bar, baz = self.make_foo_bar_baz()
929
t = self.get_transport()
930
self.assertEqualBzrdirs(
932
bzrdir.BzrDir.find_bzrdirs(t, list_current=list_current))
796
transport = get_transport(self.get_url())
797
self.assertEqualBzrdirs([foo, bar],
798
bzrdir.BzrDir.find_bzrdirs(transport,
799
list_current=list_current))
934
802
def test_find_bzrdirs_evaluate(self):
935
803
def evaluate(bzrdir):
937
805
repo = bzrdir.open_repository()
938
except errors.NoRepositoryPresent:
806
except NoRepositoryPresent:
939
807
return True, bzrdir.root_transport.base
941
809
return False, bzrdir.root_transport.base
943
811
foo, bar, baz = self.make_foo_bar_baz()
944
t = self.get_transport()
812
transport = get_transport(self.get_url())
945
813
self.assertEqual([baz.root_transport.base, foo.root_transport.base],
946
list(bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate)))
814
list(bzrdir.BzrDir.find_bzrdirs(transport,
948
817
def assertEqualBzrdirs(self, first, second):
949
818
first = list(first)
1015
868
Metadirs should compare equal iff they have the same repo, branch and
1018
mydir = controldir.format_registry.make_bzrdir('knit')
871
mydir = bzrdir.format_registry.make_bzrdir('knit')
1019
872
self.assertEqual(mydir, mydir)
1020
873
self.assertFalse(mydir != mydir)
1021
otherdir = controldir.format_registry.make_bzrdir('knit')
874
otherdir = bzrdir.format_registry.make_bzrdir('knit')
1022
875
self.assertEqual(otherdir, mydir)
1023
876
self.assertFalse(otherdir != mydir)
1024
otherdir2 = controldir.format_registry.make_bzrdir('development-subtree')
877
otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
1025
878
self.assertNotEqual(otherdir2, mydir)
1026
879
self.assertFalse(otherdir2 == mydir)
1028
def test_with_features(self):
1029
tree = self.make_branch_and_tree('tree', format='2a')
1030
tree.bzrdir.update_feature_flags({"bar": "required"})
1031
self.assertRaises(errors.MissingFeature, bzrdir.BzrDir.open, 'tree')
1032
bzrdir.BzrDirMetaFormat1.register_feature('bar')
1033
self.addCleanup(bzrdir.BzrDirMetaFormat1.unregister_feature, 'bar')
1034
dir = bzrdir.BzrDir.open('tree')
1035
self.assertEquals("required", dir._format.features.get("bar"))
1036
tree.bzrdir.update_feature_flags({"bar": None, "nonexistant": None})
1037
dir = bzrdir.BzrDir.open('tree')
1038
self.assertEquals({}, dir._format.features)
1040
881
def test_needs_conversion_different_working_tree(self):
1041
882
# meta1dirs need an conversion if any element is not the default.
1042
new_format = controldir.format_registry.make_bzrdir('dirstate')
1043
tree = self.make_branch_and_tree('tree', format='knit')
1044
self.assertTrue(tree.bzrdir.needs_format_conversion(
1047
def test_initialize_on_format_uses_smart_transport(self):
1048
self.setup_smart_server_with_call_log()
1049
new_format = controldir.format_registry.make_bzrdir('dirstate')
1050
transport = self.get_transport('target')
1051
transport.ensure_base()
1052
self.reset_smart_call_log()
1053
instance = new_format.initialize_on_transport(transport)
1054
self.assertIsInstance(instance, remote.RemoteBzrDir)
1055
rpc_count = len(self.hpss_calls)
1056
# This figure represent the amount of work to perform this use case. It
1057
# is entirely ok to reduce this number if a test fails due to rpc_count
1058
# being too low. If rpc_count increases, more network roundtrips have
1059
# become necessary for this use case. Please do not adjust this number
1060
# upwards without agreement from bzr's network support maintainers.
1061
self.assertEqual(2, rpc_count)
883
old_format = bzrdir.BzrDirFormat.get_default_format()
885
new_default = bzrdir.format_registry.make_bzrdir('dirstate')
886
bzrdir.BzrDirFormat._set_default_format(new_default)
888
tree = self.make_branch_and_tree('tree', format='knit')
889
self.assertTrue(tree.bzrdir.needs_format_conversion())
891
bzrdir.BzrDirFormat._set_default_format(old_format)
894
class TestFormat5(TestCaseWithTransport):
895
"""Tests specific to the version 5 bzrdir format."""
897
def test_same_lockfiles_between_tree_repo_branch(self):
898
# this checks that only a single lockfiles instance is created
899
# for format 5 objects
900
dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
901
def check_dir_components_use_same_lock(dir):
902
ctrl_1 = dir.open_repository().control_files
903
ctrl_2 = dir.open_branch().control_files
904
ctrl_3 = dir.open_workingtree()._control_files
905
self.assertTrue(ctrl_1 is ctrl_2)
906
self.assertTrue(ctrl_2 is ctrl_3)
907
check_dir_components_use_same_lock(dir)
908
# and if we open it normally.
909
dir = bzrdir.BzrDir.open(self.get_url())
910
check_dir_components_use_same_lock(dir)
912
def test_can_convert(self):
913
# format 5 dirs are convertable
914
dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
915
self.assertTrue(dir.can_convert_format())
917
def test_needs_conversion(self):
918
# format 5 dirs need a conversion if they are not the default.
919
# and they start of not the default.
920
old_format = bzrdir.BzrDirFormat.get_default_format()
921
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
923
dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
924
self.assertFalse(dir.needs_format_conversion())
926
bzrdir.BzrDirFormat._set_default_format(old_format)
927
self.assertTrue(dir.needs_format_conversion())
930
class TestFormat6(TestCaseWithTransport):
931
"""Tests specific to the version 6 bzrdir format."""
933
def test_same_lockfiles_between_tree_repo_branch(self):
934
# this checks that only a single lockfiles instance is created
935
# for format 6 objects
936
dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
937
def check_dir_components_use_same_lock(dir):
938
ctrl_1 = dir.open_repository().control_files
939
ctrl_2 = dir.open_branch().control_files
940
ctrl_3 = dir.open_workingtree()._control_files
941
self.assertTrue(ctrl_1 is ctrl_2)
942
self.assertTrue(ctrl_2 is ctrl_3)
943
check_dir_components_use_same_lock(dir)
944
# and if we open it normally.
945
dir = bzrdir.BzrDir.open(self.get_url())
946
check_dir_components_use_same_lock(dir)
948
def test_can_convert(self):
949
# format 6 dirs are convertable
950
dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
951
self.assertTrue(dir.can_convert_format())
953
def test_needs_conversion(self):
954
# format 6 dirs need an conversion if they are not the default.
955
old_format = bzrdir.BzrDirFormat.get_default_format()
956
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
958
dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
959
self.assertTrue(dir.needs_format_conversion())
961
bzrdir.BzrDirFormat._set_default_format(old_format)
964
class NotBzrDir(bzrlib.bzrdir.BzrDir):
965
"""A non .bzr based control directory."""
967
def __init__(self, transport, format):
968
self._format = format
969
self.root_transport = transport
970
self.transport = transport.clone('.not')
973
class NotBzrDirFormat(bzrlib.bzrdir.BzrDirFormat):
974
"""A test class representing any non-.bzr based disk format."""
976
def initialize_on_transport(self, transport):
977
"""Initialize a new .not dir in the base directory of a Transport."""
978
transport.mkdir('.not')
979
return self.open(transport)
981
def open(self, transport):
982
"""Open this directory."""
983
return NotBzrDir(transport, self)
986
def _known_formats(self):
987
return set([NotBzrDirFormat()])
990
def probe_transport(self, transport):
991
"""Our format is present if the transport ends in '.not/'."""
992
if transport.has('.not'):
993
return NotBzrDirFormat()
996
class TestNotBzrDir(TestCaseWithTransport):
997
"""Tests for using the bzrdir api with a non .bzr based disk format.
999
If/when one of these is in the core, we can let the implementation tests
1003
def test_create_and_find_format(self):
1004
# create a .notbzr dir
1005
format = NotBzrDirFormat()
1006
dir = format.initialize(self.get_url())
1007
self.assertIsInstance(dir, NotBzrDir)
1009
bzrlib.bzrdir.BzrDirFormat.register_control_format(format)
1011
found = bzrlib.bzrdir.BzrDirFormat.find_format(
1012
get_transport(self.get_url()))
1013
self.assertIsInstance(found, NotBzrDirFormat)
1015
bzrlib.bzrdir.BzrDirFormat.unregister_control_format(format)
1017
def test_included_in_known_formats(self):
1018
bzrlib.bzrdir.BzrDirFormat.register_control_format(NotBzrDirFormat)
1020
formats = bzrlib.bzrdir.BzrDirFormat.known_formats()
1021
for format in formats:
1022
if isinstance(format, NotBzrDirFormat):
1024
self.fail("No NotBzrDirFormat in %s" % formats)
1026
bzrlib.bzrdir.BzrDirFormat.unregister_control_format(NotBzrDirFormat)
1064
1029
class NonLocalTests(TestCaseWithTransport):
1251
1206
class _TestBzrDir(bzrdir.BzrDirMeta1):
1252
1207
"""Test BzrDir implementation for TestBzrDirSprout.
1254
1209
When created a _TestBzrDir already has repository and a branch. The branch
1255
1210
is a test double as well.
1258
1213
def __init__(self, *args, **kwargs):
1259
1214
super(_TestBzrDir, self).__init__(*args, **kwargs)
1260
self.test_branch = _TestBranch(self.transport)
1215
self.test_branch = _TestBranch()
1261
1216
self.test_branch.repository = self.create_repository()
1263
def open_branch(self, unsupported=False, possible_transports=None):
1218
def open_branch(self, unsupported=False):
1264
1219
return self.test_branch
1266
1221
def cloning_metadir(self, require_stacking=False):
1267
1222
return _TestBzrDirFormat()
1270
class _TestBranchFormat(bzrlib.branch.BranchFormat):
1271
"""Test Branch format for TestBzrDirSprout."""
1274
1225
class _TestBranch(bzrlib.branch.Branch):
1275
1226
"""Test Branch implementation for TestBzrDirSprout."""
1277
def __init__(self, transport, *args, **kwargs):
1278
self._format = _TestBranchFormat()
1279
self._transport = transport
1280
self.base = transport.base
1228
def __init__(self, *args, **kwargs):
1281
1229
super(_TestBranch, self).__init__(*args, **kwargs)
1282
1230
self.calls = []
1283
1231
self._parent = None
1285
1233
def sprout(self, *args, **kwargs):
1286
1234
self.calls.append('sprout')
1287
return _TestBranch(self._transport)
1235
return _TestBranch()
1289
1237
def copy_content_into(self, destination, revision_id=None):
1290
1238
self.calls.append('copy_content_into')
1292
def last_revision(self):
1293
return _mod_revision.NULL_REVISION
1295
1240
def get_parent(self):
1296
1241
return self._parent
1298
def _get_config(self):
1299
return config.TransportConfig(self._transport, 'branch.conf')
1301
def _get_config_store(self):
1302
return config.BranchStore(self)
1304
1243
def set_parent(self, parent):
1305
1244
self._parent = parent
1307
def lock_read(self):
1308
return lock.LogicalLockResult(self.unlock)
1314
1247
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1346
1279
parent = grandparent_tree.bzrdir.sprout('parent').open_branch()
1347
1280
branch_tree = parent.bzrdir.sprout('branch').open_branch()
1348
1281
self.assertContainsRe(branch_tree.get_parent(), '/parent/$')
1351
class TestBzrDirHooks(TestCaseWithMemoryTransport):
1353
def test_pre_open_called(self):
1355
bzrdir.BzrDir.hooks.install_named_hook('pre_open', calls.append, None)
1356
transport = self.get_transport('foo')
1357
url = transport.base
1358
self.assertRaises(errors.NotBranchError, bzrdir.BzrDir.open, url)
1359
self.assertEqual([transport.base], [t.base for t in calls])
1361
def test_pre_open_actual_exceptions_raised(self):
1363
def fail_once(transport):
1366
raise errors.BzrError("fail")
1367
bzrdir.BzrDir.hooks.install_named_hook('pre_open', fail_once, None)
1368
transport = self.get_transport('foo')
1369
url = transport.base
1370
err = self.assertRaises(errors.BzrError, bzrdir.BzrDir.open, url)
1371
self.assertEqual('fail', err._preformatted_string)
1373
def test_post_repo_init(self):
1374
from bzrlib.controldir import RepoInitHookParams
1376
bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
1378
self.make_repository('foo')
1379
self.assertLength(1, calls)
1381
self.assertIsInstance(params, RepoInitHookParams)
1382
self.assertTrue(hasattr(params, 'bzrdir'))
1383
self.assertTrue(hasattr(params, 'repository'))
1385
def test_post_repo_init_hook_repr(self):
1387
bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
1388
lambda params: param_reprs.append(repr(params)), None)
1389
self.make_repository('foo')
1390
self.assertLength(1, param_reprs)
1391
param_repr = param_reprs[0]
1392
self.assertStartsWith(param_repr, '<RepoInitHookParams for ')
1395
class TestGenerateBackupName(TestCaseWithMemoryTransport):
1396
# FIXME: This may need to be unified with test_osutils.TestBackupNames or
1397
# moved to per_bzrdir or per_transport for better coverage ?
1401
super(TestGenerateBackupName, self).setUp()
1402
self._transport = self.get_transport()
1403
bzrdir.BzrDir.create(self.get_url(),
1404
possible_transports=[self._transport])
1405
self._bzrdir = bzrdir.BzrDir.open_from_transport(self._transport)
1408
self.assertEqual("a.~1~", self._bzrdir._available_backup_name("a"))
1410
def test_exiting(self):
1411
self._transport.put_bytes("a.~1~", "some content")
1412
self.assertEqual("a.~2~", self._bzrdir._available_backup_name("a"))
1415
class TestMeta1DirColoFormat(TestCaseWithTransport):
1416
"""Tests specific to the meta1 dir with colocated branches format."""
1418
def test_supports_colo(self):
1419
format = bzrdir.BzrDirMetaFormat1Colo()
1420
self.assertTrue(format.colocated_branches)
1422
def test_upgrade_from_2a(self):
1423
tree = self.make_branch_and_tree('.', format='2a')
1424
format = bzrdir.BzrDirMetaFormat1Colo()
1425
self.assertTrue(tree.bzrdir.needs_format_conversion(format))
1426
converter = tree.bzrdir._format.get_converter(format)
1427
result = converter.convert(tree.bzrdir, None)
1428
self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1Colo)
1429
self.assertFalse(result.needs_format_conversion(format))
1431
def test_downgrade_to_2a(self):
1432
tree = self.make_branch_and_tree('.', format='development-colo')
1433
format = bzrdir.BzrDirMetaFormat1()
1434
self.assertTrue(tree.bzrdir.needs_format_conversion(format))
1435
converter = tree.bzrdir._format.get_converter(format)
1436
result = converter.convert(tree.bzrdir, None)
1437
self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)
1438
self.assertFalse(result.needs_format_conversion(format))
1440
def test_downgrade_to_2a_too_many_branches(self):
1441
tree = self.make_branch_and_tree('.', format='development-colo')
1442
tree.bzrdir.create_branch(name="another-colocated-branch")
1443
converter = tree.bzrdir._format.get_converter(
1444
bzrdir.BzrDirMetaFormat1())
1445
result = converter.convert(tree.bzrdir, bzrdir.BzrDirMetaFormat1())
1446
self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)
1448
def test_nested(self):
1449
tree = self.make_branch_and_tree('.', format='development-colo')
1450
tree.bzrdir.create_branch(name='foo')
1451
tree.bzrdir.create_branch(name='fool/bla')
1453
errors.ParentBranchExists, tree.bzrdir.create_branch,
1456
def test_parent(self):
1457
tree = self.make_branch_and_tree('.', format='development-colo')
1458
tree.bzrdir.create_branch(name='fool/bla')
1459
tree.bzrdir.create_branch(name='foo/bar')
1461
errors.AlreadyBranchError, tree.bzrdir.create_branch,
1465
class SampleBzrFormat(bzrdir.BzrFormat):
1468
def get_format_string(cls):
1469
return "First line\n"
1472
class TestBzrFormat(TestCase):
1473
"""Tests for BzrFormat."""
1475
def test_as_string(self):
1476
format = SampleBzrFormat()
1477
format.features = {"foo": "required"}
1478
self.assertEquals(format.as_string(),
1481
format.features["another"] = "optional"
1482
self.assertEquals(format.as_string(),
1485
"optional another\n")
1487
def test_network_name(self):
1488
# The network string should include the feature info
1489
format = SampleBzrFormat()
1490
format.features = {"foo": "required"}
1492
"First line\nrequired foo\n",
1493
format.network_name())
1495
def test_from_string_no_features(self):
1497
format = SampleBzrFormat.from_string(
1499
self.assertEquals({}, format.features)
1501
def test_from_string_with_feature(self):
1503
format = SampleBzrFormat.from_string(
1504
"First line\nrequired foo\n")
1505
self.assertEquals("required", format.features.get("foo"))
1507
def test_from_string_format_string_mismatch(self):
1508
# The first line has to match the format string
1509
self.assertRaises(AssertionError, SampleBzrFormat.from_string,
1510
"Second line\nrequired foo\n")
1512
def test_from_string_missing_space(self):
1513
# At least one space is required in the feature lines
1514
self.assertRaises(errors.ParseFormatError, SampleBzrFormat.from_string,
1515
"First line\nfoo\n")
1517
def test_from_string_with_spaces(self):
1518
# Feature with spaces (in case we add stuff like this in the future)
1519
format = SampleBzrFormat.from_string(
1520
"First line\nrequired foo with spaces\n")
1521
self.assertEquals("required", format.features.get("foo with spaces"))
1524
format1 = SampleBzrFormat()
1525
format1.features = {"nested-trees": "optional"}
1526
format2 = SampleBzrFormat()
1527
format2.features = {"nested-trees": "optional"}
1528
self.assertEquals(format1, format1)
1529
self.assertEquals(format1, format2)
1530
format3 = SampleBzrFormat()
1531
self.assertNotEquals(format1, format3)
1533
def test_check_support_status_optional(self):
1534
# Optional, so silently ignore
1535
format = SampleBzrFormat()
1536
format.features = {"nested-trees": "optional"}
1537
format.check_support_status(True)
1538
self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
1539
SampleBzrFormat.register_feature("nested-trees")
1540
format.check_support_status(True)
1542
def test_check_support_status_required(self):
1543
# Optional, so trigger an exception
1544
format = SampleBzrFormat()
1545
format.features = {"nested-trees": "required"}
1546
self.assertRaises(errors.MissingFeature, format.check_support_status,
1548
self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
1549
SampleBzrFormat.register_feature("nested-trees")
1550
format.check_support_status(True)
1552
def test_check_support_status_unknown(self):
1553
# treat unknown necessity as required
1554
format = SampleBzrFormat()
1555
format.features = {"nested-trees": "unknown"}
1556
self.assertRaises(errors.MissingFeature, format.check_support_status,
1558
self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
1559
SampleBzrFormat.register_feature("nested-trees")
1560
format.check_support_status(True)
1562
def test_feature_already_registered(self):
1563
# a feature can only be registered once
1564
self.addCleanup(SampleBzrFormat.unregister_feature, "nested-trees")
1565
SampleBzrFormat.register_feature("nested-trees")
1566
self.assertRaises(errors.FeatureAlreadyRegistered,
1567
SampleBzrFormat.register_feature, "nested-trees")
1569
def test_feature_with_space(self):
1570
# spaces are not allowed in feature names
1571
self.assertRaises(ValueError, SampleBzrFormat.register_feature,
added
removed
bzrlib/tests/test_bzrdir.py
