← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-15 11:26:00 UTC
  • mfrom: (5757.7.7 knitpackrepo-6)
  • mto: This revision was merged to the branch mainline in revision 5801.
  • Revision ID: jelmer@samba.org-20110415112600-vrv2431lh3gi6wx2
Merge knitpackrepo-6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
2765
2765
                except UnicodeDecodeError:
2766
2766
                    raise errors.NonAsciiRevisionId(method, self)
2767
2767
 
2768
 
    def revision_graph_can_have_wrong_parents(self):
2769
 
        """Is it possible for this repository to have a revision graph with
2770
 
        incorrect parents?
 
2768
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
2769
        """Find revisions with different parent lists in the revision object
 
2770
        and in the index graph.
2771
2771
 
2772
 
        If True, then this repository must also implement
2773
 
        _find_inconsistent_revision_parents so that check and reconcile can
2774
 
        check for inconsistencies before proceeding with other checks that may
2775
 
        depend on the revision index being consistent.
 
2772
        :param revisions_iterator: None, or an iterator of (revid,
 
2773
            Revision-or-None). This iterator controls the revisions checked.
 
2774
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
 
2775
            parents-in-revision).
2776
2776
        """
2777
 
        raise NotImplementedError(self.revision_graph_can_have_wrong_parents)
 
2777
        if not self.is_locked():
 
2778
            raise AssertionError()
 
2779
        vf = self.revisions
 
2780
        if revisions_iterator is None:
 
2781
            revisions_iterator = self._iter_revisions(None)
 
2782
        for revid, revision in revisions_iterator:
 
2783
            if revision is None:
 
2784
                pass
 
2785
            parent_map = vf.get_parent_map([(revid,)])
 
2786
            parents_according_to_index = tuple(parent[-1] for parent in
 
2787
                parent_map[(revid,)])
 
2788
            parents_according_to_revision = tuple(revision.parent_ids)
 
2789
            if parents_according_to_index != parents_according_to_revision:
 
2790
                yield (revid, parents_according_to_index,
 
2791
                    parents_according_to_revision)
 
2792
 
 
2793
    def _check_for_inconsistent_revision_parents(self):
 
2794
        inconsistencies = list(self._find_inconsistent_revision_parents())
 
2795
        if inconsistencies:
 
2796
            raise errors.BzrCheckError(
 
2797
                "Revision knit has inconsistent parents.")
2778
2798
 
2779
2799
 
2780
2800
def install_revision(repository, rev, revision_tree):
3019
3039
    supports_full_versioned_files = None
3020
3040
    # Does this format support signing revision signatures?
3021
3041
    supports_revision_signatures = True
 
3042
    # Can the revision graph have incorrect parents?
 
3043
    revision_graph_can_have_wrong_parents = None
3022
3044
 
3023
3045
    def __repr__(self):
3024
3046
        return "%s()" % self.__class__.__name__