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
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
|
# Copyright (C) 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
import os
import stat
from StringIO import StringIO
import sys
from bzrlib import (
errors,
generate_ids,
osutils,
progress,
revision as _mod_revision,
symbol_versioning,
tests,
urlutils,
)
from bzrlib.bzrdir import BzrDir
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
UnversionedParent, ParentLoop, DeletingParent,
NonDirectoryParent)
from bzrlib.diff import show_diff_trees
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
ReusingTransform, CantMoveRoot,
PathsNotVersionedError, ExistingLimbo,
ExistingPendingDeletion, ImmortalLimbo,
ImmortalPendingDeletion, LockError)
from bzrlib.osutils import file_kind, pathjoin
from bzrlib.merge import Merge3Merger
from bzrlib.tests import (
CaseInsensitiveFilesystemFeature,
HardlinkFeature,
SymlinkFeature,
TestCase,
TestCaseInTempDir,
TestSkipped,
)
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
resolve_conflicts, cook_conflicts,
find_interesting, build_tree, get_backup_name,
change_entry, _FileMover, resolve_checkout,
TransformPreview)
class TestTreeTransform(tests.TestCaseWithTransport):
def setUp(self):
super(TestTreeTransform, self).setUp()
self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
os.chdir('..')
def get_transform(self):
transform = TreeTransform(self.wt)
#self.addCleanup(transform.finalize)
return transform, transform.root
def test_existing_limbo(self):
transform, root = self.get_transform()
limbo_name = transform._limbodir
deletion_path = transform._deletiondir
os.mkdir(pathjoin(limbo_name, 'hehe'))
self.assertRaises(ImmortalLimbo, transform.apply)
self.assertRaises(LockError, self.wt.unlock)
self.assertRaises(ExistingLimbo, self.get_transform)
self.assertRaises(LockError, self.wt.unlock)
os.rmdir(pathjoin(limbo_name, 'hehe'))
os.rmdir(limbo_name)
os.rmdir(deletion_path)
transform, root = self.get_transform()
transform.apply()
def test_existing_pending_deletion(self):
transform, root = self.get_transform()
deletion_path = self._limbodir = urlutils.local_path_from_url(
transform._tree._control_files.controlfilename('pending-deletion'))
os.mkdir(pathjoin(deletion_path, 'blocking-directory'))
self.assertRaises(ImmortalPendingDeletion, transform.apply)
self.assertRaises(LockError, self.wt.unlock)
self.assertRaises(ExistingPendingDeletion, self.get_transform)
def test_build(self):
transform, root = self.get_transform()
self.wt.lock_tree_write()
self.addCleanup(self.wt.unlock)
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
imaginary_id = transform.trans_id_tree_path('imaginary')
imaginary_id2 = transform.trans_id_tree_path('imaginary/')
self.assertEqual(imaginary_id, imaginary_id2)
self.assertEqual(transform.get_tree_parent(imaginary_id), root)
self.assertEqual(transform.final_kind(root), 'directory')
self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
trans_id = transform.create_path('name', root)
self.assertIs(transform.final_file_id(trans_id), None)
self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
transform.create_file('contents', trans_id)
transform.set_executability(True, trans_id)
transform.version_file('my_pretties', trans_id)
self.assertRaises(DuplicateKey, transform.version_file,
'my_pretties', trans_id)
self.assertEqual(transform.final_file_id(trans_id), 'my_pretties')
self.assertEqual(transform.final_parent(trans_id), root)
self.assertIs(transform.final_parent(root), ROOT_PARENT)
self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
oz_id = transform.create_path('oz', root)
transform.create_directory(oz_id)
transform.version_file('ozzie', oz_id)
trans_id2 = transform.create_path('name2', root)
transform.create_file('contents', trans_id2)
transform.set_executability(False, trans_id2)
transform.version_file('my_pretties2', trans_id2)
modified_paths = transform.apply().modified_paths
self.assertEqual('contents', self.wt.get_file_byname('name').read())
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
self.assertIs(self.wt.is_executable('my_pretties'), True)
self.assertIs(self.wt.is_executable('my_pretties2'), False)
self.assertEqual('directory', file_kind(self.wt.abspath('oz')))
self.assertEqual(len(modified_paths), 3)
tree_mod_paths = [self.wt.id2abspath(f) for f in
('ozzie', 'my_pretties', 'my_pretties2')]
self.assertSubset(tree_mod_paths, modified_paths)
# is it safe to finalize repeatedly?
transform.finalize()
transform.finalize()
def test_hardlink(self):
self.requireFeature(HardlinkFeature)
transform, root = self.get_transform()
transform.new_file('file1', root, 'contents')
transform.apply()
target = self.make_branch_and_tree('target')
target_transform = TreeTransform(target)
trans_id = target_transform.create_path('file1', target_transform.root)
target_transform.create_hardlink(self.wt.abspath('file1'), trans_id)
target_transform.apply()
self.failUnlessExists('target/file1')
source_stat = os.stat(self.wt.abspath('file1'))
target_stat = os.stat('target/file1')
self.assertEqual(source_stat, target_stat)
def test_convenience(self):
transform, root = self.get_transform()
self.wt.lock_tree_write()
self.addCleanup(self.wt.unlock)
trans_id = transform.new_file('name', root, 'contents',
'my_pretties', True)
oz = transform.new_directory('oz', root, 'oz-id')
dorothy = transform.new_directory('dorothy', oz, 'dorothy-id')
toto = transform.new_file('toto', dorothy, 'toto-contents',
'toto-id', False)
self.assertEqual(len(transform.find_conflicts()), 0)
transform.apply()
self.assertRaises(ReusingTransform, transform.find_conflicts)
self.assertEqual('contents', file(self.wt.abspath('name')).read())
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
self.assertIs(self.wt.is_executable('my_pretties'), True)
self.assertEqual(self.wt.path2id('oz'), 'oz-id')
self.assertEqual(self.wt.path2id('oz/dorothy'), 'dorothy-id')
self.assertEqual(self.wt.path2id('oz/dorothy/toto'), 'toto-id')
self.assertEqual('toto-contents',
self.wt.get_file_byname('oz/dorothy/toto').read())
self.assertIs(self.wt.is_executable('toto-id'), False)
def test_tree_reference(self):
transform, root = self.get_transform()
tree = transform._tree
trans_id = transform.new_directory('reference', root, 'subtree-id')
transform.set_tree_reference('subtree-revision', trans_id)
transform.apply()
tree.lock_read()
self.addCleanup(tree.unlock)
self.assertEqual('subtree-revision',
tree.inventory['subtree-id'].reference_revision)
def test_conflicts(self):
transform, root = self.get_transform()
trans_id = transform.new_file('name', root, 'contents',
'my_pretties')
self.assertEqual(len(transform.find_conflicts()), 0)
trans_id2 = transform.new_file('name', root, 'Crontents', 'toto')
self.assertEqual(transform.find_conflicts(),
[('duplicate', trans_id, trans_id2, 'name')])
self.assertRaises(MalformedTransform, transform.apply)
transform.adjust_path('name', trans_id, trans_id2)
self.assertEqual(transform.find_conflicts(),
[('non-directory parent', trans_id)])
tinman_id = transform.trans_id_tree_path('tinman')
transform.adjust_path('name', tinman_id, trans_id2)
self.assertEqual(transform.find_conflicts(),
[('unversioned parent', tinman_id),
('missing parent', tinman_id)])
lion_id = transform.create_path('lion', root)
self.assertEqual(transform.find_conflicts(),
[('unversioned parent', tinman_id),
('missing parent', tinman_id)])
transform.adjust_path('name', lion_id, trans_id2)
self.assertEqual(transform.find_conflicts(),
[('unversioned parent', lion_id),
('missing parent', lion_id)])
transform.version_file("Courage", lion_id)
self.assertEqual(transform.find_conflicts(),
[('missing parent', lion_id),
('versioning no contents', lion_id)])
transform.adjust_path('name2', root, trans_id2)
self.assertEqual(transform.find_conflicts(),
[('versioning no contents', lion_id)])
transform.create_file('Contents, okay?', lion_id)
transform.adjust_path('name2', trans_id2, trans_id2)
self.assertEqual(transform.find_conflicts(),
[('parent loop', trans_id2),
('non-directory parent', trans_id2)])
transform.adjust_path('name2', root, trans_id2)
oz_id = transform.new_directory('oz', root)
transform.set_executability(True, oz_id)
self.assertEqual(transform.find_conflicts(),
[('unversioned executability', oz_id)])
transform.version_file('oz-id', oz_id)
self.assertEqual(transform.find_conflicts(),
[('non-file executability', oz_id)])
transform.set_executability(None, oz_id)
tip_id = transform.new_file('tip', oz_id, 'ozma', 'tip-id')
transform.apply()
self.assertEqual(self.wt.path2id('name'), 'my_pretties')
self.assertEqual('contents', file(self.wt.abspath('name')).read())
transform2, root = self.get_transform()
oz_id = transform2.trans_id_tree_file_id('oz-id')
newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
result = transform2.find_conflicts()
fp = FinalPaths(transform2)
self.assert_('oz/tip' in transform2._tree_path_ids)
self.assertEqual(fp.get_path(newtip), pathjoin('oz', 'tip'))
self.assertEqual(len(result), 2)
self.assertEqual((result[0][0], result[0][1]),
('duplicate', newtip))
self.assertEqual((result[1][0], result[1][2]),
('duplicate id', newtip))
transform2.finalize()
transform3 = TreeTransform(self.wt)
self.addCleanup(transform3.finalize)
oz_id = transform3.trans_id_tree_file_id('oz-id')
transform3.delete_contents(oz_id)
self.assertEqual(transform3.find_conflicts(),
[('missing parent', oz_id)])
root_id = transform3.root
tip_id = transform3.trans_id_tree_file_id('tip-id')
transform3.adjust_path('tip', root_id, tip_id)
transform3.apply()
def test_conflict_on_case_insensitive(self):
tree = self.make_branch_and_tree('tree')
# Don't try this at home, kids!
# Force the tree to report that it is case sensitive, for conflict
# resolution tests
tree.case_sensitive = True
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
transform.new_file('FiLe', transform.root, 'content')
result = transform.find_conflicts()
self.assertEqual([], result)
transform.finalize()
# Force the tree to report that it is case insensitive, for conflict
# generation tests
tree.case_sensitive = False
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
transform.new_file('FiLe', transform.root, 'content')
result = transform.find_conflicts()
self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
def test_conflict_on_case_insensitive_existing(self):
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/FiLe'])
# Don't try this at home, kids!
# Force the tree to report that it is case sensitive, for conflict
# resolution tests
tree.case_sensitive = True
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
result = transform.find_conflicts()
self.assertEqual([], result)
transform.finalize()
# Force the tree to report that it is case insensitive, for conflict
# generation tests
tree.case_sensitive = False
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
result = transform.find_conflicts()
self.assertEqual([('duplicate', 'new-1', 'new-2', 'file')], result)
def test_resolve_case_insensitive_conflict(self):
tree = self.make_branch_and_tree('tree')
# Don't try this at home, kids!
# Force the tree to report that it is case insensitive, for conflict
# resolution tests
tree.case_sensitive = False
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
transform.new_file('FiLe', transform.root, 'content')
resolve_conflicts(transform)
transform.apply()
self.failUnlessExists('tree/file')
self.failUnlessExists('tree/FiLe.moved')
def test_resolve_checkout_case_conflict(self):
tree = self.make_branch_and_tree('tree')
# Don't try this at home, kids!
# Force the tree to report that it is case insensitive, for conflict
# resolution tests
tree.case_sensitive = False
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
transform.new_file('FiLe', transform.root, 'content')
resolve_conflicts(transform,
pass_func=lambda t, c: resolve_checkout(t, c, []))
transform.apply()
self.failUnlessExists('tree/file')
self.failUnlessExists('tree/FiLe.moved')
def test_apply_case_conflict(self):
"""Ensure that a transform with case conflicts can always be applied"""
tree = self.make_branch_and_tree('tree')
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
transform.new_file('file', transform.root, 'content')
transform.new_file('FiLe', transform.root, 'content')
dir = transform.new_directory('dir', transform.root)
transform.new_file('dirfile', dir, 'content')
transform.new_file('dirFiLe', dir, 'content')
resolve_conflicts(transform)
transform.apply()
self.failUnlessExists('tree/file')
if not os.path.exists('tree/FiLe.moved'):
self.failUnlessExists('tree/FiLe')
self.failUnlessExists('tree/dir/dirfile')
if not os.path.exists('tree/dir/dirFiLe.moved'):
self.failUnlessExists('tree/dir/dirFiLe')
def test_case_insensitive_limbo(self):
tree = self.make_branch_and_tree('tree')
# Don't try this at home, kids!
# Force the tree to report that it is case insensitive
tree.case_sensitive = False
transform = TreeTransform(tree)
self.addCleanup(transform.finalize)
dir = transform.new_directory('dir', transform.root)
first = transform.new_file('file', dir, 'content')
second = transform.new_file('FiLe', dir, 'content')
self.assertContainsRe(transform._limbo_name(first), 'new-1/file')
self.assertNotContainsRe(transform._limbo_name(second), 'new-1/FiLe')
def test_add_del(self):
start, root = self.get_transform()
start.new_directory('a', root, 'a')
start.apply()
transform, root = self.get_transform()
transform.delete_versioned(transform.trans_id_tree_file_id('a'))
transform.new_directory('a', root, 'a')
transform.apply()
def test_unversioning(self):
create_tree, root = self.get_transform()
parent_id = create_tree.new_directory('parent', root, 'parent-id')
create_tree.new_file('child', parent_id, 'child', 'child-id')
create_tree.apply()
unversion = TreeTransform(self.wt)
self.addCleanup(unversion.finalize)
parent = unversion.trans_id_tree_path('parent')
unversion.unversion_file(parent)
self.assertEqual(unversion.find_conflicts(),
[('unversioned parent', parent_id)])
file_id = unversion.trans_id_tree_file_id('child-id')
unversion.unversion_file(file_id)
unversion.apply()
def test_name_invariants(self):
create_tree, root = self.get_transform()
# prepare tree
root = create_tree.root
create_tree.new_file('name1', root, 'hello1', 'name1')
create_tree.new_file('name2', root, 'hello2', 'name2')
ddir = create_tree.new_directory('dying_directory', root, 'ddir')
create_tree.new_file('dying_file', ddir, 'goodbye1', 'dfile')
create_tree.new_file('moving_file', ddir, 'later1', 'mfile')
create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
create_tree.apply()
mangle_tree,root = self.get_transform()
root = mangle_tree.root
#swap names
name1 = mangle_tree.trans_id_tree_file_id('name1')
name2 = mangle_tree.trans_id_tree_file_id('name2')
mangle_tree.adjust_path('name2', root, name1)
mangle_tree.adjust_path('name1', root, name2)
#tests for deleting parent directories
ddir = mangle_tree.trans_id_tree_file_id('ddir')
mangle_tree.delete_contents(ddir)
dfile = mangle_tree.trans_id_tree_file_id('dfile')
mangle_tree.delete_versioned(dfile)
mangle_tree.unversion_file(dfile)
mfile = mangle_tree.trans_id_tree_file_id('mfile')
mangle_tree.adjust_path('mfile', root, mfile)
#tests for adding parent directories
newdir = mangle_tree.new_directory('new_directory', root, 'newdir')
mfile2 = mangle_tree.trans_id_tree_file_id('mfile2')
mangle_tree.adjust_path('mfile2', newdir, mfile2)
mangle_tree.new_file('newfile', newdir, 'hello3', 'dfile')
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
self.assertEqual(mangle_tree.final_file_id(mfile2), 'mfile2')
mangle_tree.apply()
self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
self.assertEqual(file(mfile2_path).read(), 'later2')
self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
self.assertEqual(file(newfile_path).read(), 'hello3')
self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
def test_both_rename(self):
create_tree,root = self.get_transform()
newdir = create_tree.new_directory('selftest', root, 'selftest-id')
create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
create_tree.apply()
mangle_tree,root = self.get_transform()
selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
mangle_tree.adjust_path('test', root, selftest)
mangle_tree.adjust_path('test_too_much', root, selftest)
mangle_tree.set_executability(True, blackbox)
mangle_tree.apply()
def test_both_rename2(self):
create_tree,root = self.get_transform()
bzrlib = create_tree.new_directory('bzrlib', root, 'bzrlib-id')
tests = create_tree.new_directory('tests', bzrlib, 'tests-id')
blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
create_tree.new_file('test_too_much.py', blackbox, 'hello1',
'test_too_much-id')
create_tree.apply()
mangle_tree,root = self.get_transform()
bzrlib = mangle_tree.trans_id_tree_file_id('bzrlib-id')
tests = mangle_tree.trans_id_tree_file_id('tests-id')
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
mangle_tree.adjust_path('selftest', bzrlib, tests)
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
mangle_tree.set_executability(True, test_too_much)
mangle_tree.apply()
def test_both_rename3(self):
create_tree,root = self.get_transform()
tests = create_tree.new_directory('tests', root, 'tests-id')
create_tree.new_file('test_too_much.py', tests, 'hello1',
'test_too_much-id')
create_tree.apply()
mangle_tree,root = self.get_transform()
tests = mangle_tree.trans_id_tree_file_id('tests-id')
test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
mangle_tree.adjust_path('selftest', root, tests)
mangle_tree.adjust_path('blackbox.py', tests, test_too_much)
mangle_tree.set_executability(True, test_too_much)
mangle_tree.apply()
def test_move_dangling_ie(self):
create_tree, root = self.get_transform()
# prepare tree
root = create_tree.root
create_tree.new_file('name1', root, 'hello1', 'name1')
create_tree.apply()
delete_contents, root = self.get_transform()
file = delete_contents.trans_id_tree_file_id('name1')
delete_contents.delete_contents(file)
delete_contents.apply()
move_id, root = self.get_transform()
name1 = move_id.trans_id_tree_file_id('name1')
newdir = move_id.new_directory('dir', root, 'newdir')
move_id.adjust_path('name2', newdir, name1)
move_id.apply()
def test_replace_dangling_ie(self):
create_tree, root = self.get_transform()
# prepare tree
root = create_tree.root
create_tree.new_file('name1', root, 'hello1', 'name1')
create_tree.apply()
delete_contents = TreeTransform(self.wt)
self.addCleanup(delete_contents.finalize)
file = delete_contents.trans_id_tree_file_id('name1')
delete_contents.delete_contents(file)
delete_contents.apply()
delete_contents.finalize()
replace = TreeTransform(self.wt)
self.addCleanup(replace.finalize)
name2 = replace.new_file('name2', root, 'hello2', 'name1')
conflicts = replace.find_conflicts()
name1 = replace.trans_id_tree_file_id('name1')
self.assertEqual(conflicts, [('duplicate id', name1, name2)])
resolve_conflicts(replace)
replace.apply()
def test_symlinks(self):
self.requireFeature(SymlinkFeature)
transform,root = self.get_transform()
oz_id = transform.new_directory('oz', root, 'oz-id')
wizard = transform.new_symlink('wizard', oz_id, 'wizard-target',
'wizard-id')
wiz_id = transform.create_path('wizard2', oz_id)
transform.create_symlink('behind_curtain', wiz_id)
transform.version_file('wiz-id2', wiz_id)
transform.set_executability(True, wiz_id)
self.assertEqual(transform.find_conflicts(),
[('non-file executability', wiz_id)])
transform.set_executability(None, wiz_id)
transform.apply()
self.assertEqual(self.wt.path2id('oz/wizard'), 'wizard-id')
self.assertEqual(file_kind(self.wt.abspath('oz/wizard')), 'symlink')
self.assertEqual(os.readlink(self.wt.abspath('oz/wizard2')),
'behind_curtain')
self.assertEqual(os.readlink(self.wt.abspath('oz/wizard')),
'wizard-target')
def test_unable_create_symlink(self):
def tt_helper():
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
tt.new_symlink('foo', tt.root, 'bar')
tt.apply()
finally:
wt.unlock()
os_symlink = getattr(os, 'symlink', None)
os.symlink = None
try:
err = self.assertRaises(errors.UnableCreateSymlink, tt_helper)
self.assertEquals(
"Unable to create symlink 'foo' on this platform",
str(err))
finally:
if os_symlink:
os.symlink = os_symlink
def get_conflicted(self):
create,root = self.get_transform()
create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
oz = create.new_directory('oz', root, 'oz-id')
create.new_directory('emeraldcity', oz, 'emerald-id')
create.apply()
conflicts,root = self.get_transform()
# set up duplicate entry, duplicate id
new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
'dorothy-id')
old_dorothy = conflicts.trans_id_tree_file_id('dorothy-id')
oz = conflicts.trans_id_tree_file_id('oz-id')
# set up DeletedParent parent conflict
conflicts.delete_versioned(oz)
emerald = conflicts.trans_id_tree_file_id('emerald-id')
# set up MissingParent conflict
munchkincity = conflicts.trans_id_file_id('munchkincity-id')
conflicts.adjust_path('munchkincity', root, munchkincity)
conflicts.new_directory('auntem', munchkincity, 'auntem-id')
# set up parent loop
conflicts.adjust_path('emeraldcity', emerald, emerald)
return conflicts, emerald, oz, old_dorothy, new_dorothy
def test_conflict_resolution(self):
conflicts, emerald, oz, old_dorothy, new_dorothy =\
self.get_conflicted()
resolve_conflicts(conflicts)
self.assertEqual(conflicts.final_name(old_dorothy), 'dorothy.moved')
self.assertIs(conflicts.final_file_id(old_dorothy), None)
self.assertEqual(conflicts.final_name(new_dorothy), 'dorothy')
self.assertEqual(conflicts.final_file_id(new_dorothy), 'dorothy-id')
self.assertEqual(conflicts.final_parent(emerald), oz)
conflicts.apply()
def test_cook_conflicts(self):
tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
raw_conflicts = resolve_conflicts(tt)
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
duplicate = DuplicateEntry('Moved existing file to', 'dorothy.moved',
'dorothy', None, 'dorothy-id')
self.assertEqual(cooked_conflicts[0], duplicate)
duplicate_id = DuplicateID('Unversioned existing file',
'dorothy.moved', 'dorothy', None,
'dorothy-id')
self.assertEqual(cooked_conflicts[1], duplicate_id)
missing_parent = MissingParent('Created directory', 'munchkincity',
'munchkincity-id')
deleted_parent = DeletingParent('Not deleting', 'oz', 'oz-id')
self.assertEqual(cooked_conflicts[2], missing_parent)
unversioned_parent = UnversionedParent('Versioned directory',
'munchkincity',
'munchkincity-id')
unversioned_parent2 = UnversionedParent('Versioned directory', 'oz',
'oz-id')
self.assertEqual(cooked_conflicts[3], unversioned_parent)
parent_loop = ParentLoop('Cancelled move', 'oz/emeraldcity',
'oz/emeraldcity', 'emerald-id', 'emerald-id')
self.assertEqual(cooked_conflicts[4], deleted_parent)
self.assertEqual(cooked_conflicts[5], unversioned_parent2)
self.assertEqual(cooked_conflicts[6], parent_loop)
self.assertEqual(len(cooked_conflicts), 7)
tt.finalize()
def test_string_conflicts(self):
tt, emerald, oz, old_dorothy, new_dorothy = self.get_conflicted()
raw_conflicts = resolve_conflicts(tt)
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
tt.finalize()
conflicts_s = [str(c) for c in cooked_conflicts]
self.assertEqual(len(cooked_conflicts), len(conflicts_s))
self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy. '
'Moved existing file to '
'dorothy.moved.')
self.assertEqual(conflicts_s[1], 'Conflict adding id to dorothy. '
'Unversioned existing file '
'dorothy.moved.')
self.assertEqual(conflicts_s[2], 'Conflict adding files to'
' munchkincity. Created directory.')
self.assertEqual(conflicts_s[3], 'Conflict because munchkincity is not'
' versioned, but has versioned'
' children. Versioned directory.')
self.assertEqualDiff(conflicts_s[4], "Conflict: can't delete oz because it"
" is not empty. Not deleting.")
self.assertEqual(conflicts_s[5], 'Conflict because oz is not'
' versioned, but has versioned'
' children. Versioned directory.')
self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
' oz/emeraldcity. Cancelled move.')
def prepare_wrong_parent_kind(self):
tt, root = self.get_transform()
tt.new_file('parent', root, 'contents', 'parent-id')
tt.apply()
tt, root = self.get_transform()
parent_id = tt.trans_id_file_id('parent-id')
tt.new_file('child,', parent_id, 'contents2', 'file-id')
return tt
def test_find_conflicts_wrong_parent_kind(self):
tt = self.prepare_wrong_parent_kind()
tt.find_conflicts()
def test_resolve_conflicts_wrong_existing_parent_kind(self):
tt = self.prepare_wrong_parent_kind()
raw_conflicts = resolve_conflicts(tt)
self.assertEqual(set([('non-directory parent', 'Created directory',
'new-3')]), raw_conflicts)
cooked_conflicts = cook_conflicts(raw_conflicts, tt)
self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
'parent-id')], cooked_conflicts)
tt.apply()
self.assertEqual(None, self.wt.path2id('parent'))
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
def test_resolve_conflicts_wrong_new_parent_kind(self):
tt, root = self.get_transform()
parent_id = tt.new_directory('parent', root, 'parent-id')
tt.new_file('child,', parent_id, 'contents2', 'file-id')
tt.apply()
tt, root = self.get_transform()
parent_id = tt.trans_id_file_id('parent-id')
tt.delete_contents(parent_id)
tt.create_file('contents', parent_id)
raw_conflicts = resolve_conflicts(tt)
self.assertEqual(set([('non-directory parent', 'Created directory',
'new-3')]), raw_conflicts)
tt.apply()
self.assertEqual(None, self.wt.path2id('parent'))
self.assertEqual('parent-id', self.wt.path2id('parent.new'))
def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
tt, root = self.get_transform()
parent_id = tt.new_directory('parent', root)
tt.new_file('child,', parent_id, 'contents2')
tt.apply()
tt, root = self.get_transform()
parent_id = tt.trans_id_tree_path('parent')
tt.delete_contents(parent_id)
tt.create_file('contents', parent_id)
resolve_conflicts(tt)
tt.apply()
self.assertIs(None, self.wt.path2id('parent'))
self.assertIs(None, self.wt.path2id('parent.new'))
def test_moving_versioned_directories(self):
create, root = self.get_transform()
kansas = create.new_directory('kansas', root, 'kansas-id')
create.new_directory('house', kansas, 'house-id')
create.new_directory('oz', root, 'oz-id')
create.apply()
cyclone, root = self.get_transform()
oz = cyclone.trans_id_tree_file_id('oz-id')
house = cyclone.trans_id_tree_file_id('house-id')
cyclone.adjust_path('house', oz, house)
cyclone.apply()
def test_moving_root(self):
create, root = self.get_transform()
fun = create.new_directory('fun', root, 'fun-id')
create.new_directory('sun', root, 'sun-id')
create.new_directory('moon', root, 'moon')
create.apply()
transform, root = self.get_transform()
transform.adjust_root_path('oldroot', fun)
new_root=transform.trans_id_tree_path('')
transform.version_file('new-root', new_root)
transform.apply()
def test_renames(self):
create, root = self.get_transform()
old = create.new_directory('old-parent', root, 'old-id')
intermediate = create.new_directory('intermediate', old, 'im-id')
myfile = create.new_file('myfile', intermediate, 'myfile-text',
'myfile-id')
create.apply()
rename, root = self.get_transform()
old = rename.trans_id_file_id('old-id')
rename.adjust_path('new', root, old)
myfile = rename.trans_id_file_id('myfile-id')
rename.set_executability(True, myfile)
rename.apply()
def test_find_interesting(self):
create, root = self.get_transform()
wt = create._tree
create.new_file('vfile', root, 'myfile-text', 'myfile-id')
create.new_file('uvfile', root, 'othertext')
create.apply()
result = self.applyDeprecated(symbol_versioning.zero_fifteen,
find_interesting, wt, wt, ['vfile'])
self.assertEqual(result, set(['myfile-id']))
def test_set_executability_order(self):
"""Ensure that executability behaves the same, no matter what order.
- create file and set executability simultaneously
- create file and set executability afterward
- unsetting the executability of a file whose executability has not been
declared should throw an exception (this may happen when a
merge attempts to create a file with a duplicate ID)
"""
transform, root = self.get_transform()
wt = transform._tree
wt.lock_read()
self.addCleanup(wt.unlock)
transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
True)
sac = transform.new_file('set_after_creation', root,
'Set after creation', 'sac')
transform.set_executability(True, sac)
uws = transform.new_file('unset_without_set', root, 'Unset badly',
'uws')
self.assertRaises(KeyError, transform.set_executability, None, uws)
transform.apply()
self.assertTrue(wt.is_executable('soc'))
self.assertTrue(wt.is_executable('sac'))
def test_preserve_mode(self):
"""File mode is preserved when replacing content"""
if sys.platform == 'win32':
raise TestSkipped('chmod has no effect on win32')
transform, root = self.get_transform()
transform.new_file('file1', root, 'contents', 'file1-id', True)
transform.apply()
self.wt.lock_write()
self.addCleanup(self.wt.unlock)
self.assertTrue(self.wt.is_executable('file1-id'))
transform, root = self.get_transform()
file1_id = transform.trans_id_tree_file_id('file1-id')
transform.delete_contents(file1_id)
transform.create_file('contents2', file1_id)
transform.apply()
self.assertTrue(self.wt.is_executable('file1-id'))
def test__set_mode_stats_correctly(self):
"""_set_mode stats to determine file mode."""
if sys.platform == 'win32':
raise TestSkipped('chmod has no effect on win32')
stat_paths = []
real_stat = os.stat
def instrumented_stat(path):
stat_paths.append(path)
return real_stat(path)
transform, root = self.get_transform()
bar1_id = transform.new_file('bar', root, 'bar contents 1\n',
file_id='bar-id-1', executable=False)
transform.apply()
transform, root = self.get_transform()
bar1_id = transform.trans_id_tree_path('bar')
bar2_id = transform.trans_id_tree_path('bar2')
try:
os.stat = instrumented_stat
transform.create_file('bar2 contents\n', bar2_id, mode_id=bar1_id)
finally:
os.stat = real_stat
transform.finalize()
bar1_abspath = self.wt.abspath('bar')
self.assertEqual([bar1_abspath], stat_paths)
def test_iter_changes(self):
self.wt.set_root_id('eert_toor')
transform, root = self.get_transform()
transform.new_file('old', root, 'blah', 'id-1', True)
transform.apply()
transform, root = self.get_transform()
try:
self.assertEqual([], list(transform.iter_changes()))
old = transform.trans_id_tree_file_id('id-1')
transform.unversion_file(old)
self.assertEqual([('id-1', ('old', None), False, (True, False),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(True, True))], list(transform.iter_changes()))
transform.new_directory('new', root, 'id-1')
self.assertEqual([('id-1', ('old', 'new'), True, (True, True),
('eert_toor', 'eert_toor'), ('old', 'new'),
('file', 'directory'),
(True, False))], list(transform.iter_changes()))
finally:
transform.finalize()
def test_iter_changes_new(self):
self.wt.set_root_id('eert_toor')
transform, root = self.get_transform()
transform.new_file('old', root, 'blah')
transform.apply()
transform, root = self.get_transform()
try:
old = transform.trans_id_tree_path('old')
transform.version_file('id-1', old)
self.assertEqual([('id-1', (None, 'old'), False, (False, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(False, False))], list(transform.iter_changes()))
finally:
transform.finalize()
def test_iter_changes_modifications(self):
self.wt.set_root_id('eert_toor')
transform, root = self.get_transform()
transform.new_file('old', root, 'blah', 'id-1')
transform.new_file('new', root, 'blah')
transform.new_directory('subdir', root, 'subdir-id')
transform.apply()
transform, root = self.get_transform()
try:
old = transform.trans_id_tree_path('old')
subdir = transform.trans_id_tree_file_id('subdir-id')
new = transform.trans_id_tree_path('new')
self.assertEqual([], list(transform.iter_changes()))
#content deletion
transform.delete_contents(old)
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', None),
(False, False))], list(transform.iter_changes()))
#content change
transform.create_file('blah', old)
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(False, False))], list(transform.iter_changes()))
transform.cancel_deletion(old)
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(False, False))], list(transform.iter_changes()))
transform.cancel_creation(old)
# move file_id to a different file
self.assertEqual([], list(transform.iter_changes()))
transform.unversion_file(old)
transform.version_file('id-1', new)
transform.adjust_path('old', root, new)
self.assertEqual([('id-1', ('old', 'old'), True, (True, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(False, False))], list(transform.iter_changes()))
transform.cancel_versioning(new)
transform._removed_id = set()
#execute bit
self.assertEqual([], list(transform.iter_changes()))
transform.set_executability(True, old)
self.assertEqual([('id-1', ('old', 'old'), False, (True, True),
('eert_toor', 'eert_toor'), ('old', 'old'), ('file', 'file'),
(False, True))], list(transform.iter_changes()))
transform.set_executability(None, old)
# filename
self.assertEqual([], list(transform.iter_changes()))
transform.adjust_path('new', root, old)
transform._new_parent = {}
self.assertEqual([('id-1', ('old', 'new'), False, (True, True),
('eert_toor', 'eert_toor'), ('old', 'new'), ('file', 'file'),
(False, False))], list(transform.iter_changes()))
transform._new_name = {}
# parent directory
self.assertEqual([], list(transform.iter_changes()))
transform.adjust_path('new', subdir, old)
transform._new_name = {}
self.assertEqual([('id-1', ('old', 'subdir/old'), False,
(True, True), ('eert_toor', 'subdir-id'), ('old', 'old'),
('file', 'file'), (False, False))],
list(transform.iter_changes()))
transform._new_path = {}
finally:
transform.finalize()
def test_iter_changes_modified_bleed(self):
self.wt.set_root_id('eert_toor')
"""Modified flag should not bleed from one change to another"""
# unfortunately, we have no guarantee that file1 (which is modified)
# will be applied before file2. And if it's applied after file2, it
# obviously can't bleed into file2's change output. But for now, it
# works.
transform, root = self.get_transform()
transform.new_file('file1', root, 'blah', 'id-1')
transform.new_file('file2', root, 'blah', 'id-2')
transform.apply()
transform, root = self.get_transform()
try:
transform.delete_contents(transform.trans_id_file_id('id-1'))
transform.set_executability(True,
transform.trans_id_file_id('id-2'))
self.assertEqual([('id-1', (u'file1', u'file1'), True, (True, True),
('eert_toor', 'eert_toor'), ('file1', u'file1'),
('file', None), (False, False)),
('id-2', (u'file2', u'file2'), False, (True, True),
('eert_toor', 'eert_toor'), ('file2', u'file2'),
('file', 'file'), (False, True))],
list(transform.iter_changes()))
finally:
transform.finalize()
def test_iter_changes_move_missing(self):
"""Test moving ids with no files around"""
self.wt.set_root_id('toor_eert')
# Need two steps because versioning a non-existant file is a conflict.
transform, root = self.get_transform()
transform.new_directory('floater', root, 'floater-id')
transform.apply()
transform, root = self.get_transform()
transform.delete_contents(transform.trans_id_tree_path('floater'))
transform.apply()
transform, root = self.get_transform()
floater = transform.trans_id_tree_path('floater')
try:
transform.adjust_path('flitter', root, floater)
self.assertEqual([('floater-id', ('floater', 'flitter'), False,
(True, True), ('toor_eert', 'toor_eert'), ('floater', 'flitter'),
(None, None), (False, False))], list(transform.iter_changes()))
finally:
transform.finalize()
def test_iter_changes_pointless(self):
"""Ensure that no-ops are not treated as modifications"""
self.wt.set_root_id('eert_toor')
transform, root = self.get_transform()
transform.new_file('old', root, 'blah', 'id-1')
transform.new_directory('subdir', root, 'subdir-id')
transform.apply()
transform, root = self.get_transform()
try:
old = transform.trans_id_tree_path('old')
subdir = transform.trans_id_tree_file_id('subdir-id')
self.assertEqual([], list(transform.iter_changes()))
transform.delete_contents(subdir)
transform.create_directory(subdir)
transform.set_executability(False, old)
transform.unversion_file(old)
transform.version_file('id-1', old)
transform.adjust_path('old', root, old)
self.assertEqual([], list(transform.iter_changes()))
finally:
transform.finalize()
def test_rename_count(self):
transform, root = self.get_transform()
transform.new_file('name1', root, 'contents')
self.assertEqual(transform.rename_count, 0)
transform.apply()
self.assertEqual(transform.rename_count, 1)
transform2, root = self.get_transform()
transform2.adjust_path('name2', root,
transform2.trans_id_tree_path('name1'))
self.assertEqual(transform2.rename_count, 0)
transform2.apply()
self.assertEqual(transform2.rename_count, 2)
def test_change_parent(self):
"""Ensure that after we change a parent, the results are still right.
Renames and parent changes on pending transforms can happen as part
of conflict resolution, and are explicitly permitted by the
TreeTransform API.
This test ensures they work correctly with the rename-avoidance
optimization.
"""
transform, root = self.get_transform()
parent1 = transform.new_directory('parent1', root)
child1 = transform.new_file('child1', parent1, 'contents')
parent2 = transform.new_directory('parent2', root)
transform.adjust_path('child1', parent2, child1)
transform.apply()
self.failIfExists(self.wt.abspath('parent1/child1'))
self.failUnlessExists(self.wt.abspath('parent2/child1'))
# rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
# no rename for child1 (counting only renames during apply)
self.failUnlessEqual(2, transform.rename_count)
def test_cancel_parent(self):
"""Cancelling a parent doesn't cause deletion of a non-empty directory
This is like the test_change_parent, except that we cancel the parent
before adjusting the path. The transform must detect that the
directory is non-empty, and move children to safe locations.
"""
transform, root = self.get_transform()
parent1 = transform.new_directory('parent1', root)
child1 = transform.new_file('child1', parent1, 'contents')
child2 = transform.new_file('child2', parent1, 'contents')
try:
transform.cancel_creation(parent1)
except OSError:
self.fail('Failed to move child1 before deleting parent1')
transform.cancel_creation(child2)
transform.create_directory(parent1)
try:
transform.cancel_creation(parent1)
# If the transform incorrectly believes that child2 is still in
# parent1's limbo directory, it will try to rename it and fail
# because was already moved by the first cancel_creation.
except OSError:
self.fail('Transform still thinks child2 is a child of parent1')
parent2 = transform.new_directory('parent2', root)
transform.adjust_path('child1', parent2, child1)
transform.apply()
self.failIfExists(self.wt.abspath('parent1'))
self.failUnlessExists(self.wt.abspath('parent2/child1'))
# rename limbo/new-3 => parent2, rename limbo/new-2 => child1
self.failUnlessEqual(2, transform.rename_count)
def test_adjust_and_cancel(self):
"""Make sure adjust_path keeps track of limbo children properly"""
transform, root = self.get_transform()
parent1 = transform.new_directory('parent1', root)
child1 = transform.new_file('child1', parent1, 'contents')
parent2 = transform.new_directory('parent2', root)
transform.adjust_path('child1', parent2, child1)
transform.cancel_creation(child1)
try:
transform.cancel_creation(parent1)
# if the transform thinks child1 is still in parent1's limbo
# directory, it will attempt to move it and fail.
except OSError:
self.fail('Transform still thinks child1 is a child of parent1')
transform.finalize()
def test_noname_contents(self):
"""TreeTransform should permit deferring naming files."""
transform, root = self.get_transform()
parent = transform.trans_id_file_id('parent-id')
try:
transform.create_directory(parent)
except KeyError:
self.fail("Can't handle contents with no name")
transform.finalize()
def test_noname_contents_nested(self):
"""TreeTransform should permit deferring naming files."""
transform, root = self.get_transform()
parent = transform.trans_id_file_id('parent-id')
try:
transform.create_directory(parent)
except KeyError:
self.fail("Can't handle contents with no name")
child = transform.new_directory('child', parent)
transform.adjust_path('parent', root, parent)
transform.apply()
self.failUnlessExists(self.wt.abspath('parent/child'))
self.assertEqual(1, transform.rename_count)
def test_reuse_name(self):
"""Avoid reusing the same limbo name for different files"""
transform, root = self.get_transform()
parent = transform.new_directory('parent', root)
child1 = transform.new_directory('child', parent)
try:
child2 = transform.new_directory('child', parent)
except OSError:
self.fail('Tranform tried to use the same limbo name twice')
transform.adjust_path('child2', parent, child2)
transform.apply()
# limbo/new-1 => parent, limbo/new-3 => parent/child2
# child2 is put into top-level limbo because child1 has already
# claimed the direct limbo path when child2 is created. There is no
# advantage in renaming files once they're in top-level limbo, except
# as part of apply.
self.assertEqual(2, transform.rename_count)
def test_reuse_when_first_moved(self):
"""Don't avoid direct paths when it is safe to use them"""
transform, root = self.get_transform()
parent = transform.new_directory('parent', root)
child1 = transform.new_directory('child', parent)
transform.adjust_path('child1', parent, child1)
child2 = transform.new_directory('child', parent)
transform.apply()
# limbo/new-1 => parent
self.assertEqual(1, transform.rename_count)
def test_reuse_after_cancel(self):
"""Don't avoid direct paths when it is safe to use them"""
transform, root = self.get_transform()
parent2 = transform.new_directory('parent2', root)
child1 = transform.new_directory('child1', parent2)
transform.cancel_creation(parent2)
transform.create_directory(parent2)
child2 = transform.new_directory('child1', parent2)
transform.adjust_path('child2', parent2, child1)
transform.apply()
# limbo/new-1 => parent2, limbo/new-2 => parent2/child1
self.assertEqual(2, transform.rename_count)
def test_finalize_order(self):
"""Finalize must be done in child-to-parent order"""
transform, root = self.get_transform()
parent = transform.new_directory('parent', root)
child = transform.new_directory('child', parent)
try:
transform.finalize()
except OSError:
self.fail('Tried to remove parent before child1')
def test_cancel_with_cancelled_child_should_succeed(self):
transform, root = self.get_transform()
parent = transform.new_directory('parent', root)
child = transform.new_directory('child', parent)
transform.cancel_creation(child)
transform.cancel_creation(parent)
transform.finalize()
def test_change_entry(self):
txt = 'bzrlib.transform.change_entry was deprecated in version 0.90.'
self.callDeprecated([txt], change_entry, None, None, None, None, None,
None, None, None)
def test_case_insensitive_clash(self):
self.requireFeature(CaseInsensitiveFilesystemFeature)
def tt_helper():
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
tt.new_file('foo', tt.root, 'bar')
tt.new_file('Foo', tt.root, 'spam')
# Lie to tt that we've already resolved all conflicts.
tt.apply(no_conflicts=True)
except:
wt.unlock()
raise
err = self.assertRaises(errors.FileExists, tt_helper)
self.assertContainsRe(str(err),
"^File exists: .+/foo")
def test_two_directories_clash(self):
def tt_helper():
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
foo_1 = tt.new_directory('foo', tt.root)
tt.new_directory('bar', foo_1)
foo_2 = tt.new_directory('foo', tt.root)
tt.new_directory('baz', foo_2)
# Lie to tt that we've already resolved all conflicts.
tt.apply(no_conflicts=True)
except:
wt.unlock()
raise
err = self.assertRaises(errors.FileExists, tt_helper)
self.assertContainsRe(str(err),
"^File exists: .+/foo")
def test_two_directories_clash_finalize(self):
def tt_helper():
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt) # TreeTransform obtains write lock
try:
foo_1 = tt.new_directory('foo', tt.root)
tt.new_directory('bar', foo_1)
foo_2 = tt.new_directory('foo', tt.root)
tt.new_directory('baz', foo_2)
# Lie to tt that we've already resolved all conflicts.
tt.apply(no_conflicts=True)
except:
tt.finalize()
raise
err = self.assertRaises(errors.FileExists, tt_helper)
self.assertContainsRe(str(err),
"^File exists: .+/foo")
class TransformGroup(object):
def __init__(self, dirname, root_id):
self.name = dirname
os.mkdir(dirname)
self.wt = BzrDir.create_standalone_workingtree(dirname)
self.wt.set_root_id(root_id)
self.b = self.wt.branch
self.tt = TreeTransform(self.wt)
self.root = self.tt.trans_id_tree_file_id(self.wt.get_root_id())
def conflict_text(tree, merge):
template = '%s TREE\n%s%s\n%s%s MERGE-SOURCE\n'
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
class TestTransformMerge(TestCaseInTempDir):
def test_text_merge(self):
root_id = generate_ids.gen_root_id()
base = TransformGroup("base", root_id)
base.tt.new_file('a', base.root, 'a\nb\nc\nd\be\n', 'a')
base.tt.new_file('b', base.root, 'b1', 'b')
base.tt.new_file('c', base.root, 'c', 'c')
base.tt.new_file('d', base.root, 'd', 'd')
base.tt.new_file('e', base.root, 'e', 'e')
base.tt.new_file('f', base.root, 'f', 'f')
base.tt.new_directory('g', base.root, 'g')
base.tt.new_directory('h', base.root, 'h')
base.tt.apply()
other = TransformGroup("other", root_id)
other.tt.new_file('a', other.root, 'y\nb\nc\nd\be\n', 'a')
other.tt.new_file('b', other.root, 'b2', 'b')
other.tt.new_file('c', other.root, 'c2', 'c')
other.tt.new_file('d', other.root, 'd', 'd')
other.tt.new_file('e', other.root, 'e2', 'e')
other.tt.new_file('f', other.root, 'f', 'f')
other.tt.new_file('g', other.root, 'g', 'g')
other.tt.new_file('h', other.root, 'h\ni\nj\nk\n', 'h')
other.tt.new_file('i', other.root, 'h\ni\nj\nk\n', 'i')
other.tt.apply()
this = TransformGroup("this", root_id)
this.tt.new_file('a', this.root, 'a\nb\nc\nd\bz\n', 'a')
this.tt.new_file('b', this.root, 'b', 'b')
this.tt.new_file('c', this.root, 'c', 'c')
this.tt.new_file('d', this.root, 'd2', 'd')
this.tt.new_file('e', this.root, 'e2', 'e')
this.tt.new_file('f', this.root, 'f', 'f')
this.tt.new_file('g', this.root, 'g', 'g')
this.tt.new_file('h', this.root, '1\n2\n3\n4\n', 'h')
this.tt.new_file('i', this.root, '1\n2\n3\n4\n', 'i')
this.tt.apply()
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
# textual merge
self.assertEqual(this.wt.get_file('a').read(), 'y\nb\nc\nd\bz\n')
# three-way text conflict
self.assertEqual(this.wt.get_file('b').read(),
conflict_text('b', 'b2'))
# OTHER wins
self.assertEqual(this.wt.get_file('c').read(), 'c2')
# THIS wins
self.assertEqual(this.wt.get_file('d').read(), 'd2')
# Ambigious clean merge
self.assertEqual(this.wt.get_file('e').read(), 'e2')
# No change
self.assertEqual(this.wt.get_file('f').read(), 'f')
# Correct correct results when THIS == OTHER
self.assertEqual(this.wt.get_file('g').read(), 'g')
# Text conflict when THIS & OTHER are text and BASE is dir
self.assertEqual(this.wt.get_file('h').read(),
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
self.assertEqual(this.wt.get_file_byname('h.THIS').read(),
'1\n2\n3\n4\n')
self.assertEqual(this.wt.get_file_byname('h.OTHER').read(),
'h\ni\nj\nk\n')
self.assertEqual(file_kind(this.wt.abspath('h.BASE')), 'directory')
self.assertEqual(this.wt.get_file('i').read(),
conflict_text('1\n2\n3\n4\n', 'h\ni\nj\nk\n'))
self.assertEqual(this.wt.get_file_byname('i.THIS').read(),
'1\n2\n3\n4\n')
self.assertEqual(this.wt.get_file_byname('i.OTHER').read(),
'h\ni\nj\nk\n')
self.assertEqual(os.path.exists(this.wt.abspath('i.BASE')), False)
modified = ['a', 'b', 'c', 'h', 'i']
merge_modified = this.wt.merge_modified()
self.assertSubset(merge_modified, modified)
self.assertEqual(len(merge_modified), len(modified))
file(this.wt.id2abspath('a'), 'wb').write('booga')
modified.pop(0)
merge_modified = this.wt.merge_modified()
self.assertSubset(merge_modified, modified)
self.assertEqual(len(merge_modified), len(modified))
this.wt.remove('b')
this.wt.revert()
def test_file_merge(self):
self.requireFeature(SymlinkFeature)
root_id = generate_ids.gen_root_id()
base = TransformGroup("BASE", root_id)
this = TransformGroup("THIS", root_id)
other = TransformGroup("OTHER", root_id)
for tg in this, base, other:
tg.tt.new_directory('a', tg.root, 'a')
tg.tt.new_symlink('b', tg.root, 'b', 'b')
tg.tt.new_file('c', tg.root, 'c', 'c')
tg.tt.new_symlink('d', tg.root, tg.name, 'd')
targets = ((base, 'base-e', 'base-f', None, None),
(this, 'other-e', 'this-f', 'other-g', 'this-h'),
(other, 'other-e', None, 'other-g', 'other-h'))
for tg, e_target, f_target, g_target, h_target in targets:
for link, target in (('e', e_target), ('f', f_target),
('g', g_target), ('h', h_target)):
if target is not None:
tg.tt.new_symlink(link, tg.root, target, link)
for tg in this, base, other:
tg.tt.apply()
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
self.assertIs(os.path.isdir(this.wt.abspath('a')), True)
self.assertIs(os.path.islink(this.wt.abspath('b')), True)
self.assertIs(os.path.isfile(this.wt.abspath('c')), True)
for suffix in ('THIS', 'BASE', 'OTHER'):
self.assertEqual(os.readlink(this.wt.abspath('d.'+suffix)), suffix)
self.assertIs(os.path.lexists(this.wt.abspath('d')), False)
self.assertEqual(this.wt.id2path('d'), 'd.OTHER')
self.assertEqual(this.wt.id2path('f'), 'f.THIS')
self.assertEqual(os.readlink(this.wt.abspath('e')), 'other-e')
self.assertIs(os.path.lexists(this.wt.abspath('e.THIS')), False)
self.assertIs(os.path.lexists(this.wt.abspath('e.OTHER')), False)
self.assertIs(os.path.lexists(this.wt.abspath('e.BASE')), False)
self.assertIs(os.path.lexists(this.wt.abspath('g')), True)
self.assertIs(os.path.lexists(this.wt.abspath('g.BASE')), False)
self.assertIs(os.path.lexists(this.wt.abspath('h')), False)
self.assertIs(os.path.lexists(this.wt.abspath('h.BASE')), False)
self.assertIs(os.path.lexists(this.wt.abspath('h.THIS')), True)
self.assertIs(os.path.lexists(this.wt.abspath('h.OTHER')), True)
def test_filename_merge(self):
root_id = generate_ids.gen_root_id()
base = TransformGroup("BASE", root_id)
this = TransformGroup("THIS", root_id)
other = TransformGroup("OTHER", root_id)
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
for t in [base, this, other]]
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
for t in [base, this, other]]
base.tt.new_directory('c', base_a, 'c')
this.tt.new_directory('c1', this_a, 'c')
other.tt.new_directory('c', other_b, 'c')
base.tt.new_directory('d', base_a, 'd')
this.tt.new_directory('d1', this_b, 'd')
other.tt.new_directory('d', other_a, 'd')
base.tt.new_directory('e', base_a, 'e')
this.tt.new_directory('e', this_a, 'e')
other.tt.new_directory('e1', other_b, 'e')
base.tt.new_directory('f', base_a, 'f')
this.tt.new_directory('f1', this_b, 'f')
other.tt.new_directory('f1', other_b, 'f')
for tg in [this, base, other]:
tg.tt.apply()
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
self.assertEqual(this.wt.id2path('c'), pathjoin('b/c1'))
self.assertEqual(this.wt.id2path('d'), pathjoin('b/d1'))
self.assertEqual(this.wt.id2path('e'), pathjoin('b/e1'))
self.assertEqual(this.wt.id2path('f'), pathjoin('b/f1'))
def test_filename_merge_conflicts(self):
root_id = generate_ids.gen_root_id()
base = TransformGroup("BASE", root_id)
this = TransformGroup("THIS", root_id)
other = TransformGroup("OTHER", root_id)
base_a, this_a, other_a = [t.tt.new_directory('a', t.root, 'a')
for t in [base, this, other]]
base_b, this_b, other_b = [t.tt.new_directory('b', t.root, 'b')
for t in [base, this, other]]
base.tt.new_file('g', base_a, 'g', 'g')
other.tt.new_file('g1', other_b, 'g1', 'g')
base.tt.new_file('h', base_a, 'h', 'h')
this.tt.new_file('h1', this_b, 'h1', 'h')
base.tt.new_file('i', base.root, 'i', 'i')
other.tt.new_directory('i1', this_b, 'i')
for tg in [this, base, other]:
tg.tt.apply()
Merge3Merger(this.wt, this.wt, base.wt, other.wt)
self.assertEqual(this.wt.id2path('g'), pathjoin('b/g1.OTHER'))
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.BASE')), True)
self.assertIs(os.path.lexists(this.wt.abspath('b/g1.THIS')), False)
self.assertEqual(this.wt.id2path('h'), pathjoin('b/h1.THIS'))
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.BASE')), True)
self.assertIs(os.path.lexists(this.wt.abspath('b/h1.OTHER')), False)
self.assertEqual(this.wt.id2path('i'), pathjoin('b/i1.OTHER'))
class TestBuildTree(tests.TestCaseWithTransport):
def test_build_tree_with_symlinks(self):
self.requireFeature(SymlinkFeature)
os.mkdir('a')
a = BzrDir.create_standalone_workingtree('a')
os.mkdir('a/foo')
file('a/foo/bar', 'wb').write('contents')
os.symlink('a/foo/bar', 'a/foo/baz')
a.add(['foo', 'foo/bar', 'foo/baz'])
a.commit('initial commit')
b = BzrDir.create_standalone_workingtree('b')
basis = a.basis_tree()
basis.lock_read()
self.addCleanup(basis.unlock)
build_tree(basis, b)
self.assertIs(os.path.isdir('b/foo'), True)
self.assertEqual(file('b/foo/bar', 'rb').read(), "contents")
self.assertEqual(os.readlink('b/foo/baz'), 'a/foo/bar')
def test_build_with_references(self):
tree = self.make_branch_and_tree('source',
format='dirstate-with-subtree')
subtree = self.make_branch_and_tree('source/subtree',
format='dirstate-with-subtree')
tree.add_reference(subtree)
tree.commit('a revision')
tree.branch.create_checkout('target')
self.failUnlessExists('target')
self.failUnlessExists('target/subtree')
def test_file_conflict_handling(self):
"""Ensure that when building trees, conflict handling is done"""
source = self.make_branch_and_tree('source')
target = self.make_branch_and_tree('target')
self.build_tree(['source/file', 'target/file'])
source.add('file', 'new-file')
source.commit('added file')
build_tree(source.basis_tree(), target)
self.assertEqual([DuplicateEntry('Moved existing file to',
'file.moved', 'file', None, 'new-file')],
target.conflicts())
target2 = self.make_branch_and_tree('target2')
target_file = file('target2/file', 'wb')
try:
source_file = file('source/file', 'rb')
try:
target_file.write(source_file.read())
finally:
source_file.close()
finally:
target_file.close()
build_tree(source.basis_tree(), target2)
self.assertEqual([], target2.conflicts())
def test_symlink_conflict_handling(self):
"""Ensure that when building trees, conflict handling is done"""
self.requireFeature(SymlinkFeature)
source = self.make_branch_and_tree('source')
os.symlink('foo', 'source/symlink')
source.add('symlink', 'new-symlink')
source.commit('added file')
target = self.make_branch_and_tree('target')
os.symlink('bar', 'target/symlink')
build_tree(source.basis_tree(), target)
self.assertEqual([DuplicateEntry('Moved existing file to',
'symlink.moved', 'symlink', None, 'new-symlink')],
target.conflicts())
target = self.make_branch_and_tree('target2')
os.symlink('foo', 'target2/symlink')
build_tree(source.basis_tree(), target)
self.assertEqual([], target.conflicts())
def test_directory_conflict_handling(self):
"""Ensure that when building trees, conflict handling is done"""
source = self.make_branch_and_tree('source')
target = self.make_branch_and_tree('target')
self.build_tree(['source/dir1/', 'source/dir1/file', 'target/dir1/'])
source.add(['dir1', 'dir1/file'], ['new-dir1', 'new-file'])
source.commit('added file')
build_tree(source.basis_tree(), target)
self.assertEqual([], target.conflicts())
self.failUnlessExists('target/dir1/file')
# Ensure contents are merged
target = self.make_branch_and_tree('target2')
self.build_tree(['target2/dir1/', 'target2/dir1/file2'])
build_tree(source.basis_tree(), target)
self.assertEqual([], target.conflicts())
self.failUnlessExists('target2/dir1/file2')
self.failUnlessExists('target2/dir1/file')
# Ensure new contents are suppressed for existing branches
target = self.make_branch_and_tree('target3')
self.make_branch('target3/dir1')
self.build_tree(['target3/dir1/file2'])
build_tree(source.basis_tree(), target)
self.failIfExists('target3/dir1/file')
self.failUnlessExists('target3/dir1/file2')
self.failUnlessExists('target3/dir1.diverted/file')
self.assertEqual([DuplicateEntry('Diverted to',
'dir1.diverted', 'dir1', 'new-dir1', None)],
target.conflicts())
target = self.make_branch_and_tree('target4')
self.build_tree(['target4/dir1/'])
self.make_branch('target4/dir1/file')
build_tree(source.basis_tree(), target)
self.failUnlessExists('target4/dir1/file')
self.assertEqual('directory', file_kind('target4/dir1/file'))
self.failUnlessExists('target4/dir1/file.diverted')
self.assertEqual([DuplicateEntry('Diverted to',
'dir1/file.diverted', 'dir1/file', 'new-file', None)],
target.conflicts())
def test_mixed_conflict_handling(self):
"""Ensure that when building trees, conflict handling is done"""
source = self.make_branch_and_tree('source')
target = self.make_branch_and_tree('target')
self.build_tree(['source/name', 'target/name/'])
source.add('name', 'new-name')
source.commit('added file')
build_tree(source.basis_tree(), target)
self.assertEqual([DuplicateEntry('Moved existing file to',
'name.moved', 'name', None, 'new-name')], target.conflicts())
def test_raises_in_populated(self):
source = self.make_branch_and_tree('source')
self.build_tree(['source/name'])
source.add('name')
source.commit('added name')
target = self.make_branch_and_tree('target')
self.build_tree(['target/name'])
target.add('name')
self.assertRaises(errors.WorkingTreeAlreadyPopulated,
build_tree, source.basis_tree(), target)
def test_build_tree_rename_count(self):
source = self.make_branch_and_tree('source')
self.build_tree(['source/file1', 'source/dir1/'])
source.add(['file1', 'dir1'])
source.commit('add1')
target1 = self.make_branch_and_tree('target1')
transform_result = build_tree(source.basis_tree(), target1)
self.assertEqual(2, transform_result.rename_count)
self.build_tree(['source/dir1/file2'])
source.add(['dir1/file2'])
source.commit('add3')
target2 = self.make_branch_and_tree('target2')
transform_result = build_tree(source.basis_tree(), target2)
# children of non-root directories should not be renamed
self.assertEqual(2, transform_result.rename_count)
def create_ab_tree(self):
"""Create a committed test tree with two files"""
source = self.make_branch_and_tree('source')
self.build_tree_contents([('source/file1', 'A')])
self.build_tree_contents([('source/file2', 'B')])
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
source.commit('commit files')
source.lock_write()
self.addCleanup(source.unlock)
return source
def test_build_tree_accelerator_tree(self):
source = self.create_ab_tree()
self.build_tree_contents([('source/file2', 'C')])
calls = []
real_source_get_file = source.get_file
def get_file(file_id, path=None):
calls.append(file_id)
return real_source_get_file(file_id, path)
source.get_file = get_file
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source)
self.assertEqual(['file1-id'], calls)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
def test_build_tree_accelerator_tree_missing_file(self):
source = self.create_ab_tree()
os.unlink('source/file1')
source.remove(['file2'])
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
def test_build_tree_accelerator_wrong_kind(self):
self.requireFeature(SymlinkFeature)
source = self.make_branch_and_tree('source')
self.build_tree_contents([('source/file1', '')])
self.build_tree_contents([('source/file2', '')])
source.add(['file1', 'file2'], ['file1-id', 'file2-id'])
source.commit('commit files')
os.unlink('source/file2')
self.build_tree_contents([('source/file2/', 'C')])
os.unlink('source/file1')
os.symlink('file2', 'source/file1')
calls = []
real_source_get_file = source.get_file
def get_file(file_id, path=None):
calls.append(file_id)
return real_source_get_file(file_id, path)
source.get_file = get_file
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source)
self.assertEqual([], calls)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
def test_build_tree_hardlink(self):
self.requireFeature(HardlinkFeature)
source = self.create_ab_tree()
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source, hardlink=True)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
source_stat = os.stat('source/file1')
target_stat = os.stat('target/file1')
self.assertEqual(source_stat, target_stat)
# Explicitly disallowing hardlinks should prevent them.
target2 = self.make_branch_and_tree('target2')
build_tree(revision_tree, target2, source, hardlink=False)
target2.lock_read()
self.addCleanup(target2.unlock)
self.assertEqual([], list(target2.iter_changes(revision_tree)))
source_stat = os.stat('source/file1')
target2_stat = os.stat('target2/file1')
self.assertNotEqual(source_stat, target2_stat)
def test_build_tree_accelerator_tree_moved(self):
source = self.make_branch_and_tree('source')
self.build_tree_contents([('source/file1', 'A')])
source.add(['file1'], ['file1-id'])
source.commit('commit files')
source.rename_one('file1', 'file2')
source.lock_read()
self.addCleanup(source.unlock)
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
def test_build_tree_hardlinks_preserve_execute(self):
self.requireFeature(HardlinkFeature)
source = self.create_ab_tree()
tt = TreeTransform(source)
trans_id = tt.trans_id_tree_file_id('file1-id')
tt.set_executability(True, trans_id)
tt.apply()
self.assertTrue(source.is_executable('file1-id'))
target = self.make_branch_and_tree('target')
revision_tree = source.basis_tree()
revision_tree.lock_read()
self.addCleanup(revision_tree.unlock)
build_tree(revision_tree, target, source, hardlink=True)
target.lock_read()
self.addCleanup(target.unlock)
self.assertEqual([], list(target.iter_changes(revision_tree)))
self.assertTrue(source.is_executable('file1-id'))
class MockTransform(object):
def has_named_child(self, by_parent, parent_id, name):
for child_id in by_parent[parent_id]:
if child_id == '0':
if name == "name~":
return True
elif name == "name.~%s~" % child_id:
return True
return False
class MockEntry(object):
def __init__(self):
object.__init__(self)
self.name = "name"
class TestGetBackupName(TestCase):
def test_get_backup_name(self):
tt = MockTransform()
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
self.assertEqual(name, 'name.~1~')
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
self.assertEqual(name, 'name.~2~')
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
self.assertEqual(name, 'name.~1~')
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
self.assertEqual(name, 'name.~1~')
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
self.assertEqual(name, 'name.~4~')
class TestFileMover(tests.TestCaseWithTransport):
def test_file_mover(self):
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
mover = _FileMover()
mover.rename('a', 'q')
self.failUnlessExists('q')
self.failIfExists('a')
self.failUnlessExists('q/b')
self.failUnlessExists('c')
self.failUnlessExists('c/d')
def test_pre_delete_rollback(self):
self.build_tree(['a/'])
mover = _FileMover()
mover.pre_delete('a', 'q')
self.failUnlessExists('q')
self.failIfExists('a')
mover.rollback()
self.failIfExists('q')
self.failUnlessExists('a')
def test_apply_deletions(self):
self.build_tree(['a/', 'b/'])
mover = _FileMover()
mover.pre_delete('a', 'q')
mover.pre_delete('b', 'r')
self.failUnlessExists('q')
self.failUnlessExists('r')
self.failIfExists('a')
self.failIfExists('b')
mover.apply_deletions()
self.failIfExists('q')
self.failIfExists('r')
self.failIfExists('a')
self.failIfExists('b')
def test_file_mover_rollback(self):
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
mover = _FileMover()
mover.rename('c/d', 'c/f')
mover.rename('c/e', 'c/d')
try:
mover.rename('a', 'c')
except errors.FileExists, e:
mover.rollback()
self.failUnlessExists('a')
self.failUnlessExists('c/d')
class Bogus(Exception):
pass
class TestTransformRollback(tests.TestCaseWithTransport):
class ExceptionFileMover(_FileMover):
def __init__(self, bad_source=None, bad_target=None):
_FileMover.__init__(self)
self.bad_source = bad_source
self.bad_target = bad_target
def rename(self, source, target):
if (self.bad_source is not None and
source.endswith(self.bad_source)):
raise Bogus
elif (self.bad_target is not None and
target.endswith(self.bad_target)):
raise Bogus
else:
_FileMover.rename(self, source, target)
def test_rollback_rename(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b'])
tt = TreeTransform(tree)
self.addCleanup(tt.finalize)
a_id = tt.trans_id_tree_path('a')
tt.adjust_path('c', tt.root, a_id)
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
self.assertRaises(Bogus, tt.apply,
_mover=self.ExceptionFileMover(bad_source='a'))
self.failUnlessExists('a')
self.failUnlessExists('a/b')
tt.apply()
self.failUnlessExists('c')
self.failUnlessExists('c/d')
def test_rollback_rename_into_place(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b'])
tt = TreeTransform(tree)
self.addCleanup(tt.finalize)
a_id = tt.trans_id_tree_path('a')
tt.adjust_path('c', tt.root, a_id)
tt.adjust_path('d', a_id, tt.trans_id_tree_path('a/b'))
self.assertRaises(Bogus, tt.apply,
_mover=self.ExceptionFileMover(bad_target='c/d'))
self.failUnlessExists('a')
self.failUnlessExists('a/b')
tt.apply()
self.failUnlessExists('c')
self.failUnlessExists('c/d')
def test_rollback_deletion(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a/', 'a/b'])
tt = TreeTransform(tree)
self.addCleanup(tt.finalize)
a_id = tt.trans_id_tree_path('a')
tt.delete_contents(a_id)
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
self.assertRaises(Bogus, tt.apply,
_mover=self.ExceptionFileMover(bad_target='d'))
self.failUnlessExists('a')
self.failUnlessExists('a/b')
def test_resolve_no_parent(self):
wt = self.make_branch_and_tree('.')
tt = TreeTransform(wt)
self.addCleanup(tt.finalize)
parent = tt.trans_id_file_id('parent-id')
tt.new_file('file', parent, 'Contents')
resolve_conflicts(tt)
class TestTransformPreview(tests.TestCaseWithTransport):
def create_tree(self):
tree = self.make_branch_and_tree('.')
self.build_tree_contents([('a', 'content 1')])
tree.add('a', 'a-id')
tree.commit('rev1', rev_id='rev1')
return tree.branch.repository.revision_tree('rev1')
def get_empty_preview(self):
repository = self.make_repository('repo')
tree = repository.revision_tree(_mod_revision.NULL_REVISION)
preview = TransformPreview(tree)
self.addCleanup(preview.finalize)
return preview
def test_transform_preview(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
def test_transform_preview_tree(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
preview.get_preview_tree()
def test_transform_new_file(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
preview_tree = preview.get_preview_tree()
self.assertEqual(preview_tree.kind('file2-id'), 'file')
self.assertEqual(
preview_tree.get_file('file2-id').read(), 'content B\n')
def test_diff_preview_tree(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
preview_tree = preview.get_preview_tree()
out = StringIO()
show_diff_trees(revision_tree, preview_tree, out)
lines = out.getvalue().splitlines()
self.assertEqual(lines[0], "=== added file 'file2'")
# 3 lines of diff administrivia
self.assertEqual(lines[4], "+content B")
def test_transform_conflicts(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
preview.new_file('a', preview.root, 'content 2')
resolve_conflicts(preview)
trans_id = preview.trans_id_file_id('a-id')
self.assertEqual('a.moved', preview.final_name(trans_id))
def get_tree_and_preview_tree(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
a_trans_id = preview.trans_id_file_id('a-id')
preview.delete_contents(a_trans_id)
preview.create_file('b content', a_trans_id)
preview_tree = preview.get_preview_tree()
return revision_tree, preview_tree
def test_iter_changes(self):
revision_tree, preview_tree = self.get_tree_and_preview_tree()
root = revision_tree.inventory.root.file_id
self.assertEqual([('a-id', ('a', 'a'), True, (True, True),
(root, root), ('a', 'a'), ('file', 'file'),
(False, False))],
list(preview_tree.iter_changes(revision_tree)))
def test_wrong_tree_value_error(self):
revision_tree, preview_tree = self.get_tree_and_preview_tree()
e = self.assertRaises(ValueError, preview_tree.iter_changes,
preview_tree)
self.assertEqual('from_tree must be transform source tree.', str(e))
def test_include_unchanged_value_error(self):
revision_tree, preview_tree = self.get_tree_and_preview_tree()
e = self.assertRaises(ValueError, preview_tree.iter_changes,
revision_tree, include_unchanged=True)
self.assertEqual('include_unchanged is not supported', str(e))
def test_specific_files(self):
revision_tree, preview_tree = self.get_tree_and_preview_tree()
e = self.assertRaises(ValueError, preview_tree.iter_changes,
revision_tree, specific_files=['pete'])
self.assertEqual('specific_files is not supported', str(e))
def test_want_unversioned_value_error(self):
revision_tree, preview_tree = self.get_tree_and_preview_tree()
e = self.assertRaises(ValueError, preview_tree.iter_changes,
revision_tree, want_unversioned=True)
self.assertEqual('want_unversioned is not supported', str(e))
def test_ignore_extra_trees_no_specific_files(self):
# extra_trees is harmless without specific_files, so we'll silently
# accept it, even though we won't use it.
revision_tree, preview_tree = self.get_tree_and_preview_tree()
preview_tree.iter_changes(revision_tree, extra_trees=[preview_tree])
def test_ignore_require_versioned_no_specific_files(self):
# require_versioned is meaningless without specific_files.
revision_tree, preview_tree = self.get_tree_and_preview_tree()
preview_tree.iter_changes(revision_tree, require_versioned=False)
def test_ignore_pb(self):
# pb could be supported, but TT.iter_changes doesn't support it.
revision_tree, preview_tree = self.get_tree_and_preview_tree()
preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
def test_kind(self):
revision_tree = self.create_tree()
preview = TransformPreview(revision_tree)
self.addCleanup(preview.finalize)
preview.new_file('file', preview.root, 'contents', 'file-id')
preview.new_directory('directory', preview.root, 'dir-id')
preview_tree = preview.get_preview_tree()
self.assertEqual('file', preview_tree.kind('file-id'))
self.assertEqual('directory', preview_tree.kind('dir-id'))
def test_get_file_mtime(self):
preview = self.get_empty_preview()
file_trans_id = preview.new_file('file', preview.root, 'contents',
'file-id')
limbo_path = preview._limbo_name(file_trans_id)
preview_tree = preview.get_preview_tree()
self.assertEqual(os.stat(limbo_path).st_mtime,
preview_tree.get_file_mtime('file-id'))
def test_get_file(self):
preview = self.get_empty_preview()
preview.new_file('file', preview.root, 'contents', 'file-id')
preview_tree = preview.get_preview_tree()
tree_file = preview_tree.get_file('file-id')
try:
self.assertEqual('contents', tree_file.read())
finally:
tree_file.close()
def test_get_symlink_target(self):
self.requireFeature(SymlinkFeature)
preview = self.get_empty_preview()
preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
preview_tree = preview.get_preview_tree()
self.assertEqual('target',
preview_tree.get_symlink_target('symlink-id'))
|