261
208
return not self.__eq__(other)
263
210
def __repr__(self):
264
return "<%s.%s object at 0x%x, %s, %s" % (
265
self.__class__.__module__, self.__class__.__name__, id(self),
266
self.pack_transport, self.name)
269
class ResumedPack(ExistingPack):
271
def __init__(self, name, revision_index, inventory_index, text_index,
272
signature_index, upload_transport, pack_transport, index_transport,
273
pack_collection, chk_index=None):
274
"""Create a ResumedPack object."""
275
ExistingPack.__init__(self, pack_transport, name, revision_index,
276
inventory_index, text_index, signature_index,
278
self.upload_transport = upload_transport
279
self.index_transport = index_transport
280
self.index_sizes = [None, None, None, None]
282
('revision', revision_index),
283
('inventory', inventory_index),
284
('text', text_index),
285
('signature', signature_index),
287
if chk_index is not None:
288
indices.append(('chk', chk_index))
289
self.index_sizes.append(None)
290
for index_type, index in indices:
291
offset = self.index_offset(index_type)
292
self.index_sizes[offset] = index._size
293
self.index_class = pack_collection._index_class
294
self._pack_collection = pack_collection
295
self._state = 'resumed'
296
# XXX: perhaps check that the .pack file exists?
298
def access_tuple(self):
299
if self._state == 'finished':
300
return Pack.access_tuple(self)
301
elif self._state == 'resumed':
302
return self.upload_transport, self.file_name()
304
raise AssertionError(self._state)
307
self.upload_transport.delete(self.file_name())
308
indices = [self.revision_index, self.inventory_index, self.text_index,
309
self.signature_index]
310
if self.chk_index is not None:
311
indices.append(self.chk_index)
312
for index in indices:
313
index._transport.delete(index._name)
316
self._check_references()
317
index_types = ['revision', 'inventory', 'text', 'signature']
318
if self.chk_index is not None:
319
index_types.append('chk')
320
for index_type in index_types:
321
old_name = self.index_name(index_type, self.name)
322
new_name = '../indices/' + old_name
323
self.upload_transport.rename(old_name, new_name)
324
self._replace_index_with_readonly(index_type)
325
new_name = '../packs/' + self.file_name()
326
self.upload_transport.rename(self.file_name(), new_name)
327
self._state = 'finished'
329
def _get_external_refs(self, index):
330
"""Return compression parents for this index that are not present.
332
This returns any compression parents that are referenced by this index,
333
which are not contained *in* this index. They may be present elsewhere.
335
return index.external_references(1)
211
return "<bzrlib.repofmt.pack_repo.Pack object at 0x%x, %s, %s" % (
212
id(self), self.pack_transport, self.name)
338
215
class NewPack(Pack):
339
216
"""An in memory proxy for a pack which is being created."""
341
def __init__(self, pack_collection, upload_suffix='', file_mode=None):
218
# A map of index 'type' to the file extension and position in the
220
index_definitions = {
221
'revision': ('.rix', 0),
222
'inventory': ('.iix', 1),
224
'signature': ('.six', 3),
227
def __init__(self, upload_transport, index_transport, pack_transport,
228
upload_suffix='', file_mode=None):
342
229
"""Create a NewPack instance.
344
:param pack_collection: A PackCollection into which this is being inserted.
231
:param upload_transport: A writable transport for the pack to be
232
incrementally uploaded to.
233
:param index_transport: A writable transport for the pack's indices to
234
be written to when the pack is finished.
235
:param pack_transport: A writable transport for the pack to be renamed
236
to when the upload is complete. This *must* be the same as
237
upload_transport.clone('../packs').
345
238
:param upload_suffix: An optional suffix to be given to any temporary
346
239
files created during the pack creation. e.g '.autopack'
347
:param file_mode: Unix permissions for newly created file.
240
:param file_mode: An optional file mode to create the new files with.
349
242
# The relative locations of the packs are constrained, but all are
350
243
# passed in because the caller has them, so as to avoid object churn.
351
index_builder_class = pack_collection._index_builder_class
352
if pack_collection.chk_index is not None:
353
chk_index = index_builder_class(reference_lists=0)
356
244
Pack.__init__(self,
357
245
# Revisions: parents list, no text compression.
358
index_builder_class(reference_lists=1),
246
InMemoryGraphIndex(reference_lists=1),
359
247
# Inventory: We want to map compression only, but currently the
360
248
# knit code hasn't been updated enough to understand that, so we
361
249
# have a regular 2-list index giving parents and compression
363
index_builder_class(reference_lists=2),
251
InMemoryGraphIndex(reference_lists=2),
364
252
# Texts: compression and per file graph, for all fileids - so two
365
253
# reference lists and two elements in the key tuple.
366
index_builder_class(reference_lists=2, key_elements=2),
254
InMemoryGraphIndex(reference_lists=2, key_elements=2),
367
255
# Signatures: Just blobs to store, no compression, no parents
369
index_builder_class(reference_lists=0),
370
# CHK based storage - just blobs, no compression or parents.
257
InMemoryGraphIndex(reference_lists=0),
373
self._pack_collection = pack_collection
374
# When we make readonly indices, we need this.
375
self.index_class = pack_collection._index_class
376
259
# where should the new pack be opened
377
self.upload_transport = pack_collection._upload_transport
260
self.upload_transport = upload_transport
378
261
# where are indices written out to
379
self.index_transport = pack_collection._index_transport
262
self.index_transport = index_transport
380
263
# where is the pack renamed to when it is finished?
381
self.pack_transport = pack_collection._pack_transport
264
self.pack_transport = pack_transport
382
265
# What file mode to upload the pack and indices with.
383
266
self._file_mode = file_mode
384
267
# tracks the content written to the .pack file.
385
self._hash = osutils.md5()
386
# a tuple with the length in bytes of the indices, once the pack
387
# is finalised. (rev, inv, text, sigs, chk_if_in_use)
268
self._hash = md5.new()
269
# a four-tuple with the length in bytes of the indices, once the pack
270
# is finalised. (rev, inv, text, sigs)
388
271
self.index_sizes = None
389
272
# How much data to cache when writing packs. Note that this is not
390
273
# synchronised with reads, because it's not in the transport layer, so
1353
1110
class RepositoryPackCollection(object):
1354
"""Management of packs within a repository.
1356
:ivar _names: map of {pack_name: (index_size,)}
1359
pack_factory = NewPack
1360
resumed_pack_factory = ResumedPack
1111
"""Management of packs within a repository."""
1362
1113
def __init__(self, repo, transport, index_transport, upload_transport,
1363
pack_transport, index_builder_class, index_class,
1365
1115
"""Create a new RepositoryPackCollection.
1367
:param transport: Addresses the repository base directory
1117
:param transport: Addresses the repository base directory
1368
1118
(typically .bzr/repository/).
1369
1119
:param index_transport: Addresses the directory containing indices.
1370
1120
:param upload_transport: Addresses the directory into which packs are written
1371
1121
while they're being created.
1372
1122
:param pack_transport: Addresses the directory of existing complete packs.
1373
:param index_builder_class: The index builder class to use.
1374
:param index_class: The index class to use.
1375
:param use_chk_index: Whether to setup and manage a CHK index.
1377
# XXX: This should call self.reset()
1378
1124
self.repo = repo
1379
1125
self.transport = transport
1380
1126
self._index_transport = index_transport
1381
1127
self._upload_transport = upload_transport
1382
1128
self._pack_transport = pack_transport
1383
self._index_builder_class = index_builder_class
1384
self._index_class = index_class
1385
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3,
1129
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3}
1387
1130
self.packs = []
1388
1131
# name:Pack mapping
1390
1132
self._packs_by_name = {}
1391
1133
# the previous pack-names content
1392
1134
self._packs_at_load = None
1393
1135
# when a pack is being created by this object, the state of that pack.
1394
1136
self._new_pack = None
1395
1137
# aggregated revision index data
1396
flush = self._flush_new_pack
1397
self.revision_index = AggregateIndex(self.reload_pack_names, flush)
1398
self.inventory_index = AggregateIndex(self.reload_pack_names, flush)
1399
self.text_index = AggregateIndex(self.reload_pack_names, flush)
1400
self.signature_index = AggregateIndex(self.reload_pack_names, flush)
1401
all_indices = [self.revision_index, self.inventory_index,
1402
self.text_index, self.signature_index]
1404
self.chk_index = AggregateIndex(self.reload_pack_names, flush)
1405
all_indices.append(self.chk_index)
1407
# used to determine if we're using a chk_index elsewhere.
1408
self.chk_index = None
1409
# Tell all the CombinedGraphIndex objects about each other, so they can
1410
# share hints about which pack names to search first.
1411
all_combined = [agg_idx.combined_index for agg_idx in all_indices]
1412
for combined_idx in all_combined:
1413
combined_idx.set_sibling_indices(
1414
set(all_combined).difference([combined_idx]))
1416
self._resumed_packs = []
1419
return '%s(%r)' % (self.__class__.__name__, self.repo)
1138
self.revision_index = AggregateIndex()
1139
self.inventory_index = AggregateIndex()
1140
self.text_index = AggregateIndex()
1141
self.signature_index = AggregateIndex()
1421
1143
def add_pack_to_memory(self, pack):
1422
1144
"""Make a Pack object available to the repository to satisfy queries.
1424
1146
:param pack: A Pack object.
1426
1148
if pack.name in self._packs_by_name:
1427
raise AssertionError(
1428
'pack %s already in _packs_by_name' % (pack.name,))
1149
raise AssertionError()
1429
1150
self.packs.append(pack)
1430
1151
self._packs_by_name[pack.name] = pack
1431
1152
self.revision_index.add_index(pack.revision_index, pack)
1432
1153
self.inventory_index.add_index(pack.inventory_index, pack)
1433
1154
self.text_index.add_index(pack.text_index, pack)
1434
1155
self.signature_index.add_index(pack.signature_index, pack)
1435
if self.chk_index is not None:
1436
self.chk_index.add_index(pack.chk_index, pack)
1438
1157
def all_packs(self):
1439
1158
"""Return a list of all the Pack objects this repository has.
1490
1205
# group their data with the relevant commit, and that may
1491
1206
# involve rewriting ancient history - which autopack tries to
1492
1207
# avoid. Alternatively we could not group the data but treat
1493
# each of these as having a single revision, and thus add
1208
# each of these as having a single revision, and thus add
1494
1209
# one revision for each to the total revision count, to get
1495
1210
# a matching distribution.
1497
1212
existing_packs.append((revision_count, pack))
1498
1213
pack_operations = self.plan_autopack_combinations(
1499
1214
existing_packs, pack_distribution)
1500
num_new_packs = len(pack_operations)
1501
num_old_packs = sum([len(po[1]) for po in pack_operations])
1502
num_revs_affected = sum([po[0] for po in pack_operations])
1503
mutter('Auto-packing repository %s, which has %d pack files, '
1504
'containing %d revisions. Packing %d files into %d affecting %d'
1505
' revisions', self, total_packs, total_revisions, num_old_packs,
1506
num_new_packs, num_revs_affected)
1507
result = self._execute_pack_operations(pack_operations,
1508
reload_func=self._restart_autopack)
1509
mutter('Auto-packing repository %s completed', self)
1215
self._execute_pack_operations(pack_operations)
1512
def _execute_pack_operations(self, pack_operations, _packer_class=Packer,
1218
def _execute_pack_operations(self, pack_operations, _packer_class=Packer):
1514
1219
"""Execute a series of pack operations.
1516
1221
:param pack_operations: A list of [revision_count, packs_to_combine].
1517
1222
:param _packer_class: The class of packer to use (default: Packer).
1518
:return: The new pack names.
1520
1225
for revision_count, packs in pack_operations:
1521
1226
# we may have no-ops from the setup logic
1522
1227
if len(packs) == 0:
1524
packer = _packer_class(self, packs, '.autopack',
1525
reload_func=reload_func)
1528
except errors.RetryWithNewPacks:
1529
# An exception is propagating out of this context, make sure
1530
# this packer has cleaned up. Packer() doesn't set its new_pack
1531
# state into the RepositoryPackCollection object, so we only
1532
# have access to it directly here.
1533
if packer.new_pack is not None:
1534
packer.new_pack.abort()
1229
_packer_class(self, packs, '.autopack').pack()
1536
1230
for pack in packs:
1537
1231
self._remove_pack_from_memory(pack)
1538
1232
# record the newly available packs and stop advertising the old
1540
to_be_obsoleted = []
1541
for _, packs in pack_operations:
1542
to_be_obsoleted.extend(packs)
1543
result = self._save_pack_names(clear_obsolete_packs=True,
1544
obsolete_packs=to_be_obsoleted)
1547
def _flush_new_pack(self):
1548
if self._new_pack is not None:
1549
self._new_pack.flush()
1234
self._save_pack_names(clear_obsolete_packs=True)
1235
# Move the old packs out of the way now they are no longer referenced.
1236
for revision_count, packs in pack_operations:
1237
self._obsolete_packs(packs)
1551
1239
def lock_names(self):
1552
1240
"""Acquire the mutex around the pack-names index.
1554
1242
This cannot be used in the middle of a read-only transaction on the
1557
1245
self.repo.control_files.lock_write()
1559
def _already_packed(self):
1560
"""Is the collection already packed?"""
1561
return not (self.repo._format.pack_compresses or (len(self._names) > 1))
1563
def pack(self, hint=None, clean_obsolete_packs=False):
1564
1248
"""Pack the pack collection totally."""
1565
1249
self.ensure_loaded()
1566
1250
total_packs = len(self._names)
1567
if self._already_packed():
1252
# This is arguably wrong because we might not be optimal, but for
1253
# now lets leave it in. (e.g. reconcile -> one pack. But not
1569
1256
total_revisions = self.revision_index.combined_index.key_count()
1570
1257
# XXX: the following may want to be a class, to pack with a given
1572
1259
mutter('Packing repository %s, which has %d pack files, '
1573
'containing %d revisions with hint %r.', self, total_packs,
1574
total_revisions, hint)
1260
'containing %d revisions into 1 packs.', self, total_packs,
1575
1262
# determine which packs need changing
1263
pack_distribution = [1]
1576
1264
pack_operations = [[0, []]]
1577
1265
for pack in self.all_packs():
1578
if hint is None or pack.name in hint:
1579
# Either no hint was provided (so we are packing everything),
1580
# or this pack was included in the hint.
1581
pack_operations[-1][0] += pack.get_revision_count()
1582
pack_operations[-1][1].append(pack)
1266
pack_operations[-1][0] += pack.get_revision_count()
1267
pack_operations[-1][1].append(pack)
1583
1268
self._execute_pack_operations(pack_operations, OptimisingPacker)
1585
if clean_obsolete_packs:
1586
self._clear_obsolete_packs()
1588
1270
def plan_autopack_combinations(self, existing_packs, pack_distribution):
1589
1271
"""Plan a pack operation.
1873
1474
self._packs_by_name = {}
1874
1475
self._packs_at_load = None
1477
def _make_index_map(self, index_suffix):
1478
"""Return information on existing indices.
1480
:param suffix: Index suffix added to pack name.
1482
:returns: (pack_map, indices) where indices is a list of GraphIndex
1483
objects, and pack_map is a mapping from those objects to the
1484
pack tuple they describe.
1486
# TODO: stop using this; it creates new indices unnecessarily.
1487
self.ensure_loaded()
1488
suffix_map = {'.rix': 'revision_index',
1489
'.six': 'signature_index',
1490
'.iix': 'inventory_index',
1491
'.tix': 'text_index',
1493
return self._packs_list_to_pack_map_and_index_list(self.all_packs(),
1494
suffix_map[index_suffix])
1496
def _packs_list_to_pack_map_and_index_list(self, packs, index_attribute):
1497
"""Convert a list of packs to an index pack map and index list.
1499
:param packs: The packs list to process.
1500
:param index_attribute: The attribute that the desired index is found
1502
:return: A tuple (map, list) where map contains the dict from
1503
index:pack_tuple, and lsit contains the indices in the same order
1509
index = getattr(pack, index_attribute)
1510
indices.append(index)
1511
pack_map[index] = (pack.pack_transport, pack.file_name())
1512
return pack_map, indices
1514
def _index_contents(self, pack_map, key_filter=None):
1515
"""Get an iterable of the index contents from a pack_map.
1517
:param pack_map: A map from indices to pack details.
1518
:param key_filter: An optional filter to limit the
1521
indices = [index for index in pack_map.iterkeys()]
1522
all_index = CombinedGraphIndex(indices)
1523
if key_filter is None:
1524
return all_index.iter_all_entries()
1526
return all_index.iter_entries(key_filter)
1876
1528
def _unlock_names(self):
1877
1529
"""Release the mutex around the pack-names index."""
1878
1530
self.repo.control_files.unlock()
1880
def _diff_pack_names(self):
1881
"""Read the pack names from disk, and compare it to the one in memory.
1883
:return: (disk_nodes, deleted_nodes, new_nodes)
1884
disk_nodes The final set of nodes that should be referenced
1885
deleted_nodes Nodes which have been removed from when we started
1886
new_nodes Nodes that are newly introduced
1888
# load the disk nodes across
1890
for index, key, value in self._iter_disk_pack_index():
1891
disk_nodes.add((key, value))
1892
orig_disk_nodes = set(disk_nodes)
1894
# do a two-way diff against our original content
1895
current_nodes = set()
1896
for name, sizes in self._names.iteritems():
1898
((name, ), ' '.join(str(size) for size in sizes)))
1900
# Packs no longer present in the repository, which were present when we
1901
# locked the repository
1902
deleted_nodes = self._packs_at_load - current_nodes
1903
# Packs which this process is adding
1904
new_nodes = current_nodes - self._packs_at_load
1906
# Update the disk_nodes set to include the ones we are adding, and
1907
# remove the ones which were removed by someone else
1908
disk_nodes.difference_update(deleted_nodes)
1909
disk_nodes.update(new_nodes)
1911
return disk_nodes, deleted_nodes, new_nodes, orig_disk_nodes
1913
def _syncronize_pack_names_from_disk_nodes(self, disk_nodes):
1914
"""Given the correct set of pack files, update our saved info.
1916
:return: (removed, added, modified)
1917
removed pack names removed from self._names
1918
added pack names added to self._names
1919
modified pack names that had changed value
1924
## self._packs_at_load = disk_nodes
1532
def _save_pack_names(self, clear_obsolete_packs=False):
1533
"""Save the list of packs.
1535
This will take out the mutex around the pack names list for the
1536
duration of the method call. If concurrent updates have been made, a
1537
three-way merge between the current list and the current in memory list
1540
:param clear_obsolete_packs: If True, clear out the contents of the
1541
obsolete_packs directory.
1545
builder = GraphIndexBuilder()
1546
# load the disk nodes across
1548
for index, key, value in self._iter_disk_pack_index():
1549
disk_nodes.add((key, value))
1550
# do a two-way diff against our original content
1551
current_nodes = set()
1552
for name, sizes in self._names.iteritems():
1554
((name, ), ' '.join(str(size) for size in sizes)))
1555
deleted_nodes = self._packs_at_load - current_nodes
1556
new_nodes = current_nodes - self._packs_at_load
1557
disk_nodes.difference_update(deleted_nodes)
1558
disk_nodes.update(new_nodes)
1559
# TODO: handle same-name, index-size-changes here -
1560
# e.g. use the value from disk, not ours, *unless* we're the one
1562
for key, value in disk_nodes:
1563
builder.add_node(key, value)
1564
self.transport.put_file('pack-names', builder.finish(),
1565
mode=self.repo.bzrdir._get_file_mode())
1566
# move the baseline forward
1567
self._packs_at_load = disk_nodes
1568
if clear_obsolete_packs:
1569
self._clear_obsolete_packs()
1571
self._unlock_names()
1572
# synchronise the memory packs list with what we just wrote:
1925
1573
new_names = dict(disk_nodes)
1926
1574
# drop no longer present nodes
1927
1575
for pack in self.all_packs():
1928
1576
if (pack.name,) not in new_names:
1929
removed.append(pack.name)
1930
1577
self._remove_pack_from_memory(pack)
1931
1578
# add new nodes/refresh existing ones
1932
1579
for key, value in disk_nodes:
1946
1593
self._remove_pack_from_memory(self.get_pack_by_name(name))
1947
1594
self._names[name] = sizes
1948
1595
self.get_pack_by_name(name)
1949
modified.append(name)
1952
1598
self._names[name] = sizes
1953
1599
self.get_pack_by_name(name)
1955
return removed, added, modified
1957
def _save_pack_names(self, clear_obsolete_packs=False, obsolete_packs=None):
1958
"""Save the list of packs.
1960
This will take out the mutex around the pack names list for the
1961
duration of the method call. If concurrent updates have been made, a
1962
three-way merge between the current list and the current in memory list
1965
:param clear_obsolete_packs: If True, clear out the contents of the
1966
obsolete_packs directory.
1967
:param obsolete_packs: Packs that are obsolete once the new pack-names
1968
file has been written.
1969
:return: A list of the names saved that were not previously on disk.
1971
already_obsolete = []
1974
builder = self._index_builder_class()
1975
(disk_nodes, deleted_nodes, new_nodes,
1976
orig_disk_nodes) = self._diff_pack_names()
1977
# TODO: handle same-name, index-size-changes here -
1978
# e.g. use the value from disk, not ours, *unless* we're the one
1980
for key, value in disk_nodes:
1981
builder.add_node(key, value)
1982
self.transport.put_file('pack-names', builder.finish(),
1983
mode=self.repo.bzrdir._get_file_mode())
1984
self._packs_at_load = disk_nodes
1985
if clear_obsolete_packs:
1988
to_preserve = set([o.name for o in obsolete_packs])
1989
already_obsolete = self._clear_obsolete_packs(to_preserve)
1991
self._unlock_names()
1992
# synchronise the memory packs list with what we just wrote:
1993
self._syncronize_pack_names_from_disk_nodes(disk_nodes)
1995
# TODO: We could add one more condition here. "if o.name not in
1996
# orig_disk_nodes and o != the new_pack we haven't written to
1997
# disk yet. However, the new pack object is not easily
1998
# accessible here (it would have to be passed through the
1999
# autopacking code, etc.)
2000
obsolete_packs = [o for o in obsolete_packs
2001
if o.name not in already_obsolete]
2002
self._obsolete_packs(obsolete_packs)
2003
return [new_node[0][0] for new_node in new_nodes]
2005
def reload_pack_names(self):
2006
"""Sync our pack listing with what is present in the repository.
2008
This should be called when we find out that something we thought was
2009
present is now missing. This happens when another process re-packs the
2012
:return: True if the in-memory list of packs has been altered at all.
2014
# The ensure_loaded call is to handle the case where the first call
2015
# made involving the collection was to reload_pack_names, where we
2016
# don't have a view of disk contents. Its a bit of a bandaid, and
2017
# causes two reads of pack-names, but its a rare corner case not struck
2018
# with regular push/pull etc.
2019
first_read = self.ensure_loaded()
2022
# out the new value.
2023
(disk_nodes, deleted_nodes, new_nodes,
2024
orig_disk_nodes) = self._diff_pack_names()
2025
# _packs_at_load is meant to be the explicit list of names in
2026
# 'pack-names' at then start. As such, it should not contain any
2027
# pending names that haven't been written out yet.
2028
self._packs_at_load = orig_disk_nodes
2030
modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2031
if removed or added or modified:
2035
def _restart_autopack(self):
2036
"""Reload the pack names list, and restart the autopack code."""
2037
if not self.reload_pack_names():
2038
# Re-raise the original exception, because something went missing
2039
# and a restart didn't find it
2041
raise errors.RetryAutopack(self.repo, False, sys.exc_info())
2043
def _clear_obsolete_packs(self, preserve=None):
1601
def _clear_obsolete_packs(self):
2044
1602
"""Delete everything from the obsolete-packs directory.
2046
:return: A list of pack identifiers (the filename without '.pack') that
2047
were found in obsolete_packs.
2050
1604
obsolete_pack_transport = self.transport.clone('obsolete_packs')
2051
if preserve is None:
2053
1605
for filename in obsolete_pack_transport.list_dir('.'):
2054
name, ext = osutils.splitext(filename)
2057
if name in preserve:
2060
1607
obsolete_pack_transport.delete(filename)
2061
1608
except (errors.PathError, errors.TransportError), e:
2062
warning("couldn't delete obsolete pack, skipping it:\n%s"
1609
warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
2066
1611
def _start_write_group(self):
2067
1612
# Do not permit preparation for writing if we're not in a 'write lock'.
2068
1613
if not self.repo.is_write_locked():
2069
1614
raise errors.NotWriteLocked(self)
2070
self._new_pack = self.pack_factory(self, upload_suffix='.pack',
1615
self._new_pack = NewPack(self._upload_transport, self._index_transport,
1616
self._pack_transport, upload_suffix='.pack',
2071
1617
file_mode=self.repo.bzrdir._get_file_mode())
2072
1618
# allow writing: queue writes to a new index
2073
1619
self.revision_index.add_writable_index(self._new_pack.revision_index,
2094
1634
# FIXME: just drop the transient index.
2095
1635
# forget what names there are
2096
1636
if self._new_pack is not None:
2097
operation = cleanup.OperationWithCleanups(self._new_pack.abort)
2098
operation.add_cleanup(setattr, self, '_new_pack', None)
2099
# If we aborted while in the middle of finishing the write
2100
# group, _remove_pack_indices could fail because the indexes are
2101
# already gone. But they're not there we shouldn't fail in this
2102
# case, so we pass ignore_missing=True.
2103
operation.add_cleanup(self._remove_pack_indices, self._new_pack,
2104
ignore_missing=True)
2105
operation.run_simple()
2106
for resumed_pack in self._resumed_packs:
2107
operation = cleanup.OperationWithCleanups(resumed_pack.abort)
2108
# See comment in previous finally block.
2109
operation.add_cleanup(self._remove_pack_indices, resumed_pack,
2110
ignore_missing=True)
2111
operation.run_simple()
2112
del self._resumed_packs[:]
2114
def _remove_resumed_pack_indices(self):
2115
for resumed_pack in self._resumed_packs:
2116
self._remove_pack_indices(resumed_pack)
2117
del self._resumed_packs[:]
2119
def _check_new_inventories(self):
2120
"""Detect missing inventories in this write group.
2122
:returns: list of strs, summarising any problems found. If the list is
2123
empty no problems were found.
2125
# The base implementation does no checks. GCRepositoryPackCollection
1637
self._new_pack.abort()
1638
self._remove_pack_indices(self._new_pack)
1639
self._new_pack = None
1640
self.repo._text_knit = None
2129
1642
def _commit_write_group(self):
2131
for prefix, versioned_file in (
2132
('revisions', self.repo.revisions),
2133
('inventories', self.repo.inventories),
2134
('texts', self.repo.texts),
2135
('signatures', self.repo.signatures),
2137
missing = versioned_file.get_missing_compression_parent_keys()
2138
all_missing.update([(prefix,) + key for key in missing])
2140
raise errors.BzrCheckError(
2141
"Repository %s has missing compression parent(s) %r "
2142
% (self.repo, sorted(all_missing)))
2143
problems = self._check_new_inventories()
2145
problems_summary = '\n'.join(problems)
2146
raise errors.BzrCheckError(
2147
"Cannot add revision(s) to repository: " + problems_summary)
2148
1643
self._remove_pack_indices(self._new_pack)
2149
any_new_content = False
2150
1644
if self._new_pack.data_inserted():
2151
1645
# get all the data to disk and read to use
2152
1646
self._new_pack.finish()
2153
1647
self.allocate(self._new_pack)
2154
1648
self._new_pack = None
2155
any_new_content = True
2157
self._new_pack.abort()
2158
self._new_pack = None
2159
for resumed_pack in self._resumed_packs:
2160
# XXX: this is a pretty ugly way to turn the resumed pack into a
2161
# properly committed pack.
2162
self._names[resumed_pack.name] = None
2163
self._remove_pack_from_memory(resumed_pack)
2164
resumed_pack.finish()
2165
self.allocate(resumed_pack)
2166
any_new_content = True
2167
del self._resumed_packs[:]
2169
result = self.autopack()
1649
if not self.autopack():
2171
1650
# when autopack takes no steps, the names list is still
2173
return self._save_pack_names()
2177
def _suspend_write_group(self):
2178
tokens = [pack.name for pack in self._resumed_packs]
2179
self._remove_pack_indices(self._new_pack)
2180
if self._new_pack.data_inserted():
2181
# get all the data to disk and read to use
2182
self._new_pack.finish(suspend=True)
2183
tokens.append(self._new_pack.name)
2184
self._new_pack = None
1652
self._save_pack_names()
2186
1654
self._new_pack.abort()
2187
1655
self._new_pack = None
2188
self._remove_resumed_pack_indices()
2191
def _resume_write_group(self, tokens):
2192
for token in tokens:
2193
self._resume_pack(token)
1656
self.repo._text_knit = None
2196
1659
class KnitPackRepository(KnitRepository):
2197
1660
"""Repository with knit objects stored inside pack containers.
2199
1662
The layering for a KnitPackRepository is:
2201
1664
Graph | HPSS | Repository public layer |
2280
1726
self._reconcile_fixes_text_parents = True
2281
1727
self._reconcile_backsup_inventory = False
2283
def _warn_if_deprecated(self, branch=None):
2284
# This class isn't deprecated, but one sub-format is
2285
if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
2286
super(KnitPackRepository, self)._warn_if_deprecated(branch)
2288
1729
def _abort_write_group(self):
2289
self.revisions._index._key_dependencies.clear()
2290
1730
self._pack_collection._abort_write_group()
2292
def _get_source(self, to_format):
2293
if to_format.network_name() == self._format.network_name():
2294
return KnitPackStreamSource(self, to_format)
2295
return super(KnitPackRepository, self)._get_source(to_format)
1732
def _find_inconsistent_revision_parents(self):
1733
"""Find revisions with incorrectly cached parents.
1735
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
1736
parents-in-revision).
1738
if not self.is_locked():
1739
raise errors.ObjectNotLocked(self)
1740
pb = ui.ui_factory.nested_progress_bar()
1743
revision_nodes = self._pack_collection.revision_index \
1744
.combined_index.iter_all_entries()
1745
index_positions = []
1746
# Get the cached index values for all revisions, and also the location
1747
# in each index of the revision text so we can perform linear IO.
1748
for index, key, value, refs in revision_nodes:
1749
pos, length = value[1:].split(' ')
1750
index_positions.append((index, int(pos), key[0],
1751
tuple(parent[0] for parent in refs[0])))
1752
pb.update("Reading revision index.", 0, 0)
1753
index_positions.sort()
1754
batch_count = len(index_positions) / 1000 + 1
1755
pb.update("Checking cached revision graph.", 0, batch_count)
1756
for offset in xrange(batch_count):
1757
pb.update("Checking cached revision graph.", offset)
1758
to_query = index_positions[offset * 1000:(offset + 1) * 1000]
1761
rev_ids = [item[2] for item in to_query]
1762
revs = self.get_revisions(rev_ids)
1763
for revision, item in zip(revs, to_query):
1764
index_parents = item[3]
1765
rev_parents = tuple(revision.parent_ids)
1766
if index_parents != rev_parents:
1767
result.append((revision.revision_id, index_parents, rev_parents))
1772
@symbol_versioning.deprecated_method(symbol_versioning.one_one)
1773
def get_parents(self, revision_ids):
1774
"""See graph._StackedParentsProvider.get_parents."""
1775
parent_map = self.get_parent_map(revision_ids)
1776
return [parent_map.get(r, None) for r in revision_ids]
1778
def get_parent_map(self, keys):
1779
"""See graph._StackedParentsProvider.get_parent_map
1781
This implementation accesses the combined revision index to provide
1784
self._pack_collection.ensure_loaded()
1785
index = self._pack_collection.revision_index.combined_index
1788
raise ValueError('get_parent_map(None) is not valid')
1789
if _mod_revision.NULL_REVISION in keys:
1790
keys.discard(_mod_revision.NULL_REVISION)
1791
found_parents = {_mod_revision.NULL_REVISION:()}
1794
search_keys = set((revision_id,) for revision_id in keys)
1795
for index, key, value, refs in index.iter_entries(search_keys):
1798
parents = (_mod_revision.NULL_REVISION,)
1800
parents = tuple(parent[0] for parent in parents)
1801
found_parents[key[0]] = parents
1802
return found_parents
1804
def has_revisions(self, revision_ids):
1805
"""See Repository.has_revisions()."""
1806
revision_ids = set(revision_ids)
1807
result = revision_ids.intersection(
1808
set([None, _mod_revision.NULL_REVISION]))
1809
revision_ids.difference_update(result)
1810
index = self._pack_collection.revision_index.combined_index
1811
keys = [(revision_id,) for revision_id in revision_ids]
1812
result.update(node[1][0] for node in index.iter_entries(keys))
2297
1815
def _make_parents_provider(self):
2298
1816
return graph.CachingParentsProvider(self)
2300
1818
def _refresh_data(self):
2301
if not self.is_locked():
2303
self._pack_collection.reload_pack_names()
1819
if self._write_lock_count == 1 or (
1820
self.control_files._lock_count == 1 and
1821
self.control_files._lock_mode == 'r'):
1822
# forget what names there are
1823
self._pack_collection.reset()
1824
# XXX: Better to do an in-memory merge when acquiring a new lock -
1825
# factor out code from _save_pack_names.
1826
self._pack_collection.ensure_loaded()
2305
1828
def _start_write_group(self):
2306
1829
self._pack_collection._start_write_group()
2308
1831
def _commit_write_group(self):
2309
hint = self._pack_collection._commit_write_group()
2310
self.revisions._index._key_dependencies.clear()
2313
def suspend_write_group(self):
2314
# XXX check self._write_group is self.get_transaction()?
2315
tokens = self._pack_collection._suspend_write_group()
2316
self.revisions._index._key_dependencies.clear()
2317
self._write_group = None
2320
def _resume_write_group(self, tokens):
2321
self._start_write_group()
2323
self._pack_collection._resume_write_group(tokens)
2324
except errors.UnresumableWriteGroup:
2325
self._abort_write_group()
2327
for pack in self._pack_collection._resumed_packs:
2328
self.revisions._index.scan_unvalidated_index(pack.revision_index)
1832
return self._pack_collection._commit_write_group()
2330
1834
def get_transaction(self):
2331
1835
if self._write_lock_count:
2413
1904
transaction = self._transaction
2414
1905
self._transaction = None
2415
1906
transaction.finish()
1907
for repo in self._fallback_repositories:
2417
1910
self.control_files.unlock()
2419
if not self.is_locked():
2420
1911
for repo in self._fallback_repositories:
2424
class KnitPackStreamSource(StreamSource):
2425
"""A StreamSource used to transfer data between same-format KnitPack repos.
2427
This source assumes:
2428
1) Same serialization format for all objects
2429
2) Same root information
2430
3) XML format inventories
2431
4) Atomic inserts (so we can stream inventory texts before text
2436
def __init__(self, from_repository, to_format):
2437
super(KnitPackStreamSource, self).__init__(from_repository, to_format)
2438
self._text_keys = None
2439
self._text_fetch_order = 'unordered'
2441
def _get_filtered_inv_stream(self, revision_ids):
2442
from_repo = self.from_repository
2443
parent_ids = from_repo._find_parent_ids_of_revisions(revision_ids)
2444
parent_keys = [(p,) for p in parent_ids]
2445
find_text_keys = from_repo._find_text_key_references_from_xml_inventory_lines
2446
parent_text_keys = set(find_text_keys(
2447
from_repo._inventory_xml_lines_for_keys(parent_keys)))
2448
content_text_keys = set()
2449
knit = KnitVersionedFiles(None, None)
2450
factory = KnitPlainFactory()
2451
def find_text_keys_from_content(record):
2452
if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):
2453
raise ValueError("Unknown content storage kind for"
2454
" inventory text: %s" % (record.storage_kind,))
2455
# It's a knit record, it has a _raw_record field (even if it was
2456
# reconstituted from a network stream).
2457
raw_data = record._raw_record
2458
# read the entire thing
2459
revision_id = record.key[-1]
2460
content, _ = knit._parse_record(revision_id, raw_data)
2461
if record.storage_kind == 'knit-delta-gz':
2462
line_iterator = factory.get_linedelta_content(content)
2463
elif record.storage_kind == 'knit-ft-gz':
2464
line_iterator = factory.get_fulltext_content(content)
2465
content_text_keys.update(find_text_keys(
2466
[(line, revision_id) for line in line_iterator]))
2467
revision_keys = [(r,) for r in revision_ids]
2468
def _filtered_inv_stream():
2469
source_vf = from_repo.inventories
2470
stream = source_vf.get_record_stream(revision_keys,
2472
for record in stream:
2473
if record.storage_kind == 'absent':
2474
raise errors.NoSuchRevision(from_repo, record.key)
2475
find_text_keys_from_content(record)
2477
self._text_keys = content_text_keys - parent_text_keys
2478
return ('inventories', _filtered_inv_stream())
2480
def _get_text_stream(self):
2481
# Note: We know we don't have to handle adding root keys, because both
2482
# the source and target are the identical network name.
2483
text_stream = self.from_repository.texts.get_record_stream(
2484
self._text_keys, self._text_fetch_order, False)
2485
return ('texts', text_stream)
2487
def get_stream(self, search):
2488
revision_ids = search.get_keys()
2489
for stream_info in self._fetch_revision_texts(revision_ids):
2491
self._revision_keys = [(rev_id,) for rev_id in revision_ids]
2492
yield self._get_filtered_inv_stream(revision_ids)
2493
yield self._get_text_stream()
2497
class RepositoryFormatPack(MetaDirRepositoryFormat):
2498
"""Format logic for pack structured repositories.
2500
This repository format has:
2501
- a list of packs in pack-names
2502
- packs in packs/NAME.pack
2503
- indices in indices/NAME.{iix,six,tix,rix}
2504
- knit deltas in the packs, knit indices mapped to the indices.
2505
- thunk objects to support the knits programming API.
2506
- a format marker of its own
2507
- an optional 'shared-storage' flag
2508
- an optional 'no-working-trees' flag
2512
# Set this attribute in derived classes to control the repository class
2513
# created by open and initialize.
2514
repository_class = None
2515
# Set this attribute in derived classes to control the
2516
# _commit_builder_class that the repository objects will have passed to
2517
# their constructor.
2518
_commit_builder_class = None
2519
# Set this attribute in derived clases to control the _serializer that the
2520
# repository objects will have passed to their constructor.
2522
# Packs are not confused by ghosts.
2523
supports_ghosts = True
2524
# External references are not supported in pack repositories yet.
2525
supports_external_lookups = False
2526
# Most pack formats do not use chk lookups.
2527
supports_chks = False
2528
# What index classes to use
2529
index_builder_class = None
2531
_fetch_uses_deltas = True
2534
def initialize(self, a_bzrdir, shared=False):
2535
"""Create a pack based repository.
2537
:param a_bzrdir: bzrdir to contain the new repository; must already
2539
:param shared: If true the repository will be initialized as a shared
2542
mutter('creating repository in %s.', a_bzrdir.transport.base)
2543
dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
2544
builder = self.index_builder_class()
2545
files = [('pack-names', builder.finish())]
2546
utf8_files = [('format', self.get_format_string())]
2548
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2549
repository = self.open(a_bzrdir=a_bzrdir, _found=True)
2550
self._run_post_repo_init_hooks(repository, a_bzrdir, shared)
2553
def open(self, a_bzrdir, _found=False, _override_transport=None):
2554
"""See RepositoryFormat.open().
2556
:param _override_transport: INTERNAL USE ONLY. Allows opening the
2557
repository at a slightly different url
2558
than normal. I.e. during 'upgrade'.
2561
format = RepositoryFormat.find_format(a_bzrdir)
2562
if _override_transport is not None:
2563
repo_transport = _override_transport
2565
repo_transport = a_bzrdir.get_repository_transport(None)
2566
control_files = lockable_files.LockableFiles(repo_transport,
2567
'lock', lockdir.LockDir)
2568
return self.repository_class(_format=self,
2570
control_files=control_files,
2571
_commit_builder_class=self._commit_builder_class,
2572
_serializer=self._serializer)
2575
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2576
"""A no-subtrees parameterized Pack repository.
2578
This format was introduced in 0.92.
2581
repository_class = KnitPackRepository
2582
_commit_builder_class = PackCommitBuilder
2584
def _serializer(self):
2585
return xml5.serializer_v5
2586
# What index classes to use
2587
index_builder_class = InMemoryGraphIndex
2588
index_class = GraphIndex
2590
def _get_matching_bzrdir(self):
2591
return bzrdir.format_registry.make_bzrdir('pack-0.92')
2593
def _ignore_setting_bzrdir(self, format):
2596
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2598
def get_format_string(self):
2599
"""See RepositoryFormat.get_format_string()."""
2600
return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2602
def get_format_description(self):
2603
"""See RepositoryFormat.get_format_description()."""
2604
return "Packs containing knits without subtree support"
1915
class RepositoryFormatPack(MetaDirRepositoryFormat):
1916
"""Format logic for pack structured repositories.
1918
This repository format has:
1919
- a list of packs in pack-names
1920
- packs in packs/NAME.pack
1921
- indices in indices/NAME.{iix,six,tix,rix}
1922
- knit deltas in the packs, knit indices mapped to the indices.
1923
- thunk objects to support the knits programming API.
1924
- a format marker of its own
1925
- an optional 'shared-storage' flag
1926
- an optional 'no-working-trees' flag
1930
# Set this attribute in derived classes to control the repository class
1931
# created by open and initialize.
1932
repository_class = None
1933
# Set this attribute in derived classes to control the
1934
# _commit_builder_class that the repository objects will have passed to
1935
# their constructor.
1936
_commit_builder_class = None
1937
# Set this attribute in derived clases to control the _serializer that the
1938
# repository objects will have passed to their constructor.
1940
# External references are not supported in pack repositories yet.
1941
supports_external_lookups = False
1943
def initialize(self, a_bzrdir, shared=False):
1944
"""Create a pack based repository.
1946
:param a_bzrdir: bzrdir to contain the new repository; must already
1948
:param shared: If true the repository will be initialized as a shared
1951
mutter('creating repository in %s.', a_bzrdir.transport.base)
1952
dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
1953
builder = GraphIndexBuilder()
1954
files = [('pack-names', builder.finish())]
1955
utf8_files = [('format', self.get_format_string())]
1957
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
1958
return self.open(a_bzrdir=a_bzrdir, _found=True)
1960
def open(self, a_bzrdir, _found=False, _override_transport=None):
1961
"""See RepositoryFormat.open().
1963
:param _override_transport: INTERNAL USE ONLY. Allows opening the
1964
repository at a slightly different url
1965
than normal. I.e. during 'upgrade'.
1968
format = RepositoryFormat.find_format(a_bzrdir)
1969
if _override_transport is not None:
1970
repo_transport = _override_transport
1972
repo_transport = a_bzrdir.get_repository_transport(None)
1973
control_files = lockable_files.LockableFiles(repo_transport,
1974
'lock', lockdir.LockDir)
1975
return self.repository_class(_format=self,
1977
control_files=control_files,
1978
_commit_builder_class=self._commit_builder_class,
1979
_serializer=self._serializer)
1982
class RepositoryFormatKnitPack1(RepositoryFormatPack):
1983
"""A no-subtrees parameterized Pack repository.
1985
This format was introduced in 0.92.
1988
repository_class = KnitPackRepository
1989
_commit_builder_class = PackCommitBuilder
1990
_serializer = xml5.serializer_v5
1992
def _get_matching_bzrdir(self):
1993
return bzrdir.format_registry.make_bzrdir('pack-0.92')
1995
def _ignore_setting_bzrdir(self, format):
1998
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2000
def get_format_string(self):
2001
"""See RepositoryFormat.get_format_string()."""
2002
return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2004
def get_format_description(self):
2005
"""See RepositoryFormat.get_format_description()."""
2006
return "Packs containing knits without subtree support"
2008
def check_conversion_target(self, target_format):
2012
class RepositoryFormatPack(MetaDirRepositoryFormat):
2013
"""Format logic for pack structured repositories.
2015
This repository format has:
2016
- a list of packs in pack-names
2017
- packs in packs/NAME.pack
2018
- indices in indices/NAME.{iix,six,tix,rix}
2019
- knit deltas in the packs, knit indices mapped to the indices.
2020
- thunk objects to support the knits programming API.
2021
- a format marker of its own
2022
- an optional 'shared-storage' flag
2023
- an optional 'no-working-trees' flag
2027
# Set this attribute in derived classes to control the repository class
2028
# created by open and initialize.
2029
repository_class = None
2030
# Set this attribute in derived classes to control the
2031
# _commit_builder_class that the repository objects will have passed to
2032
# their constructor.
2033
_commit_builder_class = None
2034
# Set this attribute in derived clases to control the _serializer that the
2035
# repository objects will have passed to their constructor.
2037
# External references are not supported in pack repositories yet.
2038
supports_external_lookups = False
2040
def initialize(self, a_bzrdir, shared=False):
2041
"""Create a pack based repository.
2043
:param a_bzrdir: bzrdir to contain the new repository; must already
2045
:param shared: If true the repository will be initialized as a shared
2048
mutter('creating repository in %s.', a_bzrdir.transport.base)
2049
dirs = ['indices', 'obsolete_packs', 'packs', 'upload']
2050
builder = GraphIndexBuilder()
2051
files = [('pack-names', builder.finish())]
2052
utf8_files = [('format', self.get_format_string())]
2054
self._upload_blank_content(a_bzrdir, dirs, files, utf8_files, shared)
2055
return self.open(a_bzrdir=a_bzrdir, _found=True)
2057
def open(self, a_bzrdir, _found=False, _override_transport=None):
2058
"""See RepositoryFormat.open().
2060
:param _override_transport: INTERNAL USE ONLY. Allows opening the
2061
repository at a slightly different url
2062
than normal. I.e. during 'upgrade'.
2065
format = RepositoryFormat.find_format(a_bzrdir)
2066
if _override_transport is not None:
2067
repo_transport = _override_transport
2069
repo_transport = a_bzrdir.get_repository_transport(None)
2070
control_files = lockable_files.LockableFiles(repo_transport,
2071
'lock', lockdir.LockDir)
2072
return self.repository_class(_format=self,
2074
control_files=control_files,
2075
_commit_builder_class=self._commit_builder_class,
2076
_serializer=self._serializer)
2079
class RepositoryFormatKnitPack1(RepositoryFormatPack):
2080
"""A no-subtrees parameterized Pack repository.
2082
This format was introduced in 0.92.
2085
repository_class = KnitPackRepository
2086
_commit_builder_class = PackCommitBuilder
2087
_serializer = xml5.serializer_v5
2089
def _get_matching_bzrdir(self):
2090
return bzrdir.format_registry.make_bzrdir('pack-0.92')
2092
def _ignore_setting_bzrdir(self, format):
2095
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2097
def get_format_string(self):
2098
"""See RepositoryFormat.get_format_string()."""
2099
return "Bazaar pack repository format 1 (needs bzr 0.92)\n"
2101
def get_format_description(self):
2102
"""See RepositoryFormat.get_format_description()."""
2103
return "Packs containing knits without subtree support"
2105
def check_conversion_target(self, target_format):
2607
2109
class RepositoryFormatKnitPack3(RepositoryFormatPack):
2683
2187
return "Packs containing knits with rich root support\n"
2686
class RepositoryFormatKnitPack5(RepositoryFormatPack):
2687
"""Repository that supports external references to allow stacking.
2691
Supports external lookups, which results in non-truncated ghosts after
2692
reconcile compared to pack-0.92 formats.
2695
repository_class = KnitPackRepository
2696
_commit_builder_class = PackCommitBuilder
2697
supports_external_lookups = True
2698
# What index classes to use
2699
index_builder_class = InMemoryGraphIndex
2700
index_class = GraphIndex
2703
def _serializer(self):
2704
return xml5.serializer_v5
2706
def _get_matching_bzrdir(self):
2707
return bzrdir.format_registry.make_bzrdir('1.6')
2709
def _ignore_setting_bzrdir(self, format):
2712
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2714
def get_format_string(self):
2715
"""See RepositoryFormat.get_format_string()."""
2716
return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"
2718
def get_format_description(self):
2719
"""See RepositoryFormat.get_format_description()."""
2720
return "Packs 5 (adds stacking support, requires bzr 1.6)"
2723
class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):
2724
"""A repository with rich roots and stacking.
2726
New in release 1.6.1.
2728
Supports stacking on other repositories, allowing data to be accessed
2729
without being stored locally.
2732
repository_class = KnitPackRepository
2733
_commit_builder_class = PackRootCommitBuilder
2734
rich_root_data = True
2735
supports_tree_reference = False # no subtrees
2736
supports_external_lookups = True
2737
# What index classes to use
2738
index_builder_class = InMemoryGraphIndex
2739
index_class = GraphIndex
2742
def _serializer(self):
2743
return xml6.serializer_v6
2745
def _get_matching_bzrdir(self):
2746
return bzrdir.format_registry.make_bzrdir(
2749
def _ignore_setting_bzrdir(self, format):
2752
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2754
def get_format_string(self):
2755
"""See RepositoryFormat.get_format_string()."""
2756
return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2758
def get_format_description(self):
2759
return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"
2762
class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):
2763
"""A repository with rich roots and external references.
2767
Supports external lookups, which results in non-truncated ghosts after
2768
reconcile compared to pack-0.92 formats.
2770
This format was deprecated because the serializer it uses accidentally
2771
supported subtrees, when the format was not intended to. This meant that
2772
someone could accidentally fetch from an incorrect repository.
2775
repository_class = KnitPackRepository
2776
_commit_builder_class = PackRootCommitBuilder
2777
rich_root_data = True
2778
supports_tree_reference = False # no subtrees
2780
supports_external_lookups = True
2781
# What index classes to use
2782
index_builder_class = InMemoryGraphIndex
2783
index_class = GraphIndex
2786
def _serializer(self):
2787
return xml7.serializer_v7
2789
def _get_matching_bzrdir(self):
2790
matching = bzrdir.format_registry.make_bzrdir(
2792
matching.repository_format = self
2795
def _ignore_setting_bzrdir(self, format):
2798
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2800
def get_format_string(self):
2801
"""See RepositoryFormat.get_format_string()."""
2802
return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
2804
def get_format_description(self):
2805
return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"
2809
class RepositoryFormatKnitPack6(RepositoryFormatPack):
2810
"""A repository with stacking and btree indexes,
2811
without rich roots or subtrees.
2813
This is equivalent to pack-1.6 with B+Tree indices.
2816
repository_class = KnitPackRepository
2817
_commit_builder_class = PackCommitBuilder
2818
supports_external_lookups = True
2819
# What index classes to use
2820
index_builder_class = BTreeBuilder
2821
index_class = BTreeGraphIndex
2824
def _serializer(self):
2825
return xml5.serializer_v5
2827
def _get_matching_bzrdir(self):
2828
return bzrdir.format_registry.make_bzrdir('1.9')
2830
def _ignore_setting_bzrdir(self, format):
2833
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2835
def get_format_string(self):
2836
"""See RepositoryFormat.get_format_string()."""
2837
return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"
2839
def get_format_description(self):
2840
"""See RepositoryFormat.get_format_description()."""
2841
return "Packs 6 (uses btree indexes, requires bzr 1.9)"
2844
class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):
2845
"""A repository with rich roots, no subtrees, stacking and btree indexes.
2847
1.6-rich-root with B+Tree indices.
2850
repository_class = KnitPackRepository
2851
_commit_builder_class = PackRootCommitBuilder
2852
rich_root_data = True
2853
supports_tree_reference = False # no subtrees
2854
supports_external_lookups = True
2855
# What index classes to use
2856
index_builder_class = BTreeBuilder
2857
index_class = BTreeGraphIndex
2860
def _serializer(self):
2861
return xml6.serializer_v6
2863
def _get_matching_bzrdir(self):
2864
return bzrdir.format_registry.make_bzrdir(
2867
def _ignore_setting_bzrdir(self, format):
2870
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2872
def get_format_string(self):
2873
"""See RepositoryFormat.get_format_string()."""
2874
return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2876
def get_format_description(self):
2877
return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2880
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2190
class RepositoryFormatPackDevelopment0(RepositoryFormatPack):
2191
"""A no-subtrees development repository.
2193
This format should be retained until the second release after bzr 1.0.
2195
No changes to the disk behaviour from pack-0.92.
2198
repository_class = KnitPackRepository
2199
_commit_builder_class = PackCommitBuilder
2200
_serializer = xml5.serializer_v5
2202
def _get_matching_bzrdir(self):
2203
return bzrdir.format_registry.make_bzrdir('development0')
2205
def _ignore_setting_bzrdir(self, format):
2208
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2210
def get_format_string(self):
2211
"""See RepositoryFormat.get_format_string()."""
2212
return "Bazaar development format 0 (needs bzr.dev from before 1.3)\n"
2214
def get_format_description(self):
2215
"""See RepositoryFormat.get_format_description()."""
2216
return ("Development repository format, currently the same as "
2219
def check_conversion_target(self, target_format):
2223
class RepositoryFormatPackDevelopment0Subtree(RepositoryFormatPack):
2881
2224
"""A subtrees development repository.
2883
This format should be retained until the second release after bzr 1.7.
2885
1.6.1-subtree[as it might have been] with B+Tree indices.
2887
This is [now] retained until we have a CHK based subtree format in
2226
This format should be retained until the second release after bzr 1.0.
2228
No changes to the disk behaviour from pack-0.92-subtree.
2891
2231
repository_class = KnitPackRepository
2892
2232
_commit_builder_class = PackRootCommitBuilder
2893
2233
rich_root_data = True
2895
2234
supports_tree_reference = True
2896
supports_external_lookups = True
2897
# What index classes to use
2898
index_builder_class = BTreeBuilder
2899
index_class = BTreeGraphIndex
2902
def _serializer(self):
2903
return xml7.serializer_v7
2905
def _get_matching_bzrdir(self):
2906
return bzrdir.format_registry.make_bzrdir(
2907
'development-subtree')
2909
def _ignore_setting_bzrdir(self, format):
2912
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2914
def get_format_string(self):
2915
"""See RepositoryFormat.get_format_string()."""
2916
return ("Bazaar development format 2 with subtree support "
2917
"(needs bzr.dev from before 1.8)\n")
2919
def get_format_description(self):
2920
"""See RepositoryFormat.get_format_description()."""
2921
return ("Development repository format, currently the same as "
2922
"1.6.1-subtree with B+Tree indices.\n")
2235
_serializer = xml7.serializer_v7
2237
def _get_matching_bzrdir(self):
2238
return bzrdir.format_registry.make_bzrdir(
2239
'development0-subtree')
2241
def _ignore_setting_bzrdir(self, format):
2244
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2246
def check_conversion_target(self, target_format):
2247
if not target_format.rich_root_data:
2248
raise errors.BadConversionTarget(
2249
'Does not support rich root data.', target_format)
2250
if not getattr(target_format, 'supports_tree_reference', False):
2251
raise errors.BadConversionTarget(
2252
'Does not support nested trees', target_format)
2254
def get_format_string(self):
2255
"""See RepositoryFormat.get_format_string()."""
2256
return ("Bazaar development format 0 with subtree support "
2257
"(needs bzr.dev from before 1.3)\n")
2259
def get_format_description(self):
2260
"""See RepositoryFormat.get_format_description()."""
2261
return ("Development repository format, currently the same as "
2262
"pack-0.92-subtree\n")
2265
class RepositoryFormatPackDevelopment1(RepositoryFormatPackDevelopment0):
2266
"""A no-subtrees development repository.
2268
This format should be retained until the second release after bzr 1.5.
2270
Supports external lookups, which results in non-truncated ghosts after
2271
reconcile compared to pack-0.92 formats.
2274
supports_external_lookups = True
2276
def _get_matching_bzrdir(self):
2277
return bzrdir.format_registry.make_bzrdir('development1')
2279
def _ignore_setting_bzrdir(self, format):
2282
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2284
def get_format_string(self):
2285
"""See RepositoryFormat.get_format_string()."""
2286
return "Bazaar development format 1 (needs bzr.dev from before 1.6)\n"
2288
def get_format_description(self):
2289
"""See RepositoryFormat.get_format_description()."""
2290
return ("Development repository format, currently the same as "
2291
"pack-0.92 with external reference support.\n")
2293
def check_conversion_target(self, target_format):
2297
class RepositoryFormatPackDevelopment1Subtree(RepositoryFormatPackDevelopment0Subtree):
2298
"""A subtrees development repository.
2300
This format should be retained until the second release after bzr 1.5.
2302
Supports external lookups, which results in non-truncated ghosts after
2303
reconcile compared to pack-0.92 formats.
2306
supports_external_lookups = True
2308
def _get_matching_bzrdir(self):
2309
return bzrdir.format_registry.make_bzrdir(
2310
'development1-subtree')
2312
def _ignore_setting_bzrdir(self, format):
2315
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2317
def check_conversion_target(self, target_format):
2318
if not target_format.rich_root_data:
2319
raise errors.BadConversionTarget(
2320
'Does not support rich root data.', target_format)
2321
if not getattr(target_format, 'supports_tree_reference', False):
2322
raise errors.BadConversionTarget(
2323
'Does not support nested trees', target_format)
2325
def get_format_string(self):
2326
"""See RepositoryFormat.get_format_string()."""
2327
return ("Bazaar development format 1 with subtree support "
2328
"(needs bzr.dev from before 1.6)\n")
2330
def get_format_description(self):
2331
"""See RepositoryFormat.get_format_description()."""
2332
return ("Development repository format, currently the same as "
2333
"pack-0.92-subtree with external reference support.\n")
added
removed
bzrlib/repofmt/pack_repo.py
