← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-17 22:43:26 UTC
  • mfrom: (4617.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090817224326-uhljmr5me5x3xyda
(robertc) Multiple 2a-as-default fixes. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
130
130
 
131
131
    def check_conversion_target(self, target_format):
132
132
        target_repo_format = target_format.repository_format
133
 
        self.open_repository()._format.check_conversion_target(target_repo_format)
 
133
        source_repo_format = self._format.repository_format
 
134
        source_repo_format.check_conversion_target(target_repo_format)
134
135
 
135
136
    @staticmethod
136
137
    def _check_supported(format, allow_unsupported,
3864
3865
# The following format should be an alias for the rich root equivalent 
3865
3866
# of the default format
3866
3867
format_registry.register_metadir('default-rich-root',
3867
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
3868
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
3869
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3868
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
 
3869
    help='Default format, rich root variant. (needed for bzr-svn and bzr-git).',
 
3870
    branch_format='bzrlib.branch.BzrBranchFormat6',
 
3871
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3870
3872
    alias=True,
3871
 
    help='Same as 2a.')
3872
 
 
 
3873
    )
3873
3874
# The current format that is made on 'bzr init'.
3874
 
format_registry.set_default('2a')
 
3875
format_registry.set_default('pack-0.92')