/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-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/branch_updater.py
100
100
        # Policy for locating branches
101
101
        def dir_under_current(name, ref_name):
102
102
            # Using the Bazaar name, get a directory under the current one
103
 
            repo_base = self.repo.bzrdir.transport.base
 
103
            repo_base = self.repo.controldir.transport.base
104
104
            return osutils.pathjoin(repo_base, "..", name)
105
105
        def dir_sister_branch(name, ref_name):
106
106
            # Using the Bazaar name, get a sister directory to the branch