← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
229
229
    def _make_parents_provider(self):
230
230
        return _KnitsParentsProvider(self.revisions)
231
231
 
232
 
    def _find_inconsistent_revision_parents(self):
 
232
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
233
233
        """Find revisions with different parent lists in the revision object
234
234
        and in the index graph.
235
235
 
 
236
        :param revisions_iterator: None, or an iterator of (revid,
 
237
            Revision-or-None). This iterator controls the revisions checked.
236
238
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
237
239
            parents-in-revision).
238
240
        """
239
241
        if not self.is_locked():
240
242
            raise AssertionError()
241
243
        vf = self.revisions
242
 
        for index_version in vf.keys():
243
 
            parent_map = vf.get_parent_map([index_version])
 
244
        if revisions_iterator is None:
 
245
            revisions_iterator = self._iter_revisions(None)
 
246
        for revid, revision in revisions_iterator:
 
247
            if revision is None:
 
248
                pass
 
249
            parent_map = vf.get_parent_map([(revid,)])
244
250
            parents_according_to_index = tuple(parent[-1] for parent in
245
 
                parent_map[index_version])
246
 
            revision = self.get_revision(index_version[-1])
 
251
                parent_map[(revid,)])
247
252
            parents_according_to_revision = tuple(revision.parent_ids)
248
253
            if parents_according_to_index != parents_according_to_revision:
249
 
                yield (index_version[-1], parents_according_to_index,
 
254
                yield (revid, parents_according_to_index,
250
255
                    parents_according_to_revision)
251
256
 
252
257
    def _check_for_inconsistent_revision_parents(self):
419
424
        """See RepositoryFormat.get_format_description()."""
420
425
        return "Knit repository format 1"
421
426
 
422
 
    def check_conversion_target(self, target_format):
423
 
        pass
424
 
 
425
427
 
426
428
class RepositoryFormatKnit3(RepositoryFormatKnit):
427
429
    """Bzr repository knit format 3.
455
457
 
456
458
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
457
459
 
458
 
    def check_conversion_target(self, target_format):
459
 
        if not target_format.rich_root_data:
460
 
            raise errors.BadConversionTarget(
461
 
                'Does not support rich root data.', target_format)
462
 
        if not getattr(target_format, 'supports_tree_reference', False):
463
 
            raise errors.BadConversionTarget(
464
 
                'Does not support nested trees', target_format)
465
 
 
466
460
    def get_format_string(self):
467
461
        """See RepositoryFormat.get_format_string()."""
468
462
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
504
498
 
505
499
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
506
500
 
507
 
    def check_conversion_target(self, target_format):
508
 
        if not target_format.rich_root_data:
509
 
            raise errors.BadConversionTarget(
510
 
                'Does not support rich root data.', target_format)
511
 
 
512
501
    def get_format_string(self):
513
502
        """See RepositoryFormat.get_format_string()."""
514
503
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'