← 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 16:09:47 UTC
  • mto: (5582.10.69 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5688.
  • Revision ID: jelmer@samba.org-20110224160947-e7kqclxnjif28v5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1737
1737
 
1738
1738
    _lock_class = lockable_files.TransportLock
1739
1739
 
 
1740
    fixed_components = True
 
1741
 
1740
1742
    def get_format_string(self):
1741
1743
        """See BzrDirFormat.get_format_string()."""
1742
1744
        return "Bazaar-NG branch, format 0.0.4\n"
1780
1782
class BzrDirFormatAllInOne(BzrDirFormat):
1781
1783
    """Common class for formats before meta-dirs."""
1782
1784
 
 
1785
    fixed_components = True
 
1786
 
1783
1787
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
1784
1788
        create_prefix=False, force_new_repo=False, stacked_on=None,
1785
1789
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
1938
1942
 
1939
1943
    _lock_class = lockdir.LockDir
1940
1944
 
 
1945
    fixed_components = False
 
1946
 
1941
1947
    def __init__(self):
1942
1948
        self._workingtree_format = None
1943
1949
        self._branch_format = None
1957
1963
 
1958
1964
    def get_branch_format(self):
1959
1965
        if self._branch_format is None:
1960
 
            from bzrlib.branch import BranchFormat
1961
 
            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()
1962
1968
        return self._branch_format
1963
1969
 
1964
1970
    def set_branch_format(self, format):
2119
2125
 
2120
2126
    def __get_workingtree_format(self):
2121
2127
        if self._workingtree_format is None:
2122
 
            from bzrlib.workingtree import WorkingTreeFormat
2123
 
            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()
2124
2132
        return self._workingtree_format
2125
2133
 
2126
2134
    def __set_workingtree_format(self, wt_format):