← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/knitrepo.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-14 12:14:51 UTC
  • mfrom: (4608.1.4 408824-test-upgrade)
  • Revision ID: pqm@pqm.ubuntu.com-20090814121451-n3h9cp3c26mmpe9m
(mbp) cleanup check_conversion_target and upgrade blackbox tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/knitrepo.py
460
460
 
461
461
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
462
462
 
463
 
    def check_conversion_target(self, target_format):
464
 
        if not target_format.rich_root_data:
465
 
            raise errors.BadConversionTarget(
466
 
                'Does not support rich root data.', target_format)
467
 
        if not getattr(target_format, 'supports_tree_reference', False):
468
 
            raise errors.BadConversionTarget(
469
 
                'Does not support nested trees', target_format)
470
 
 
471
463
    def get_format_string(self):
472
464
        """See RepositoryFormat.get_format_string()."""
473
465
        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
509
501
 
510
502
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
511
503
 
512
 
    def check_conversion_target(self, target_format):
513
 
        if not target_format.rich_root_data:
514
 
            raise errors.BadConversionTarget(
515
 
                'Does not support rich root data.', target_format)
516
 
 
517
504
    def get_format_string(self):
518
505
        """See RepositoryFormat.get_format_string()."""
519
506
        return 'Bazaar Knit Repository Format 4 (bzr 1.0)\n'