~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to cbranch.py

  • Committer: Aaron Bentley
  • Date: 2007-01-08 17:27:48 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070108172748-1b22qtszaadoby89
Improve bzr import docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2008 Aaron Bentley
2
 
# <aaron@aaronbentley.com>
 
1
# Copyright (C) 2006 Aaron Bentley
 
2
# <aaron.bentley@utoronto.ca>
3
3
#
4
4
#    This program is free software; you can redistribute it and/or modify
5
5
#    it under the terms of the GNU General Public License as published by
15
15
#    along with this program; if not, write to the Free Software
16
16
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
from bzrlib.bzrdir import BzrDir
19
18
from bzrlib.branch import Branch
 
19
from bzrlib.builtins import cmd_branch, cmd_checkout
20
20
from bzrlib.config import LocationConfig
21
21
from bzrlib.errors import BzrCommandError
22
 
from bzrlib.osutils import pathjoin, basename, abspath
23
 
from bzrlib.workingtree import WorkingTree
24
 
from bzrlib import ui
25
 
from bzrlib.urlutils import derive_to_location
 
22
from bzrlib.osutils import pathjoin, basename, abspath, getcwd
 
23
from bzrlib.urlutils import local_path_to_url
26
24
 
27
25
def cbranch(from_location, to_location=None, revision=None,
28
 
            lightweight=False, files_from=None):
 
26
            lightweight=False):
 
27
    from_location = from_location.rstrip('/')
29
28
    if to_location is None:
30
 
        to_location = derive_to_location(from_location)
 
29
        to_location = pathjoin(getcwd(), basename(from_location))
31
30
    config = LocationConfig(abspath(to_location))
32
31
    b_loc = config.get_user_option("cbranch_target")
33
32
    if b_loc is None:
36
35
            raise BzrCommandError("Can't find cbranch_target in"
37
36
                                  " locations.conf")
38
37
        b_loc = pathjoin(b_root, basename(to_location))
39
 
    accelerator_tree, old_branch = BzrDir.open_tree_or_branch(from_location)
40
 
    if files_from is not None:
41
 
        accelerator_tree = WorkingTree.open(files_from)
42
 
    if revision is None or len(revision) == 0:
43
 
        revision_id = old_branch.last_revision()
44
 
    elif len(revision) == 1:
45
 
        revision_id = revision[0].in_history(old_branch)[1]
46
 
    else:
47
 
        raise BzrCommandError('At most one revision may be supplied.')
48
 
    pb = ui.ui_factory.nested_progress_bar()
49
 
    try:
50
 
        pb.update('Creating branch', 0, 2)
51
 
        new_branch = old_branch.bzrdir.sprout(b_loc, revision_id,
52
 
            accelerator_tree=accelerator_tree).open_branch()
53
 
        pb.update('Creating checkout', 1, 2)
54
 
        new_branch.create_checkout(to_location, lightweight=lightweight,
55
 
                                   accelerator_tree=accelerator_tree)
56
 
    finally:
57
 
        pb.finished()
 
38
    cmd_branch().run(from_location, b_loc, revision=revision)
 
39
    cmd_checkout().run(b_loc, to_location, lightweight=lightweight)
 
40
    b = Branch.open(to_location)