/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/branch_updater.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/branch_updater.py
141
141
        to_transport = transport.get_transport(location)
142
142
        to_transport.create_prefix()
143
143
        try:
144
 
            return bzrdir.BzrDir.open(location).open_branch()
 
144
            return controldir.ControlDir.open(location).open_branch()
145
145
        except errors.NotBranchError, ex:
146
 
            return bzrdir.BzrDir.create_branch_convenience(location,
 
146
            return controldir.ControlDir.create_branch_convenience(
 
147
                location,
147
148
                format=self._branch_format,
148
149
                possible_transports=[to_transport])
149
150