226
222
return self.index_name('text', name)
228
224
def _replace_index_with_readonly(self, index_type):
229
unlimited_cache = False
230
if index_type == 'chk':
231
unlimited_cache = True
232
225
setattr(self, index_type + '_index',
233
226
self.index_class(self.index_transport,
234
227
self.index_name(index_type, self.name),
235
self.index_sizes[self.index_offset(index_type)],
236
unlimited_cache=unlimited_cache))
228
self.index_sizes[self.index_offset(index_type)]))
239
231
class ExistingPack(Pack):
240
232
"""An in memory proxy for an existing .pack and its disk indices."""
242
234
def __init__(self, pack_transport, name, revision_index, inventory_index,
243
text_index, signature_index, chk_index=None):
235
text_index, signature_index):
244
236
"""Create an ExistingPack object.
246
238
:param pack_transport: The transport where the pack file resides.
247
239
:param name: The name of the pack on disk in the pack_transport.
249
241
Pack.__init__(self, revision_index, inventory_index, text_index,
250
signature_index, chk_index)
252
244
self.pack_transport = pack_transport
253
245
if None in (revision_index, inventory_index, text_index,
271
263
def __init__(self, name, revision_index, inventory_index, text_index,
272
264
signature_index, upload_transport, pack_transport, index_transport,
273
pack_collection, chk_index=None):
274
266
"""Create a ResumedPack object."""
275
267
ExistingPack.__init__(self, pack_transport, name, revision_index,
276
inventory_index, text_index, signature_index,
268
inventory_index, text_index, signature_index)
278
269
self.upload_transport = upload_transport
279
270
self.index_transport = index_transport
280
271
self.index_sizes = [None, None, None, None]
307
295
self.upload_transport.delete(self.file_name())
308
296
indices = [self.revision_index, self.inventory_index, self.text_index,
309
297
self.signature_index]
310
if self.chk_index is not None:
311
indices.append(self.chk_index)
312
298
for index in indices:
313
299
index._transport.delete(index._name)
315
301
def finish(self):
316
302
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:
303
new_name = '../packs/' + self.file_name()
304
self.upload_transport.rename(self.file_name(), new_name)
305
for index_type in ['revision', 'inventory', 'text', 'signature']:
321
306
old_name = self.index_name(index_type, self.name)
322
307
new_name = '../indices/' + old_name
323
308
self.upload_transport.rename(old_name, new_name)
324
309
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
310
self._state = 'finished'
329
312
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
313
return index.external_references(1)
583
543
self.index_to_pack = {}
584
544
self.combined_index = CombinedGraphIndex([], reload_func=reload_func)
585
545
self.data_access = _DirectPackAccess(self.index_to_pack,
586
reload_func=reload_func,
587
flush_func=flush_func)
546
reload_func=reload_func)
547
self.add_callback = None
549
def replace_indices(self, index_to_pack, indices):
550
"""Replace the current mappings with fresh ones.
552
This should probably not be used eventually, rather incremental add and
553
removal of indices. It has been added during refactoring of existing
556
:param index_to_pack: A mapping from index objects to
557
(transport, name) tuples for the pack file data.
558
:param indices: A list of indices.
560
# refresh the revision pack map dict without replacing the instance.
561
self.index_to_pack.clear()
562
self.index_to_pack.update(index_to_pack)
563
# XXX: API break - clearly a 'replace' method would be good?
564
self.combined_index._indices[:] = indices
565
# the current add nodes callback for the current writable index if
588
567
self.add_callback = None
590
569
def add_index(self, index, pack):
625
604
self.data_access.set_writer(None, None, (None, None))
626
605
self.index_to_pack.clear()
627
606
del self.combined_index._indices[:]
628
del self.combined_index._index_names[:]
629
607
self.add_callback = None
631
def remove_index(self, index):
609
def remove_index(self, index, pack):
632
610
"""Remove index from the indices used to answer queries.
634
612
:param index: An index from the pack parameter.
613
:param pack: A Pack instance.
636
615
del self.index_to_pack[index]
637
pos = self.combined_index._indices.index(index)
638
del self.combined_index._indices[pos]
639
del self.combined_index._index_names[pos]
616
self.combined_index._indices.remove(index)
640
617
if (self.add_callback is not None and
641
618
getattr(index, 'add_nodes', None) == self.add_callback):
642
619
self.add_callback = None
749
726
def open_pack(self):
750
727
"""Open a pack for the pack we are creating."""
751
new_pack = self._pack_collection.pack_factory(self._pack_collection,
752
upload_suffix=self.suffix,
728
return NewPack(self._pack_collection, upload_suffix=self.suffix,
753
729
file_mode=self._pack_collection.repo.bzrdir._get_file_mode())
754
# We know that we will process all nodes in order, and don't need to
755
# query, so don't combine any indices spilled to disk until we are done
756
new_pack.revision_index.set_optimize(combine_backing_indices=False)
757
new_pack.inventory_index.set_optimize(combine_backing_indices=False)
758
new_pack.text_index.set_optimize(combine_backing_indices=False)
759
new_pack.signature_index.set_optimize(combine_backing_indices=False)
762
731
def _update_pack_order(self, entries, index_to_pack_map):
763
732
"""Determine how we want our packs to be ordered.
920
888
time.ctime(), self._pack_collection._upload_transport.base, new_pack.random_name,
921
889
new_pack.signature_index.key_count(),
922
890
time.time() - new_pack.start_time)
924
# NB XXX: how to check CHK references are present? perhaps by yielding
925
# the items? How should that interact with stacked repos?
926
if new_pack.chk_index is not None:
928
if 'pack' in debug.debug_flags:
929
mutter('%s: create_pack: chk content copied: %s%s %d items t+%6.3fs',
930
time.ctime(), self._pack_collection._upload_transport.base,
931
new_pack.random_name,
932
new_pack.chk_index.key_count(),
933
time.time() - new_pack.start_time)
934
891
new_pack._check_references()
935
892
if not self._use_pack(new_pack):
940
897
self._pack_collection.allocate(new_pack)
943
def _copy_chks(self, refs=None):
944
# XXX: Todo, recursive follow-pointers facility when fetching some
946
chk_index_map, chk_indices = self._pack_map_and_index_list(
948
chk_nodes = self._index_contents(chk_indices, refs)
950
# TODO: This isn't strictly tasteful as we are accessing some private
951
# variables (_serializer). Perhaps a better way would be to have
952
# Repository._deserialise_chk_node()
953
search_key_func = chk_map.search_key_registry.get(
954
self._pack_collection.repo._serializer.search_key_name)
955
def accumlate_refs(lines):
956
# XXX: move to a generic location
958
bytes = ''.join(lines)
959
node = chk_map._deserialise(bytes, ("unknown",), search_key_func)
960
new_refs.update(node.refs())
961
self._copy_nodes(chk_nodes, chk_index_map, self.new_pack._writer,
962
self.new_pack.chk_index, output_lines=accumlate_refs)
965
def _copy_nodes(self, nodes, index_map, writer, write_index,
967
"""Copy knit nodes between packs with no graph references.
969
:param output_lines: Output full texts of copied items.
900
def _copy_nodes(self, nodes, index_map, writer, write_index):
901
"""Copy knit nodes between packs with no graph references."""
971
902
pb = ui.ui_factory.nested_progress_bar()
973
904
return self._do_copy_nodes(nodes, index_map, writer,
974
write_index, pb, output_lines=output_lines)
978
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb,
909
def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb):
980
910
# for record verification
981
911
knit = KnitVersionedFiles(None, None)
982
912
# plan a readv on each source pack:
1382
1303
self._pack_transport = pack_transport
1383
1304
self._index_builder_class = index_builder_class
1384
1305
self._index_class = index_class
1385
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3,
1306
self._suffix_offsets = {'.rix': 0, '.iix': 1, '.tix': 2, '.six': 3}
1387
1307
self.packs = []
1388
1308
# name:Pack mapping
1390
1309
self._packs_by_name = {}
1391
1310
# the previous pack-names content
1392
1311
self._packs_at_load = None
1393
1312
# when a pack is being created by this object, the state of that pack.
1394
1313
self._new_pack = None
1395
1314
# 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]))
1315
self.revision_index = AggregateIndex(self.reload_pack_names)
1316
self.inventory_index = AggregateIndex(self.reload_pack_names)
1317
self.text_index = AggregateIndex(self.reload_pack_names)
1318
self.signature_index = AggregateIndex(self.reload_pack_names)
1415
1319
# resumed packs
1416
1320
self._resumed_packs = []
1419
return '%s(%r)' % (self.__class__.__name__, self.repo)
1421
1322
def add_pack_to_memory(self, pack):
1422
1323
"""Make a Pack object available to the repository to satisfy queries.
1557
1451
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
1454
"""Pack the pack collection totally."""
1565
1455
self.ensure_loaded()
1566
1456
total_packs = len(self._names)
1567
if self._already_packed():
1458
# This is arguably wrong because we might not be optimal, but for
1459
# now lets leave it in. (e.g. reconcile -> one pack. But not
1569
1462
total_revisions = self.revision_index.combined_index.key_count()
1570
1463
# XXX: the following may want to be a class, to pack with a given
1572
1465
mutter('Packing repository %s, which has %d pack files, '
1573
'containing %d revisions with hint %r.', self, total_packs,
1574
total_revisions, hint)
1466
'containing %d revisions into 1 packs.', self, total_packs,
1575
1468
# determine which packs need changing
1469
pack_distribution = [1]
1576
1470
pack_operations = [[0, []]]
1577
1471
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)
1472
pack_operations[-1][0] += pack.get_revision_count()
1473
pack_operations[-1][1].append(pack)
1583
1474
self._execute_pack_operations(pack_operations, OptimisingPacker)
1585
if clean_obsolete_packs:
1586
self._clear_obsolete_packs()
1588
1476
def plan_autopack_combinations(self, existing_packs, pack_distribution):
1589
1477
"""Plan a pack operation.
1702
1578
inv_index = self._make_index(name, '.iix', resume=True)
1703
1579
txt_index = self._make_index(name, '.tix', resume=True)
1704
1580
sig_index = self._make_index(name, '.six', resume=True)
1705
if self.chk_index is not None:
1706
chk_index = self._make_index(name, '.cix', resume=True,
1707
unlimited_cache=True)
1710
result = self.resumed_pack_factory(name, rev_index, inv_index,
1711
txt_index, sig_index, self._upload_transport,
1712
self._pack_transport, self._index_transport, self,
1713
chk_index=chk_index)
1581
result = ResumedPack(name, rev_index, inv_index, txt_index,
1582
sig_index, self._upload_transport, self._pack_transport,
1583
self._index_transport, self)
1714
1584
except errors.NoSuchFile, e:
1715
1585
raise errors.UnresumableWriteGroup(self.repo, [name], str(e))
1716
1586
self.add_pack_to_memory(result)
1784
1653
:param return: None.
1786
1655
for pack in packs:
1788
pack.pack_transport.rename(pack.file_name(),
1789
'../obsolete_packs/' + pack.file_name())
1790
except (errors.PathError, errors.TransportError), e:
1791
# TODO: Should these be warnings or mutters?
1792
mutter("couldn't rename obsolete pack, skipping it:\n%s"
1656
pack.pack_transport.rename(pack.file_name(),
1657
'../obsolete_packs/' + pack.file_name())
1794
1658
# TODO: Probably needs to know all possible indices for this pack
1795
1659
# - or maybe list the directory and move all indices matching this
1796
1660
# name whether we recognize it or not?
1797
suffixes = ['.iix', '.six', '.tix', '.rix']
1798
if self.chk_index is not None:
1799
suffixes.append('.cix')
1800
for suffix in suffixes:
1802
self._index_transport.rename(pack.name + suffix,
1803
'../obsolete_packs/' + pack.name + suffix)
1804
except (errors.PathError, errors.TransportError), e:
1805
mutter("couldn't rename obsolete index, skipping it:\n%s"
1661
for suffix in ('.iix', '.six', '.tix', '.rix'):
1662
self._index_transport.rename(pack.name + suffix,
1663
'../obsolete_packs/' + pack.name + suffix)
1808
1665
def pack_distribution(self, total_revisions):
1809
1666
"""Generate a list of the number of revisions to put in each pack.
1835
1692
self._remove_pack_indices(pack)
1836
1693
self.packs.remove(pack)
1838
def _remove_pack_indices(self, pack, ignore_missing=False):
1839
"""Remove the indices for pack from the aggregated indices.
1841
:param ignore_missing: Suppress KeyErrors from calling remove_index.
1843
for index_type in Pack.index_definitions.keys():
1844
attr_name = index_type + '_index'
1845
aggregate_index = getattr(self, attr_name)
1846
if aggregate_index is not None:
1847
pack_index = getattr(pack, attr_name)
1849
aggregate_index.remove_index(pack_index)
1695
def _remove_pack_indices(self, pack):
1696
"""Remove the indices for pack from the aggregated indices."""
1697
self.revision_index.remove_index(pack.revision_index, pack)
1698
self.inventory_index.remove_index(pack.inventory_index, pack)
1699
self.text_index.remove_index(pack.text_index, pack)
1700
self.signature_index.remove_index(pack.signature_index, pack)
1855
1702
def reset(self):
1856
1703
"""Clear all cached data."""
1857
1704
# cached revision data
1705
self.repo._revision_knit = None
1858
1706
self.revision_index.clear()
1859
1707
# cached signature data
1708
self.repo._signature_knit = None
1860
1709
self.signature_index.clear()
1861
1710
# cached file text data
1862
1711
self.text_index.clear()
1712
self.repo._text_knit = None
1863
1713
# cached inventory data
1864
1714
self.inventory_index.clear()
1866
if self.chk_index is not None:
1867
self.chk_index.clear()
1868
1715
# remove the open pack
1869
1716
self._new_pack = None
1870
1717
# information about packs.
1981
1822
builder.add_node(key, value)
1982
1823
self.transport.put_file('pack-names', builder.finish(),
1983
1824
mode=self.repo.bzrdir._get_file_mode())
1825
# move the baseline forward
1984
1826
self._packs_at_load = disk_nodes
1985
1827
if clear_obsolete_packs:
1988
to_preserve = set([o.name for o in obsolete_packs])
1989
already_obsolete = self._clear_obsolete_packs(to_preserve)
1828
self._clear_obsolete_packs()
1991
1830
self._unlock_names()
1992
1831
# synchronise the memory packs list with what we just wrote:
1993
1832
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
1834
def reload_pack_names(self):
2006
1835
"""Sync our pack listing with what is present in the repository.
2008
1837
This should be called when we find out that something we thought was
2009
1838
present is now missing. This happens when another process re-packs the
2010
1839
repository, etc.
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()
1841
# This is functionally similar to _save_pack_names, but we don't write
2022
1842
# 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
1843
disk_nodes, _, _ = self._diff_pack_names()
1844
self._packs_at_load = disk_nodes
2029
1845
(removed, added,
2030
1846
modified) = self._syncronize_pack_names_from_disk_nodes(disk_nodes)
2031
1847
if removed or added or modified:
2041
1857
raise errors.RetryAutopack(self.repo, False, sys.exc_info())
2043
def _clear_obsolete_packs(self, preserve=None):
1859
def _clear_obsolete_packs(self):
2044
1860
"""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
1862
obsolete_pack_transport = self.transport.clone('obsolete_packs')
2051
if preserve is None:
2053
1863
for filename in obsolete_pack_transport.list_dir('.'):
2054
name, ext = osutils.splitext(filename)
2057
if name in preserve:
2060
1865
obsolete_pack_transport.delete(filename)
2061
1866
except (errors.PathError, errors.TransportError), e:
2062
warning("couldn't delete obsolete pack, skipping it:\n%s"
1867
warning("couldn't delete obsolete pack, skipping it:\n%s" % (e,))
2066
1869
def _start_write_group(self):
2067
1870
# Do not permit preparation for writing if we're not in a 'write lock'.
2068
1871
if not self.repo.is_write_locked():
2069
1872
raise errors.NotWriteLocked(self)
2070
self._new_pack = self.pack_factory(self, upload_suffix='.pack',
1873
self._new_pack = NewPack(self, upload_suffix='.pack',
2071
1874
file_mode=self.repo.bzrdir._get_file_mode())
2072
1875
# allow writing: queue writes to a new index
2073
1876
self.revision_index.add_writable_index(self._new_pack.revision_index,
2094
1891
# FIXME: just drop the transient index.
2095
1892
# forget what names there are
2096
1893
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()
1895
self._new_pack.abort()
1897
# XXX: If we aborted while in the middle of finishing the write
1898
# group, _remove_pack_indices can fail because the indexes are
1899
# already gone. If they're not there we shouldn't fail in this
1900
# case. -- mbp 20081113
1901
self._remove_pack_indices(self._new_pack)
1902
self._new_pack = None
2106
1903
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()
1905
resumed_pack.abort()
1907
# See comment in previous finally block.
1909
self._remove_pack_indices(resumed_pack)
2112
1912
del self._resumed_packs[:]
1913
self.repo._text_knit = None
2114
1915
def _remove_resumed_pack_indices(self):
2115
1916
for resumed_pack in self._resumed_packs:
2116
1917
self._remove_pack_indices(resumed_pack)
2117
1918
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
2129
1920
def _commit_write_group(self):
2130
1921
all_missing = set()
2131
1922
for prefix, versioned_file in (
2256
2038
deltas=True, parents=True, is_locked=self.is_locked),
2257
2039
data_access=self._pack_collection.text_index.data_access,
2258
2040
max_delta_chain=200)
2259
if _format.supports_chks:
2260
# No graph, no compression:- references from chks are between
2261
# different objects not temporal versions of the same; and without
2262
# some sort of temporal structure knit compression will just fail.
2263
self.chk_bytes = KnitVersionedFiles(
2264
_KnitGraphIndex(self._pack_collection.chk_index.combined_index,
2265
add_callback=self._pack_collection.chk_index.add_callback,
2266
deltas=False, parents=False, is_locked=self.is_locked),
2267
data_access=self._pack_collection.chk_index.data_access,
2270
self.chk_bytes = None
2271
2041
# True when the repository object is 'write locked' (as opposed to the
2272
2042
# physical lock only taken out around changes to the pack-names list.)
2273
2043
# Another way to represent this would be a decorator around the control
2279
2049
self._reconcile_does_inventory_gc = True
2280
2050
self._reconcile_fixes_text_parents = True
2281
2051
self._reconcile_backsup_inventory = False
2052
self._fetch_order = 'unordered'
2283
def _warn_if_deprecated(self, branch=None):
2054
def _warn_if_deprecated(self):
2284
2055
# This class isn't deprecated, but one sub-format is
2285
2056
if isinstance(self._format, RepositoryFormatKnitPack5RichRootBroken):
2286
super(KnitPackRepository, self)._warn_if_deprecated(branch)
2057
from bzrlib import repository
2058
if repository._deprecation_warning_done:
2060
repository._deprecation_warning_done = True
2061
warning("Format %s for %s is deprecated - please use"
2062
" 'bzr upgrade --1.6.1-rich-root'"
2063
% (self._format, self.bzrdir.transport.base))
2288
2065
def _abort_write_group(self):
2289
self.revisions._index._key_dependencies.clear()
2290
2066
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)
2068
def _find_inconsistent_revision_parents(self):
2069
"""Find revisions with incorrectly cached parents.
2071
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
2072
parents-in-revision).
2074
if not self.is_locked():
2075
raise errors.ObjectNotLocked(self)
2076
pb = ui.ui_factory.nested_progress_bar()
2079
revision_nodes = self._pack_collection.revision_index \
2080
.combined_index.iter_all_entries()
2081
index_positions = []
2082
# Get the cached index values for all revisions, and also the location
2083
# in each index of the revision text so we can perform linear IO.
2084
for index, key, value, refs in revision_nodes:
2085
pos, length = value[1:].split(' ')
2086
index_positions.append((index, int(pos), key[0],
2087
tuple(parent[0] for parent in refs[0])))
2088
pb.update("Reading revision index.", 0, 0)
2089
index_positions.sort()
2090
batch_count = len(index_positions) / 1000 + 1
2091
pb.update("Checking cached revision graph.", 0, batch_count)
2092
for offset in xrange(batch_count):
2093
pb.update("Checking cached revision graph.", offset)
2094
to_query = index_positions[offset * 1000:(offset + 1) * 1000]
2097
rev_ids = [item[2] for item in to_query]
2098
revs = self.get_revisions(rev_ids)
2099
for revision, item in zip(revs, to_query):
2100
index_parents = item[3]
2101
rev_parents = tuple(revision.parent_ids)
2102
if index_parents != rev_parents:
2103
result.append((revision.revision_id, index_parents, rev_parents))
2108
@symbol_versioning.deprecated_method(symbol_versioning.one_one)
2109
def get_parents(self, revision_ids):
2110
"""See graph._StackedParentsProvider.get_parents."""
2111
parent_map = self.get_parent_map(revision_ids)
2112
return [parent_map.get(r, None) for r in revision_ids]
2297
2114
def _make_parents_provider(self):
2298
2115
return graph.CachingParentsProvider(self)
2300
2117
def _refresh_data(self):
2301
if not self.is_locked():
2303
self._pack_collection.reload_pack_names()
2118
if self._write_lock_count == 1 or (
2119
self.control_files._lock_count == 1 and
2120
self.control_files._lock_mode == 'r'):
2121
# forget what names there are
2122
self._pack_collection.reset()
2123
# XXX: Better to do an in-memory merge when acquiring a new lock -
2124
# factor out code from _save_pack_names.
2125
self._pack_collection.ensure_loaded()
2305
2127
def _start_write_group(self):
2306
2128
self._pack_collection._start_write_group()
2308
2130
def _commit_write_group(self):
2309
hint = self._pack_collection._commit_write_group()
2310
self.revisions._index._key_dependencies.clear()
2131
return self._pack_collection._commit_write_group()
2313
2133
def suspend_write_group(self):
2314
2134
# XXX check self._write_group is self.get_transaction()?
2315
2135
tokens = self._pack_collection._suspend_write_group()
2316
self.revisions._index._key_dependencies.clear()
2317
2136
self._write_group = None
2320
2139
def _resume_write_group(self, tokens):
2321
2140
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)
2141
self._pack_collection._resume_write_group(tokens)
2330
2143
def get_transaction(self):
2331
2144
if self._write_lock_count:
2340
2153
return self._write_lock_count
2342
2155
def lock_write(self, token=None):
2343
locked = self.is_locked()
2344
if not self._write_lock_count and locked:
2156
if not self._write_lock_count and self.is_locked():
2345
2157
raise errors.ReadOnlyError(self)
2346
2158
self._write_lock_count += 1
2347
2159
if self._write_lock_count == 1:
2348
2160
self._transaction = transactions.WriteTransaction()
2350
if 'relock' in debug.debug_flags and self._prev_lock == 'w':
2351
note('%r was write locked again', self)
2352
self._prev_lock = 'w'
2353
2161
for repo in self._fallback_repositories:
2354
2162
# Writes don't affect fallback repos
2355
2163
repo.lock_read()
2356
self._refresh_data()
2164
self._refresh_data()
2358
2166
def lock_read(self):
2359
locked = self.is_locked()
2360
2167
if self._write_lock_count:
2361
2168
self._write_lock_count += 1
2363
2170
self.control_files.lock_read()
2365
if 'relock' in debug.debug_flags and self._prev_lock == 'r':
2366
note('%r was read locked again', self)
2367
self._prev_lock = 'r'
2368
2171
for repo in self._fallback_repositories:
2172
# Writes don't affect fallback repos
2369
2173
repo.lock_read()
2370
self._refresh_data()
2174
self._refresh_data()
2372
2176
def leave_lock_in_place(self):
2373
2177
# not supported - raise an error
2413
2212
transaction = self._transaction
2414
2213
self._transaction = None
2415
2214
transaction.finish()
2215
for repo in self._fallback_repositories:
2417
2218
self.control_files.unlock()
2419
if not self.is_locked():
2420
2219
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
2223
class RepositoryFormatPack(MetaDirRepositoryFormat):
2498
2224
"""Format logic for pack structured repositories.
2877
2631
return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"
2634
class RepositoryFormatPackDevelopment2(RepositoryFormatPack):
2635
"""A no-subtrees development repository.
2637
This format should be retained until the second release after bzr 1.7.
2639
This is pack-1.6.1 with B+Tree indices.
2642
repository_class = KnitPackRepository
2643
_commit_builder_class = PackCommitBuilder
2644
supports_external_lookups = True
2645
# What index classes to use
2646
index_builder_class = BTreeBuilder
2647
index_class = BTreeGraphIndex
2650
def _serializer(self):
2651
return xml5.serializer_v5
2653
def _get_matching_bzrdir(self):
2654
return bzrdir.format_registry.make_bzrdir('development2')
2656
def _ignore_setting_bzrdir(self, format):
2659
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2661
def get_format_string(self):
2662
"""See RepositoryFormat.get_format_string()."""
2663
return "Bazaar development format 2 (needs bzr.dev from before 1.8)\n"
2665
def get_format_description(self):
2666
"""See RepositoryFormat.get_format_description()."""
2667
return ("Development repository format, currently the same as "
2668
"1.6.1 with B+Trees.\n")
2670
def check_conversion_target(self, target_format):
2880
2674
class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):
2881
2675
"""A subtrees development repository.
2883
2677
This format should be retained until the second release after bzr 1.7.
2885
2679
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
2891
2682
repository_class = KnitPackRepository
2892
2683
_commit_builder_class = PackRootCommitBuilder
2893
2684
rich_root_data = True
2895
2685
supports_tree_reference = True
2896
2686
supports_external_lookups = True
2897
2687
# What index classes to use
2905
2695
def _get_matching_bzrdir(self):
2906
2696
return bzrdir.format_registry.make_bzrdir(
2907
'development-subtree')
2697
'development2-subtree')
2909
2699
def _ignore_setting_bzrdir(self, format):
2912
2702
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2704
def check_conversion_target(self, target_format):
2705
if not target_format.rich_root_data:
2706
raise errors.BadConversionTarget(
2707
'Does not support rich root data.', target_format)
2708
if not getattr(target_format, 'supports_tree_reference', False):
2709
raise errors.BadConversionTarget(
2710
'Does not support nested trees', target_format)
2914
2712
def get_format_string(self):
2915
2713
"""See RepositoryFormat.get_format_string()."""
2916
2714
return ("Bazaar development format 2 with subtree support "