← 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-24 18:38:20 UTC
  • mfrom: (5685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5687.
  • Revision ID: jelmer@samba.org-20110224183820-3nq2ka84ro042iu2
Merge bzr.dev.

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
1751
1737
 
1752
1738
    _lock_class = lockable_files.TransportLock
1753
1739
 
 
1740
    fixed_components = True
 
1741
 
1754
1742
    def get_format_string(self):
1755
1743
        """See BzrDirFormat.get_format_string()."""
1756
1744
        return "Bazaar-NG branch, format 0.0.4\n"
1794
1782
class BzrDirFormatAllInOne(BzrDirFormat):
1795
1783
    """Common class for formats before meta-dirs."""
1796
1784
 
 
1785
    fixed_components = True
 
1786
 
1797
1787
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
1798
1788
        create_prefix=False, force_new_repo=False, stacked_on=None,
1799
1789
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
1952
1942
 
1953
1943
    _lock_class = lockdir.LockDir
1954
1944
 
 
1945
    fixed_components = False
 
1946
 
1955
1947
    def __init__(self):
1956
1948
        self._workingtree_format = None
1957
1949
        self._branch_format = None
1971
1963
 
1972
1964
    def get_branch_format(self):
1973
1965
        if self._branch_format is None:
1974
 
            from bzrlib.branch import BranchFormat
1975
 
            self._branch_format = BranchFormat.get_default_format()
 
1966
            from bzrlib.branch import format_registry as branch_format_registry
 
1967
            self._branch_format = branch_format_registry.get_default()
1976
1968
        return self._branch_format
1977
1969
 
1978
1970
    def set_branch_format(self, format):
2133
2125
 
2134
2126
    def __get_workingtree_format(self):
2135
2127
        if self._workingtree_format is None:
2136
 
            from bzrlib.workingtree import WorkingTreeFormat
2137
 
            self._workingtree_format = WorkingTreeFormat.get_default_format()
 
2128
            from bzrlib.workingtree import (
 
2129
                format_registry as wt_format_registry,
 
2130
                )
 
2131
            self._workingtree_format = wt_format_registry.get_default()
2138
2132
        return self._workingtree_format
2139
2133
 
2140
2134
    def __set_workingtree_format(self, wt_format):