/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/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-12-28 17:58:32 UTC
  • mfrom: (3123.5.22 hardlinks)
  • Revision ID: pqm@pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
Checkout uses branch tree as a fallback accelerator (abentley)

Show diffs side-by-side

added added

removed removed

Lines of Context:
956
956
 
957
957
    def run(self, branch_location=None, to_location=None, revision=None,
958
958
            lightweight=False, files_from=None):
959
 
        if files_from is not None:
960
 
            accelerator_tree = WorkingTree.open(files_from)
961
 
        else:
962
 
            accelerator_tree = None
963
959
        if revision is None:
964
960
            revision = [None]
965
961
        elif len(revision) > 1:
968
964
        if branch_location is None:
969
965
            branch_location = osutils.getcwd()
970
966
            to_location = branch_location
971
 
        source = Branch.open(branch_location)
 
967
        accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
 
968
            branch_location)
 
969
        if files_from is not None:
 
970
            accelerator_tree = WorkingTree.open(files_from)
972
971
        if len(revision) == 1 and revision[0] is not None:
973
972
            revision_id = _mod_revision.ensure_null(
974
973
                revision[0].in_history(source)[1])