← 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-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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 bzrdir into a new tree/branch/repository layout"""
 
17
"""Reconfigure a bzrdir into a new tree/branch/repository layout.
 
18
 
 
19
Various types of reconfiguration operation are available either by
 
20
constructing a class or using a factory method on Reconfigure.
 
21
"""
 
22
 
18
23
 
19
24
from bzrlib import (
20
25
    branch,
21
26
    bzrdir,
22
27
    errors,
 
28
    trace,
 
29
    ui,
 
30
    urlutils,
23
31
    )
24
32
 
 
33
 
 
34
# TODO: common base class for all reconfigure operations, making no
 
35
# assumptions about what kind of change will be done.
 
36
 
 
37
 
 
38
class ReconfigureStackedOn(object):
 
39
    """Reconfigures a branch to be stacked on another branch."""
 
40
 
 
41
    def apply(self, bzrdir, stacked_on_url):
 
42
        branch = bzrdir.open_branch()
 
43
        # it may be a path relative to the cwd or a url; the branch wants
 
44
        # a path relative to itself...
 
45
        on_url = urlutils.relative_url(branch.base,
 
46
            urlutils.normalize_url(stacked_on_url))
 
47
        branch.lock_write()
 
48
        try:
 
49
            branch.set_stacked_on_url(on_url)
 
50
            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()))
 
54
        finally:
 
55
            branch.unlock()
 
56
 
 
57
 
 
58
class ReconfigureUnstacked(object):
 
59
 
 
60
    def apply(self, bzrdir):
 
61
        branch = bzrdir.open_branch()
 
62
        branch.lock_write()
 
63
        try:
 
64
            branch.set_stacked_on_url(None)
 
65
            if not trace.is_quiet():
 
66
                ui.ui_factory.note(
 
67
                    "%s is now not stacked\n"
 
68
                    % (branch.base,))
 
69
        finally:
 
70
            branch.unlock()
 
71
 
 
72
 
25
73
class Reconfigure(object):
26
74
 
27
75
    def __init__(self, bzrdir, new_bound_location=None):
28
76
        self.bzrdir = bzrdir
29
77
        self.new_bound_location = new_bound_location
 
78
        self.local_repository = None
30
79
        try:
31
80
            self.repository = self.bzrdir.find_repository()
32
81
        except errors.NoRepositoryPresent:
33
82
            self.repository = None
34
83
            self.local_repository = None
35
84
        else:
36
 
            if (self.repository.bzrdir.root_transport.base ==
37
 
                self.bzrdir.root_transport.base):
 
85
            if (self.repository.user_url == self.bzrdir.user_url):
38
86
                self.local_repository = self.repository
39
87
            else:
40
88
                self.local_repository = None
41
89
        try:
42
90
            branch = self.bzrdir.open_branch()
43
 
            if branch.bzrdir.root_transport.base == bzrdir.root_transport.base:
 
91
            if branch.user_url == bzrdir.user_url:
44
92
                self.local_branch = branch
45
93
                self.referenced_branch = None
46
94
            else:
168
216
            if not want_reference:
169
217
                self._create_repository = True
170
218
        else:
171
 
            if want_reference and (self.repository.bzrdir.root_transport.base
172
 
                                   == self.bzrdir.root_transport.base):
 
219
            if want_reference and (
 
220
                self.repository.user_url == self.bzrdir.user_url):
173
221
                if not self.repository.is_shared():
174
222
                    self._destroy_repository = True
175
223
        if self.referenced_branch is None:
216
264
 
217
265
    def _check(self):
218
266
        """Raise if reconfiguration would destroy local changes"""
219
 
        if self._destroy_tree:
220
 
            changes = self.tree.changes_from(self.tree.basis_tree())
221
 
            if changes.has_changed():
 
267
        if self._destroy_tree and self.tree.has_changes():
222
268
                raise errors.UncommittedChanges(self.tree)
223
269
        if self._create_reference and self.local_branch is not None:
224
270
            reference_branch = branch.Branch.open(self._select_bind_location())
297
343
            if self._create_reference:
298
344
                reference_branch.repository.fetch(self.repository)
299
345
            elif self.local_branch is not None and not self._destroy_branch:
300
 
                up = self.local_branch.bzrdir.root_transport.clone('..')
 
346
                up = self.local_branch.user_transport.clone('..')
301
347
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
302
348
                new_repo = up_bzrdir.find_repository()
303
349
                new_repo.fetch(self.repository)
321
367
            local_branch = self.local_branch
322
368
        if self._create_reference:
323
369
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
324
 
                reference_branch)
 
370
                target_branch=reference_branch)
325
371
        if self._destroy_tree:
326
372
            self.bzrdir.destroy_workingtree()
327
373
        if self._create_tree: