← 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: 2012-03-13 17:25:29 UTC
  • mfrom: (6499 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6501.
  • Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk

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 bzrdir into a new tree/branch/repository layout.
 
17
"""Reconfigure a controldir 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.
21
21
"""
22
22
 
 
23
from __future__ import absolute_import
 
24
 
23
25
 
24
26
from bzrlib import (
25
27
    branch,
26
 
    bzrdir,
 
28
    controldir,
27
29
    errors,
28
30
    trace,
29
31
    ui,
30
32
    urlutils,
31
33
    )
32
 
 
 
34
from bzrlib.i18n import gettext
33
35
 
34
36
# TODO: common base class for all reconfigure operations, making no
35
37
# assumptions about what kind of change will be done.
48
50
        try:
49
51
            branch.set_stacked_on_url(on_url)
50
52
            if not trace.is_quiet():
51
 
                ui.ui_factory.note(
52
 
                    "%s is now stacked on %s\n"
53
 
                    % (branch.base, branch.get_stacked_on_url()))
 
53
                ui.ui_factory.note(gettext(
 
54
                    "{0} is now stacked on {1}\n").format(
 
55
                      branch.base, branch.get_stacked_on_url()))
54
56
        finally:
55
57
            branch.unlock()
56
58
 
63
65
        try:
64
66
            branch.set_stacked_on_url(None)
65
67
            if not trace.is_quiet():
66
 
                ui.ui_factory.note(
67
 
                    "%s is now not stacked\n"
 
68
                ui.ui_factory.note(gettext(
 
69
                    "%s is now not stacked\n")
68
70
                    % (branch.base,))
69
71
        finally:
70
72
            branch.unlock()
344
346
                reference_branch.repository.fetch(self.repository)
345
347
            elif self.local_branch is not None and not self._destroy_branch:
346
348
                up = self.local_branch.user_transport.clone('..')
347
 
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
 
349
                up_bzrdir = controldir.ControlDir.open_containing_from_transport(
 
350
                    up)[0]
348
351
                new_repo = up_bzrdir.find_repository()
349
352
                new_repo.fetch(self.repository)
350
353
        last_revision_info = None
366
369
        else:
367
370
            local_branch = self.local_branch
368
371
        if self._create_reference:
369
 
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
370
 
                target_branch=reference_branch)
 
372
            self.bzrdir.set_branch_reference(reference_branch)
371
373
        if self._destroy_tree:
372
374
            self.bzrdir.destroy_workingtree()
373
375
        if self._create_tree: