/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: Jelmer Vernooij
  • Date: 2017-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/branch_updater.py
77
77
        """
78
78
        branch_tips = []
79
79
        lost_heads = []
80
 
        ref_names = self.heads_by_ref.keys()
 
80
        ref_names = list(self.heads_by_ref)
81
81
        if self.branch is not None:
82
82
            trunk = self.select_trunk(ref_names)
83
83
            default_tip = self.heads_by_ref[trunk][0]
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