/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 16:40:42 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610164042-zrxqgy2htyduvke2
Merge rename-controldir branch.

Show diffs side-by-side

added added

removed removed

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