/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: Andrew Bennetts
  • Date: 2010-04-27 06:40:37 UTC
  • mto: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100427064037-kb7bp0uzaarvk9ah
https://launchpad.net/bugs/528041
First, fix _remember_remote_is_before to never raise AssertionError for what is a very minor bug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
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
25
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
34
26
    """Switch the branch associated with a checkout.
35
27
 
46
38
    _set_branch_location(control_dir, to_branch, force)
47
39
    tree = control_dir.open_workingtree()
48
40
    _update(tree, source_repository, quiet, revision_id)
49
 
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
 
41
 
50
42
 
51
43
def _check_pending_merges(control, force=False):
52
44
    """Check that there are no outstanding pending merges before switching.