← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Aaron Bentley
  • Date: 2008-08-26 21:06:05 UTC
  • mfrom: (3650.2.2 sprout)
  • mto: (3650.5.4 push)
  • mto: This revision was merged to the branch mainline in revision 3661.
  • Revision ID: aaron@aaronbentley.com-20080826210605-9ie943xkqs2itq5e
Merge from sprout

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1205
1205
 
1206
1206
    def create_branch(self):
1207
1207
        """See BzrDir.create_branch."""
1208
 
        return self.open_branch()
 
1208
        return self._format.get_branch_format().initialize(self)
1209
1209
 
1210
1210
    def destroy_branch(self):
1211
1211
        """See BzrDir.destroy_branch."""
1853
1853
        """See BzrDirFormat.get_format_string()."""
1854
1854
        return "Bazaar-NG branch, format 5\n"
1855
1855
 
 
1856
    def get_branch_format(self):
 
1857
        from bzrlib import branch
 
1858
        return branch.BzrBranchFormat4()
 
1859
 
1856
1860
    def get_format_description(self):
1857
1861
        """See BzrDirFormat.get_format_description()."""
1858
1862
        return "All-in-one format 5"
1916
1920
        """See BzrDirFormat.get_format_description()."""
1917
1921
        return "All-in-one format 6"
1918
1922
 
 
1923
    def get_branch_format(self):
 
1924
        from bzrlib import branch
 
1925
        return branch.BzrBranchFormat4()
 
1926
 
1919
1927
    def get_converter(self, format=None):
1920
1928
        """See BzrDirFormat.get_converter()."""
1921
1929
        # there is one and only one upgrade path here.