← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Aaron Bentley
  • Date: 2009-06-19 21:16:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4481.
  • Revision ID: aaron@aaronbentley.com-20090619211631-4fnkv2uui98xj7ux
Provide control over switch and shelver messaging.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009, 2010 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
17
17
# Original author: David Allouche
18
18
 
19
19
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch
 
20
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
 
21
from bzrlib.bzrdir import BzrDir
21
22
from bzrlib.trace import note
22
23
 
23
24
 
24
 
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
25
 
    from bzrlib.branch import SwitchHookParams
26
 
    hooks = Branch.hooks['post_switch']
27
 
    if not hooks:
28
 
        return
29
 
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
30
 
    for hook in hooks:
31
 
        hook(params)
32
 
 
33
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
 
25
def switch(control_dir, to_branch, force=False, quiet=False):
34
26
    """Switch the branch associated with a checkout.
35
27
 
36
28
    :param control_dir: BzrDir of the checkout to change
37
29
    :param to_branch: branch that the checkout is to reference
38
30
    :param force: skip the check for local commits in a heavy checkout
39
 
    :param revision_id: revision ID to switch to.
40
31
    """
41
32
    _check_pending_merges(control_dir, force)
42
33
    try:
45
36
        source_repository = to_branch.repository
46
37
    _set_branch_location(control_dir, to_branch, force)
47
38
    tree = control_dir.open_workingtree()
48
 
    _update(tree, source_repository, quiet, revision_id)
49
 
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
 
39
    _update(tree, source_repository, quiet)
 
40
 
50
41
 
51
42
def _check_pending_merges(control, force=False):
52
43
    """Check that there are no outstanding pending merges before switching.
78
69
    branch_format = control.find_branch_format()
79
70
    if branch_format.get_reference(control) is not None:
80
71
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, None, to_branch)
 
72
        branch_format.set_reference(control, to_branch)
82
73
    else:
83
74
        b = control.open_branch()
84
75
        bound_branch = b.get_bound_location()
103
94
            b.pull(to_branch, overwrite=True,
104
95
                possible_transports=possible_transports)
105
96
            b.set_bound_location(to_branch.base)
106
 
            b.set_parent(b.get_master_branch().get_parent())
107
97
        else:
108
98
            raise errors.BzrCommandError('Cannot switch a branch, '
109
99
                'only a checkout.')
128
118
    return False
129
119
 
130
120
 
131
 
def _update(tree, source_repository, quiet=False, revision_id=None):
 
121
def _update(tree, source_repository, quiet=False):
132
122
    """Update a working tree to the latest revision of its branch.
133
123
 
134
124
    :param tree: the working tree
137
127
    tree.lock_tree_write()
138
128
    try:
139
129
        to_branch = tree.branch
140
 
        if revision_id is None:
141
 
            revision_id = to_branch.last_revision()
142
 
        if tree.last_revision() == revision_id:
 
130
        if tree.last_revision() == to_branch.last_revision():
143
131
            if not quiet:
144
132
                note("Tree is up to date at revision %d.", to_branch.revno())
145
133
            return
146
134
        base_tree = source_repository.revision_tree(tree.last_revision())
147
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
 
135
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
148
136
        tree.set_last_revision(to_branch.last_revision())
149
137
        if not quiet:
150
138
            note('Updated to revision %d.' % to_branch.revno())