← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-19 17:37:45 UTC
  • mto: This revision was merged to the branch mainline in revision 5672.
  • Revision ID: jelmer@samba.org-20110219173745-q05eth8vohf7g4k6
Remove all methods and arguments that were deprecated before bzr 2.0.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1131
1131
            return self.transport
1132
1132
        raise errors.IncompatibleFormat(workingtree_format, self._format)
1133
1133
 
1134
 
    def needs_format_conversion(self, format=None):
 
1134
    def needs_format_conversion(self, format):
1135
1135
        """See BzrDir.needs_format_conversion()."""
1136
 
        # if the format is not the same as the system default,
1137
 
        # an upgrade is needed.
1138
 
        if format is None:
1139
 
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1140
 
                % 'needs_format_conversion(format=None)')
1141
 
            format = BzrDirFormat.get_default_format()
1142
1136
        return not isinstance(self._format, format.__class__)
1143
1137
 
1144
1138
    def open_branch(self, name=None, unsupported=False,
1195
1189
        """See BzrDir.create_repository."""
1196
1190
        return self._format.repository_format.initialize(self, shared)
1197
1191
 
1198
 
    def needs_format_conversion(self, format=None):
 
1192
    def needs_format_conversion(self, format):
1199
1193
        """Format 4 dirs are always in need of conversion."""
1200
 
        if format is None:
1201
 
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1202
 
                % 'needs_format_conversion(format=None)')
1203
1194
        return True
1204
1195
 
1205
1196
    def open_repository(self):
1392
1383
            return False
1393
1384
        return True
1394
1385
 
1395
 
    def needs_format_conversion(self, format=None):
 
1386
    def needs_format_conversion(self, format):
1396
1387
        """See BzrDir.needs_format_conversion()."""
1397
 
        if format is None:
1398
 
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
1399
 
                % 'needs_format_conversion(format=None)')
1400
 
        if format is None:
1401
 
            format = BzrDirFormat.get_default_format()
1402
1388
        if not isinstance(self._format, format.__class__):
1403
1389
            # it is not a meta dir format, conversion is needed.
1404
1390
            return True