/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Ian Clatworthy
  • Date: 2007-11-21 15:10:44 UTC
  • mto: (3015.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3016.
  • Revision ID: ian.clatworthy@internode.on.net-20071121151044-pnn0r0kwttjvzlfb
incorporate review feedback including basic blackbox tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007 Canonical Ltd.
 
1
# Copyright (C) 2006, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
# Original author: David Allouche
 
18
 
17
19
from bzrlib import errors, merge
18
20
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
19
21
from bzrlib.bzrdir import BzrDir
21
23
 
22
24
 
23
25
def switch(control_dir, to_branch):
 
26
    """Switch the branch associated with a checkout.
 
27
 
 
28
    :param control_dir: BzrDir of the checkout to change
 
29
    :param to_branch: branch that the checkout is to be bound to
 
30
    """
 
31
    _check_switch_branch_format(control_dir)
 
32
    _check_pending_merges(control_dir)
24
33
    try:
25
34
        source_repository = control_dir.open_branch().repository
26
35
    except errors.NotBranchError:
27
36
        source_repository = to_branch.repository
28
 
    set_branch_location(control_dir, to_branch)
 
37
    _set_branch_location(control_dir, to_branch)
29
38
    tree = control_dir.open_workingtree()
30
 
    _update(tree, source_repository, to_branch)
31
 
 
32
 
 
33
 
def _update(tree, source_repository, to_branch):
34
 
    tree.lock_tree_write()
35
 
    try:
36
 
        if tree.last_revision() == tree.branch.last_revision():
37
 
            note("Tree is up to date.")
38
 
            return
39
 
        base_tree = source_repository.revision_tree(tree.last_revision())
40
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
41
 
        tree.set_last_revision(to_branch.last_revision())
42
 
        note('Updated to revision %d' % tree.branch.revno())
43
 
    finally:
44
 
        tree.unlock()
 
39
    _update(tree, source_repository)
45
40
 
46
41
 
47
42
def _check_switch_branch_format(control):
 
43
    """Check that the branch format supports the switch operation.
 
44
 
 
45
    Note: Only lightweight checkouts are currently supported.
 
46
    This may change in the future though.
 
47
 
 
48
    :param control: BzrDir of the branch to check
 
49
    """
48
50
    branch_format = BranchFormat.find_format(control)
49
51
    format_string = branch_format.get_format_string()
50
52
    if not format_string.startswith("Bazaar-NG Branch Reference Format "):
57
59
            'Unsupported: %r' % (format_string.strip(),))        
58
60
 
59
61
 
60
 
def set_branch_location(control, to_branch):
 
62
def _check_pending_merges(control):
 
63
    """Check that there are no outstanding pending merges before switching.
 
64
 
 
65
    :param control: BzrDir of the branch to check
 
66
    """
 
67
    try:
 
68
        tree = control.open_workingtree()
 
69
        # XXX: Should the tree be locked for get_parent_ids?
 
70
        existing_pending_merges = tree.get_parent_ids()[1:]
 
71
    except errors.NotBranchError:
 
72
        # no tree, so can't be any pending merges???
 
73
        return
 
74
    if len(existing_pending_merges) > 0:
 
75
        raise errors.BzrCommandError('Pending merges must be '
 
76
            'committed or reverted before using switch.')
 
77
 
 
78
 
 
79
def _set_branch_location(control, to_branch):
61
80
    """Set location value of a branch reference.
62
81
 
63
 
    :param control: BzrDir containing the branch reference
64
 
    :param location: value to write to the branch reference location.
 
82
    :param control: BzrDir of the checkout to change
 
83
    :param to_branch: branch that the checkout is to be bound to.
65
84
    """
66
 
    _check_switch_branch_format(control)
67
 
    branch_format = BranchFormat.find_format(control)
68
85
    transport = control.get_branch_transport(None)
69
86
    location = transport.put_bytes('location', to_branch.base)
 
87
 
 
88
 
 
89
def _update(tree, source_repository):
 
90
    """Update a working tree to the latest revision of its branch.
 
91
 
 
92
    :param tree: the working tree
 
93
    :param source_repository: repository holding the revisions
 
94
    """
 
95
    tree.lock_tree_write()
 
96
    try:
 
97
        to_branch = tree.branch
 
98
        if tree.last_revision() == to_branch.last_revision():
 
99
            note("Tree is up to date at revision %d.", to_branch.revno())
 
100
            return
 
101
        base_tree = source_repository.revision_tree(tree.last_revision())
 
102
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
 
103
        tree.set_last_revision(to_branch.last_revision())
 
104
        note('Updated to revision %d.' % to_branch.revno())
 
105
    finally:
 
106
        tree.unlock()