1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
|
# (C) 2005, 2006 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests for bzrdir implementations - tests a bzrdir format."""
import os
from stat import *
import sys
import bzrlib.branch
import bzrlib.bzrdir as bzrdir
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
from bzrlib.check import check
from bzrlib.commit import commit
import bzrlib.errors as errors
from bzrlib.errors import (FileExists,
NoSuchRevision,
NoSuchFile,
UninitializableFormat,
NotBranchError,
)
import bzrlib.repository as repository
from bzrlib.tests import (
ChrootedTestCase,
TestCase,
TestCaseWithTransport,
TestSkipped,
)
from bzrlib.trace import mutter
import bzrlib.transactions as transactions
import bzrlib.transport as transport
from bzrlib.transport import get_transport
import bzrlib.ui as ui
from bzrlib.upgrade import upgrade
import bzrlib.workingtree as workingtree
class TestCaseWithBzrDir(TestCaseWithTransport):
def setUp(self):
super(TestCaseWithBzrDir, self).setUp()
self.bzrdir = None
def get_bzrdir(self):
if self.bzrdir is None:
self.bzrdir = self.make_bzrdir(None)
return self.bzrdir
def make_bzrdir(self, relpath):
try:
url = self.get_url(relpath)
segments = url.split('/')
if segments and segments[-1] not in ('', '.'):
parent = '/'.join(segments[:-1])
t = get_transport(parent)
try:
t.mkdir(segments[-1])
except FileExists:
pass
return self.bzrdir_format.initialize(url)
except UninitializableFormat:
raise TestSkipped("Format %s is not initializable.")
class TestBzrDir(TestCaseWithBzrDir):
# Many of these tests test for disk equality rather than checking
# for semantic equivalence. This works well for some tests but
# is not good at handling changes in representation or the addition
# or removal of control data. It would be nice to for instance:
# sprout a new branch, check that the nickname has been reset by hand
# and then set the nickname to match the source branch, at which point
# a semantic equivalence should pass
def assertDirectoriesEqual(self, source, target, ignore_list=[]):
"""Assert that the content of source and target are identical.
paths in ignore list will be completely ignored.
"""
files = []
directories = ['.']
while directories:
dir = directories.pop()
for path in source.list_dir(dir):
path = dir + '/' + path
if path in ignore_list:
continue
stat = source.stat(path)
if S_ISDIR(stat.st_mode):
self.assertTrue(S_ISDIR(target.stat(path).st_mode))
directories.append(path)
else:
self.assertEqualDiff(source.get(path).read(),
target.get(path).read(),
"text for file %r differs:\n" % path)
def test_clone_bzrdir_empty(self):
dir = self.make_bzrdir('source')
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_empty_force_new_ignored(self):
# the force_new_repo parameter should have no effect on an empty
# bzrdir's clone logic
dir = self.make_bzrdir('source')
target = dir.clone(self.get_url('target'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_repository(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
dir = self.make_bzrdir('source')
repo = dir.create_repository()
repo.fetch(tree.branch.repository)
self.assertTrue(repo.has_revision('1'))
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_repository_under_shared(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
dir = self.make_bzrdir('source')
repo = dir.create_repository()
repo.fetch(tree.branch.repository)
self.assertTrue(repo.has_revision('1'))
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.clone(self.get_url('target/child'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertRaises(errors.NoRepositoryPresent, target.open_repository)
def test_clone_bzrdir_repository_branch_both_under_shared(self):
try:
shared_repo = self.make_repository('shared', shared=True)
except errors.IncompatibleFormat:
return
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
tree.bzrdir.open_repository().copy_content_into(shared_repo)
dir = self.make_bzrdir('shared/source')
dir.create_branch()
target = dir.clone(self.get_url('shared/target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertNotEqual(dir.transport.base, shared_repo.bzrdir.transport.base)
self.assertTrue(shared_repo.has_revision('1'))
def test_clone_bzrdir_repository_under_shared_force_new_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
dir = self.make_bzrdir('source')
repo = dir.create_repository()
repo.fetch(tree.branch.repository)
self.assertTrue(repo.has_revision('1'))
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.clone(self.get_url('target/child'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_repository_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a repository with some revisions,
# and clone it with a revision limit.
#
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.bzrdir.open_repository().copy_content_into(source)
dir = source.bzrdir
target = dir.clone(self.get_url('target'), revision_id='2')
raise TestSkipped('revision limiting not strict yet')
def test_clone_bzrdir_branch_and_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache', './.bzr/checkout/stat-cache'])
def test_clone_bzrdir_branch_and_repo_into_shared_repo(self):
# by default cloning into a shared repo uses the shared repo.
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
dir = source.bzrdir
target = dir.clone(self.get_url('target/child'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertRaises(errors.NoRepositoryPresent, target.open_repository)
self.assertEqual(source.revision_history(),
target.open_branch().revision_history())
def test_clone_bzrdir_branch_and_repo_into_shared_repo_force_new_repo(self):
# by default cloning into a shared repo uses the shared repo.
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
dir = source.bzrdir
target = dir.clone(self.get_url('target/child'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
target.open_repository()
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_branch_reference(self):
# cloning should preserve the reference status of the branch in a bzrdir
referenced_branch = self.make_branch('referencced')
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_clone_bzrdir_branch_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a branch with some revisions,
# and clone it with a revision limit.
#
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = dir.clone(self.get_url('target'), revision_id='1')
self.assertEqual('1', target.open_branch().last_revision())
def test_clone_bzrdir_tree_branch_repo(self):
tree = self.make_branch_and_tree('sourcce')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache', './.bzr/checkout/stat-cache'])
target.open_workingtree().revert([])
def test_revert_inventory(self):
tree = self.make_branch_and_tree('sourcce')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = dir.clone(self.get_url('target'))
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache', './.bzr/checkout/stat-cache'])
target.open_workingtree().revert([])
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache', './.bzr/checkout/stat-cache'])
def test_clone_bzrdir_tree_branch_reference(self):
# a tree with a branch reference (aka a checkout)
# should stay a checkout on clone.
referenced_branch = self.make_branch('referencced')
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
dir.create_workingtree()
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache', './.bzr/checkout/stat-cache'])
def test_clone_bzrdir_tree_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a tree with a revision with a last-revision
# and clone it with a revision limit.
# This smoke test just checks the revision-id is right. Tree specific
# tests will check corner cases.
tree = self.make_branch_and_tree('source')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
dir = tree.bzrdir
target = dir.clone(self.get_url('target'), revision_id='1')
self.assertEqual('1', target.open_workingtree().last_revision())
def test_clone_bzrdir_incomplete_source_with_basis(self):
# ensure that basis really does grab from the basis by having incomplete source
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch_and_tree('source')
# this gives us an incomplete repository
tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
tree.commit('revision 2', rev_id='2', allow_pointless=True)
tree.bzrdir.open_branch().copy_content_into(source.branch)
tree.copy_content_into(source)
self.assertFalse(source.branch.repository.has_revision('2'))
dir = source.bzrdir
target = dir.clone(self.get_url('target'), basis=tree.bzrdir)
self.assertEqual('2', target.open_branch().last_revision())
self.assertEqual('2', target.open_workingtree().last_revision())
self.assertTrue(target.open_branch().repository.has_revision('2'))
def test_sprout_bzrdir_empty(self):
dir = self.make_bzrdir('source')
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
# creates a new repository branch and tree
target.open_repository()
target.open_branch()
target.open_workingtree()
def test_sprout_bzrdir_empty_under_shared_repo(self):
# sprouting an empty dir into a repo uses the repo
dir = self.make_bzrdir('source')
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'))
self.assertRaises(errors.NoRepositoryPresent, target.open_repository)
target.open_branch()
target.open_workingtree()
def test_sprout_bzrdir_empty_under_shared_repo(self):
# the force_new_repo parameter should force use of a new repo in an empty
# bzrdir's sprout logic
dir = self.make_bzrdir('source')
try:
self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'), force_new_repo=True)
target.open_repository()
target.open_branch()
target.open_workingtree()
def test_sprout_bzrdir_repository(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
dir = self.make_bzrdir('source')
repo = dir.create_repository()
repo.fetch(tree.branch.repository)
self.assertTrue(repo.has_revision('1'))
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport)
def test_sprout_bzrdir_with_repository_to_shared(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.bzrdir.open_repository().copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertTrue(shared_repo.has_revision('1'))
def test_sprout_bzrdir_repository_branch_both_under_shared(self):
try:
shared_repo = self.make_repository('shared', shared=True)
except errors.IncompatibleFormat:
return
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
tree.bzrdir.open_repository().copy_content_into(shared_repo)
dir = self.make_bzrdir('shared/source')
dir.create_branch()
target = dir.sprout(self.get_url('shared/target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertNotEqual(dir.transport.base, shared_repo.bzrdir.transport.base)
self.assertTrue(shared_repo.has_revision('1'))
def test_sprout_bzrdir_repository_under_shared_force_new_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.bzrdir.open_repository().copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertFalse(shared_repo.has_revision('1'))
def test_sprout_bzrdir_repository_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a repository with some revisions,
# and sprout it with a revision limit.
#
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_last_revision(None)
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.bzrdir.open_repository().copy_content_into(source)
dir = source.bzrdir
target = dir.sprout(self.get_url('target'), revision_id='2')
raise TestSkipped('revision limiting not strict yet')
def test_sprout_bzrdir_branch_and_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache',
'./.bzr/checkout/stat-cache',
'./.bzr/inventory',
'./.bzr/checkout/inventory',
])
def test_sprout_bzrdir_branch_and_repo_shared(self):
# sprouting a branch with a repo into a shared repo uses the shared
# repo
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'))
self.assertTrue(shared_repo.has_revision('1'))
def test_sprout_bzrdir_branch_and_repo_shared_force_new_repo(self):
# sprouting a branch with a repo into a shared repo uses the shared
# repo
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertFalse(shared_repo.has_revision('1'))
def test_sprout_bzrdir_branch_reference(self):
# sprouting should create a repository if needed and a sprouted branch.
referenced_branch = self.make_branch('referencced')
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
# we want target to have a branch that is in-place.
self.assertEqual(target, target.open_branch().bzrdir)
# and as we dont support repositories being detached yet, a repo in
# place
target.open_repository()
def test_sprout_bzrdir_branch_reference_shared(self):
# sprouting should create a repository if needed and a sprouted branch.
referenced_tree = self.make_branch_and_tree('referenced')
referenced_tree.commit('1', rev_id='1', allow_pointless=True)
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_tree.branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'))
self.assertNotEqual(dir.transport.base, target.transport.base)
# we want target to have a branch that is in-place.
self.assertEqual(target, target.open_branch().bzrdir)
# and we want no repository as the target is shared
self.assertRaises(errors.NoRepositoryPresent,
target.open_repository)
# and we want revision '1' in the shared repo
self.assertTrue(shared_repo.has_revision('1'))
def test_sprout_bzrdir_branch_reference_shared_force_new_repo(self):
# sprouting should create a repository if needed and a sprouted branch.
referenced_tree = self.make_branch_and_tree('referenced')
referenced_tree.commit('1', rev_id='1', allow_pointless=True)
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_tree.branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = dir.sprout(self.get_url('target/child'), force_new_repo=True)
self.assertNotEqual(dir.transport.base, target.transport.base)
# we want target to have a branch that is in-place.
self.assertEqual(target, target.open_branch().bzrdir)
# and we want revision '1' in the new repo
self.assertTrue(target.open_repository().has_revision('1'))
# but not the shared one
self.assertFalse(shared_repo.has_revision('1'))
def test_sprout_bzrdir_branch_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a repository with some revisions,
# and sprout it with a revision limit.
#
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
source = self.make_branch('source')
tree.bzrdir.open_repository().copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = dir.sprout(self.get_url('target'), revision_id='1')
self.assertEqual('1', target.open_branch().last_revision())
def test_sprout_bzrdir_tree_branch_repo(self):
tree = self.make_branch_and_tree('sourcce')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache',
'./.bzr/checkout/stat-cache',
'./.bzr/inventory',
'./.bzr/checkout/inventory',
])
def test_sprout_bzrdir_tree_branch_reference(self):
# sprouting should create a repository if needed and a sprouted branch.
# the tree state should not be copied.
referenced_branch = self.make_branch('referencced')
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
tree = dir.create_workingtree()
tree.bzrdir.root_transport.mkdir('subdir')
tree.add('subdir')
target = dir.sprout(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
# we want target to have a branch that is in-place.
self.assertEqual(target, target.open_branch().bzrdir)
# and as we dont support repositories being detached yet, a repo in
# place
target.open_repository()
result_tree = target.open_workingtree()
self.assertFalse(result_tree.has_filename('subdir'))
def test_sprout_bzrdir_tree_branch_reference_revision(self):
# sprouting should create a repository if needed and a sprouted branch.
# the tree state should not be copied but the revision changed,
# and the likewise the new branch should be truncated too
referenced_branch = self.make_branch('referencced')
dir = self.make_bzrdir('source')
try:
reference = bzrlib.branch.BranchReferenceFormat().initialize(dir,
referenced_branch)
except errors.IncompatibleFormat:
# this is ok too, not all formats have to support references.
return
self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
tree = dir.create_workingtree()
self.build_tree(['foo'], transport=dir.root_transport)
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
target = dir.sprout(self.get_url('target'), revision_id='1')
self.assertNotEqual(dir.transport.base, target.transport.base)
# we want target to have a branch that is in-place.
self.assertEqual(target, target.open_branch().bzrdir)
# and as we dont support repositories being detached yet, a repo in
# place
target.open_repository()
# we trust that the working tree sprouting works via the other tests.
self.assertEqual('1', target.open_workingtree().last_revision())
self.assertEqual('1', target.open_branch().last_revision())
def test_sprout_bzrdir_tree_revision(self):
# test for revision limiting, [smoke test, not corner case checks].
# make a tree with a revision with a last-revision
# and sprout it with a revision limit.
# This smoke test just checks the revision-id is right. Tree specific
# tests will check corner cases.
tree = self.make_branch_and_tree('source')
self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
dir = tree.bzrdir
target = dir.sprout(self.get_url('target'), revision_id='1')
self.assertEqual('1', target.open_workingtree().last_revision())
def test_sprout_bzrdir_incomplete_source_with_basis(self):
# ensure that basis really does grab from the basis by having incomplete source
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch_and_tree('source')
# this gives us an incomplete repository
tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
tree.commit('revision 2', rev_id='2', allow_pointless=True)
tree.bzrdir.open_branch().copy_content_into(source.branch)
tree.copy_content_into(source)
self.assertFalse(source.branch.repository.has_revision('2'))
dir = source.bzrdir
target = dir.sprout(self.get_url('target'), basis=tree.bzrdir)
self.assertEqual('2', target.open_branch().last_revision())
self.assertEqual('2', target.open_workingtree().last_revision())
self.assertTrue(target.open_branch().repository.has_revision('2'))
def test_format_initialize_find_open(self):
# loopback test to check the current format initializes to itself.
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
# supported formats must be able to init and open
t = get_transport(self.get_url())
readonly_t = get_transport(self.get_readonly_url())
made_control = self.bzrdir_format.initialize(t.base)
self.failUnless(isinstance(made_control, bzrdir.BzrDir))
self.assertEqual(self.bzrdir_format,
bzrdir.BzrDirFormat.find_format(readonly_t))
direct_opened_dir = self.bzrdir_format.open(readonly_t)
opened_dir = bzrdir.BzrDir.open(t.base)
self.assertEqual(made_control._format,
opened_dir._format)
self.assertEqual(direct_opened_dir._format,
opened_dir._format)
self.failUnless(isinstance(opened_dir, bzrdir.BzrDir))
def test_open_not_bzrdir(self):
# test the formats specific behaviour for no-content or similar dirs.
self.assertRaises(NotBranchError,
self.bzrdir_format.open,
get_transport(self.get_readonly_url()))
def test_create_branch(self):
# a bzrdir can construct a branch and repository for itself.
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
t = get_transport(self.get_url())
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
self.failUnless(isinstance(made_branch, bzrlib.branch.Branch))
self.assertEqual(made_control, made_branch.bzrdir)
def test_open_branch(self):
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
t = get_transport(self.get_url())
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
opened_branch = made_control.open_branch()
self.assertEqual(made_control, opened_branch.bzrdir)
self.failUnless(isinstance(opened_branch, made_branch.__class__))
self.failUnless(isinstance(opened_branch._format, made_branch._format.__class__))
def test_create_repository(self):
# a bzrdir can construct a repository for itself.
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
t = get_transport(self.get_url())
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
self.failUnless(isinstance(made_repo, repository.Repository))
self.assertEqual(made_control, made_repo.bzrdir)
def test_open_repository(self):
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
t = get_transport(self.get_url())
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
opened_repo = made_control.open_repository()
self.assertEqual(made_control, opened_repo.bzrdir)
self.failUnless(isinstance(opened_repo, made_repo.__class__))
self.failUnless(isinstance(opened_repo._format, made_repo._format.__class__))
def test_create_workingtree(self):
# a bzrdir can construct a working tree for itself.
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
# this has to be tested with local access as we still support creating
# format 6 bzrdirs
t = get_transport('.')
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
made_tree = made_control.create_workingtree()
self.failUnless(isinstance(made_tree, workingtree.WorkingTree))
self.assertEqual(made_control, made_tree.bzrdir)
def test_create_workingtree_revision(self):
# a bzrdir can construct a working tree for itself @ a specific revision.
source = self.make_branch_and_tree('source')
source.commit('a', rev_id='a', allow_pointless=True)
source.commit('b', rev_id='b', allow_pointless=True)
self.build_tree(['new/'])
made_control = self.bzrdir_format.initialize('new')
source.branch.repository.clone(made_control)
source.branch.clone(made_control)
made_tree = made_control.create_workingtree(revision_id='a')
self.assertEqual('a', made_tree.last_revision())
def test_open_workingtree(self):
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
# this has to be tested with local access as we still support creating
# format 6 bzrdirs
t = get_transport('.')
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
made_tree = made_control.create_workingtree()
opened_tree = made_control.open_workingtree()
self.assertEqual(made_control, opened_tree.bzrdir)
self.failUnless(isinstance(opened_tree, made_tree.__class__))
self.failUnless(isinstance(opened_tree._format, made_tree._format.__class__))
def test_get_branch_transport(self):
dir = self.make_bzrdir('.')
# without a format, get_branch_transport gives use a transport
# which -may- point to an existing dir.
self.assertTrue(isinstance(dir.get_branch_transport(None),
transport.Transport))
# with a given format, either the bzr dir supports identifiable
# branches, or it supports anonymous branch formats, but not both.
anonymous_format = bzrlib.branch.BzrBranchFormat4()
identifiable_format = bzrlib.branch.BzrBranchFormat5()
try:
found_transport = dir.get_branch_transport(anonymous_format)
self.assertRaises(errors.IncompatibleFormat,
dir.get_branch_transport,
identifiable_format)
except errors.IncompatibleFormat:
found_transport = dir.get_branch_transport(identifiable_format)
self.assertTrue(isinstance(found_transport, transport.Transport))
# and the dir which has been initialized for us must be statable.
found_transport.stat('.')
def test_get_repository_transport(self):
dir = self.make_bzrdir('.')
# without a format, get_repository_transport gives use a transport
# which -may- point to an existing dir.
self.assertTrue(isinstance(dir.get_repository_transport(None),
transport.Transport))
# with a given format, either the bzr dir supports identifiable
# repositoryes, or it supports anonymous repository formats, but not both.
anonymous_format = repository.RepositoryFormat6()
identifiable_format = repository.RepositoryFormat7()
try:
found_transport = dir.get_repository_transport(anonymous_format)
self.assertRaises(errors.IncompatibleFormat,
dir.get_repository_transport,
identifiable_format)
except errors.IncompatibleFormat:
found_transport = dir.get_repository_transport(identifiable_format)
self.assertTrue(isinstance(found_transport, transport.Transport))
# and the dir which has been initialized for us must be statable.
found_transport.stat('.')
def test_get_workingtree_transport(self):
dir = self.make_bzrdir('.')
# without a format, get_workingtree_transport gives use a transport
# which -may- point to an existing dir.
self.assertTrue(isinstance(dir.get_workingtree_transport(None),
transport.Transport))
# with a given format, either the bzr dir supports identifiable
# trees, or it supports anonymous tree formats, but not both.
anonymous_format = workingtree.WorkingTreeFormat2()
identifiable_format = workingtree.WorkingTreeFormat3()
try:
found_transport = dir.get_workingtree_transport(anonymous_format)
self.assertRaises(errors.IncompatibleFormat,
dir.get_workingtree_transport,
identifiable_format)
except errors.IncompatibleFormat:
found_transport = dir.get_workingtree_transport(identifiable_format)
self.assertTrue(isinstance(found_transport, transport.Transport))
# and the dir which has been initialized for us must be statable.
found_transport.stat('.')
def test_root_transport(self):
dir = self.make_bzrdir('.')
self.assertEqual(dir.root_transport.base,
get_transport(self.get_url('.')).base)
def test_find_repository_no_repo_under_standalone_branch(self):
# finding a repo stops at standalone branches even if there is a
# higher repository available.
try:
repo = self.make_repository('.', shared=True)
except errors.IncompatibleFormat:
# need a shared repository to test this.
return
url = self.get_url('intermediate')
get_transport(self.get_url()).mkdir('intermediate')
get_transport(self.get_url()).mkdir('intermediate/child')
made_control = self.bzrdir_format.initialize(url)
made_control.create_repository()
innermost_control = self.bzrdir_format.initialize(
self.get_url('intermediate/child'))
try:
child_repo = innermost_control.open_repository()
# if there is a repository, then the format cannot ever hit this
# code path.
return
except errors.NoRepositoryPresent:
pass
self.assertRaises(errors.NoRepositoryPresent,
innermost_control.find_repository)
def test_find_repository_containing_shared_repository(self):
# find repo inside a shared repo with an empty control dir
# returns the shared repo.
try:
repo = self.make_repository('.', shared=True)
except errors.IncompatibleFormat:
# need a shared repository to test this.
return
url = self.get_url('childbzrdir')
get_transport(self.get_url()).mkdir('childbzrdir')
made_control = self.bzrdir_format.initialize(url)
try:
child_repo = made_control.open_repository()
# if there is a repository, then the format cannot ever hit this
# code path.
return
except errors.NoRepositoryPresent:
pass
found_repo = made_control.find_repository()
self.assertEqual(repo.bzrdir.root_transport.base,
found_repo.bzrdir.root_transport.base)
def test_find_repository_standalone_with_containing_shared_repository(self):
# find repo inside a standalone repo inside a shared repo finds the standalone repo
try:
containing_repo = self.make_repository('.', shared=True)
except errors.IncompatibleFormat:
# need a shared repository to test this.
return
child_repo = self.make_repository('childrepo')
opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
found_repo = opened_control.find_repository()
self.assertEqual(child_repo.bzrdir.root_transport.base,
found_repo.bzrdir.root_transport.base)
def test_find_repository_shared_within_shared_repository(self):
# find repo at a shared repo inside a shared repo finds the inner repo
try:
containing_repo = self.make_repository('.', shared=True)
except errors.IncompatibleFormat:
# need a shared repository to test this.
return
url = self.get_url('childrepo')
get_transport(self.get_url()).mkdir('childrepo')
child_control = self.bzrdir_format.initialize(url)
child_repo = child_control.create_repository(shared=True)
opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
found_repo = opened_control.find_repository()
self.assertEqual(child_repo.bzrdir.root_transport.base,
found_repo.bzrdir.root_transport.base)
self.assertNotEqual(child_repo.bzrdir.root_transport.base,
containing_repo.bzrdir.root_transport.base)
def test_find_repository_with_nested_dirs_works(self):
# find repo inside a bzrdir inside a bzrdir inside a shared repo
# finds the outer shared repo.
try:
repo = self.make_repository('.', shared=True)
except errors.IncompatibleFormat:
# need a shared repository to test this.
return
url = self.get_url('intermediate')
get_transport(self.get_url()).mkdir('intermediate')
get_transport(self.get_url()).mkdir('intermediate/child')
made_control = self.bzrdir_format.initialize(url)
try:
child_repo = made_control.open_repository()
# if there is a repository, then the format cannot ever hit this
# code path.
return
except errors.NoRepositoryPresent:
pass
innermost_control = self.bzrdir_format.initialize(
self.get_url('intermediate/child'))
try:
child_repo = innermost_control.open_repository()
# if there is a repository, then the format cannot ever hit this
# code path.
return
except errors.NoRepositoryPresent:
pass
found_repo = innermost_control.find_repository()
self.assertEqual(repo.bzrdir.root_transport.base,
found_repo.bzrdir.root_transport.base)
def test_can_and_needs_format_conversion(self):
# check that we can ask an instance if its upgradable
dir = self.make_bzrdir('.')
if dir.can_convert_format():
# if its default updatable there must be an updater
# (we change the default to match the lastest known format
# as downgrades may not be available
old_format = bzrdir.BzrDirFormat.get_default_format()
bzrdir.BzrDirFormat.set_default_format(dir._format)
try:
self.assertTrue(isinstance(dir._format.get_converter(),
bzrdir.Converter))
finally:
bzrdir.BzrDirFormat.set_default_format(old_format)
dir.needs_format_conversion(None)
def test_upgrade_new_instance(self):
"""Does an available updater work ?."""
dir = self.make_bzrdir('.')
# for now, check is not ready for partial bzrdirs.
dir.create_repository()
dir.create_branch()
dir.create_workingtree()
if dir.can_convert_format():
# if its default updatable there must be an updater
# (we change the default to match the lastest known format
# as downgrades may not be available
old_format = bzrdir.BzrDirFormat.get_default_format()
bzrdir.BzrDirFormat.set_default_format(dir._format)
pb = ui.ui_factory.nested_progress_bar()
try:
dir._format.get_converter(None).convert(dir, pb)
finally:
bzrdir.BzrDirFormat.set_default_format(old_format)
pb.finished()
# and it should pass 'check' now.
check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)
class ChrootedBzrDirTests(ChrootedTestCase):
def test_find_repository_no_repository(self):
# loopback test to check the current format fails to find a
# share repository correctly.
if not self.bzrdir_format.is_supported():
# unsupported formats are not loopback testable
# because the default open will not open them and
# they may not be initializable.
return
# supported formats must be able to init and open
url = self.get_url('subdir')
get_transport(self.get_url()).mkdir('subdir')
made_control = self.bzrdir_format.initialize(url)
try:
repo = made_control.open_repository()
# if there is a repository, then the format cannot ever hit this
# code path.
return
except errors.NoRepositoryPresent:
pass
opened_control = bzrdir.BzrDir.open(self.get_readonly_url('subdir'))
self.assertRaises(errors.NoRepositoryPresent,
opened_control.find_repository)
|