/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/smart/bzrdir.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/smart/bzrdir.py
530
530
            rich_root, tree_ref, external_lookup = self._format_to_capabilities(
531
531
                repo._format)
532
532
            repo_name = repo._format.network_name()
533
 
            repo_bzrdir_name = repo.bzrdir._format.network_name()
 
533
            repo_bzrdir_name = repo.controldir._format.network_name()
534
534
            final_stack = repository_policy._stack_on
535
535
            final_stack_pwd = repository_policy._stack_on_pwd
536
536
            # It is returned locked, but we need to do the lock to get the lock