← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

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, revisions_iterator=None):
 
232
    def _find_inconsistent_revision_parents(self):
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.
238
236
        :returns: an iterator yielding tuples of (revison-id, parents-in-index,
239
237
            parents-in-revision).
240
238
        """
241
239
        if not self.is_locked():
242
240
            raise AssertionError()
243
241
        vf = self.revisions
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,)])
 
242
        for index_version in vf.keys():
 
243
            parent_map = vf.get_parent_map([index_version])
250
244
            parents_according_to_index = tuple(parent[-1] for parent in
251
 
                parent_map[(revid,)])
 
245
                parent_map[index_version])
 
246
            revision = self.get_revision(index_version[-1])
252
247
            parents_according_to_revision = tuple(revision.parent_ids)
253
248
            if parents_according_to_index != parents_according_to_revision:
254
 
                yield (revid, parents_according_to_index,
 
249
                yield (index_version[-1], parents_according_to_index,
255
250
                    parents_according_to_revision)
256
251
 
257
252
    def _check_for_inconsistent_revision_parents(self):
424
419
        """See RepositoryFormat.get_format_description()."""
425
420
        return "Knit repository format 1"
426
421
 
 
422
    def check_conversion_target(self, target_format):
 
423
        pass
 
424
 
427
425
 
428
426
class RepositoryFormatKnit3(RepositoryFormatKnit):
429
427
    """Bzr repository knit format 3.
457
455
 
458
456
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
459
457
 
 
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
 
460
466
    def get_format_string(self):
461
467
        """See RepositoryFormat.get_format_string()."""
462
468
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
498
504
 
499
505
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
500
506
 
 
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
 
501
512
    def get_format_string(self):
502
513
        """See RepositoryFormat.get_format_string()."""
503
514
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'