← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

(jam) Handle bug #382709 by encoding paths as 'mbcs' when spawning
        external diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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,
30
30
    urlutils,
31
31
    )
32
 
from bzrlib.i18n import gettext
 
32
 
33
33
 
34
34
# TODO: common base class for all reconfigure operations, making no
35
35
# assumptions about what kind of change will be done.
48
48
        try:
49
49
            branch.set_stacked_on_url(on_url)
50
50
            if not trace.is_quiet():
51
 
                ui.ui_factory.note(gettext(
52
 
                    "{0} is now stacked on {1}\n").format(
53
 
                      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()))
54
54
        finally:
55
55
            branch.unlock()
56
56
 
63
63
        try:
64
64
            branch.set_stacked_on_url(None)
65
65
            if not trace.is_quiet():
66
 
                ui.ui_factory.note(gettext(
67
 
                    "%s is now not stacked\n")
 
66
                ui.ui_factory.note(
 
67
                    "%s is now not stacked\n"
68
68
                    % (branch.base,))
69
69
        finally:
70
70
            branch.unlock()
82
82
            self.repository = None
83
83
            self.local_repository = None
84
84
        else:
85
 
            if (self.repository.user_url == self.bzrdir.user_url):
 
85
            if (self.repository.bzrdir.root_transport.base ==
 
86
                self.bzrdir.root_transport.base):
86
87
                self.local_repository = self.repository
87
88
            else:
88
89
                self.local_repository = None
89
90
        try:
90
91
            branch = self.bzrdir.open_branch()
91
 
            if branch.user_url == bzrdir.user_url:
 
92
            if branch.bzrdir.root_transport.base == bzrdir.root_transport.base:
92
93
                self.local_branch = branch
93
94
                self.referenced_branch = None
94
95
            else:
216
217
            if not want_reference:
217
218
                self._create_repository = True
218
219
        else:
219
 
            if want_reference and (
220
 
                self.repository.user_url == self.bzrdir.user_url):
 
220
            if want_reference and (self.repository.bzrdir.root_transport.base
 
221
                                   == self.bzrdir.root_transport.base):
221
222
                if not self.repository.is_shared():
222
223
                    self._destroy_repository = True
223
224
        if self.referenced_branch is None:
264
265
 
265
266
    def _check(self):
266
267
        """Raise if reconfiguration would destroy local changes"""
267
 
        if self._destroy_tree and self.tree.has_changes():
 
268
        if self._destroy_tree:
 
269
            # XXX: What about pending merges ? -- vila 20090629
 
270
            if self.tree.has_changes(self.tree.basis_tree()):
268
271
                raise errors.UncommittedChanges(self.tree)
269
272
        if self._create_reference and self.local_branch is not None:
270
273
            reference_branch = branch.Branch.open(self._select_bind_location())
343
346
            if self._create_reference:
344
347
                reference_branch.repository.fetch(self.repository)
345
348
            elif self.local_branch is not None and not self._destroy_branch:
346
 
                up = self.local_branch.user_transport.clone('..')
347
 
                up_bzrdir = controldir.ControlDir.open_containing_from_transport(
348
 
                    up)[0]
 
349
                up = self.local_branch.bzrdir.root_transport.clone('..')
 
350
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
349
351
                new_repo = up_bzrdir.find_repository()
350
352
                new_repo.fetch(self.repository)
351
353
        last_revision_info = None
368
370
            local_branch = self.local_branch
369
371
        if self._create_reference:
370
372
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
371
 
                target_branch=reference_branch)
 
373
                reference_branch)
372
374
        if self._destroy_tree:
373
375
            self.bzrdir.destroy_workingtree()
374
376
        if self._create_tree: