← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Ian Clatworthy
  • Date: 2007-06-06 14:06:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2520.
  • Revision ID: ian.clatworthy@internode.on.net-20070606140614-yp66v5i1gm5kruqp
https://launchpad.net/bugs/115491
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
848
848
 
849
849
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
850
850
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
 
851
    If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
 
852
    is derived from the FROM_LOCATION by stripping a leading scheme or drive
 
853
    identifier, if any. For example, "branch lp:foo-bar" will attempt to
 
854
    create ./foo-bar.
851
855
 
852
856
    To retrieve the branch as of a particular revision, supply the --revision
853
857
    parameter, as in "branch foo/bar -r 5".
877
881
                # RBC 20060209
878
882
                revision_id = br_from.last_revision()
879
883
            if to_location is None:
880
 
                to_location = os.path.basename(from_location.rstrip("/\\"))
 
884
                to_location = urlutils.derive_to_location(from_location)
881
885
                name = None
882
886
            else:
883
887
                name = os.path.basename(to_location) + '\n'
917
921
    
918
922
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
919
923
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
 
924
    If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
 
925
    is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
 
926
    identifier, if any. For example, "checkout lp:foo-bar" will attempt to
 
927
    create ./foo-bar.
920
928
 
921
929
    To retrieve the branch as of a particular revision, supply the --revision
922
930
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
953
961
        else:
954
962
            revision_id = None
955
963
        if to_location is None:
956
 
            to_location = os.path.basename(branch_location.rstrip("/\\"))
 
964
            to_location = urlutils.derive_to_location(branch_location)
957
965
        # if the source and to_location are the same, 
958
966
        # and there is no working tree,
959
967
        # then reconstitute a branch