← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1114
1114
            return False
1115
1115
        return True
1116
1116
 
1117
 
    def needs_format_conversion(self, format=None):
 
1117
    def needs_format_conversion(self, format):
1118
1118
        """See BzrDir.needs_format_conversion()."""
1119
 
        if format is None:
1120
 
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1121
 
                % 'needs_format_conversion(format=None)')
1122
 
        if format is None:
1123
 
            format = BzrDirFormat.get_default_format()
1124
1119
        if not isinstance(self._format, format.__class__):
1125
1120
            # it is not a meta dir format, conversion is needed.
1126
1121
            return True