← 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: 2009-04-09 20:23:07 UTC
  • mfrom: (4265.1.4 bbc-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20090409202307-n0depb16qepoe21o
(jam) Change _fetch_uses_deltas = False for CHK repos until we can
        write a better fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
1
 
# Copyright (C) 2007, 2009 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
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.
18
 
 
19
 
Various types of reconfiguration operation are available either by
20
 
constructing a class or using a factory method on Reconfigure.
21
 
"""
22
 
 
 
17
"""Reconfigure a bzrdir into a new tree/branch/repository layout"""
23
18
 
24
19
from bzrlib import (
25
20
    branch,
26
21
    bzrdir,
27
22
    errors,
28
 
    trace,
29
 
    ui,
30
 
    urlutils,
31
23
    )
32
24
 
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
 
 
73
25
class Reconfigure(object):
74
26
 
75
27
    def __init__(self, bzrdir, new_bound_location=None):
76
28
        self.bzrdir = bzrdir
77
29
        self.new_bound_location = new_bound_location
78
 
        self.local_repository = None
79
30
        try:
80
31
            self.repository = self.bzrdir.find_repository()
81
32
        except errors.NoRepositoryPresent:
82
33
            self.repository = None
83
 
            self.local_repository = None
84
34
        else:
85
35
            if (self.repository.bzrdir.root_transport.base ==
86
36
                self.bzrdir.root_transport.base):
266
216
    def _check(self):
267
217
        """Raise if reconfiguration would destroy local changes"""
268
218
        if self._destroy_tree:
269
 
            # XXX: What about pending merges ? -- vila 20090629
270
 
            if self.tree.has_changes(self.tree.basis_tree()):
 
219
            changes = self.tree.changes_from(self.tree.basis_tree())
 
220
            if changes.has_changed():
271
221
                raise errors.UncommittedChanges(self.tree)
272
222
        if self._create_reference and self.local_branch is not None:
273
223
            reference_branch = branch.Branch.open(self._select_bind_location())
318
268
        if not force:
319
269
            self._check()
320
270
        if self._create_repository:
321
 
            if self.local_branch and not self._destroy_branch:
322
 
                old_repo = self.local_branch.repository
323
 
            elif self._create_branch and self.referenced_branch is not None:
324
 
                old_repo = self.referenced_branch.repository
325
 
            else:
326
 
                old_repo = None
327
 
            if old_repo is not None:
328
 
                repository_format = old_repo._format
329
 
            else:
330
 
                repository_format = None
331
 
            if repository_format is not None:
332
 
                repo = repository_format.initialize(self.bzrdir)
333
 
            else:
334
 
                repo = self.bzrdir.create_repository()
 
271
            repo = self.bzrdir.create_repository()
335
272
            if self.local_branch and not self._destroy_branch:
336
273
                repo.fetch(self.local_branch.repository,
337
274
                           self.local_branch.last_revision())
365
302
                local_branch.set_last_revision_info(*last_revision_info)
366
303
            if self._destroy_reference:
367
304
                self.referenced_branch.tags.merge_to(local_branch.tags)
368
 
                self.referenced_branch.update_references(local_branch)
369
305
        else:
370
306
            local_branch = self.local_branch
371
307
        if self._create_reference: