37
39
from bzrlib.decorators import needs_read_lock, needs_write_lock
38
40
from bzrlib.repository import (
41
MetaDirRepositoryFormat,
45
from bzrlib.trace import mutter, mutter_callsite
43
RepositoryFormatMetaDir,
45
from bzrlib.vf_repository import (
46
InterSameDataRepository,
47
MetaDirVersionedFileRepository,
48
MetaDirVersionedFileRepositoryFormat,
49
VersionedFileCommitBuilder,
50
VersionedFileRootCommitBuilder,
52
from bzrlib import symbol_versioning
48
55
class _KnitParentsProvider(object):
115
122
def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,
117
MetaDirRepository.__init__(self, _format, a_bzrdir, control_files)
124
super(KnitRepository, self).__init__(_format, a_bzrdir, control_files)
118
125
self._commit_builder_class = _commit_builder_class
119
126
self._serializer = _serializer
120
127
self._reconcile_fixes_text_parents = True
176
183
result.get_parent_map([('A',)])
179
def fileid_involved_between_revs(self, from_revid, to_revid):
180
"""Find file_id(s) which are involved in the changes between revisions.
182
This determines the set of revisions which are involved, and then
183
finds all file ids affected by those revisions.
185
vf = self._get_revision_vf()
186
from_set = set(vf.get_ancestry(from_revid))
187
to_set = set(vf.get_ancestry(to_revid))
188
changed = to_set.difference(from_set)
189
return self._fileid_involved_by_set(changed)
191
def fileid_involved(self, last_revid=None):
192
"""Find all file_ids modified in the ancestry of last_revid.
194
:param last_revid: If None, last_revision() will be used.
197
changed = set(self.all_revision_ids())
199
changed = set(self.get_ancestry(last_revid))
202
return self._fileid_involved_by_set(changed)
205
187
def get_revision(self, revision_id):
206
188
"""Return the Revision object for a named revision"""
229
213
def _make_parents_provider(self):
230
214
return _KnitsParentsProvider(self.revisions)
232
def _find_inconsistent_revision_parents(self, revisions_iterator=None):
233
"""Find revisions with different parent lists in the revision object
234
and in the index graph.
236
:param revisions_iterator: None, or an iterator of (revid,
237
Revision-or-None). This iterator controls the revisions checked.
238
:returns: an iterator yielding tuples of (revison-id, parents-in-index,
239
parents-in-revision).
241
if not self.is_locked():
242
raise AssertionError()
244
if revisions_iterator is None:
245
revisions_iterator = self._iter_revisions(None)
246
for revid, revision in revisions_iterator:
249
parent_map = vf.get_parent_map([(revid,)])
250
parents_according_to_index = tuple(parent[-1] for parent in
251
parent_map[(revid,)])
252
parents_according_to_revision = tuple(revision.parent_ids)
253
if parents_according_to_index != parents_according_to_revision:
254
yield (revid, parents_according_to_index,
255
parents_according_to_revision)
257
def _check_for_inconsistent_revision_parents(self):
258
inconsistencies = list(self._find_inconsistent_revision_parents())
260
raise errors.BzrCheckError(
261
"Revision knit has inconsistent parents.")
263
def revision_graph_can_have_wrong_parents(self):
264
# The revision.kndx could potentially claim a revision has a different
265
# parent to the revision text.
269
class RepositoryFormatKnit(MetaDirRepositoryFormat):
217
class RepositoryFormatKnit(MetaDirVersionedFileRepositoryFormat):
270
218
"""Bzr repository knit format (generalized).
272
220
This repository format has:
499
455
_matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
501
def get_format_string(self):
458
def get_format_string(cls):
502
459
"""See RepositoryFormat.get_format_string()."""
503
460
return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'
505
462
def get_format_description(self):
506
463
"""See RepositoryFormat.get_format_description()."""
507
464
return "Knit repository format 4"
467
class InterKnitRepo(InterSameDataRepository):
468
"""Optimised code paths between Knit based repositories."""
471
def _get_repo_format_to_test(self):
472
return RepositoryFormatKnit1()
475
def is_compatible(source, target):
476
"""Be compatible with known Knit formats.
478
We don't test for the stores being of specific types because that
479
could lead to confusing results, and there is no need to be
483
are_knits = (isinstance(source._format, RepositoryFormatKnit) and
484
isinstance(target._format, RepositoryFormatKnit))
485
except AttributeError:
487
return are_knits and InterRepository._same_model(source, target)
490
def search_missing_revision_ids(self,
491
revision_id=symbol_versioning.DEPRECATED_PARAMETER,
492
find_ghosts=True, revision_ids=None, if_present_ids=None,
494
"""See InterRepository.search_missing_revision_ids()."""
495
if symbol_versioning.deprecated_passed(revision_id):
496
symbol_versioning.warn(
497
'search_missing_revision_ids(revision_id=...) was '
498
'deprecated in 2.4. Use revision_ids=[...] instead.',
499
DeprecationWarning, stacklevel=2)
500
if revision_ids is not None:
501
raise AssertionError(
502
'revision_ids is mutually exclusive with revision_id')
503
if revision_id is not None:
504
revision_ids = [revision_id]
506
source_ids_set = self._present_source_revisions_for(
507
revision_ids, if_present_ids)
508
# source_ids is the worst possible case we may need to pull.
509
# now we want to filter source_ids against what we actually
510
# have in target, but don't try to check for existence where we know
511
# we do not have a revision as that would be pointless.
512
target_ids = set(self.target.all_revision_ids())
513
possibly_present_revisions = target_ids.intersection(source_ids_set)
514
actually_present_revisions = set(
515
self.target._eliminate_revisions_not_present(possibly_present_revisions))
516
required_revisions = source_ids_set.difference(actually_present_revisions)
517
if revision_ids is not None:
518
# we used get_ancestry to determine source_ids then we are assured all
519
# revisions referenced are present as they are installed in topological order.
520
# and the tip revision was validated by get_ancestry.
521
result_set = required_revisions
523
# if we just grabbed the possibly available ids, then
524
# we only have an estimate of whats available and need to validate
525
# that against the revision records.
527
self.source._eliminate_revisions_not_present(required_revisions))
528
if limit is not None:
529
topo_ordered = self.source.get_graph().iter_topo_order(result_set)
530
result_set = set(itertools.islice(topo_ordered, limit))
531
return self.source.revision_ids_to_search_result(result_set)
534
InterRepository.register_optimiser(InterKnitRepo)
added
removed
bzrlib/repofmt/knitrepo.py
