← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-27 11:48:50 UTC
  • mto: This revision was merged to the branch mainline in revision 6173.
  • Revision ID: v.ladeuil+lp@free.fr-20110927114850-338r2mns0138klv0
https://launchpad.net/bugs/860424
Global options respect their hidden attribute

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Reconfigure a controldir into a new tree/branch/repository layout.
 
17
"""Reconfigure a bzrdir into a new tree/branch/repository layout.
18
18
 
19
19
Various types of reconfiguration operation are available either by
20
20
constructing a class or using a factory method on Reconfigure.
23
23
 
24
24
from bzrlib import (
25
25
    branch,
26
 
    controldir,
 
26
    bzrdir,
27
27
    errors,
28
28
    trace,
29
29
    ui,
344
344
                reference_branch.repository.fetch(self.repository)
345
345
            elif self.local_branch is not None and not self._destroy_branch:
346
346
                up = self.local_branch.user_transport.clone('..')
347
 
                up_bzrdir = controldir.ControlDir.open_containing_from_transport(
348
 
                    up)[0]
 
347
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
349
348
                new_repo = up_bzrdir.find_repository()
350
349
                new_repo.fetch(self.repository)
351
350
        last_revision_info = None