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
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
|
# Copyright (C) 2005, 2006 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from binascii import hexlify
from copy import deepcopy
from cStringIO import StringIO
import re
import time
from unittest import TestSuite
from bzrlib import bzrdir, check, delta, gpg, errors, xml5, ui, transactions, osutils
from bzrlib.decorators import needs_read_lock, needs_write_lock
from bzrlib.errors import InvalidRevisionId
from bzrlib.graph import Graph
from bzrlib.inter import InterObject
from bzrlib.inventory import Inventory, InventoryDirectory, ROOT_ID
from bzrlib.knit import KnitVersionedFile, KnitPlainFactory
from bzrlib.lockable_files import LockableFiles, TransportLock
from bzrlib.lockdir import LockDir
from bzrlib.osutils import (safe_unicode, rand_bytes, compact_date,
local_time_offset)
from bzrlib.revision import NULL_REVISION, Revision
from bzrlib.revisiontree import RevisionTree
from bzrlib.store.versioned import VersionedFileStore, WeaveStore
from bzrlib.store.text import TextStore
from bzrlib import symbol_versioning
from bzrlib.symbol_versioning import (deprecated_method,
zero_nine,
)
from bzrlib.testament import Testament
from bzrlib.trace import mutter, note, warning
from bzrlib.tsort import topo_sort
from bzrlib.weave import WeaveFile
# Old formats display a warning, but only once
_deprecation_warning_done = False
class Repository(object):
"""Repository holding history for one or more branches.
The repository holds and retrieves historical information including
revisions and file history. It's normally accessed only by the Branch,
which views a particular line of development through that history.
The Repository builds on top of Stores and a Transport, which respectively
describe the disk data format and the way of accessing the (possibly
remote) disk.
"""
@needs_write_lock
def add_inventory(self, revid, inv, parents):
"""Add the inventory inv to the repository as revid.
:param parents: The revision ids of the parents that revid
is known to have and are in the repository already.
returns the sha1 of the serialized inventory.
"""
assert inv.revision_id is None or inv.revision_id == revid, \
"Mismatch between inventory revision" \
" id and insertion revid (%r, %r)" % (inv.revision_id, revid)
assert inv.root is not None
inv_text = xml5.serializer_v5.write_inventory_to_string(inv)
inv_sha1 = osutils.sha_string(inv_text)
inv_vf = self.control_weaves.get_weave('inventory',
self.get_transaction())
self._inventory_add_lines(inv_vf, revid, parents, osutils.split_lines(inv_text))
return inv_sha1
def _inventory_add_lines(self, inv_vf, revid, parents, lines):
final_parents = []
for parent in parents:
if parent in inv_vf:
final_parents.append(parent)
inv_vf.add_lines(revid, final_parents, lines)
@needs_write_lock
def add_revision(self, rev_id, rev, inv=None, config=None):
"""Add rev to the revision store as rev_id.
:param rev_id: the revision id to use.
:param rev: The revision object.
:param inv: The inventory for the revision. if None, it will be looked
up in the inventory storer
:param config: If None no digital signature will be created.
If supplied its signature_needed method will be used
to determine if a signature should be made.
"""
if config is not None and config.signature_needed():
if inv is None:
inv = self.get_inventory(rev_id)
plaintext = Testament(rev, inv).as_short_text()
self.store_revision_signature(
gpg.GPGStrategy(config), plaintext, rev_id)
if not rev_id in self.get_inventory_weave():
if inv is None:
raise errors.WeaveRevisionNotPresent(rev_id,
self.get_inventory_weave())
else:
# yes, this is not suitable for adding with ghosts.
self.add_inventory(rev_id, inv, rev.parent_ids)
self._revision_store.add_revision(rev, self.get_transaction())
@needs_read_lock
def _all_possible_ids(self):
"""Return all the possible revisions that we could find."""
return self.get_inventory_weave().versions()
def all_revision_ids(self):
"""Returns a list of all the revision ids in the repository.
This is deprecated because code should generally work on the graph
reachable from a particular revision, and ignore any other revisions
that might be present. There is no direct replacement method.
"""
return self._all_revision_ids()
@needs_read_lock
def _all_revision_ids(self):
"""Returns a list of all the revision ids in the repository.
These are in as much topological order as the underlying store can
present: for weaves ghosts may lead to a lack of correctness until
the reweave updates the parents list.
"""
if self._revision_store.text_store.listable():
return self._revision_store.all_revision_ids(self.get_transaction())
result = self._all_possible_ids()
return self._eliminate_revisions_not_present(result)
def break_lock(self):
"""Break a lock if one is present from another instance.
Uses the ui factory to ask for confirmation if the lock may be from
an active process.
"""
self.control_files.break_lock()
@needs_read_lock
def _eliminate_revisions_not_present(self, revision_ids):
"""Check every revision id in revision_ids to see if we have it.
Returns a set of the present revisions.
"""
result = []
for id in revision_ids:
if self.has_revision(id):
result.append(id)
return result
@staticmethod
def create(a_bzrdir):
"""Construct the current default format repository in a_bzrdir."""
return RepositoryFormat.get_default_format().initialize(a_bzrdir)
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
"""instantiate a Repository.
:param _format: The format of the repository on disk.
:param a_bzrdir: The BzrDir of the repository.
In the future we will have a single api for all stores for
getting file texts, inventories and revisions, then
this construct will accept instances of those things.
"""
super(Repository, self).__init__()
self._format = _format
# the following are part of the public API for Repository:
self.bzrdir = a_bzrdir
self.control_files = control_files
self._revision_store = _revision_store
self.text_store = text_store
# backwards compatibility
self.weave_store = text_store
# not right yet - should be more semantically clear ?
#
self.control_store = control_store
self.control_weaves = control_store
# TODO: make sure to construct the right store classes, etc, depending
# on whether escaping is required.
self._warn_if_deprecated()
def __repr__(self):
return '%s(%r)' % (self.__class__.__name__,
self.bzrdir.transport.base)
def is_locked(self):
return self.control_files.is_locked()
def lock_write(self):
self.control_files.lock_write()
def lock_read(self):
self.control_files.lock_read()
def get_physical_lock_status(self):
return self.control_files.get_physical_lock_status()
@needs_read_lock
def missing_revision_ids(self, other, revision_id=None):
"""Return the revision ids that other has that this does not.
These are returned in topological order.
revision_id: only return revision ids included by revision_id.
"""
return InterRepository.get(other, self).missing_revision_ids(revision_id)
@staticmethod
def open(base):
"""Open the repository rooted at base.
For instance, if the repository is at URL/.bzr/repository,
Repository.open(URL) -> a Repository instance.
"""
control = bzrdir.BzrDir.open(base)
return control.open_repository()
def copy_content_into(self, destination, revision_id=None, basis=None):
"""Make a complete copy of the content in self into destination.
This is a destructive operation! Do not use it on existing
repositories.
"""
return InterRepository.get(self, destination).copy_content(revision_id, basis)
def fetch(self, source, revision_id=None, pb=None):
"""Fetch the content required to construct revision_id from source.
If revision_id is None all content is copied.
"""
return InterRepository.get(source, self).fetch(revision_id=revision_id,
pb=pb)
def get_commit_builder(self, branch, parents, config, timestamp=None,
timezone=None, committer=None, revprops=None,
revision_id=None):
"""Obtain a CommitBuilder for this repository.
:param branch: Branch to commit to.
:param parents: Revision ids of the parents of the new revision.
:param config: Configuration to use.
:param timestamp: Optional timestamp recorded for commit.
:param timezone: Optional timezone for timestamp.
:param committer: Optional committer to set for commit.
:param revprops: Optional dictionary of revision properties.
:param revision_id: Optional revision id.
"""
return _CommitBuilder(self, parents, config, timestamp, timezone,
committer, revprops, revision_id)
def unlock(self):
self.control_files.unlock()
@needs_read_lock
def clone(self, a_bzrdir, revision_id=None, basis=None):
"""Clone this repository into a_bzrdir using the current format.
Currently no check is made that the format of this repository and
the bzrdir format are compatible. FIXME RBC 20060201.
"""
if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
# use target default format.
result = a_bzrdir.create_repository()
# FIXME RBC 20060209 split out the repository type to avoid this check ?
elif isinstance(a_bzrdir._format,
(bzrdir.BzrDirFormat4,
bzrdir.BzrDirFormat5,
bzrdir.BzrDirFormat6)):
result = a_bzrdir.open_repository()
else:
result = self._format.initialize(a_bzrdir, shared=self.is_shared())
self.copy_content_into(result, revision_id, basis)
return result
@needs_read_lock
def has_revision(self, revision_id):
"""True if this repository has a copy of the revision."""
return self._revision_store.has_revision_id(revision_id,
self.get_transaction())
@needs_read_lock
def get_revision_reconcile(self, revision_id):
"""'reconcile' helper routine that allows access to a revision always.
This variant of get_revision does not cross check the weave graph
against the revision one as get_revision does: but it should only
be used by reconcile, or reconcile-alike commands that are correcting
or testing the revision graph.
"""
if not revision_id or not isinstance(revision_id, basestring):
raise InvalidRevisionId(revision_id=revision_id, branch=self)
return self._revision_store.get_revisions([revision_id],
self.get_transaction())[0]
@needs_read_lock
def get_revisions(self, revision_ids):
return self._revision_store.get_revisions(revision_ids,
self.get_transaction())
@needs_read_lock
def get_revision_xml(self, revision_id):
rev = self.get_revision(revision_id)
rev_tmp = StringIO()
# the current serializer..
self._revision_store._serializer.write_revision(rev, rev_tmp)
rev_tmp.seek(0)
return rev_tmp.getvalue()
@needs_read_lock
def get_revision(self, revision_id):
"""Return the Revision object for a named revision"""
r = self.get_revision_reconcile(revision_id)
# weave corruption can lead to absent revision markers that should be
# present.
# the following test is reasonably cheap (it needs a single weave read)
# and the weave is cached in read transactions. In write transactions
# it is not cached but typically we only read a small number of
# revisions. For knits when they are introduced we will probably want
# to ensure that caching write transactions are in use.
inv = self.get_inventory_weave()
self._check_revision_parents(r, inv)
return r
@needs_read_lock
def get_deltas_for_revisions(self, revisions):
"""Produce a generator of revision deltas.
Note that the input is a sequence of REVISIONS, not revision_ids.
Trees will be held in memory until the generator exits.
Each delta is relative to the revision's lefthand predecessor.
"""
required_trees = set()
for revision in revisions:
required_trees.add(revision.revision_id)
required_trees.update(revision.parent_ids[:1])
trees = dict((t.get_revision_id(), t) for
t in self.revision_trees(required_trees))
for revision in revisions:
if not revision.parent_ids:
old_tree = self.revision_tree(None)
else:
old_tree = trees[revision.parent_ids[0]]
yield trees[revision.revision_id].changes_from(old_tree)
@needs_read_lock
def get_revision_delta(self, revision_id):
"""Return the delta for one revision.
The delta is relative to the left-hand predecessor of the
revision.
"""
r = self.get_revision(revision_id)
return list(self.get_deltas_for_revisions([r]))[0]
def _check_revision_parents(self, revision, inventory):
"""Private to Repository and Fetch.
This checks the parentage of revision in an inventory weave for
consistency and is only applicable to inventory-weave-for-ancestry
using repository formats & fetchers.
"""
weave_parents = inventory.get_parents(revision.revision_id)
weave_names = inventory.versions()
for parent_id in revision.parent_ids:
if parent_id in weave_names:
# this parent must not be a ghost.
if not parent_id in weave_parents:
# but it is a ghost
raise errors.CorruptRepository(self)
@needs_write_lock
def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
signature = gpg_strategy.sign(plaintext)
self._revision_store.add_revision_signature_text(revision_id,
signature,
self.get_transaction())
def fileids_altered_by_revision_ids(self, revision_ids):
"""Find the file ids and versions affected by revisions.
:param revisions: an iterable containing revision ids.
:return: a dictionary mapping altered file-ids to an iterable of
revision_ids. Each altered file-ids has the exact revision_ids that
altered it listed explicitly.
"""
assert isinstance(self._format, (RepositoryFormat5,
RepositoryFormat6,
RepositoryFormat7,
RepositoryFormatKnit1)), \
("fileids_altered_by_revision_ids only supported for branches "
"which store inventory as unnested xml, not on %r" % self)
selected_revision_ids = set(revision_ids)
w = self.get_inventory_weave()
result = {}
# this code needs to read every new line in every inventory for the
# inventories [revision_ids]. Seeing a line twice is ok. Seeing a line
# not present in one of those inventories is unnecessary but not
# harmful because we are filtering by the revision id marker in the
# inventory lines : we only select file ids altered in one of those
# revisions. We don't need to see all lines in the inventory because
# only those added in an inventory in rev X can contain a revision=X
# line.
for line in w.iter_lines_added_or_present_in_versions(selected_revision_ids):
start = line.find('file_id="')+9
if start < 9: continue
end = line.find('"', start)
assert end>= 0
file_id = _unescape_xml(line[start:end])
start = line.find('revision="')+10
if start < 10: continue
end = line.find('"', start)
assert end>= 0
revision_id = _unescape_xml(line[start:end])
if revision_id in selected_revision_ids:
result.setdefault(file_id, set()).add(revision_id)
return result
@needs_read_lock
def get_inventory_weave(self):
return self.control_weaves.get_weave('inventory',
self.get_transaction())
@needs_read_lock
def get_inventory(self, revision_id):
"""Get Inventory object by hash."""
return self.deserialise_inventory(
revision_id, self.get_inventory_xml(revision_id))
def deserialise_inventory(self, revision_id, xml):
"""Transform the xml into an inventory object.
:param revision_id: The expected revision id of the inventory.
:param xml: A serialised inventory.
"""
result = xml5.serializer_v5.read_inventory_from_string(xml)
result.root.revision = revision_id
return result
@needs_read_lock
def get_inventory_xml(self, revision_id):
"""Get inventory XML as a file object."""
try:
assert isinstance(revision_id, basestring), type(revision_id)
iw = self.get_inventory_weave()
return iw.get_text(revision_id)
except IndexError:
raise errors.HistoryMissing(self, 'inventory', revision_id)
@needs_read_lock
def get_inventory_sha1(self, revision_id):
"""Return the sha1 hash of the inventory entry
"""
return self.get_revision(revision_id).inventory_sha1
@needs_read_lock
def get_revision_graph(self, revision_id=None):
"""Return a dictionary containing the revision graph.
:param revision_id: The revision_id to get a graph from. If None, then
the entire revision graph is returned. This is a deprecated mode of
operation and will be removed in the future.
:return: a dictionary of revision_id->revision_parents_list.
"""
# special case NULL_REVISION
if revision_id == NULL_REVISION:
return {}
weave = self.get_inventory_weave()
all_revisions = self._eliminate_revisions_not_present(weave.versions())
entire_graph = dict([(node, weave.get_parents(node)) for
node in all_revisions])
if revision_id is None:
return entire_graph
elif revision_id not in entire_graph:
raise errors.NoSuchRevision(self, revision_id)
else:
# add what can be reached from revision_id
result = {}
pending = set([revision_id])
while len(pending) > 0:
node = pending.pop()
result[node] = entire_graph[node]
for revision_id in result[node]:
if revision_id not in result:
pending.add(revision_id)
return result
@needs_read_lock
def get_revision_graph_with_ghosts(self, revision_ids=None):
"""Return a graph of the revisions with ghosts marked as applicable.
:param revision_ids: an iterable of revisions to graph or None for all.
:return: a Graph object with the graph reachable from revision_ids.
"""
result = Graph()
if not revision_ids:
pending = set(self.all_revision_ids())
required = set([])
else:
pending = set(revision_ids)
# special case NULL_REVISION
if NULL_REVISION in pending:
pending.remove(NULL_REVISION)
required = set(pending)
done = set([])
while len(pending):
revision_id = pending.pop()
try:
rev = self.get_revision(revision_id)
except errors.NoSuchRevision:
if revision_id in required:
raise
# a ghost
result.add_ghost(revision_id)
continue
for parent_id in rev.parent_ids:
# is this queued or done ?
if (parent_id not in pending and
parent_id not in done):
# no, queue it.
pending.add(parent_id)
result.add_node(revision_id, rev.parent_ids)
done.add(revision_id)
return result
@needs_read_lock
def get_revision_inventory(self, revision_id):
"""Return inventory of a past revision."""
# TODO: Unify this with get_inventory()
# bzr 0.0.6 and later imposes the constraint that the inventory_id
# must be the same as its revision, so this is trivial.
if revision_id is None:
# This does not make sense: if there is no revision,
# then it is the current tree inventory surely ?!
# and thus get_root_id() is something that looks at the last
# commit on the branch, and the get_root_id is an inventory check.
raise NotImplementedError
# return Inventory(self.get_root_id())
else:
return self.get_inventory(revision_id)
@needs_read_lock
def is_shared(self):
"""Return True if this repository is flagged as a shared repository."""
raise NotImplementedError(self.is_shared)
@needs_write_lock
def reconcile(self, other=None, thorough=False):
"""Reconcile this repository."""
from bzrlib.reconcile import RepoReconciler
reconciler = RepoReconciler(self, thorough=thorough)
reconciler.reconcile()
return reconciler
@needs_read_lock
def revision_tree(self, revision_id):
"""Return Tree for a revision on this branch.
`revision_id` may be None for the empty tree revision.
"""
# TODO: refactor this to use an existing revision object
# so we don't need to read it in twice.
if revision_id is None or revision_id == NULL_REVISION:
return RevisionTree(self, Inventory(), NULL_REVISION)
else:
inv = self.get_revision_inventory(revision_id)
return RevisionTree(self, inv, revision_id)
@needs_read_lock
def revision_trees(self, revision_ids):
"""Return Tree for a revision on this branch.
`revision_id` may not be None or 'null:'"""
assert None not in revision_ids
assert NULL_REVISION not in revision_ids
texts = self.get_inventory_weave().get_texts(revision_ids)
for text, revision_id in zip(texts, revision_ids):
inv = self.deserialise_inventory(revision_id, text)
yield RevisionTree(self, inv, revision_id)
@needs_read_lock
def get_ancestry(self, revision_id):
"""Return a list of revision-ids integrated by a revision.
The first element of the list is always None, indicating the origin
revision. This might change when we have history horizons, or
perhaps we should have a new API.
This is topologically sorted.
"""
if revision_id is None:
return [None]
if not self.has_revision(revision_id):
raise errors.NoSuchRevision(self, revision_id)
w = self.get_inventory_weave()
candidates = w.get_ancestry(revision_id)
return [None] + candidates # self._eliminate_revisions_not_present(candidates)
@needs_read_lock
def print_file(self, file, revision_id):
"""Print `file` to stdout.
FIXME RBC 20060125 as John Meinel points out this is a bad api
- it writes to stdout, it assumes that that is valid etc. Fix
by creating a new more flexible convenience function.
"""
tree = self.revision_tree(revision_id)
# use inventory as it was in that revision
file_id = tree.inventory.path2id(file)
if not file_id:
# TODO: jam 20060427 Write a test for this code path
# it had a bug in it, and was raising the wrong
# exception.
raise errors.BzrError("%r is not present in revision %s" % (file, revision_id))
tree.print_file(file_id)
def get_transaction(self):
return self.control_files.get_transaction()
def revision_parents(self, revid):
return self.get_inventory_weave().parent_names(revid)
@needs_write_lock
def set_make_working_trees(self, new_value):
"""Set the policy flag for making working trees when creating branches.
This only applies to branches that use this repository.
The default is 'True'.
:param new_value: True to restore the default, False to disable making
working trees.
"""
raise NotImplementedError(self.set_make_working_trees)
def make_working_trees(self):
"""Returns the policy for making working trees on new branches."""
raise NotImplementedError(self.make_working_trees)
@needs_write_lock
def sign_revision(self, revision_id, gpg_strategy):
plaintext = Testament.from_revision(self, revision_id).as_short_text()
self.store_revision_signature(gpg_strategy, plaintext, revision_id)
@needs_read_lock
def has_signature_for_revision_id(self, revision_id):
"""Query for a revision signature for revision_id in the repository."""
return self._revision_store.has_signature(revision_id,
self.get_transaction())
@needs_read_lock
def get_signature_text(self, revision_id):
"""Return the text for a signature."""
return self._revision_store.get_signature_text(revision_id,
self.get_transaction())
@needs_read_lock
def check(self, revision_ids):
"""Check consistency of all history of given revision_ids.
Different repository implementations should override _check().
:param revision_ids: A non-empty list of revision_ids whose ancestry
will be checked. Typically the last revision_id of a branch.
"""
if not revision_ids:
raise ValueError("revision_ids must be non-empty in %s.check"
% (self,))
return self._check(revision_ids)
def _check(self, revision_ids):
result = check.Check(self)
result.check()
return result
def _warn_if_deprecated(self):
global _deprecation_warning_done
if _deprecation_warning_done:
return
_deprecation_warning_done = True
warning("Format %s for %s is deprecated - please use 'bzr upgrade' to get better performance"
% (self._format, self.bzrdir.transport.base))
class AllInOneRepository(Repository):
"""Legacy support - the repository behaviour for all-in-one branches."""
def __init__(self, _format, a_bzrdir, _revision_store, control_store, text_store):
# we reuse one control files instance.
dir_mode = a_bzrdir._control_files._dir_mode
file_mode = a_bzrdir._control_files._file_mode
def get_store(name, compressed=True, prefixed=False):
# FIXME: This approach of assuming stores are all entirely compressed
# or entirely uncompressed is tidy, but breaks upgrade from
# some existing branches where there's a mixture; we probably
# still want the option to look for both.
relpath = a_bzrdir._control_files._escape(name)
store = TextStore(a_bzrdir._control_files._transport.clone(relpath),
prefixed=prefixed, compressed=compressed,
dir_mode=dir_mode,
file_mode=file_mode)
#if self._transport.should_cache():
# cache_path = os.path.join(self.cache_root, name)
# os.mkdir(cache_path)
# store = bzrlib.store.CachedStore(store, cache_path)
return store
# not broken out yet because the controlweaves|inventory_store
# and text_store | weave_store bits are still different.
if isinstance(_format, RepositoryFormat4):
# cannot remove these - there is still no consistent api
# which allows access to this old info.
self.inventory_store = get_store('inventory-store')
text_store = get_store('text-store')
super(AllInOneRepository, self).__init__(_format, a_bzrdir, a_bzrdir._control_files, _revision_store, control_store, text_store)
@needs_read_lock
def is_shared(self):
"""AllInOne repositories cannot be shared."""
return False
@needs_write_lock
def set_make_working_trees(self, new_value):
"""Set the policy flag for making working trees when creating branches.
This only applies to branches that use this repository.
The default is 'True'.
:param new_value: True to restore the default, False to disable making
working trees.
"""
raise NotImplementedError(self.set_make_working_trees)
def make_working_trees(self):
"""Returns the policy for making working trees on new branches."""
return True
def install_revision(repository, rev, revision_tree):
"""Install all revision data into a repository."""
present_parents = []
parent_trees = {}
for p_id in rev.parent_ids:
if repository.has_revision(p_id):
present_parents.append(p_id)
parent_trees[p_id] = repository.revision_tree(p_id)
else:
parent_trees[p_id] = repository.revision_tree(None)
inv = revision_tree.inventory
# backwards compatability hack: skip the root id.
entries = inv.iter_entries()
entries.next()
# Add the texts that are not already present
for path, ie in entries:
w = repository.weave_store.get_weave_or_empty(ie.file_id,
repository.get_transaction())
if ie.revision not in w:
text_parents = []
# FIXME: TODO: The following loop *may* be overlapping/duplicate
# with InventoryEntry.find_previous_heads(). if it is, then there
# is a latent bug here where the parents may have ancestors of each
# other. RBC, AB
for revision, tree in parent_trees.iteritems():
if ie.file_id not in tree:
continue
parent_id = tree.inventory[ie.file_id].revision
if parent_id in text_parents:
continue
text_parents.append(parent_id)
vfile = repository.weave_store.get_weave_or_empty(ie.file_id,
repository.get_transaction())
lines = revision_tree.get_file(ie.file_id).readlines()
vfile.add_lines(rev.revision_id, text_parents, lines)
try:
# install the inventory
repository.add_inventory(rev.revision_id, inv, present_parents)
except errors.RevisionAlreadyPresent:
pass
repository.add_revision(rev.revision_id, rev, inv)
class MetaDirRepository(Repository):
"""Repositories in the new meta-dir layout."""
def __init__(self, _format, a_bzrdir, control_files, _revision_store, control_store, text_store):
super(MetaDirRepository, self).__init__(_format,
a_bzrdir,
control_files,
_revision_store,
control_store,
text_store)
dir_mode = self.control_files._dir_mode
file_mode = self.control_files._file_mode
@needs_read_lock
def is_shared(self):
"""Return True if this repository is flagged as a shared repository."""
return self.control_files._transport.has('shared-storage')
@needs_write_lock
def set_make_working_trees(self, new_value):
"""Set the policy flag for making working trees when creating branches.
This only applies to branches that use this repository.
The default is 'True'.
:param new_value: True to restore the default, False to disable making
working trees.
"""
if new_value:
try:
self.control_files._transport.delete('no-working-trees')
except errors.NoSuchFile:
pass
else:
self.control_files.put_utf8('no-working-trees', '')
def make_working_trees(self):
"""Returns the policy for making working trees on new branches."""
return not self.control_files._transport.has('no-working-trees')
class KnitRepository(MetaDirRepository):
"""Knit format repository."""
def _warn_if_deprecated(self):
# This class isn't deprecated
pass
def _inventory_add_lines(self, inv_vf, revid, parents, lines):
inv_vf.add_lines_with_ghosts(revid, parents, lines)
@needs_read_lock
def _all_revision_ids(self):
"""See Repository.all_revision_ids()."""
# Knits get the revision graph from the index of the revision knit, so
# it's always possible even if they're on an unlistable transport.
return self._revision_store.all_revision_ids(self.get_transaction())
def fileid_involved_between_revs(self, from_revid, to_revid):
"""Find file_id(s) which are involved in the changes between revisions.
This determines the set of revisions which are involved, and then
finds all file ids affected by those revisions.
"""
vf = self._get_revision_vf()
from_set = set(vf.get_ancestry(from_revid))
to_set = set(vf.get_ancestry(to_revid))
changed = to_set.difference(from_set)
return self._fileid_involved_by_set(changed)
def fileid_involved(self, last_revid=None):
"""Find all file_ids modified in the ancestry of last_revid.
:param last_revid: If None, last_revision() will be used.
"""
if not last_revid:
changed = set(self.all_revision_ids())
else:
changed = set(self.get_ancestry(last_revid))
if None in changed:
changed.remove(None)
return self._fileid_involved_by_set(changed)
@needs_read_lock
def get_ancestry(self, revision_id):
"""Return a list of revision-ids integrated by a revision.
This is topologically sorted.
"""
if revision_id is None:
return [None]
vf = self._get_revision_vf()
try:
return [None] + vf.get_ancestry(revision_id)
except errors.RevisionNotPresent:
raise errors.NoSuchRevision(self, revision_id)
@needs_read_lock
def get_revision(self, revision_id):
"""Return the Revision object for a named revision"""
return self.get_revision_reconcile(revision_id)
@needs_read_lock
def get_revision_graph(self, revision_id=None):
"""Return a dictionary containing the revision graph.
:param revision_id: The revision_id to get a graph from. If None, then
the entire revision graph is returned. This is a deprecated mode of
operation and will be removed in the future.
:return: a dictionary of revision_id->revision_parents_list.
"""
# special case NULL_REVISION
if revision_id == NULL_REVISION:
return {}
weave = self._get_revision_vf()
entire_graph = weave.get_graph()
if revision_id is None:
return weave.get_graph()
elif revision_id not in weave:
raise errors.NoSuchRevision(self, revision_id)
else:
# add what can be reached from revision_id
result = {}
pending = set([revision_id])
while len(pending) > 0:
node = pending.pop()
result[node] = weave.get_parents(node)
for revision_id in result[node]:
if revision_id not in result:
pending.add(revision_id)
return result
@needs_read_lock
def get_revision_graph_with_ghosts(self, revision_ids=None):
"""Return a graph of the revisions with ghosts marked as applicable.
:param revision_ids: an iterable of revisions to graph or None for all.
:return: a Graph object with the graph reachable from revision_ids.
"""
result = Graph()
vf = self._get_revision_vf()
versions = set(vf.versions())
if not revision_ids:
pending = set(self.all_revision_ids())
required = set([])
else:
pending = set(revision_ids)
# special case NULL_REVISION
if NULL_REVISION in pending:
pending.remove(NULL_REVISION)
required = set(pending)
done = set([])
while len(pending):
revision_id = pending.pop()
if not revision_id in versions:
if revision_id in required:
raise errors.NoSuchRevision(self, revision_id)
# a ghost
result.add_ghost(revision_id)
# mark it as done so we don't try for it again.
done.add(revision_id)
continue
parent_ids = vf.get_parents_with_ghosts(revision_id)
for parent_id in parent_ids:
# is this queued or done ?
if (parent_id not in pending and
parent_id not in done):
# no, queue it.
pending.add(parent_id)
result.add_node(revision_id, parent_ids)
done.add(revision_id)
return result
def _get_revision_vf(self):
""":return: a versioned file containing the revisions."""
vf = self._revision_store.get_revision_file(self.get_transaction())
return vf
@needs_write_lock
def reconcile(self, other=None, thorough=False):
"""Reconcile this repository."""
from bzrlib.reconcile import KnitReconciler
reconciler = KnitReconciler(self, thorough=thorough)
reconciler.reconcile()
return reconciler
def revision_parents(self, revision_id):
return self._get_revision_vf().get_parents(revision_id)
class RepositoryFormat(object):
"""A repository format.
Formats provide three things:
* An initialization routine to construct repository data on disk.
* a format string which is used when the BzrDir supports versioned
children.
* an open routine which returns a Repository instance.
Formats are placed in an dict by their format string for reference
during opening. These should be subclasses of RepositoryFormat
for consistency.
Once a format is deprecated, just deprecate the initialize and open
methods on the format class. Do not deprecate the object, as the
object will be created every system load.
Common instance attributes:
_matchingbzrdir - the bzrdir format that the repository format was
originally written to work with. This can be used if manually
constructing a bzrdir and repository, or more commonly for test suite
parameterisation.
"""
_default_format = None
"""The default format used for new repositories."""
_formats = {}
"""The known formats."""
def __str__(self):
return "<%s>" % self.__class__.__name__
@classmethod
def find_format(klass, a_bzrdir):
"""Return the format for the repository object in a_bzrdir."""
try:
transport = a_bzrdir.get_repository_transport(None)
format_string = transport.get("format").read()
return klass._formats[format_string]
except errors.NoSuchFile:
raise errors.NoRepositoryPresent(a_bzrdir)
except KeyError:
raise errors.UnknownFormatError(format=format_string)
def _get_control_store(self, repo_transport, control_files):
"""Return the control store for this repository."""
raise NotImplementedError(self._get_control_store)
@classmethod
def get_default_format(klass):
"""Return the current default format."""
return klass._default_format
def get_format_string(self):
"""Return the ASCII format string that identifies this format.
Note that in pre format ?? repositories the format string is
not permitted nor written to disk.
"""
raise NotImplementedError(self.get_format_string)
def get_format_description(self):
"""Return the short description for this format."""
raise NotImplementedError(self.get_format_description)
def _get_revision_store(self, repo_transport, control_files):
"""Return the revision store object for this a_bzrdir."""
raise NotImplementedError(self._get_revision_store)
def _get_text_rev_store(self,
transport,
control_files,
name,
compressed=True,
prefixed=False,
serializer=None):
"""Common logic for getting a revision store for a repository.
see self._get_revision_store for the subclass-overridable method to
get the store for a repository.
"""
from bzrlib.store.revision.text import TextRevisionStore
dir_mode = control_files._dir_mode
file_mode = control_files._file_mode
text_store =TextStore(transport.clone(name),
prefixed=prefixed,
compressed=compressed,
dir_mode=dir_mode,
file_mode=file_mode)
_revision_store = TextRevisionStore(text_store, serializer)
return _revision_store
def _get_versioned_file_store(self,
name,
transport,
control_files,
prefixed=True,
versionedfile_class=WeaveFile,
escaped=False):
weave_transport = control_files._transport.clone(name)
dir_mode = control_files._dir_mode
file_mode = control_files._file_mode
return VersionedFileStore(weave_transport, prefixed=prefixed,
dir_mode=dir_mode,
file_mode=file_mode,
versionedfile_class=versionedfile_class,
escaped=escaped)
def initialize(self, a_bzrdir, shared=False):
"""Initialize a repository of this format in a_bzrdir.
:param a_bzrdir: The bzrdir to put the new repository in it.
:param shared: The repository should be initialized as a sharable one.
This may raise UninitializableFormat if shared repository are not
compatible the a_bzrdir.
"""
def is_supported(self):
"""Is this format supported?
Supported formats must be initializable and openable.
Unsupported formats may not support initialization or committing or
some other features depending on the reason for not being supported.
"""
return True
def open(self, a_bzrdir, _found=False):
"""Return an instance of this format for the bzrdir a_bzrdir.
_found is a private parameter, do not use it.
"""
raise NotImplementedError(self.open)
@classmethod
def register_format(klass, format):
klass._formats[format.get_format_string()] = format
@classmethod
def set_default_format(klass, format):
klass._default_format = format
@classmethod
def unregister_format(klass, format):
assert klass._formats[format.get_format_string()] is format
del klass._formats[format.get_format_string()]
class PreSplitOutRepositoryFormat(RepositoryFormat):
"""Base class for the pre split out repository formats."""
def initialize(self, a_bzrdir, shared=False, _internal=False):
"""Create a weave repository.
TODO: when creating split out bzr branch formats, move this to a common
base for Format5, Format6. or something like that.
"""
from bzrlib.weavefile import write_weave_v5
from bzrlib.weave import Weave
if shared:
raise errors.IncompatibleFormat(self, a_bzrdir._format)
if not _internal:
# always initialized when the bzrdir is.
return self.open(a_bzrdir, _found=True)
# Create an empty weave
sio = StringIO()
write_weave_v5(Weave(), sio)
empty_weave = sio.getvalue()
mutter('creating repository in %s.', a_bzrdir.transport.base)
dirs = ['revision-store', 'weaves']
files = [('inventory.weave', StringIO(empty_weave)),
]
# FIXME: RBC 20060125 don't peek under the covers
# NB: no need to escape relative paths that are url safe.
control_files = LockableFiles(a_bzrdir.transport, 'branch-lock',
TransportLock)
control_files.create_lock()
control_files.lock_write()
control_files._transport.mkdir_multi(dirs,
mode=control_files._dir_mode)
try:
for file, content in files:
control_files.put(file, content)
finally:
control_files.unlock()
return self.open(a_bzrdir, _found=True)
def _get_control_store(self, repo_transport, control_files):
"""Return the control store for this repository."""
return self._get_versioned_file_store('',
repo_transport,
control_files,
prefixed=False)
def _get_text_store(self, transport, control_files):
"""Get a store for file texts for this format."""
raise NotImplementedError(self._get_text_store)
def open(self, a_bzrdir, _found=False):
"""See RepositoryFormat.open()."""
if not _found:
# we are being called directly and must probe.
raise NotImplementedError
repo_transport = a_bzrdir.get_repository_transport(None)
control_files = a_bzrdir._control_files
text_store = self._get_text_store(repo_transport, control_files)
control_store = self._get_control_store(repo_transport, control_files)
_revision_store = self._get_revision_store(repo_transport, control_files)
return AllInOneRepository(_format=self,
a_bzrdir=a_bzrdir,
_revision_store=_revision_store,
control_store=control_store,
text_store=text_store)
class RepositoryFormat4(PreSplitOutRepositoryFormat):
"""Bzr repository format 4.
This repository format has:
- flat stores
- TextStores for texts, inventories,revisions.
This format is deprecated: it indexes texts using a text id which is
removed in format 5; initialization and write support for this format
has been removed.
"""
def __init__(self):
super(RepositoryFormat4, self).__init__()
self._matchingbzrdir = bzrdir.BzrDirFormat4()
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Repository format 4"
def initialize(self, url, shared=False, _internal=False):
"""Format 4 branches cannot be created."""
raise errors.UninitializableFormat(self)
def is_supported(self):
"""Format 4 is not supported.
It is not supported because the model changed from 4 to 5 and the
conversion logic is expensive - so doing it on the fly was not
feasible.
"""
return False
def _get_control_store(self, repo_transport, control_files):
"""Format 4 repositories have no formal control store at this point.
This will cause any control-file-needing apis to fail - this is desired.
"""
return None
def _get_revision_store(self, repo_transport, control_files):
"""See RepositoryFormat._get_revision_store()."""
from bzrlib.xml4 import serializer_v4
return self._get_text_rev_store(repo_transport,
control_files,
'revision-store',
serializer=serializer_v4)
def _get_text_store(self, transport, control_files):
"""See RepositoryFormat._get_text_store()."""
class RepositoryFormat5(PreSplitOutRepositoryFormat):
"""Bzr control format 5.
This repository format has:
- weaves for file texts and inventory
- flat stores
- TextStores for revisions and signatures.
"""
def __init__(self):
super(RepositoryFormat5, self).__init__()
self._matchingbzrdir = bzrdir.BzrDirFormat5()
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Weave repository format 5"
def _get_revision_store(self, repo_transport, control_files):
"""See RepositoryFormat._get_revision_store()."""
"""Return the revision store object for this a_bzrdir."""
return self._get_text_rev_store(repo_transport,
control_files,
'revision-store',
compressed=False)
def _get_text_store(self, transport, control_files):
"""See RepositoryFormat._get_text_store()."""
return self._get_versioned_file_store('weaves', transport, control_files, prefixed=False)
class RepositoryFormat6(PreSplitOutRepositoryFormat):
"""Bzr control format 6.
This repository format has:
- weaves for file texts and inventory
- hash subdirectory based stores.
- TextStores for revisions and signatures.
"""
def __init__(self):
super(RepositoryFormat6, self).__init__()
self._matchingbzrdir = bzrdir.BzrDirFormat6()
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Weave repository format 6"
def _get_revision_store(self, repo_transport, control_files):
"""See RepositoryFormat._get_revision_store()."""
return self._get_text_rev_store(repo_transport,
control_files,
'revision-store',
compressed=False,
prefixed=True)
def _get_text_store(self, transport, control_files):
"""See RepositoryFormat._get_text_store()."""
return self._get_versioned_file_store('weaves', transport, control_files)
class MetaDirRepositoryFormat(RepositoryFormat):
"""Common base class for the new repositories using the metadir layout."""
def __init__(self):
super(MetaDirRepositoryFormat, self).__init__()
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
def _create_control_files(self, a_bzrdir):
"""Create the required files and the initial control_files object."""
# FIXME: RBC 20060125 don't peek under the covers
# NB: no need to escape relative paths that are url safe.
repository_transport = a_bzrdir.get_repository_transport(self)
control_files = LockableFiles(repository_transport, 'lock', LockDir)
control_files.create_lock()
return control_files
def _upload_blank_content(self, a_bzrdir, dirs, files, utf8_files, shared):
"""Upload the initial blank content."""
control_files = self._create_control_files(a_bzrdir)
control_files.lock_write()
try:
control_files._transport.mkdir_multi(dirs,
mode=control_files._dir_mode)
for file, content in files:
control_files.put(file, content)
for file, content in utf8_files:
control_files.put_utf8(file, content)
if shared == True:
control_files.put_utf8('shared-storage', '')
finally:
control_files.unlock()
class RepositoryFormat7(MetaDirRepositoryFormat):
"""Bzr repository 7.
This repository format has:
- weaves for file texts and inventory
- hash subdirectory based stores.
- TextStores for revisions and signatures.
- a format marker of its own
- an optional 'shared-storage' flag
- an optional 'no-working-trees' flag
"""
def _get_control_store(self, repo_transport, control_files):
"""Return the control store for this repository."""
return self._get_versioned_file_store('',
repo_transport,
control_files,
prefixed=False)
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
return "Bazaar-NG Repository format 7"
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Weave repository format 7"
def _get_revision_store(self, repo_transport, control_files):
"""See RepositoryFormat._get_revision_store()."""
return self._get_text_rev_store(repo_transport,
control_files,
'revision-store',
compressed=False,
prefixed=True,
)
def _get_text_store(self, transport, control_files):
"""See RepositoryFormat._get_text_store()."""
return self._get_versioned_file_store('weaves',
transport,
control_files)
def initialize(self, a_bzrdir, shared=False):
"""Create a weave repository.
:param shared: If true the repository will be initialized as a shared
repository.
"""
from bzrlib.weavefile import write_weave_v5
from bzrlib.weave import Weave
# Create an empty weave
sio = StringIO()
write_weave_v5(Weave(), sio)
empty_weave = sio.getvalue()
mutter('creating repository in %s.', a_bzrdir.transport.base)
dirs = ['revision-store', 'weaves']
files = [('inventory.weave', StringIO(empty_weave)),
]
utf8_files = [('format', self.get_format_string())]
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
return self.open(a_bzrdir=a_bzrdir, _found=True)
def open(self, a_bzrdir, _found=False, _override_transport=None):
"""See RepositoryFormat.open().
:param _override_transport: INTERNAL USE ONLY. Allows opening the
repository at a slightly different url
than normal. I.e. during 'upgrade'.
"""
if not _found:
format = RepositoryFormat.find_format(a_bzrdir)
assert format.__class__ == self.__class__
if _override_transport is not None:
repo_transport = _override_transport
else:
repo_transport = a_bzrdir.get_repository_transport(None)
control_files = LockableFiles(repo_transport, 'lock', LockDir)
text_store = self._get_text_store(repo_transport, control_files)
control_store = self._get_control_store(repo_transport, control_files)
_revision_store = self._get_revision_store(repo_transport, control_files)
return MetaDirRepository(_format=self,
a_bzrdir=a_bzrdir,
control_files=control_files,
_revision_store=_revision_store,
control_store=control_store,
text_store=text_store)
class RepositoryFormatKnit1(MetaDirRepositoryFormat):
"""Bzr repository knit format 1.
This repository format has:
- knits for file texts and inventory
- hash subdirectory based stores.
- knits for revisions and signatures
- TextStores for revisions and signatures.
- a format marker of its own
- an optional 'shared-storage' flag
- an optional 'no-working-trees' flag
- a LockDir lock
This format was introduced in bzr 0.8.
"""
def _get_control_store(self, repo_transport, control_files):
"""Return the control store for this repository."""
return VersionedFileStore(
repo_transport,
prefixed=False,
file_mode=control_files._file_mode,
versionedfile_class=KnitVersionedFile,
versionedfile_kwargs={'factory':KnitPlainFactory()},
)
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
return "Bazaar-NG Knit Repository Format 1"
def get_format_description(self):
"""See RepositoryFormat.get_format_description()."""
return "Knit repository format 1"
def _get_revision_store(self, repo_transport, control_files):
"""See RepositoryFormat._get_revision_store()."""
from bzrlib.store.revision.knit import KnitRevisionStore
versioned_file_store = VersionedFileStore(
repo_transport,
file_mode=control_files._file_mode,
prefixed=False,
precious=True,
versionedfile_class=KnitVersionedFile,
versionedfile_kwargs={'delta':False, 'factory':KnitPlainFactory()},
escaped=True,
)
return KnitRevisionStore(versioned_file_store)
def _get_text_store(self, transport, control_files):
"""See RepositoryFormat._get_text_store()."""
return self._get_versioned_file_store('knits',
transport,
control_files,
versionedfile_class=KnitVersionedFile,
escaped=True)
def initialize(self, a_bzrdir, shared=False):
"""Create a knit format 1 repository.
:param a_bzrdir: bzrdir to contain the new repository; must already
be initialized.
:param shared: If true the repository will be initialized as a shared
repository.
"""
mutter('creating repository in %s.', a_bzrdir.transport.base)
dirs = ['revision-store', 'knits']
files = []
utf8_files = [('format', self.get_format_string())]
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
repo_transport = a_bzrdir.get_repository_transport(None)
control_files = LockableFiles(repo_transport, 'lock', LockDir)
control_store = self._get_control_store(repo_transport, control_files)
transaction = transactions.WriteTransaction()
# trigger a write of the inventory store.
control_store.get_weave_or_empty('inventory', transaction)
_revision_store = self._get_revision_store(repo_transport, control_files)
_revision_store.has_revision_id('A', transaction)
_revision_store.get_signature_file(transaction)
return self.open(a_bzrdir=a_bzrdir, _found=True)
def open(self, a_bzrdir, _found=False, _override_transport=None):
"""See RepositoryFormat.open().
:param _override_transport: INTERNAL USE ONLY. Allows opening the
repository at a slightly different url
than normal. I.e. during 'upgrade'.
"""
if not _found:
format = RepositoryFormat.find_format(a_bzrdir)
assert format.__class__ == self.__class__
if _override_transport is not None:
repo_transport = _override_transport
else:
repo_transport = a_bzrdir.get_repository_transport(None)
control_files = LockableFiles(repo_transport, 'lock', LockDir)
text_store = self._get_text_store(repo_transport, control_files)
control_store = self._get_control_store(repo_transport, control_files)
_revision_store = self._get_revision_store(repo_transport, control_files)
return KnitRepository(_format=self,
a_bzrdir=a_bzrdir,
control_files=control_files,
_revision_store=_revision_store,
control_store=control_store,
text_store=text_store)
# formats which have no format string are not discoverable
# and not independently creatable, so are not registered.
RepositoryFormat.register_format(RepositoryFormat7())
_default_format = RepositoryFormatKnit1()
RepositoryFormat.register_format(_default_format)
RepositoryFormat.set_default_format(_default_format)
_legacy_formats = [RepositoryFormat4(),
RepositoryFormat5(),
RepositoryFormat6()]
class InterRepository(InterObject):
"""This class represents operations taking place between two repositories.
Its instances have methods like copy_content and fetch, and contain
references to the source and target repositories these operations can be
carried out on.
Often we will provide convenience methods on 'repository' which carry out
operations with another repository - they will always forward to
InterRepository.get(other).method_name(parameters).
"""
_optimisers = set()
"""The available optimised InterRepository types."""
@needs_write_lock
def copy_content(self, revision_id=None, basis=None):
"""Make a complete copy of the content in self into destination.
This is a destructive operation! Do not use it on existing
repositories.
:param revision_id: Only copy the content needed to construct
revision_id and its parents.
:param basis: Copy the needed data preferentially from basis.
"""
try:
self.target.set_make_working_trees(self.source.make_working_trees())
except NotImplementedError:
pass
# grab the basis available data
if basis is not None:
self.target.fetch(basis, revision_id=revision_id)
# but don't bother fetching if we have the needed data now.
if (revision_id not in (None, NULL_REVISION) and
self.target.has_revision(revision_id)):
return
self.target.fetch(self.source, revision_id=revision_id)
@needs_write_lock
def fetch(self, revision_id=None, pb=None):
"""Fetch the content required to construct revision_id.
The content is copied from source to target.
:param revision_id: if None all content is copied, if NULL_REVISION no
content is copied.
:param pb: optional progress bar to use for progress reports. If not
provided a default one will be created.
Returns the copied revision count and the failed revisions in a tuple:
(copied, failures).
"""
from bzrlib.fetch import GenericRepoFetcher
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
self.source, self.source._format, self.target, self.target._format)
f = GenericRepoFetcher(to_repository=self.target,
from_repository=self.source,
last_revision=revision_id,
pb=pb)
return f.count_copied, f.failed_revisions
@needs_read_lock
def missing_revision_ids(self, revision_id=None):
"""Return the revision ids that source has that target does not.
These are returned in topological order.
:param revision_id: only return revision ids included by this
revision_id.
"""
# generic, possibly worst case, slow code path.
target_ids = set(self.target.all_revision_ids())
if revision_id is not None:
source_ids = self.source.get_ancestry(revision_id)
assert source_ids[0] is None
source_ids.pop(0)
else:
source_ids = self.source.all_revision_ids()
result_set = set(source_ids).difference(target_ids)
# this may look like a no-op: its not. It preserves the ordering
# other_ids had while only returning the members from other_ids
# that we've decided we need.
return [rev_id for rev_id in source_ids if rev_id in result_set]
class InterWeaveRepo(InterRepository):
"""Optimised code paths between Weave based repositories."""
_matching_repo_format = RepositoryFormat7()
"""Repository format for testing with."""
@staticmethod
def is_compatible(source, target):
"""Be compatible with known Weave formats.
We don't test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
try:
return (isinstance(source._format, (RepositoryFormat5,
RepositoryFormat6,
RepositoryFormat7)) and
isinstance(target._format, (RepositoryFormat5,
RepositoryFormat6,
RepositoryFormat7)))
except AttributeError:
return False
@needs_write_lock
def copy_content(self, revision_id=None, basis=None):
"""See InterRepository.copy_content()."""
# weave specific optimised path:
if basis is not None:
# copy the basis in, then fetch remaining data.
basis.copy_content_into(self.target, revision_id)
# the basis copy_content_into could miss-set this.
try:
self.target.set_make_working_trees(self.source.make_working_trees())
except NotImplementedError:
pass
self.target.fetch(self.source, revision_id=revision_id)
else:
try:
self.target.set_make_working_trees(self.source.make_working_trees())
except NotImplementedError:
pass
# FIXME do not peek!
if self.source.control_files._transport.listable():
pb = ui.ui_factory.nested_progress_bar()
try:
self.target.weave_store.copy_all_ids(
self.source.weave_store,
pb=pb,
from_transaction=self.source.get_transaction(),
to_transaction=self.target.get_transaction())
pb.update('copying inventory', 0, 1)
self.target.control_weaves.copy_multi(
self.source.control_weaves, ['inventory'],
from_transaction=self.source.get_transaction(),
to_transaction=self.target.get_transaction())
self.target._revision_store.text_store.copy_all_ids(
self.source._revision_store.text_store,
pb=pb)
finally:
pb.finished()
else:
self.target.fetch(self.source, revision_id=revision_id)
@needs_write_lock
def fetch(self, revision_id=None, pb=None):
"""See InterRepository.fetch()."""
from bzrlib.fetch import GenericRepoFetcher
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
self.source, self.source._format, self.target, self.target._format)
f = GenericRepoFetcher(to_repository=self.target,
from_repository=self.source,
last_revision=revision_id,
pb=pb)
return f.count_copied, f.failed_revisions
@needs_read_lock
def missing_revision_ids(self, revision_id=None):
"""See InterRepository.missing_revision_ids()."""
# we want all revisions to satisfy revision_id in source.
# but we don't want to stat every file here and there.
# we want then, all revisions other needs to satisfy revision_id
# checked, but not those that we have locally.
# so the first thing is to get a subset of the revisions to
# satisfy revision_id in source, and then eliminate those that
# we do already have.
# this is slow on high latency connection to self, but as as this
# disk format scales terribly for push anyway due to rewriting
# inventory.weave, this is considered acceptable.
# - RBC 20060209
if revision_id is not None:
source_ids = self.source.get_ancestry(revision_id)
assert source_ids[0] is None
source_ids.pop(0)
else:
source_ids = self.source._all_possible_ids()
source_ids_set = set(source_ids)
# source_ids is the worst possible case we may need to pull.
# now we want to filter source_ids against what we actually
# have in target, but don't try to check for existence where we know
# we do not have a revision as that would be pointless.
target_ids = set(self.target._all_possible_ids())
possibly_present_revisions = target_ids.intersection(source_ids_set)
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
required_revisions = source_ids_set.difference(actually_present_revisions)
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
if revision_id is not None:
# we used get_ancestry to determine source_ids then we are assured all
# revisions referenced are present as they are installed in topological order.
# and the tip revision was validated by get_ancestry.
return required_topo_revisions
else:
# if we just grabbed the possibly available ids, then
# we only have an estimate of whats available and need to validate
# that against the revision records.
return self.source._eliminate_revisions_not_present(required_topo_revisions)
class InterKnitRepo(InterRepository):
"""Optimised code paths between Knit based repositories."""
_matching_repo_format = RepositoryFormatKnit1()
"""Repository format for testing with."""
@staticmethod
def is_compatible(source, target):
"""Be compatible with known Knit formats.
We don't test for the stores being of specific types because that
could lead to confusing results, and there is no need to be
overly general.
"""
try:
return (isinstance(source._format, (RepositoryFormatKnit1)) and
isinstance(target._format, (RepositoryFormatKnit1)))
except AttributeError:
return False
@needs_write_lock
def fetch(self, revision_id=None, pb=None):
"""See InterRepository.fetch()."""
from bzrlib.fetch import KnitRepoFetcher
mutter("Using fetch logic to copy between %s(%s) and %s(%s)",
self.source, self.source._format, self.target, self.target._format)
f = KnitRepoFetcher(to_repository=self.target,
from_repository=self.source,
last_revision=revision_id,
pb=pb)
return f.count_copied, f.failed_revisions
@needs_read_lock
def missing_revision_ids(self, revision_id=None):
"""See InterRepository.missing_revision_ids()."""
if revision_id is not None:
source_ids = self.source.get_ancestry(revision_id)
assert source_ids[0] is None
source_ids.pop(0)
else:
source_ids = self.source._all_possible_ids()
source_ids_set = set(source_ids)
# source_ids is the worst possible case we may need to pull.
# now we want to filter source_ids against what we actually
# have in target, but don't try to check for existence where we know
# we do not have a revision as that would be pointless.
target_ids = set(self.target._all_possible_ids())
possibly_present_revisions = target_ids.intersection(source_ids_set)
actually_present_revisions = set(self.target._eliminate_revisions_not_present(possibly_present_revisions))
required_revisions = source_ids_set.difference(actually_present_revisions)
required_topo_revisions = [rev_id for rev_id in source_ids if rev_id in required_revisions]
if revision_id is not None:
# we used get_ancestry to determine source_ids then we are assured all
# revisions referenced are present as they are installed in topological order.
# and the tip revision was validated by get_ancestry.
return required_topo_revisions
else:
# if we just grabbed the possibly available ids, then
# we only have an estimate of whats available and need to validate
# that against the revision records.
return self.source._eliminate_revisions_not_present(required_topo_revisions)
InterRepository.register_optimiser(InterWeaveRepo)
InterRepository.register_optimiser(InterKnitRepo)
class RepositoryTestProviderAdapter(object):
"""A tool to generate a suite testing multiple repository formats at once.
This is done by copying the test once for each transport and injecting
the transport_server, transport_readonly_server, and bzrdir_format and
repository_format classes into each copy. Each copy is also given a new id()
to make it easy to identify.
"""
def __init__(self, transport_server, transport_readonly_server, formats):
self._transport_server = transport_server
self._transport_readonly_server = transport_readonly_server
self._formats = formats
def adapt(self, test):
result = TestSuite()
for repository_format, bzrdir_format in self._formats:
new_test = deepcopy(test)
new_test.transport_server = self._transport_server
new_test.transport_readonly_server = self._transport_readonly_server
new_test.bzrdir_format = bzrdir_format
new_test.repository_format = repository_format
def make_new_test_id():
new_id = "%s(%s)" % (new_test.id(), repository_format.__class__.__name__)
return lambda: new_id
new_test.id = make_new_test_id()
result.addTest(new_test)
return result
class InterRepositoryTestProviderAdapter(object):
"""A tool to generate a suite testing multiple inter repository formats.
This is done by copying the test once for each interrepo provider and injecting
the transport_server, transport_readonly_server, repository_format and
repository_to_format classes into each copy.
Each copy is also given a new id() to make it easy to identify.
"""
def __init__(self, transport_server, transport_readonly_server, formats):
self._transport_server = transport_server
self._transport_readonly_server = transport_readonly_server
self._formats = formats
def adapt(self, test):
result = TestSuite()
for interrepo_class, repository_format, repository_format_to in self._formats:
new_test = deepcopy(test)
new_test.transport_server = self._transport_server
new_test.transport_readonly_server = self._transport_readonly_server
new_test.interrepo_class = interrepo_class
new_test.repository_format = repository_format
new_test.repository_format_to = repository_format_to
def make_new_test_id():
new_id = "%s(%s)" % (new_test.id(), interrepo_class.__name__)
return lambda: new_id
new_test.id = make_new_test_id()
result.addTest(new_test)
return result
@staticmethod
def default_test_list():
"""Generate the default list of interrepo permutations to test."""
result = []
# test the default InterRepository between format 6 and the current
# default format.
# XXX: robertc 20060220 reinstate this when there are two supported
# formats which do not have an optimal code path between them.
result.append((InterRepository,
RepositoryFormat6(),
RepositoryFormatKnit1()))
for optimiser in InterRepository._optimisers:
result.append((optimiser,
optimiser._matching_repo_format,
optimiser._matching_repo_format
))
# if there are specific combinations we want to use, we can add them
# here.
return result
class CopyConverter(object):
"""A repository conversion tool which just performs a copy of the content.
This is slow but quite reliable.
"""
def __init__(self, target_format):
"""Create a CopyConverter.
:param target_format: The format the resulting repository should be.
"""
self.target_format = target_format
def convert(self, repo, pb):
"""Perform the conversion of to_convert, giving feedback via pb.
:param to_convert: The disk object to convert.
:param pb: a progress bar to use for progress information.
"""
self.pb = pb
self.count = 0
self.total = 4
# this is only useful with metadir layouts - separated repo content.
# trigger an assertion if not such
repo._format.get_format_string()
self.repo_dir = repo.bzrdir
self.step('Moving repository to repository.backup')
self.repo_dir.transport.move('repository', 'repository.backup')
backup_transport = self.repo_dir.transport.clone('repository.backup')
self.source_repo = repo._format.open(self.repo_dir,
_found=True,
_override_transport=backup_transport)
self.step('Creating new repository')
converted = self.target_format.initialize(self.repo_dir,
self.source_repo.is_shared())
converted.lock_write()
try:
self.step('Copying content into repository.')
self.source_repo.copy_content_into(converted)
finally:
converted.unlock()
self.step('Deleting old repository content.')
self.repo_dir.transport.delete_tree('repository.backup')
self.pb.note('repository converted')
def step(self, message):
"""Update the pb by a step."""
self.count +=1
self.pb.update(message, self.count, self.total)
class CommitBuilder(object):
"""Provides an interface to build up a commit.
This allows describing a tree to be committed without needing to
know the internals of the format of the repository.
"""
record_root_entry = False
def __init__(self, repository, parents, config, timestamp=None,
timezone=None, committer=None, revprops=None,
revision_id=None):
"""Initiate a CommitBuilder.
:param repository: Repository to commit to.
:param parents: Revision ids of the parents of the new revision.
:param config: Configuration to use.
:param timestamp: Optional timestamp recorded for commit.
:param timezone: Optional timezone for timestamp.
:param committer: Optional committer to set for commit.
:param revprops: Optional dictionary of revision properties.
:param revision_id: Optional revision id.
"""
self._config = config
if committer is None:
self._committer = self._config.username()
else:
assert isinstance(committer, basestring), type(committer)
self._committer = committer
self.new_inventory = Inventory(None)
self._new_revision_id = revision_id
self.parents = parents
self.repository = repository
self._revprops = {}
if revprops is not None:
self._revprops.update(revprops)
if timestamp is None:
timestamp = time.time()
# Restrict resolution to 1ms
self._timestamp = round(timestamp, 3)
if timezone is None:
self._timezone = local_time_offset()
else:
self._timezone = int(timezone)
self._generate_revision_if_needed()
def commit(self, message):
"""Make the actual commit.
:return: The revision id of the recorded revision.
"""
rev = Revision(timestamp=self._timestamp,
timezone=self._timezone,
committer=self._committer,
message=message,
inventory_sha1=self.inv_sha1,
revision_id=self._new_revision_id,
properties=self._revprops)
rev.parent_ids = self.parents
self.repository.add_revision(self._new_revision_id, rev,
self.new_inventory, self._config)
return self._new_revision_id
def finish_inventory(self):
"""Tell the builder that the inventory is finished."""
if self.new_inventory.root is None:
symbol_versioning.warn('Root entry should be supplied to'
' record_entry_contents, as of bzr 0.10.',
DeprecationWarning, stacklevel=2)
self.new_inventory.add(InventoryDirectory(ROOT_ID, '', None))
self.new_inventory.revision_id = self._new_revision_id
self.inv_sha1 = self.repository.add_inventory(
self._new_revision_id,
self.new_inventory,
self.parents
)
def _gen_revision_id(self):
"""Return new revision-id."""
s = '%s-%s-' % (self._config.user_email(),
compact_date(self._timestamp))
s += hexlify(rand_bytes(8))
return s
def _generate_revision_if_needed(self):
"""Create a revision id if None was supplied.
If the repository can not support user-specified revision ids
they should override this function and raise UnsupportedOperation
if _new_revision_id is not None.
:raises: UnsupportedOperation
"""
if self._new_revision_id is None:
self._new_revision_id = self._gen_revision_id()
def record_entry_contents(self, ie, parent_invs, path, tree):
"""Record the content of ie from tree into the commit if needed.
Side effect: sets ie.revision when unchanged
:param ie: An inventory entry present in the commit.
:param parent_invs: The inventories of the parent revisions of the
commit.
:param path: The path the entry is at in the tree.
:param tree: The tree which contains this entry and should be used to
obtain content.
"""
if self.new_inventory.root is None and ie.parent_id is not None:
symbol_versioning.warn('Root entry should be supplied to'
' record_entry_contents, as of bzr 0.10.',
DeprecationWarning, stacklevel=2)
self.record_entry_contents(tree.inventory.root.copy(), parent_invs,
'', tree)
self.new_inventory.add(ie)
# ie.revision is always None if the InventoryEntry is considered
# for committing. ie.snapshot will record the correct revision
# which may be the sole parent if it is untouched.
if ie.revision is not None:
return
# In this revision format, root entries have no knit or weave
if ie is self.new_inventory.root:
if len(parent_invs):
ie.revision = parent_invs[0].root.revision
else:
ie.revision = None
return
previous_entries = ie.find_previous_heads(
parent_invs,
self.repository.weave_store,
self.repository.get_transaction())
# we are creating a new revision for ie in the history store
# and inventory.
ie.snapshot(self._new_revision_id, path, previous_entries, tree, self)
def modified_directory(self, file_id, file_parents):
"""Record the presence of a symbolic link.
:param file_id: The file_id of the link to record.
:param file_parents: The per-file parent revision ids.
"""
self._add_text_to_weave(file_id, [], file_parents.keys())
def modified_file_text(self, file_id, file_parents,
get_content_byte_lines, text_sha1=None,
text_size=None):
"""Record the text of file file_id
:param file_id: The file_id of the file to record the text of.
:param file_parents: The per-file parent revision ids.
:param get_content_byte_lines: A callable which will return the byte
lines for the file.
:param text_sha1: Optional SHA1 of the file contents.
:param text_size: Optional size of the file contents.
"""
# mutter('storing text of file {%s} in revision {%s} into %r',
# file_id, self._new_revision_id, self.repository.weave_store)
# special case to avoid diffing on renames or
# reparenting
if (len(file_parents) == 1
and text_sha1 == file_parents.values()[0].text_sha1
and text_size == file_parents.values()[0].text_size):
previous_ie = file_parents.values()[0]
versionedfile = self.repository.weave_store.get_weave(file_id,
self.repository.get_transaction())
versionedfile.clone_text(self._new_revision_id,
previous_ie.revision, file_parents.keys())
return text_sha1, text_size
else:
new_lines = get_content_byte_lines()
# TODO: Rather than invoking sha_strings here, _add_text_to_weave
# should return the SHA1 and size
self._add_text_to_weave(file_id, new_lines, file_parents.keys())
return osutils.sha_strings(new_lines), \
sum(map(len, new_lines))
def modified_link(self, file_id, file_parents, link_target):
"""Record the presence of a symbolic link.
:param file_id: The file_id of the link to record.
:param file_parents: The per-file parent revision ids.
:param link_target: Target location of this link.
"""
self._add_text_to_weave(file_id, [], file_parents.keys())
def _add_text_to_weave(self, file_id, new_lines, parents):
versionedfile = self.repository.weave_store.get_weave_or_empty(
file_id, self.repository.get_transaction())
versionedfile.add_lines(self._new_revision_id, parents, new_lines)
versionedfile.clear_cache()
class _CommitBuilder(CommitBuilder):
"""Temporary class so old CommitBuilders are detected properly
Note: CommitBuilder works whether or not root entry is recorded.
"""
record_root_entry = True
_unescape_map = {
'apos':"'",
'quot':'"',
'amp':'&',
'lt':'<',
'gt':'>'
}
def _unescaper(match, _map=_unescape_map):
return _map[match.group(1)]
_unescape_re = None
def _unescape_xml(data):
"""Unescape predefined XML entities in a string of data."""
global _unescape_re
if _unescape_re is None:
_unescape_re = re.compile('\&([^;]*);')
return _unescape_re.sub(_unescaper, data)
|