/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/upstream_import.py

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
27
27
import zipfile
28
28
 
29
29
from . import generate_ids, urlutils
30
 
from .bzrdir import BzrDir
 
30
from .controldir import ControlDir
31
31
from .errors import (BzrError, NoSuchFile, BzrCommandError, NotBranchError)
32
32
from .osutils import (pathjoin, isdir, file_iterator, basename,
33
33
                      file_kind, splitpath)
310
310
        except NotBranchError:
311
311
            if not os.path.exists(tree_directory):
312
312
                os.mkdir(tree_directory)
313
 
            branch = BzrDir.create_branch_convenience(tree_directory)
 
313
            branch = ControlDir.create_branch_convenience(tree_directory)
314
314
            tree = branch.bzrdir.open_workingtree()
315
315
    else:
316
316
        tree = WorkingTree.open_containing('.')[0]