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
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
|
# Copyright (C) 2005, 2006, 2007 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."""
from cStringIO import StringIO
import errno
from itertools import izip
import os
from stat import S_ISDIR
import sys
import bzrlib.branch
from bzrlib import (
bzrdir,
errors,
lockdir,
repository,
revision as _mod_revision,
transactions,
transport,
ui,
workingtree,
)
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
from bzrlib.check import check
from bzrlib.errors import (FileExists,
NoSuchRevision,
NoSuchFile,
UninitializableFormat,
NotBranchError,
)
import bzrlib.revision
from bzrlib.tests import (
ChrootedTestCase,
TestCase,
TestCaseWithTransport,
TestNotApplicable,
TestSkipped,
)
from bzrlib.tests.bzrdir_implementations import TestCaseWithBzrDir
from bzrlib.trace import mutter
from bzrlib.transport import get_transport
from bzrlib.transport.local import LocalTransport
from bzrlib.upgrade import upgrade
from bzrlib.remote import RemoteBzrDir
from bzrlib.repofmt import weaverepo
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.
We ignore paths that represent data which is allowed to change during
a clone or sprout: for instance, inventory.knit contains gzip fragements
which have timestamps in them, and as we have read the inventory from
the source knit, the already-read data is recompressed rather than
reading it again, which leads to changed timestamps. This is ok though,
because the inventory.kndx file is not ignored, and the integrity of
knit joins is tested by test_knit and test_versionedfile.
:seealso: Additionally, assertRepositoryHasSameItems provides value
rather than representation checking of repositories for
equivalence.
"""
files = []
directories = ['.']
while directories:
dir = directories.pop()
for path in set(source.list_dir(dir) + target.list_dir(dir)):
path = dir + '/' + path
if path in ignore_list:
continue
try:
stat = source.stat(path)
except errors.NoSuchFile:
self.fail('%s not in source' % 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 assertRepositoryHasSameItems(self, left_repo, right_repo):
"""require left_repo and right_repo to contain the same data."""
# XXX: TODO: Doesn't work yet, because we need to be able to compare
# local repositories to remote ones... but this is an as-yet unsolved
# aspect of format management and the Remote protocols...
# self.assertEqual(left_repo._format.__class__,
# right_repo._format.__class__)
left_repo.lock_read()
try:
right_repo.lock_read()
try:
# revs
all_revs = left_repo.all_revision_ids()
self.assertEqual(left_repo.all_revision_ids(),
right_repo.all_revision_ids())
for rev_id in left_repo.all_revision_ids():
self.assertEqual(left_repo.get_revision(rev_id),
right_repo.get_revision(rev_id))
# inventories
left_inv_weave = left_repo.get_inventory_weave()
right_inv_weave = right_repo.get_inventory_weave()
self.assertEqual(set(left_inv_weave.versions()),
set(right_inv_weave.versions()))
# XXX: currently this does not handle indirectly referenced
# inventories (e.g. where the inventory is a delta basis for
# one that is fully present but that the revid for that
# inventory is not yet present.)
self.assertEqual(set(left_inv_weave.versions()), set(all_revs))
left_trees = left_repo.revision_trees(all_revs)
right_trees = right_repo.revision_trees(all_revs)
for left_tree, right_tree in izip(left_trees, right_trees):
self.assertEqual(left_tree.inventory, right_tree.inventory)
# texts
text_index = left_repo._generate_text_key_index()
self.assertEqual(text_index,
right_repo._generate_text_key_index())
for file_id, revision_id in text_index.iterkeys():
left_weave = left_repo.weave_store.get_weave(
file_id, left_repo.get_transaction())
right_weave = right_repo.weave_store.get_weave(
file_id, right_repo.get_transaction())
self.assertEqual(
left_weave.get_text(revision_id),
right_weave.get_text(revision_id))
# signatures
for rev_id in all_revs:
try:
left_text = left_repo.get_signature_text(rev_id)
except NoSuchRevision:
continue
right_text = right_repo.get_signature_text(rev_id)
self.assertEqual(left_text, right_text)
finally:
right_repo.unlock()
finally:
left_repo.unlock()
def skipIfNoWorkingTree(self, a_bzrdir):
"""Raises TestSkipped if a_bzrdir doesn't have a working tree.
If the bzrdir does have a workingtree, this is a no-op.
"""
try:
a_bzrdir.open_workingtree()
except (errors.NotLocalUrl, errors.NoWorkingTree):
raise TestSkipped("bzrdir on transport %r has no working tree"
% a_bzrdir.transport)
def createWorkingTreeOrSkip(self, a_bzrdir):
"""Create a working tree on a_bzrdir, or raise TestSkipped.
A simple wrapper for create_workingtree that translates NotLocalUrl into
TestSkipped. Returns the newly created working tree.
"""
try:
return a_bzrdir.create_workingtree()
except errors.NotLocalUrl:
raise TestSkipped("cannot make working tree with transport %r"
% a_bzrdir.transport)
def sproutOrSkip(self, from_bzrdir, to_url, revision_id=None,
force_new_repo=False):
"""Sprout from_bzrdir into to_url, or raise TestSkipped.
A simple wrapper for from_bzrdir.sprout that translates NotLocalUrl into
TestSkipped. Returns the newly sprouted bzrdir.
"""
to_transport = get_transport(to_url)
if not isinstance(to_transport, LocalTransport):
raise TestSkipped('Cannot sprout to remote bzrdirs.')
target = from_bzrdir.sprout(to_url, revision_id=revision_id,
force_new_repo=force_new_repo,
possible_transports=[to_transport])
return target
def test_create_null_workingtree(self):
dir = self.make_bzrdir('dir1')
dir.create_repository()
dir.create_branch()
try:
wt = dir.create_workingtree(revision_id=bzrlib.revision.NULL_REVISION)
except errors.NotLocalUrl:
raise TestSkipped("cannot make working tree with transport %r"
% dir.transport)
self.assertEqual([], wt.get_parent_ids())
def test_destroy_workingtree(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/file'])
tree.add('file')
tree.commit('first commit')
bzrdir = tree.bzrdir
try:
bzrdir.destroy_workingtree()
except errors.UnsupportedOperation:
raise TestSkipped('Format does not support destroying tree')
self.failIfExists('tree/file')
self.assertRaises(errors.NoWorkingTree, bzrdir.open_workingtree)
bzrdir.create_workingtree()
self.failUnlessExists('tree/file')
bzrdir.destroy_workingtree_metadata()
self.failUnlessExists('tree/file')
self.assertRaises(errors.NoWorkingTree, bzrdir.open_workingtree)
def test_destroy_branch(self):
branch = self.make_branch('branch')
bzrdir = branch.bzrdir
try:
bzrdir.destroy_branch()
except (errors.UnsupportedOperation, errors.TransportNotPossible):
raise TestNotApplicable('Format does not support destroying tree')
self.assertRaises(errors.NotBranchError, bzrdir.open_branch)
bzrdir.create_branch()
bzrdir.open_branch()
def test_destroy_repository(self):
repo = self.make_repository('repository')
bzrdir = repo.bzrdir
try:
bzrdir.destroy_repository()
except (errors.UnsupportedOperation, errors.TransportNotPossible):
raise TestNotApplicable('Format does not support destroying'
' repository')
self.assertRaises(errors.NoRepositoryPresent, bzrdir.open_repository)
bzrdir.create_repository()
bzrdir.open_repository()
def test_open_workingtree_raises_no_working_tree(self):
"""BzrDir.open_workingtree() should raise NoWorkingTree (rather than
e.g. NotLocalUrl) if there is no working tree.
"""
dir = self.make_bzrdir('source')
vfs_dir = bzrdir.BzrDir.open(self.get_vfs_only_url('source'))
if vfs_dir.has_workingtree():
# This BzrDir format doesn't support BzrDirs without working trees,
# so this test is irrelevant.
return
self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
def test_clone_on_transport(self):
a_dir = self.make_bzrdir('source')
target_transport = a_dir.root_transport.clone('..').clone('target')
target = a_dir.clone_on_transport(target_transport)
self.assertNotEqual(a_dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(a_dir.root_transport, target.root_transport,
['./.bzr/merge-hashes'])
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,
['./.bzr/merge-hashes'])
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,
['./.bzr/merge-hashes'])
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,
[
'./.bzr/merge-hashes',
'./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository, repo)
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):
# Create a shared repository
try:
shared_repo = self.make_repository('shared', shared=True)
except errors.IncompatibleFormat:
return
# Make a branch, 'commit_tree', and working tree outside of the shared
# repository, and commit some revisions to it.
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')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
# Copy the content (i.e. revisions) from the 'commit_tree' branch's
# repository into the shared repository.
tree.branch.repository.copy_content_into(shared_repo)
# Make a branch 'source' inside the shared repository.
dir = self.make_bzrdir('shared/source')
dir.create_branch()
# Clone 'source' to 'target', also inside the shared repository.
target = dir.clone(self.get_url('shared/target'))
# 'source', 'target', and the shared repo all have distinct bzrdirs.
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertNotEqual(dir.transport.base, shared_repo.bzrdir.transport.base)
# The shared repository will contain revisions from the 'commit_tree'
# repository, even revisions that are not part of the history of the
# 'commit_tree' branch.
self.assertTrue(shared_repo.has_revision('1'))
def test_clone_bzrdir_repository_branch_only_source_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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.branch.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
tree.branch.repository.copy_content_into(shared_repo)
if shared_repo.make_working_trees():
shared_repo.set_make_working_trees(False)
self.assertFalse(shared_repo.make_working_trees())
self.assertTrue(shared_repo.has_revision('1'))
dir = self.make_bzrdir('shared/source')
dir.create_branch()
target = dir.clone(self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertNotEqual(dir.transport.base, shared_repo.bzrdir.transport.base)
branch = target.open_branch()
self.assertTrue(branch.repository.has_revision('1'))
self.assertFalse(branch.repository.make_working_trees())
self.assertTrue(branch.repository.is_shared())
def test_clone_bzrdir_repository_under_shared_force_new_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['commit_tree/foo'])
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,
['./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository, repo)
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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.branch.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.branch.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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.branch.repository.copy_content_into(source.repository)
tree.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/basis-inventory-cache',
'./.bzr/checkout/stat-cache',
'./.bzr/merge-hashes',
'./.bzr/repository',
'./.bzr/stat-cache',
])
self.assertRepositoryHasSameItems(
tree.branch.repository, target.open_repository())
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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.branch.repository.copy_content_into(source.repository)
tree.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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.branch.repository.copy_content_into(source.repository)
tree.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)
repo = target.open_repository()
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository, repo)
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(['commit_tree/foo'])
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.branch.repository.copy_content_into(source.repository)
tree.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('source')
self.build_tree(['source/foo'])
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = dir.clone(self.get_url('target'))
self.skipIfNoWorkingTree(target)
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache',
'./.bzr/checkout/dirstate',
'./.bzr/checkout/stat-cache',
'./.bzr/checkout/merge-hashes',
'./.bzr/merge-hashes',
'./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository,
target.open_repository())
target.open_workingtree().revert()
def test_revert_inventory(self):
tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = dir.clone(self.get_url('target'))
self.skipIfNoWorkingTree(target)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache',
'./.bzr/checkout/dirstate',
'./.bzr/checkout/stat-cache',
'./.bzr/checkout/merge-hashes',
'./.bzr/merge-hashes',
'./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository,
target.open_repository())
target.open_workingtree().revert()
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
['./.bzr/stat-cache',
'./.bzr/checkout/dirstate',
'./.bzr/checkout/stat-cache',
'./.bzr/checkout/merge-hashes',
'./.bzr/merge-hashes',
'./.bzr/repository',
])
self.assertRepositoryHasSameItems(tree.branch.repository,
target.open_repository())
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
self.createWorkingTreeOrSkip(dir)
target = dir.clone(self.get_url('target'))
self.skipIfNoWorkingTree(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/checkout/merge-hashes',
'./.bzr/merge-hashes',
'./.bzr/repository/inventory.knit',
])
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(['source/foo'])
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.skipIfNoWorkingTree(target)
self.assertEqual(['1'], target.open_workingtree().get_parent_ids())
def test_clone_bzrdir_into_notrees_repo(self):
"""Cloning into a no-trees repo should not create a working tree"""
tree = self.make_branch_and_tree('source')
self.build_tree(['source/foo'])
tree.add('foo')
tree.commit('revision 1')
try:
repo = self.make_repository('repo', shared=True)
except errors.IncompatibleFormat:
raise TestNotApplicable('must support shared repositories')
if repo.make_working_trees():
repo.set_make_working_trees(False)
self.assertFalse(repo.make_working_trees())
dir = tree.bzrdir
a_dir = dir.clone(self.get_url('repo/a'))
a_dir.open_branch()
self.assertRaises(errors.NoWorkingTree, a_dir.open_workingtree)
def test_get_branch_reference_on_reference(self):
"""get_branch_reference should return the right url."""
referenced_branch = self.make_branch('referenced')
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.assertEqual(referenced_branch.bzrdir.root_transport.abspath('') + '/',
dir.get_branch_reference())
def test_get_branch_reference_on_non_reference(self):
"""get_branch_reference should return None for non-reference branches."""
branch = self.make_branch('referenced')
self.assertEqual(None, branch.bzrdir.get_branch_reference())
def test_get_branch_reference_no_branch(self):
"""get_branch_reference should not mask NotBranchErrors."""
dir = self.make_bzrdir('source')
if dir.has_branch():
# this format does not support branchless bzrdirs.
return
self.assertRaises(errors.NotBranchError, dir.get_branch_reference)
def test_sprout_bzrdir_empty(self):
dir = self.make_bzrdir('source')
target = self.sproutOrSkip(dir, 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 = self.sproutOrSkip(dir, self.get_url('target/child'))
self.assertRaises(errors.NoRepositoryPresent, target.open_repository)
target.open_branch()
try:
target.open_workingtree()
except errors.NoWorkingTree:
# bzrdir's that never have working trees are allowed to pass;
# whitelist them for now.
self.assertIsInstance(target, RemoteBzrDir)
def test_sprout_bzrdir_empty_under_shared_repo_force_new(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 = self.sproutOrSkip(dir, 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'))
try:
self.assertTrue(
_mod_revision.is_null(_mod_revision.ensure_null(
dir.open_branch().last_revision())))
except errors.NotBranchError:
pass
target = self.sproutOrSkip(dir, self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
# testing inventory isn't reasonable for repositories
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
[
'./.bzr/branch',
'./.bzr/checkout',
'./.bzr/inventory',
'./.bzr/parent',
'./.bzr/repository/inventory.knit',
])
try:
# If we happen to have a tree, we'll guarantee everything
# except for the tree root is the same.
inventory_f = file(dir.transport.base+'inventory', 'rb')
self.assertContainsRe(inventory_f.read(),
'<inventory file_id="TREE_ROOT[^"]*"'
' format="5">\n</inventory>\n')
inventory_f.close()
except IOError, e:
if e.errno != errno.ENOENT:
raise
def test_sprout_bzrdir_with_repository_to_shared(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.branch.repository.copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = self.sproutOrSkip(dir, 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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
tree.branch.repository.copy_content_into(shared_repo)
dir = self.make_bzrdir('shared/source')
dir.create_branch()
target = self.sproutOrSkip(dir, 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_branch_only_source_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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
tree.branch.repository.copy_content_into(shared_repo)
if shared_repo.make_working_trees():
shared_repo.set_make_working_trees(False)
self.assertFalse(shared_repo.make_working_trees())
self.assertTrue(shared_repo.has_revision('1'))
dir = self.make_bzrdir('shared/source')
dir.create_branch()
target = self.sproutOrSkip(dir, self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertNotEqual(dir.transport.base, shared_repo.bzrdir.transport.base)
branch = target.open_branch()
self.assertTrue(branch.repository.has_revision('1'))
if not isinstance(branch.bzrdir, RemoteBzrDir):
self.assertTrue(branch.repository.make_working_trees())
self.assertFalse(branch.repository.is_shared())
def test_sprout_bzrdir_repository_under_shared_force_new_repo(self):
tree = self.make_branch_and_tree('commit_tree')
self.build_tree(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.branch.repository.copy_content_into(source)
dir = source.bzrdir
try:
shared_repo = self.make_repository('target', shared=True)
except errors.IncompatibleFormat:
return
target = self.sproutOrSkip(dir, 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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.bzrdir.open_branch().set_revision_history([])
tree.set_parent_trees([])
tree.commit('revision 2', rev_id='2')
source = self.make_repository('source')
tree.branch.repository.copy_content_into(source)
dir = source.bzrdir
target = self.sproutOrSkip(dir, 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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1')
source = self.make_branch('source')
tree.branch.repository.copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = self.sproutOrSkip(dir, self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
[
'./.bzr/basis-inventory-cache',
'./.bzr/branch/branch.conf',
'./.bzr/branch/parent',
'./.bzr/checkout',
'./.bzr/checkout/inventory',
'./.bzr/checkout/stat-cache',
'./.bzr/inventory',
'./.bzr/parent',
'./.bzr/repository/inventory.knit',
'./.bzr/stat-cache',
'./foo',
])
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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch('source')
tree.branch.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 = self.sproutOrSkip(dir, 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(['commit_tree/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
source = self.make_branch('source')
tree.branch.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 = self.sproutOrSkip(dir, 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 = self.sproutOrSkip(dir, 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 = self.sproutOrSkip(dir, 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 = self.sproutOrSkip(dir, 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(['commit_tree/foo'])
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.branch.repository.copy_content_into(source.repository)
tree.bzrdir.open_branch().copy_content_into(source)
dir = source.bzrdir
target = self.sproutOrSkip(dir, 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('source')
self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
tree.add('foo')
tree.commit('revision 1')
dir = tree.bzrdir
target = self.sproutOrSkip(dir, self.get_url('target'))
self.assertNotEqual(dir.transport.base, target.transport.base)
self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
[
'./.bzr/branch/branch.conf',
'./.bzr/branch/parent',
'./.bzr/checkout/dirstate',
'./.bzr/checkout/stat-cache',
'./.bzr/checkout/inventory',
'./.bzr/inventory',
'./.bzr/parent',
'./.bzr/repository',
'./.bzr/stat-cache',
])
self.assertRepositoryHasSameItems(
tree.branch.repository, target.open_repository())
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 = self.createWorkingTreeOrSkip(dir)
self.build_tree(['source/subdir/'])
tree.add('subdir')
target = self.sproutOrSkip(dir, 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 = self.createWorkingTreeOrSkip(dir)
self.build_tree(['source/foo'])
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.skipIfNoWorkingTree(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()
# we trust that the working tree sprouting works via the other tests.
self.assertEqual(['1'], target.open_workingtree().get_parent_ids())
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(['source/foo'])
tree.add('foo')
tree.commit('revision 1', rev_id='1')
tree.commit('revision 2', rev_id='2', allow_pointless=True)
dir = tree.bzrdir
target = self.sproutOrSkip(dir, self.get_url('target'), revision_id='1')
self.assertEqual(['1'], target.open_workingtree().get_parent_ids())
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()
# Check that we have a repository object.
made_repo.has_revision('foo')
self.assertEqual(made_control, made_repo.bzrdir)
def test_create_repository_shared(self):
# a bzrdir can create a shared repository or
# fail appropriately
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)
try:
made_repo = made_control.create_repository(shared=True)
except errors.IncompatibleFormat:
# Old bzrdir formats don't support shared repositories
# and should raise IncompatibleFormat
return
self.assertTrue(made_repo.is_shared())
def test_create_repository_nonshared(self):
# a bzrdir can create a non-shared repository
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(shared=False)
self.assertFalse(made_repo.is_shared())
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
t = self.get_transport()
made_control = self.bzrdir_format.initialize(t.base)
made_repo = made_control.create_repository()
made_branch = made_control.create_branch()
made_tree = self.createWorkingTreeOrSkip(made_control)
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.
t = self.get_transport()
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)
t.mkdir('new')
t_new = t.clone('new')
made_control = self.bzrdir_format.initialize_on_transport(t_new)
source.branch.repository.clone(made_control)
source.branch.clone(made_control)
try:
made_tree = made_control.create_workingtree(revision_id='a')
except errors.NotLocalUrl:
raise TestSkipped("Can't make working tree on transport %r" % t)
self.assertEqual(['a'], made_tree.get_parent_ids())
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 = self.get_transport()
try:
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()
except errors.NotLocalUrl:
raise TestSkipped("Can't initialize %r on transport %r"
% (self.bzrdir_format, t))
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 exist.
found_transport.list_dir('.')
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
# repositories, or it supports anonymous repository formats, but not both.
anonymous_format = weaverepo.RepositoryFormat6()
identifiable_format = weaverepo.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 exist.
found_transport.list_dir('.')
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 exist.
found_transport.list_dir('.')
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 force the latest known format as downgrades may not be
# available
self.assertTrue(isinstance(dir._format.get_converter(
format=dir._format), bzrdir.Converter))
dir.needs_format_conversion(None)
def test_upgrade_new_instance(self):
"""Does an available updater work?"""
dir = self.make_bzrdir('.')
# for now, upgrade is not ready for partial bzrdirs.
dir.create_repository()
dir.create_branch()
self.createWorkingTreeOrSkip(dir)
if dir.can_convert_format():
# if its default updatable there must be an updater
# (we force the latest known format as downgrades may not be
# available
pb = ui.ui_factory.nested_progress_bar()
try:
dir._format.get_converter(format=dir._format).convert(dir, pb)
finally:
pb.finished()
# and it should pass 'check' now.
check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)
def test_format_description(self):
dir = self.make_bzrdir('.')
text = dir._format.get_format_description()
self.failUnless(len(text))
def test_retire_bzrdir(self):
bd = self.make_bzrdir('.')
transport = bd.root_transport
# must not overwrite existing directories
self.build_tree(['.bzr.retired.0/', '.bzr.retired.0/junk',],
transport=transport)
self.failUnless(transport.has('.bzr'))
bd.retire_bzrdir()
self.failIf(transport.has('.bzr'))
self.failUnless(transport.has('.bzr.retired.1'))
def test_retire_bzrdir_limited(self):
bd = self.make_bzrdir('.')
transport = bd.root_transport
# must not overwrite existing directories
self.build_tree(['.bzr.retired.0/', '.bzr.retired.0/junk',],
transport=transport)
self.failUnless(transport.has('.bzr'))
self.assertRaises((errors.FileExists, errors.DirectoryNotEmpty),
bd.retire_bzrdir, limit=0)
class TestBreakLock(TestCaseWithBzrDir):
def setUp(self):
super(TestBreakLock, self).setUp()
# we want a UI factory that accepts canned input for the tests:
# while SilentUIFactory still accepts stdin, we need to customise
# ours
self.old_factory = bzrlib.ui.ui_factory
self.addCleanup(self.restoreFactory)
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
def restoreFactory(self):
bzrlib.ui.ui_factory = self.old_factory
def test_break_lock_empty(self):
# break lock on an empty bzrdir should work silently.
dir = self.make_bzrdir('.')
try:
dir.break_lock()
except NotImplementedError:
pass
def test_break_lock_repository(self):
# break lock with just a repo should unlock the repo.
repo = self.make_repository('.')
repo.lock_write()
lock_repo = repo.bzrdir.open_repository()
if not lock_repo.get_physical_lock_status():
# This bzrdir's default repository does not physically lock things
# and thus this interaction cannot be tested at the interface
# level.
repo.unlock()
return
# only one yes needed here: it should only be unlocking
# the repo
bzrlib.ui.ui_factory.stdin = StringIO("y\n")
try:
repo.bzrdir.break_lock()
except NotImplementedError:
# this bzrdir does not implement break_lock - so we cant test it.
repo.unlock()
return
lock_repo.lock_write()
lock_repo.unlock()
self.assertRaises(errors.LockBroken, repo.unlock)
def test_break_lock_branch(self):
# break lock with just a repo should unlock the branch.
# and not directly try the repository.
# we test this by making a branch reference to a branch
# and repository in another bzrdir
# for pre-metadir formats this will fail, thats ok.
master = self.make_branch('branch')
thisdir = self.make_bzrdir('this')
try:
bzrlib.branch.BranchReferenceFormat().initialize(
thisdir, master)
except errors.IncompatibleFormat:
return
unused_repo = thisdir.create_repository()
master.lock_write()
unused_repo.lock_write()
try:
# two yes's : branch and repository. If the repo in this
# dir is inappropriately accessed, 3 will be needed, and
# we'll see that because the stream will be fully consumed
bzrlib.ui.ui_factory.stdin = StringIO("y\ny\ny\n")
# determine if the repository will have been locked;
this_repo_locked = \
thisdir.open_repository().get_physical_lock_status()
master.bzrdir.break_lock()
if this_repo_locked:
# only two ys should have been read
self.assertEqual("y\n", bzrlib.ui.ui_factory.stdin.read())
else:
# only one y should have been read
self.assertEqual("y\ny\n", bzrlib.ui.ui_factory.stdin.read())
# we should be able to lock a newly opened branch now
branch = master.bzrdir.open_branch()
branch.lock_write()
branch.unlock()
if this_repo_locked:
# we should not be able to lock the repository in thisdir as
# its still held by the explicit lock we took, and the break
# lock should not have touched it.
repo = thisdir.open_repository()
orig_default = lockdir._DEFAULT_TIMEOUT_SECONDS
try:
lockdir._DEFAULT_TIMEOUT_SECONDS = 1
self.assertRaises(errors.LockContention, repo.lock_write)
finally:
lockdir._DEFAULT_TIMEOUT_SECONDS = orig_default
finally:
unused_repo.unlock()
self.assertRaises(errors.LockBroken, master.unlock)
def test_break_lock_tree(self):
# break lock with a tree should unlock the tree but not try the
# branch explicitly. However this is very hard to test for as we
# dont have a tree reference class, nor is one needed;
# the worst case if this code unlocks twice is an extra question
# being asked.
tree = self.make_branch_and_tree('.')
tree.lock_write()
# three yes's : tree, branch and repository.
bzrlib.ui.ui_factory.stdin = StringIO("y\ny\ny\ny\n")
try:
tree.bzrdir.break_lock()
except (NotImplementedError, errors.LockActive):
# bzrdir does not support break_lock
# or one of the locked objects (currently only tree does this)
# raised a LockActive because we do still have a live locked
# object.
tree.unlock()
return
self.assertEqual("y\n", bzrlib.ui.ui_factory.stdin.read())
lock_tree = tree.bzrdir.open_workingtree()
lock_tree.lock_write()
lock_tree.unlock()
self.assertRaises(errors.LockBroken, tree.unlock)
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
# - do the vfs initialisation over the basic vfs transport
# XXX: TODO this should become a 'bzrdirlocation' api call.
url = self.get_vfs_only_url('subdir')
get_transport(self.get_vfs_only_url()).mkdir('subdir')
made_control = self.bzrdir_format.initialize(self.get_url('subdir'))
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
made_control = bzrdir.BzrDir.open(self.get_readonly_url('subdir'))
self.assertRaises(errors.NoRepositoryPresent,
made_control.find_repository)
|