← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to cbranch.py

  • Committer: Aaron Bentley
  • Date: 2007-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

Show diffs side-by-side

added added

removed removed

Lines of Context:
cbranch.py
22
22
from bzrlib.osutils import pathjoin, basename, abspath, getcwd
23
23
from bzrlib.urlutils import local_path_to_url
24
24
 
25
 
def cbranch(from_location, to_location=None, revision=None, lightweight=False):
 
25
def cbranch(from_location, to_location=None, revision=None,
 
26
            lightweight=False):
26
27
    from_location = from_location.rstrip('/')
27
28
    if to_location is None:
28
29
        to_location = pathjoin(getcwd(), basename(from_location))
29
30
    config = LocationConfig(abspath(to_location))
30
 
    b_root = config.get_user_option("cbranch_root")
31
 
    if b_root is None:
32
 
        raise BzrCommandError("Can't find cbranch_root in branches.conf")
33
 
    b_loc = pathjoin(b_root, basename(to_location))
 
31
    b_loc = config.get_user_option("cbranch_target")
 
32
    if b_loc is None:
 
33
        b_root = config.get_user_option("cbranch_root")
 
34
        if b_root is None:
 
35
            raise BzrCommandError("Can't find cbranch_target in"
 
36
                                  " locations.conf")
 
37
        b_loc = pathjoin(b_root, basename(to_location))
34
38
    cmd_branch().run(from_location, b_loc, revision=revision)
35
39
    cmd_checkout().run(b_loc, to_location, lightweight=lightweight)
36
40
    b = Branch.open(to_location)