← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Andrew Bennetts
  • Date: 2007-11-30 06:06:32 UTC
  • mto: This revision was merged to the branch mainline in revision 3057.
  • Revision ID: andrew.bennetts@canonical.com-20071130060632-jh8ii23pcpnzqq5p
Add NEWS entry.

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 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Reconfigure a controldir 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
 
 
23
 
from __future__ import absolute_import
24
 
 
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Reconfigure a bzrdir into a new tree/branch/repository layout"""
25
18
 
26
19
from bzrlib import (
27
20
    branch,
28
 
    controldir,
29
21
    errors,
30
 
    trace,
31
 
    ui,
32
 
    urlutils,
33
22
    )
34
 
from bzrlib.i18n import gettext
35
 
 
36
 
# TODO: common base class for all reconfigure operations, making no
37
 
# assumptions about what kind of change will be done.
38
 
 
39
 
 
40
 
class ReconfigureStackedOn(object):
41
 
    """Reconfigures a branch to be stacked on another branch."""
42
 
 
43
 
    def apply(self, bzrdir, stacked_on_url):
44
 
        branch = bzrdir.open_branch()
45
 
        # it may be a path relative to the cwd or a url; the branch wants
46
 
        # a path relative to itself...
47
 
        on_url = urlutils.relative_url(branch.base,
48
 
            urlutils.normalize_url(stacked_on_url))
49
 
        branch.lock_write()
50
 
        try:
51
 
            branch.set_stacked_on_url(on_url)
52
 
            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()))
56
 
        finally:
57
 
            branch.unlock()
58
 
 
59
 
 
60
 
class ReconfigureUnstacked(object):
61
 
 
62
 
    def apply(self, bzrdir):
63
 
        branch = bzrdir.open_branch()
64
 
        branch.lock_write()
65
 
        try:
66
 
            branch.set_stacked_on_url(None)
67
 
            if not trace.is_quiet():
68
 
                ui.ui_factory.note(gettext(
69
 
                    "%s is now not stacked\n")
70
 
                    % (branch.base,))
71
 
        finally:
72
 
            branch.unlock()
73
 
 
74
23
 
75
24
class Reconfigure(object):
76
25
 
77
26
    def __init__(self, bzrdir, new_bound_location=None):
78
27
        self.bzrdir = bzrdir
79
28
        self.new_bound_location = new_bound_location
80
 
        self.local_repository = None
81
29
        try:
82
30
            self.repository = self.bzrdir.find_repository()
83
31
        except errors.NoRepositoryPresent:
84
32
            self.repository = None
85
 
            self.local_repository = None
86
 
        else:
87
 
            if (self.repository.user_url == self.bzrdir.user_url):
88
 
                self.local_repository = self.repository
89
 
            else:
90
 
                self.local_repository = None
91
33
        try:
92
34
            branch = self.bzrdir.open_branch()
93
 
            if branch.user_url == bzrdir.user_url:
 
35
            if branch.bzrdir.root_transport.base == bzrdir.root_transport.base:
94
36
                self.local_branch = branch
95
37
                self.referenced_branch = None
96
38
            else:
113
55
        self._create_tree = False
114
56
        self._create_repository = False
115
57
        self._destroy_repository = False
116
 
        self._repository_trees = None
117
58
 
118
59
    @staticmethod
119
60
    def to_branch(bzrdir):
121
62
 
122
63
        :param bzrdir: The bzrdir to reconfigure
123
64
        :raise errors.AlreadyBranch: if bzrdir is already a branch
 
65
        :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
 
66
            a branch or branch reference
124
67
        """
125
68
        reconfiguration = Reconfigure(bzrdir)
126
69
        reconfiguration._plan_changes(want_tree=False, want_branch=True,
135
78
 
136
79
        :param bzrdir: The bzrdir to reconfigure
137
80
        :raise errors.AlreadyTree: if bzrdir is already a tree
 
81
        :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
 
82
            a branch or branch reference
138
83
        """
139
84
        reconfiguration = Reconfigure(bzrdir)
140
85
        reconfiguration._plan_changes(want_tree=True, want_branch=True,
150
95
        :param bzrdir: The bzrdir to reconfigure
151
96
        :param bound_location: The location the checkout should be bound to.
152
97
        :raise errors.AlreadyCheckout: if bzrdir is already a checkout
 
98
        :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
 
99
            a branch or branch reference
153
100
        """
154
101
        reconfiguration = Reconfigure(bzrdir, bound_location)
155
102
        reconfiguration._plan_changes(want_tree=True, want_branch=True,
166
113
        :param bound_location: The location the checkout should be bound to.
167
114
        :raise errors.AlreadyLightweightCheckout: if bzrdir is already a
168
115
            lightweight checkout
 
116
        :raise errors.ReconfigurationNotSupported: if bzrdir does not contain
 
117
            a branch or branch reference
169
118
        """
170
119
        reconfiguration = klass(bzrdir, reference_location)
171
120
        reconfiguration._plan_changes(want_tree=True, want_branch=False,
174
123
            raise errors.AlreadyLightweightCheckout(bzrdir)
175
124
        return reconfiguration
176
125
 
177
 
    @classmethod
178
 
    def to_use_shared(klass, bzrdir):
179
 
        """Convert a standalone branch into a repository branch"""
180
 
        reconfiguration = klass(bzrdir)
181
 
        reconfiguration._set_use_shared(use_shared=True)
182
 
        if not reconfiguration.changes_planned():
183
 
            raise errors.AlreadyUsingShared(bzrdir)
184
 
        return reconfiguration
185
 
 
186
 
    @classmethod
187
 
    def to_standalone(klass, bzrdir):
188
 
        """Convert a repository branch into a standalone branch"""
189
 
        reconfiguration = klass(bzrdir)
190
 
        reconfiguration._set_use_shared(use_shared=False)
191
 
        if not reconfiguration.changes_planned():
192
 
            raise errors.AlreadyStandalone(bzrdir)
193
 
        return reconfiguration
194
 
 
195
 
    @classmethod
196
 
    def set_repository_trees(klass, bzrdir, with_trees):
197
 
        """Adjust a repository's working tree presence default"""
198
 
        reconfiguration = klass(bzrdir)
199
 
        if not reconfiguration.repository.is_shared():
200
 
            raise errors.ReconfigurationNotSupported(reconfiguration.bzrdir)
201
 
        if with_trees and reconfiguration.repository.make_working_trees():
202
 
            raise errors.AlreadyWithTrees(bzrdir)
203
 
        elif (not with_trees
204
 
              and not reconfiguration.repository.make_working_trees()):
205
 
            raise errors.AlreadyWithNoTrees(bzrdir)
206
 
        else:
207
 
            reconfiguration._repository_trees = with_trees
208
 
        return reconfiguration
209
 
 
210
126
    def _plan_changes(self, want_tree, want_branch, want_bound,
211
127
                      want_reference):
212
128
        """Determine which changes are needed to assume the configuration"""
214
130
            raise errors.ReconfigurationNotSupported(self.bzrdir)
215
131
        if want_branch and want_reference:
216
132
            raise errors.ReconfigurationNotSupported(self.bzrdir)
 
133
        if (want_branch or want_reference) and (self.local_branch is None and
 
134
                                                self.referenced_branch
 
135
                                                is None):
 
136
            raise errors.ReconfigurationNotSupported(self.bzrdir)
217
137
        if self.repository is None:
218
138
            if not want_reference:
219
139
                self._create_repository = True
220
140
        else:
221
 
            if want_reference and (
222
 
                self.repository.user_url == self.bzrdir.user_url):
223
 
                if not self.repository.is_shared():
224
 
                    self._destroy_repository = True
 
141
            if want_reference and (self.repository.bzrdir.root_transport.base
 
142
                                   == self.bzrdir.root_transport.base):
 
143
                self._destroy_repository = True
225
144
        if self.referenced_branch is None:
226
145
            if want_reference:
227
146
                self._create_reference = True
228
 
                if self.local_branch is not None:
229
 
                    self._destroy_branch = True
230
147
        else:
231
148
            if not want_reference:
232
149
                self._destroy_reference = True
247
164
        if want_tree and self.tree is None:
248
165
            self._create_tree = True
249
166
 
250
 
    def _set_use_shared(self, use_shared=None):
251
 
        if use_shared is None:
252
 
            return
253
 
        if use_shared:
254
 
            if self.local_repository is not None:
255
 
                self._destroy_repository = True
256
 
        else:
257
 
            if self.local_repository is None:
258
 
                self._create_repository = True
259
 
 
260
167
    def changes_planned(self):
261
168
        """Return True if changes are planned, False otherwise"""
262
169
        return (self._unbind or self._bind or self._destroy_tree
263
170
                or self._create_tree or self._destroy_reference
264
 
                or self._create_branch or self._create_repository
265
 
                or self._create_reference or self._destroy_repository)
 
171
                or self._create_branch or self._create_repository)
266
172
 
267
173
    def _check(self):
268
174
        """Raise if reconfiguration would destroy local changes"""
269
 
        if self._destroy_tree and self.tree.has_changes():
 
175
        if self._destroy_tree:
 
176
            changes = self.tree.changes_from(self.tree.basis_tree())
 
177
            if changes.has_changed():
270
178
                raise errors.UncommittedChanges(self.tree)
271
 
        if self._create_reference and self.local_branch is not None:
272
 
            reference_branch = branch.Branch.open(self._select_bind_location())
273
 
            if (reference_branch.last_revision() !=
274
 
                self.local_branch.last_revision()):
275
 
                raise errors.UnsyncedBranches(self.bzrdir, reference_branch)
276
179
 
277
180
    def _select_bind_location(self):
278
181
        """Select a location to bind or create a reference to.
317
220
        if not force:
318
221
            self._check()
319
222
        if self._create_repository:
320
 
            if self.local_branch and not self._destroy_branch:
321
 
                old_repo = self.local_branch.repository
322
 
            elif self._create_branch and self.referenced_branch is not None:
323
 
                old_repo = self.referenced_branch.repository
324
 
            else:
325
 
                old_repo = None
326
 
            if old_repo is not None:
327
 
                repository_format = old_repo._format
328
 
            else:
329
 
                repository_format = None
330
 
            if repository_format is not None:
331
 
                repo = repository_format.initialize(self.bzrdir)
332
 
            else:
333
 
                repo = self.bzrdir.create_repository()
334
 
            if self.local_branch and not self._destroy_branch:
335
 
                repo.fetch(self.local_branch.repository,
336
 
                           self.local_branch.last_revision())
 
223
            repo = self.bzrdir.create_repository()
337
224
        else:
338
225
            repo = self.repository
339
 
        if self._create_branch and self.referenced_branch is not None:
 
226
        if self._create_branch:
340
227
            repo.fetch(self.referenced_branch.repository,
341
228
                       self.referenced_branch.last_revision())
342
 
        if self._create_reference:
343
 
            reference_branch = branch.Branch.open(self._select_bind_location())
344
 
        if self._destroy_repository:
345
 
            if self._create_reference:
346
 
                reference_branch.repository.fetch(self.repository)
347
 
            elif self.local_branch is not None and not self._destroy_branch:
348
 
                up = self.local_branch.user_transport.clone('..')
349
 
                up_bzrdir = controldir.ControlDir.open_containing_from_transport(
350
 
                    up)[0]
351
 
                new_repo = up_bzrdir.find_repository()
352
 
                new_repo.fetch(self.repository)
353
 
        last_revision_info = None
354
229
        if self._destroy_reference:
355
 
            last_revision_info = self.referenced_branch.last_revision_info()
 
230
            reference_info = self.referenced_branch.last_revision_info()
356
231
            self.bzrdir.destroy_branch()
357
232
        if self._destroy_branch:
358
 
            last_revision_info = self.local_branch.last_revision_info()
359
 
            if self._create_reference:
360
 
                self.local_branch.tags.merge_to(reference_branch.tags)
 
233
            reference_info = self.local_branch.last_revision_info()
361
234
            self.bzrdir.destroy_branch()
362
235
        if self._create_branch:
363
236
            local_branch = self.bzrdir.create_branch()
364
 
            if last_revision_info is not None:
365
 
                local_branch.set_last_revision_info(*last_revision_info)
366
 
            if self._destroy_reference:
367
 
                self.referenced_branch.tags.merge_to(local_branch.tags)
368
 
                self.referenced_branch.update_references(local_branch)
 
237
            local_branch.set_last_revision_info(*reference_info)
369
238
        else:
370
239
            local_branch = self.local_branch
371
240
        if self._create_reference:
372
 
            self.bzrdir.set_branch_reference(reference_branch)
 
241
            reference_branch = branch.Branch.open(self._select_bind_location())
 
242
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
 
243
                reference_branch)
373
244
        if self._destroy_tree:
374
245
            self.bzrdir.destroy_workingtree()
375
246
        if self._create_tree:
380
251
            bind_location = self._select_bind_location()
381
252
            local_branch.bind(branch.Branch.open(bind_location))
382
253
        if self._destroy_repository:
 
254
            if self._create_reference:
 
255
                reference_branch.repository.fetch(self.repository)
383
256
            self.bzrdir.destroy_repository()
384
 
        if self._repository_trees is not None:
385
 
            repo.set_make_working_trees(self._repository_trees)