← 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 Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
42
42
class KnitRepository(MetaDirRepository):
43
43
    """Knit format repository."""
44
44
 
45
 
 
46
45
    _serializer = xml5.serializer_v5
47
46
 
48
47
    def _warn_if_deprecated(self):
408
407
 
409
408
    repository_class = KnitRepository3
410
409
    rich_root_data = True
411
 
    support_tree_reference = True
 
410
    supports_tree_reference = True
412
411
 
413
412
    def _get_matching_bzrdir(self):
414
413
        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
422
421
        if not target_format.rich_root_data:
423
422
            raise errors.BadConversionTarget(
424
423
                'Does not support rich root data.', target_format)
425
 
        if not getattr(target_format, 'support_tree_reference', False):
 
424
        if not getattr(target_format, 'supports_tree_reference', False):
426
425
            raise errors.BadConversionTarget(
427
426
                'Does not support nested trees', target_format)
428
427