← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:34:03 UTC
  • mfrom: (6191.2.1 843900-url-nameerror)
  • Revision ID: pqm@pqm.ubuntu.com-20111006083403-jnsw0exlirg01aed
(mbp) error message without traceback on invalid ubuntu/debian url (bug
 843900) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
17
17
"""Utility for create branches with particular contents."""
18
18
 
19
19
from bzrlib import (
20
 
    controldir,
 
20
    bzrdir,
21
21
    commit,
22
22
    errors,
23
23
    memorytree,
64
64
            If the path of the transport does not exist but its parent does
65
65
            it will be created.
66
66
        :param format: Either a BzrDirFormat, or the name of a format in the
67
 
            controldir format registry for the branch to be built.
 
67
            bzrdir format registry for the branch to be built.
68
68
        :param branch: An already constructed branch to use.  This param is
69
69
            mutually exclusive with the transport and format params.
70
70
        """
82
82
            if format is None:
83
83
                format = 'default'
84
84
            if isinstance(format, str):
85
 
                format = controldir.format_registry.make_bzrdir(format)
86
 
            self._branch = controldir.ControlDir.create_branch_convenience(
 
85
                format = bzrdir.format_registry.make_bzrdir(format)
 
86
            self._branch = bzrdir.BzrDir.create_branch_convenience(
87
87
                transport.base, format=format, force_new_tree=False)
88
88
        self._tree = None
89
89