← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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