← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/pack_repo.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/pack_repo.py
2563
2563
 
2564
2564
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2565
2565
 
2566
 
    def check_conversion_target(self, target_format):
2567
 
        if not target_format.rich_root_data:
2568
 
            raise errors.BadConversionTarget(
2569
 
                'Does not support rich root data.', target_format)
2570
 
        if not getattr(target_format, 'supports_tree_reference', False):
2571
 
            raise errors.BadConversionTarget(
2572
 
                'Does not support nested trees', target_format)
2573
 
 
2574
2566
    def get_format_string(self):
2575
2567
        """See RepositoryFormat.get_format_string()."""
2576
2568
        return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"
2609
2601
 
2610
2602
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2611
2603
 
2612
 
    def check_conversion_target(self, target_format):
2613
 
        if not target_format.rich_root_data:
2614
 
            raise errors.BadConversionTarget(
2615
 
                'Does not support rich root data.', target_format)
2616
 
 
2617
2604
    def get_format_string(self):
2618
2605
        """See RepositoryFormat.get_format_string()."""
2619
2606
        return ("Bazaar pack repository format 1 with rich root"
2695
2682
 
2696
2683
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2697
2684
 
2698
 
    def check_conversion_target(self, target_format):
2699
 
        if not target_format.rich_root_data:
2700
 
            raise errors.BadConversionTarget(
2701
 
                'Does not support rich root data.', target_format)
2702
 
 
2703
2685
    def get_format_string(self):
2704
2686
        """See RepositoryFormat.get_format_string()."""
2705
2687
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"
2746
2728
 
2747
2729
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2748
2730
 
2749
 
    def check_conversion_target(self, target_format):
2750
 
        if not target_format.rich_root_data:
2751
 
            raise errors.BadConversionTarget(
2752
 
                'Does not support rich root data.', target_format)
2753
 
 
2754
2731
    def get_format_string(self):
2755
2732
        """See RepositoryFormat.get_format_string()."""
2756
2733
        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"
2826
2803
 
2827
2804
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2828
2805
 
2829
 
    def check_conversion_target(self, target_format):
2830
 
        if not target_format.rich_root_data:
2831
 
            raise errors.BadConversionTarget(
2832
 
                'Does not support rich root data.', target_format)
2833
 
 
2834
2806
    def get_format_string(self):
2835
2807
        """See RepositoryFormat.get_format_string()."""
2836
2808
        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"
2872
2844
 
2873
2845
    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
2874
2846
 
2875
 
    def check_conversion_target(self, target_format):
2876
 
        if not target_format.rich_root_data:
2877
 
            raise errors.BadConversionTarget(
2878
 
                'Does not support rich root data.', target_format)
2879
 
        if not getattr(target_format, 'supports_tree_reference', False):
2880
 
            raise errors.BadConversionTarget(
2881
 
                'Does not support nested trees', target_format)
2882
 
 
2883
2847
    def get_format_string(self):
2884
2848
        """See RepositoryFormat.get_format_string()."""
2885
2849
        return ("Bazaar development format 2 with subtree support "