← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

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
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
"""Reconfigure a bzrdir into a new tree/branch/repository layout"""
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
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
 
83
            self.local_repository = None
34
84
        else:
35
 
            if (self.repository.bzrdir.root_transport.base ==
36
 
                self.bzrdir.root_transport.base):
 
85
            if (self.repository.user_url == self.bzrdir.user_url):
37
86
                self.local_repository = self.repository
38
87
            else:
39
88
                self.local_repository = None
40
89
        try:
41
90
            branch = self.bzrdir.open_branch()
42
 
            if branch.bzrdir.root_transport.base == bzrdir.root_transport.base:
 
91
            if branch.user_url == bzrdir.user_url:
43
92
                self.local_branch = branch
44
93
                self.referenced_branch = None
45
94
            else:
62
111
        self._create_tree = False
63
112
        self._create_repository = False
64
113
        self._destroy_repository = False
 
114
        self._repository_trees = None
65
115
 
66
116
    @staticmethod
67
117
    def to_branch(bzrdir):
140
190
            raise errors.AlreadyStandalone(bzrdir)
141
191
        return reconfiguration
142
192
 
 
193
    @classmethod
 
194
    def set_repository_trees(klass, bzrdir, with_trees):
 
195
        """Adjust a repository's working tree presence default"""
 
196
        reconfiguration = klass(bzrdir)
 
197
        if not reconfiguration.repository.is_shared():
 
198
            raise errors.ReconfigurationNotSupported(reconfiguration.bzrdir)
 
199
        if with_trees and reconfiguration.repository.make_working_trees():
 
200
            raise errors.AlreadyWithTrees(bzrdir)
 
201
        elif (not with_trees
 
202
              and not reconfiguration.repository.make_working_trees()):
 
203
            raise errors.AlreadyWithNoTrees(bzrdir)
 
204
        else:
 
205
            reconfiguration._repository_trees = with_trees
 
206
        return reconfiguration
 
207
 
143
208
    def _plan_changes(self, want_tree, want_branch, want_bound,
144
209
                      want_reference):
145
210
        """Determine which changes are needed to assume the configuration"""
151
216
            if not want_reference:
152
217
                self._create_repository = True
153
218
        else:
154
 
            if want_reference and (self.repository.bzrdir.root_transport.base
155
 
                                   == self.bzrdir.root_transport.base):
 
219
            if want_reference and (
 
220
                self.repository.user_url == self.bzrdir.user_url):
156
221
                if not self.repository.is_shared():
157
222
                    self._destroy_repository = True
158
223
        if self.referenced_branch is None:
199
264
 
200
265
    def _check(self):
201
266
        """Raise if reconfiguration would destroy local changes"""
202
 
        if self._destroy_tree:
203
 
            changes = self.tree.changes_from(self.tree.basis_tree())
204
 
            if changes.has_changed():
 
267
        if self._destroy_tree and self.tree.has_changes():
205
268
                raise errors.UncommittedChanges(self.tree)
206
269
        if self._create_reference and self.local_branch is not None:
207
270
            reference_branch = branch.Branch.open(self._select_bind_location())
252
315
        if not force:
253
316
            self._check()
254
317
        if self._create_repository:
255
 
            repo = self.bzrdir.create_repository()
 
318
            if self.local_branch and not self._destroy_branch:
 
319
                old_repo = self.local_branch.repository
 
320
            elif self._create_branch and self.referenced_branch is not None:
 
321
                old_repo = self.referenced_branch.repository
 
322
            else:
 
323
                old_repo = None
 
324
            if old_repo is not None:
 
325
                repository_format = old_repo._format
 
326
            else:
 
327
                repository_format = None
 
328
            if repository_format is not None:
 
329
                repo = repository_format.initialize(self.bzrdir)
 
330
            else:
 
331
                repo = self.bzrdir.create_repository()
256
332
            if self.local_branch and not self._destroy_branch:
257
333
                repo.fetch(self.local_branch.repository,
258
334
                           self.local_branch.last_revision())
267
343
            if self._create_reference:
268
344
                reference_branch.repository.fetch(self.repository)
269
345
            elif self.local_branch is not None and not self._destroy_branch:
270
 
                up = self.local_branch.bzrdir.root_transport.clone('..')
 
346
                up = self.local_branch.user_transport.clone('..')
271
347
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
272
348
                new_repo = up_bzrdir.find_repository()
273
349
                new_repo.fetch(self.repository)
286
362
                local_branch.set_last_revision_info(*last_revision_info)
287
363
            if self._destroy_reference:
288
364
                self.referenced_branch.tags.merge_to(local_branch.tags)
 
365
                self.referenced_branch.update_references(local_branch)
289
366
        else:
290
367
            local_branch = self.local_branch
291
368
        if self._create_reference:
292
369
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
293
 
                reference_branch)
 
370
                target_branch=reference_branch)
294
371
        if self._destroy_tree:
295
372
            self.bzrdir.destroy_workingtree()
296
373
        if self._create_tree:
302
379
            local_branch.bind(branch.Branch.open(bind_location))
303
380
        if self._destroy_repository:
304
381
            self.bzrdir.destroy_repository()
 
382
        if self._repository_trees is not None:
 
383
            repo.set_make_working_trees(self._repository_trees)