/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/plugins/fastimport/helpers.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-07 18:37:11 UTC
  • mfrom: (6667.2.1 trunk)
  • Revision ID: breezy.the.bot@gmail.com-20170607183711-oz0x9xqqh9x8jgas
Use ControlDir rather than BzrDir, remove unused imports.

Merged from https://code.launchpad.net/~jelmer/brz/small-fixes/+merge/325196

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/helpers.py
81
81
    :return: BzrDir for the destination
82
82
    """
83
83
    import os
84
 
    from ... import bzrdir, errors, trace, transport
 
84
    from ... import controldir, errors, trace, transport
85
85
    try:
86
 
        control, relpath = bzrdir.BzrDir.open_containing(location)
 
86
        control, relpath = controldir.ControlDir.open_containing(location)
87
87
        # XXX: Check the relpath is None here?
88
88
        return control
89
89
    except errors.NotBranchError: