← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to cbranch.py

  • Committer: Aaron Bentley
  • Date: 2006-06-14 17:06:32 UTC
  • mto: This revision was merged to the branch mainline in revision 395.
  • Revision ID: abentley@panoramicfeedback.com-20060614170632-935a8dcb79efc4b7
Implement 'shove' for moving changes to other trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
cbranch.py
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
 
from bzrlib.branch import Branch
 
18
from bzrlib.builtins import cmd_branch, cmd_checkout
20
19
from bzrlib.config import LocationConfig
21
20
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
 
21
from bzrlib.osutils import pathjoin, basename, abspath, getcwd
26
22
 
27
 
def cbranch(from_location, to_location=None, revision=None,
28
 
            lightweight=False, files_from=None, hardlink=False):
 
23
def cbranch(from_location, to_location=None, revision=None, lightweight=False):
 
24
    from_location = from_location.rstrip('/')
29
25
    if to_location is None:
30
 
        to_location = derive_to_location(from_location)
 
26
        to_location = pathjoin(getcwd(), basename(from_location))
31
27
    config = LocationConfig(abspath(to_location))
32
 
    b_loc = config.get_user_option("cbranch_target")
33
 
    if b_loc is None:
34
 
        b_root = config.get_user_option("cbranch_root")
35
 
        if b_root is None:
36
 
            raise BzrCommandError("Can't find cbranch_target in"
37
 
                                  " locations.conf")
38
 
        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
 
                                   hardlink=hardlink)
57
 
    finally:
58
 
        pb.finished()
 
28
    b_root = config.get_user_option("cbranch_root")
 
29
    if b_root is None:
 
30
        raise BzrCommandError("Can't find cbranch_root in branches.conf")
 
31
    b_loc = pathjoin(b_root, basename(to_location))
 
32
    cmd_branch().run(from_location, b_loc, revision=revision)
 
33
    cmd_checkout().run(b_loc, to_location, lightweight=lightweight)