/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: Max Bowsher
  • Date: 2010-10-14 21:34:47 UTC
  • mto: (4797.76.2 2.1)
  • mto: This revision was merged to the branch mainline in revision 5524.
  • Revision ID: maxb@f2s.com-20101014213447-ii2if26gljdaq1n3
Fix skip criteria for bzrlib.tests.test_setup - it was testing whether setup.py existed in one location, then trying to execute setup.py in a different location.

Show diffs side-by-side

added added

removed removed

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