~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-12-19 15:00:22 UTC
  • mto: This revision was merged to the branch mainline in revision 3135.
  • Revision ID: abentley@panoramicfeedback.com-20071219150022-1unx3w7nopntj2sj
Accelerate branching from a lightweight checkout

Show diffs side-by-side

added added

removed removed

Lines of Context:
874
874
            raise errors.BzrCommandError(
875
875
                'bzr branch --revision takes exactly 1 revision value')
876
876
 
877
 
        br_from = Branch.open(from_location)
 
877
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
 
878
            from_location)
878
879
        br_from.lock_read()
879
880
        try:
880
 
            accelerator_tree = br_from.bzrdir.open_workingtree()
881
 
        except (errors.NoWorkingTree, errors.NotLocalUrl):
882
 
            accelerator_tree = None
883
 
        try:
884
881
            if len(revision) == 1 and revision[0] is not None:
885
882
                revision_id = revision[0].in_history(br_from)[1]
886
883
            else: