← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Martin Pool
  • Date: 2011-07-25 02:51:30 UTC
  • mfrom: (6042 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6043.
  • Revision ID: mbp@canonical.com-20110725025130-s0j1lxfw8wljp420
resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
1577
1577
                extra='URLs must be properly escaped')
1578
1578
        location = urlutils.local_path_to_url(location)
1579
1579
 
1580
 
    if urlutils.is_url(location):
1581
 
        return location
1582
 
 
1583
 
    return urlutils.local_path_to_url(location)
 
1580
    if location.startswith("file:") and not location.startswith("file://"):
 
1581
        return urlutils.join(urlutils.local_path_to_url("."), location[5:])
 
1582
 
 
1583
    if not urlutils.is_url(location):
 
1584
        return urlutils.local_path_to_url(location)
 
1585
 
 
1586
    return location
1584
1587
 
1585
1588
 
1586
1589
def get_transport(base, possible_transports=None):