/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2006-2010 Canonical Ltd
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
16
17
"""A collection of function for handling URL operations."""
18
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
19
import os
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
20
import re
21
import sys
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
22
23
from bzrlib.lazy_import import lazy_import
24
lazy_import(globals(), """
25
from posixpath import split as _posix_split, normpath as _posix_normpath
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
26
import urllib
3242.3.26 by Aaron Bentley
Implement rebase_url
27
import urlparse
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
28
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
29
from bzrlib import (
30
    errors,
31
    osutils,
32
    )
33
""")
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
34
35
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
36
def basename(url, exclude_trailing_slash=True):
37
    """Return the last component of a URL.
38
39
    :param url: The URL in question
40
    :param exclude_trailing_slash: If the url looks like "path/to/foo/"
41
        ignore the final slash and return 'foo' rather than ''
42
    :return: Just the final component of the URL. This can return ''
43
        if you don't exclude_trailing_slash, or if you are at the
44
        root of the URL.
45
    """
46
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[1]
47
48
49
def dirname(url, exclude_trailing_slash=True):
50
    """Return the parent directory of the given path.
51
52
    :param url: Relative or absolute URL
53
    :param exclude_trailing_slash: Remove a final slash
54
        (treat http://host/foo/ as http://host/foo, but
55
        http://host/ stays http://host/)
56
    :return: Everything in the URL except the last path chunk
57
    """
58
    # TODO: jam 20060502 This was named dirname to be consistent
59
    #       with the os functions, but maybe "parent" would be better
60
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[0]
61
62
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
63
def escape(relpath):
64
    """Escape relpath to be a valid url."""
65
    if isinstance(relpath, unicode):
66
        relpath = relpath.encode('utf-8')
67
    # After quoting and encoding, the path should be perfectly
68
    # safe as a plain ASCII string, str() just enforces this
4098.3.1 by Jonathan Lange
Don't escape tildes
69
    return str(urllib.quote(relpath, safe='/~'))
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
70
71
1685.1.46 by John Arbash Meinel
Sorting functions by name.
72
def file_relpath(base, path):
73
    """Compute just the relative sub-portion of a url
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
1685.1.46 by John Arbash Meinel
Sorting functions by name.
75
    This assumes that both paths are already fully specified file:// URLs.
76
    """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
77
    if len(base) < MIN_ABS_FILEURL_LENGTH:
4539.1.1 by Andrew Bennetts
Improve error message in osutils.file_relpath.
78
        raise ValueError('Length of base (%r) must equal or'
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
79
            ' exceed the platform minimum url length (which is %d)' %
4539.1.1 by Andrew Bennetts
Improve error message in osutils.file_relpath.
80
            (base, MIN_ABS_FILEURL_LENGTH))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
81
    base = local_path_from_url(base)
82
    path = local_path_from_url(path)
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
83
    return escape(osutils.relpath(base, path))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
84
85
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
86
def _find_scheme_and_separator(url):
87
    """Find the scheme separator (://) and the first path separator
88
89
    This is just a helper functions for other path utilities.
90
    It could probably be replaced by urlparse
91
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
92
    m = _url_scheme_re.match(url)
93
    if not m:
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
94
        return None, None
95
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
96
    scheme = m.group('scheme')
97
    path = m.group('path')
98
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
99
    # Find the path separating slash
100
    # (first slash after the ://)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
101
    first_path_slash = path.find('/')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
102
    if first_path_slash == -1:
1685.1.56 by John Arbash Meinel
Fixing _find_scheme_and_separator
103
        return len(scheme), None
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
104
    return len(scheme), first_path_slash+m.start('path')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
105
106
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
107
def join(base, *args):
108
    """Create a URL by joining sections.
109
110
    This will normalize '..', assuming that paths are absolute
111
    (it assumes no symlinks in either path)
112
113
    If any of *args is an absolute URL, it will be treated correctly.
114
    Example:
115
        join('http://foo', 'http://bar') => 'http://bar'
116
        join('http://foo', 'bar') => 'http://foo/bar'
117
        join('http://foo', 'bar', '../baz') => 'http://foo/baz'
118
    """
2018.5.100 by Andrew Bennetts
Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
119
    if not args:
120
        return base
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
121
    scheme_end, path_start = _find_scheme_and_separator(base)
122
    if scheme_end is None and path_start is None:
123
        path_start = 0
124
    elif path_start is None:
125
        path_start = len(base)
126
    path = base[path_start:]
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
127
    for arg in args:
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
128
        arg_scheme_end, arg_path_start = _find_scheme_and_separator(arg)
129
        if arg_scheme_end is None and arg_path_start is None:
130
            arg_path_start = 0
131
        elif arg_path_start is None:
132
            arg_path_start = len(arg)
5254.1.5 by Gordon Tyler
Fixes according to spiv's review.
133
        if arg_scheme_end is not None:
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
134
            base = arg
135
            path = arg[arg_path_start:]
136
            scheme_end = arg_scheme_end
137
            path_start = arg_path_start
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
138
        else:
2018.5.54 by Andrew Bennetts
Fix ChrootTransportDecorator's abspath method to be consistent with its clone
139
            path = joinpath(path, arg)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
140
    return base[:path_start] + path
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
141
142
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
143
def joinpath(base, *args):
144
    """Join URL path segments to a URL path segment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
145
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
146
    This is somewhat like osutils.joinpath, but intended for URLs.
147
148
    XXX: this duplicates some normalisation logic, and also duplicates a lot of
149
    path handling logic that already exists in some Transport implementations.
150
    We really should try to have exactly one place in the code base responsible
151
    for combining paths of URLs.
152
    """
2018.5.100 by Andrew Bennetts
Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
153
    path = base.split('/')
154
    if len(path) > 1 and path[-1] == '':
155
        #If the path ends in a trailing /, remove it.
156
        path.pop()
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
157
    for arg in args:
158
        if arg.startswith('/'):
159
            path = []
160
        for chunk in arg.split('/'):
161
            if chunk == '.':
162
                continue
163
            elif chunk == '..':
164
                if path == ['']:
165
                    raise errors.InvalidURLJoin('Cannot go above root',
166
                            base, args)
167
                path.pop()
168
            else:
169
                path.append(chunk)
170
    if path == ['']:
171
        return '/'
172
    else:
173
        return '/'.join(path)
174
175
1685.1.46 by John Arbash Meinel
Sorting functions by name.
176
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
177
def _posix_local_path_from_url(url):
178
    """Convert a url like file:///path/to/foo into /path/to/foo"""
4828.1.1 by Michael Hudson
test and fix
179
    file_localhost_prefix = 'file://localhost/'
180
    if url.startswith(file_localhost_prefix):
181
        path = url[len(file_localhost_prefix) - 1:]
182
    elif not url.startswith('file:///'):
183
        raise errors.InvalidURL(
184
            url, 'local urls must start with file:/// or file://localhost/')
185
    else:
186
        path = url[len('file://'):]
1685.1.46 by John Arbash Meinel
Sorting functions by name.
187
    # We only strip off 2 slashes
4828.1.1 by Michael Hudson
test and fix
188
    return unescape(path)
1685.1.46 by John Arbash Meinel
Sorting functions by name.
189
190
191
def _posix_local_path_to_url(path):
192
    """Convert a local path like ./foo into a URL like file:///path/to/foo
193
194
    This also handles transforming escaping unicode characters, etc.
195
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
196
    # importing directly from posixpath allows us to test this
1685.1.46 by John Arbash Meinel
Sorting functions by name.
197
    # on non-posix platforms
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
198
    return 'file://' + escape(_posix_normpath(
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
199
        osutils._posix_abspath(path)))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
200
201
202
def _win32_local_path_from_url(url):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
203
    """Convert a url like file:///C:/path/to/foo into C:/path/to/foo"""
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
204
    if not url.startswith('file://'):
205
        raise errors.InvalidURL(url, 'local urls must start with file:///, '
206
                                     'UNC path urls must start with file://')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
207
    # We strip off all 3 slashes
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
208
    win32_url = url[len('file:'):]
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
209
    # check for UNC path: //HOST/path
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
210
    if not win32_url.startswith('///'):
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
211
        if (win32_url[2] == '/'
212
            or win32_url[3] in '|:'):
213
            raise errors.InvalidURL(url, 'Win32 UNC path urls'
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
214
                ' have form file://HOST/path')
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
215
        return unescape(win32_url)
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
216
217
    # allow empty paths so we can serve all roots
218
    if win32_url == '///':
219
        return '/'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
220
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
221
    # usual local path with drive letter
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
222
    if (win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
223
                             'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
224
        or win32_url[4] not in  '|:'
225
        or win32_url[5] != '/'):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
226
        raise errors.InvalidURL(url, 'Win32 file urls start with'
1711.4.8 by John Arbash Meinel
switch to prefering lowercase drive letters, since that matches os.getcwd() drive letters
227
                ' file:///x:/, where x is a valid drive letter')
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
228
    return win32_url[3].upper() + u':' + unescape(win32_url[5:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
229
230
231
def _win32_local_path_to_url(path):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
232
    """Convert a local path like ./foo into a URL like file:///C:/path/to/foo
1685.1.46 by John Arbash Meinel
Sorting functions by name.
233
234
    This also handles transforming escaping unicode characters, etc.
235
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
236
    # importing directly from ntpath allows us to test this
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
237
    # on non-win32 platform
238
    # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
239
    #       which actually strips trailing space characters.
5278.1.5 by Martin Pool
Correct more sloppy use of the term 'Linux'
240
    #       The worst part is that on linux ntpath.abspath has different
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
241
    #       semantics, since 'nt' is not an available module.
3503.1.1 by Adrian Wilkins
Add a couple of special cases to urlutils._win32_path_(from|to)_url
242
    if path == '/':
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
243
        return 'file:///'
3503.1.1 by Adrian Wilkins
Add a couple of special cases to urlutils._win32_path_(from|to)_url
244
2279.4.2 by Alexander Belchenko
Don't do normpath after abspath, because this function is called inside abspath
245
    win32_path = osutils._win32_abspath(path)
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
246
    # check for UNC path \\HOST\path
247
    if win32_path.startswith('//'):
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
248
        return 'file:' + escape(win32_path)
3234.3.1 by Alexander Belchenko
ensure that local_path_to_url() always returns plain string, not unicode.
249
    return ('file:///' + str(win32_path[0].upper()) + ':' +
250
        escape(win32_path[2:]))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
251
252
253
local_path_to_url = _posix_local_path_to_url
254
local_path_from_url = _posix_local_path_from_url
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
255
MIN_ABS_FILEURL_LENGTH = len('file:///')
1711.4.17 by John Arbash Meinel
[merge] bzr.dev 1790
256
WIN32_MIN_ABS_FILEURL_LENGTH = len('file:///C:/')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
257
258
if sys.platform == 'win32':
259
    local_path_to_url = _win32_local_path_to_url
260
    local_path_from_url = _win32_local_path_from_url
261
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
262
    MIN_ABS_FILEURL_LENGTH = WIN32_MIN_ABS_FILEURL_LENGTH
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
263
264
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
265
_url_scheme_re = re.compile(r'^(?P<scheme>[^:/]{2,}):(//)?(?P<path>.*)$')
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
266
_url_hex_escapes_re = re.compile(r'(%[0-9a-fA-F]{2})')
267
268
269
def _unescape_safe_chars(matchobj):
270
    """re.sub callback to convert hex-escapes to plain characters (if safe).
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
271
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
272
    e.g. '%7E' will be converted to '~'.
273
    """
274
    hex_digits = matchobj.group(0)[1:]
275
    char = chr(int(hex_digits, 16))
276
    if char in _url_dont_escape_characters:
277
        return char
278
    else:
279
        return matchobj.group(0).upper()
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
280
281
282
def normalize_url(url):
283
    """Make sure that a path string is in fully normalized URL form.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
284
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
285
    This handles URLs which have unicode characters, spaces,
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
286
    special characters, etc.
287
288
    It has two basic modes of operation, depending on whether the
289
    supplied string starts with a url specifier (scheme://) or not.
290
    If it does not have a specifier it is considered a local path,
291
    and will be converted into a file:/// url. Non-ascii characters
292
    will be encoded using utf-8.
293
    If it does have a url specifier, it will be treated as a "hybrid"
294
    URL. Basically, a URL that should have URL special characters already
295
    escaped (like +?&# etc), but may have unicode characters, etc
296
    which would not be valid in a real URL.
297
298
    :param url: Either a hybrid URL or a local path
299
    :return: A normalized URL which only includes 7-bit ASCII characters.
300
    """
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
301
    scheme_end, path_start = _find_scheme_and_separator(url)
302
    if scheme_end is None:
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
303
        return local_path_to_url(url)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
304
    prefix = url[:path_start]
305
    path = url[path_start:]
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
306
    if not isinstance(url, unicode):
307
        for c in url:
308
            if c not in _url_safe_characters:
1685.1.53 by John Arbash Meinel
Updated normalize_url
309
                raise errors.InvalidURL(url, 'URLs can only contain specific'
310
                                            ' safe characters (not %r)' % c)
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
311
        path = _url_hex_escapes_re.sub(_unescape_safe_chars, path)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
312
        return str(prefix + ''.join(path))
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
313
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
314
    # We have a unicode (hybrid) url
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
315
    path_chars = list(path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
316
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
317
    for i in xrange(len(path_chars)):
318
        if path_chars[i] not in _url_safe_characters:
319
            chars = path_chars[i].encode('utf-8')
320
            path_chars[i] = ''.join(
321
                ['%%%02X' % ord(c) for c in path_chars[i].encode('utf-8')])
322
    path = ''.join(path_chars)
323
    path = _url_hex_escapes_re.sub(_unescape_safe_chars, path)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
324
    return str(prefix + path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
325
326
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
327
def relative_url(base, other):
328
    """Return a path to other from base.
329
330
    If other is unrelated to base, return other. Else return a relative path.
331
    This assumes no symlinks as part of the url.
332
    """
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
333
    dummy, base_first_slash = _find_scheme_and_separator(base)
334
    if base_first_slash is None:
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
335
        return other
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
336
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
337
    dummy, other_first_slash = _find_scheme_and_separator(other)
338
    if other_first_slash is None:
339
        return other
340
341
    # this takes care of differing schemes or hosts
342
    base_scheme = base[:base_first_slash]
343
    other_scheme = other[:other_first_slash]
344
    if base_scheme != other_scheme:
345
        return other
3139.2.1 by Alexander Belchenko
bugfix #90847: fix problem with parent location on another logical drive
346
    elif sys.platform == 'win32' and base_scheme == 'file://':
347
        base_drive = base[base_first_slash+1:base_first_slash+3]
348
        other_drive = other[other_first_slash+1:other_first_slash+3]
349
        if base_drive != other_drive:
350
            return other
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
351
352
    base_path = base[base_first_slash+1:]
353
    other_path = other[other_first_slash+1:]
354
355
    if base_path.endswith('/'):
356
        base_path = base_path[:-1]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
357
358
    base_sections = base_path.split('/')
359
    other_sections = other_path.split('/')
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
360
361
    if base_sections == ['']:
362
        base_sections = []
363
    if other_sections == ['']:
364
        other_sections = []
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
365
366
    output_sections = []
367
    for b, o in zip(base_sections, other_sections):
368
        if b != o:
369
            break
370
        output_sections.append(b)
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
371
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
372
    match_len = len(output_sections)
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
373
    output_sections = ['..' for x in base_sections[match_len:]]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
374
    output_sections.extend(other_sections[match_len:])
375
376
    return "/".join(output_sections) or "."
377
378
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
379
def _win32_extract_drive_letter(url_base, path):
380
    """On win32 the drive letter needs to be added to the url base."""
381
    # Strip off the drive letter
382
    # path is currently /C:/foo
383
    if len(path) < 3 or path[2] not in ':|' or path[3] != '/':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
384
        raise errors.InvalidURL(url_base + path,
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
385
            'win32 file:/// paths need a drive letter')
386
    url_base += path[0:3] # file:// + /C:
387
    path = path[3:] # /foo
388
    return url_base, path
389
390
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
391
def split(url, exclude_trailing_slash=True):
392
    """Split a URL into its parent directory and a child directory.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
393
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
394
    :param url: A relative or absolute URL
395
    :param exclude_trailing_slash: Strip off a final '/' if it is part
396
        of the path (but not if it is part of the protocol specification)
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
397
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
398
    :return: (parent_url, child_dir).  child_dir may be the empty string if we're at
1685.1.61 by Martin Pool
[broken] Change BzrDir._make_tail to use urlutils.split
399
        the root.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
400
    """
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
401
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
402
403
    if first_path_slash is None:
404
        # We have either a relative path, or no separating slash
405
        if scheme_loc is None:
406
            # Relative path
407
            if exclude_trailing_slash and url.endswith('/'):
408
                url = url[:-1]
409
            return _posix_split(url)
410
        else:
411
            # Scheme with no path
412
            return url, ''
413
414
    # We have a fully defined path
415
    url_base = url[:first_path_slash] # http://host, file://
416
    path = url[first_path_slash:] # /file/foo
417
418
    if sys.platform == 'win32' and url.startswith('file:///'):
419
        # Strip off the drive letter
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
420
        # url_base is currently file://
1711.2.39 by John Arbash Meinel
Fix bzrlib.urlutils.split() to work properly on win32 local paths.
421
        # path is currently /C:/foo
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
422
        url_base, path = _win32_extract_drive_letter(url_base, path)
423
        # now it should be file:///C: and /foo
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
424
425
    if exclude_trailing_slash and len(path) > 1 and path.endswith('/'):
426
        path = path[:-1]
427
    head, tail = _posix_split(path)
428
    return url_base + head, tail
429
1685.1.46 by John Arbash Meinel
Sorting functions by name.
430
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
431
def split_segment_parameters_raw(url):
5163.2.1 by Jelmer Vernooij
Add urlutils.split_subsegments.
432
    """Split the subsegment of the last segment of a URL.
433
434
    :param url: A relative or absolute URL
435
    :return: (url, subsegments)
436
    """
437
    (parent_url, child_dir) = split(url)
438
    subsegments = child_dir.split(",")
439
    if len(subsegments) == 1:
440
        return (url, [])
441
    return (join(parent_url, subsegments[0]), subsegments[1:])
442
443
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
444
def split_segment_parameters(url):
445
    """Split the segment parameters of the last segment of a URL.
446
447
    :param url: A relative or absolute URL
448
    :return: (url, segment_parameters)
449
    """
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
450
    (base_url, subsegments) = split_segment_parameters_raw(url)
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
451
    parameters = {}
452
    for subsegment in subsegments:
453
        (key, value) = subsegment.split("=", 1)
454
        parameters[key] = value
455
    return (base_url, parameters)
456
457
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
458
def join_segment_parameters_raw(base, *subsegments):
5163.2.7 by Jelmer Vernooij
Add type checking.
459
    """Create a new URL by adding subsegments to an existing one. 
460
461
    This adds the specified subsegments to the last path in the specified
462
    base URL. The subsegments should be bytestrings.
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
463
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
464
    :note: You probably want to use join_segment_parameters instead.
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
465
    """
466
    if not subsegments:
467
        return base
468
    for subsegment in subsegments:
5163.2.7 by Jelmer Vernooij
Add type checking.
469
        if type(subsegment) is not str:
470
            raise TypeError("Subsegment %r is not a bytestring" % subsegment)
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
471
        if "," in subsegment:
472
            raise errors.InvalidURLJoin(", exists in subsegments",
473
                                        base, subsegments)
474
    return ",".join((base,) + subsegments)
475
476
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
477
def join_segment_parameters(url, parameters):
478
    """Create a new URL by adding segment parameters to an existing one.
479
5163.2.7 by Jelmer Vernooij
Add type checking.
480
    The parameters of the last segment in the URL will be updated; if a
481
    parameter with the same key already exists it will be overwritten.
482
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
483
    :param url: A URL, as string
5163.2.7 by Jelmer Vernooij
Add type checking.
484
    :param parameters: Dictionary of parameters, keys and values as bytestrings
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
485
    """
486
    (base, existing_parameters) = split_segment_parameters(url)
487
    new_parameters = {}
488
    new_parameters.update(existing_parameters)
489
    for key, value in parameters.iteritems():
5163.2.7 by Jelmer Vernooij
Add type checking.
490
        if type(key) is not str:
491
            raise TypeError("parameter key %r is not a bytestring" % key)
492
        if type(value) is not str:
493
            raise TypeError("parameter value %r for %s is not a bytestring" %
494
                (key, value))
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
495
        if "=" in key:
496
            raise errors.InvalidURLJoin("= exists in parameter key", url,
497
                parameters)
498
        new_parameters[key] = value
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
499
    return join_segment_parameters_raw(base, 
5163.2.6 by Jelmer Vernooij
Fix example names in tests.
500
        *["%s=%s" % item for item in sorted(new_parameters.items())])
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
501
502
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
503
def _win32_strip_local_trailing_slash(url):
504
    """Strip slashes after the drive letter"""
505
    if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
506
        return url[:-1]
507
    else:
508
        return url
509
510
1685.1.47 by John Arbash Meinel
s comes before u
511
def strip_trailing_slash(url):
512
    """Strip trailing slash, except for root paths.
513
514
    The definition of 'root path' is platform-dependent.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
515
    This assumes that all URLs are valid netloc urls, such that they
516
    form:
517
    scheme://host/path
518
    It searches for ://, and then refuses to remove the next '/'.
519
    It can also handle relative paths
520
    Examples:
521
        path/to/foo       => path/to/foo
522
        path/to/foo/      => path/to/foo
523
        http://host/path/ => http://host/path
524
        http://host/path  => http://host/path
525
        http://host/      => http://host/
526
        file:///          => file:///
527
        file:///foo/      => file:///foo
528
        # This is unique on win32 platforms, and is the only URL
529
        # format which does it differently.
1711.4.8 by John Arbash Meinel
switch to prefering lowercase drive letters, since that matches os.getcwd() drive letters
530
        file:///c|/       => file:///c:/
1685.1.47 by John Arbash Meinel
s comes before u
531
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
532
    if not url.endswith('/'):
533
        # Nothing to do
534
        return url
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
535
    if sys.platform == 'win32' and url.startswith('file://'):
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
536
        return _win32_strip_local_trailing_slash(url)
1685.1.80 by Wouter van Heyst
more code cleanup
537
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
538
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
539
    if scheme_loc is None:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
540
        # This is a relative path, as it has no scheme
541
        # so just chop off the last character
1685.1.47 by John Arbash Meinel
s comes before u
542
        return url[:-1]
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
543
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
544
    if first_path_slash is None or first_path_slash == len(url)-1:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
545
        # Don't chop off anything if the only slash is the path
546
        # separating slash
1685.1.47 by John Arbash Meinel
s comes before u
547
        return url
548
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
549
    return url[:-1]
550
1685.1.47 by John Arbash Meinel
s comes before u
551
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
552
def unescape(url):
553
    """Unescape relpath from url format.
554
555
    This returns a Unicode path from a URL
556
    """
557
    # jam 20060427 URLs are supposed to be ASCII only strings
558
    #       If they are passed in as unicode, urllib.unquote
559
    #       will return a UNICODE string, which actually contains
560
    #       utf-8 bytes. So we have to ensure that they are
561
    #       plain ASCII strings, or the final .decode will
562
    #       try to encode the UNICODE => ASCII, and then decode
563
    #       it into utf-8.
564
    try:
565
        url = str(url)
566
    except UnicodeError, e:
567
        raise errors.InvalidURL(url, 'URL was not a plain ASCII url: %s' % (e,))
1685.1.80 by Wouter van Heyst
more code cleanup
568
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
569
    unquoted = urllib.unquote(url)
570
    try:
571
        unicode_path = unquoted.decode('utf-8')
572
    except UnicodeError, e:
573
        raise errors.InvalidURL(url, 'Unable to encode the URL as utf-8: %s' % (e,))
574
    return unicode_path
575
576
577
# These are characters that if escaped, should stay that way
578
_no_decode_chars = ';/?:@&=+$,#'
579
_no_decode_ords = [ord(c) for c in _no_decode_chars]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
580
_no_decode_hex = (['%02x' % o for o in _no_decode_ords]
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
581
                + ['%02X' % o for o in _no_decode_ords])
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
582
_hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
583
                    + [('%02X' % o, chr(o)) for o in range(256)]))
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
584
#These entries get mapped to themselves
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
585
_hex_display_map.update((hex,'%'+hex) for hex in _no_decode_hex)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
586
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
587
# These characters shouldn't be percent-encoded, and it's always safe to
588
# unencode them if they are.
589
_url_dont_escape_characters = set(
590
   "abcdefghijklmnopqrstuvwxyz" # Lowercase alpha
591
   "ABCDEFGHIJKLMNOPQRSTUVWXYZ" # Uppercase alpha
592
   "0123456789" # Numbers
593
   "-._~"  # Unreserved characters
594
)
595
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
596
# These characters should not be escaped
2167.2.2 by Aaron Bentley
Update safe character list
597
_url_safe_characters = set(
598
   "abcdefghijklmnopqrstuvwxyz" # Lowercase alpha
599
   "ABCDEFGHIJKLMNOPQRSTUVWXYZ" # Uppercase alpha
600
   "0123456789" # Numbers
601
   "_.-!~*'()"  # Unreserved characters
602
   "/;?:@&=+$," # Reserved characters
603
   "%#"         # Extra reserved characters
604
)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
605
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
606
def unescape_for_display(url, encoding):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
607
    """Decode what you can for a URL, so that we get a nice looking path.
608
609
    This will turn file:// urls into local paths, and try to decode
610
    any portions of a http:// style url that it can.
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
611
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
612
    Any sections of the URL which can't be represented in the encoding or
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
613
    need to stay as escapes are left alone.
614
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
615
    :param url: A 7-bit ASCII URL
616
    :param encoding: The final output encoding
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
617
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
618
    :return: A unicode string which can be safely encoded into the
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
619
         specified encoding.
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
620
    """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
621
    if encoding is None:
622
        raise ValueError('you cannot specify None for the display encoding')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
623
    if url.startswith('file://'):
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
624
        try:
625
            path = local_path_from_url(url)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
626
            path.encode(encoding)
627
            return path
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
628
        except UnicodeError:
629
            return url
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
630
631
    # Split into sections to try to decode utf-8
632
    res = url.split('/')
633
    for i in xrange(1, len(res)):
634
        escaped_chunks = res[i].split('%')
635
        for j in xrange(1, len(escaped_chunks)):
636
            item = escaped_chunks[j]
637
            try:
638
                escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]
639
            except KeyError:
640
                # Put back the percent symbol
641
                escaped_chunks[j] = '%' + item
642
            except UnicodeDecodeError:
643
                escaped_chunks[j] = unichr(int(item[:2], 16)) + item[2:]
644
        unescaped = ''.join(escaped_chunks)
645
        try:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
646
            decoded = unescaped.decode('utf-8')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
647
        except UnicodeDecodeError:
648
            # If this path segment cannot be properly utf-8 decoded
649
            # after doing unescaping we will just leave it alone
650
            pass
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
651
        else:
652
            try:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
653
                decoded.encode(encoding)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
654
            except UnicodeEncodeError:
655
                # If this chunk cannot be encoded in the local
656
                # encoding, then we should leave it alone
657
                pass
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
658
            else:
659
                # Otherwise take the url decoded one
660
                res[i] = decoded
661
    return u'/'.join(res)
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
662
663
664
def derive_to_location(from_location):
665
    """Derive a TO_LOCATION given a FROM_LOCATION.
666
667
    The normal case is a FROM_LOCATION of http://foo/bar => bar.
668
    The Right Thing for some logical destinations may differ though
669
    because no / may be present at all. In that case, the result is
670
    the full name without the scheme indicator, e.g. lp:foo-bar => foo-bar.
671
    This latter case also applies when a Windows drive
672
    is used without a path, e.g. c:foo-bar => foo-bar.
673
    If no /, path separator or : is found, the from_location is returned.
674
    """
675
    if from_location.find("/") >= 0 or from_location.find(os.sep) >= 0:
676
        return os.path.basename(from_location.rstrip("/\\"))
677
    else:
678
        sep = from_location.find(":")
679
        if sep > 0:
680
            return from_location[sep+1:]
681
        else:
682
            return from_location
3242.3.26 by Aaron Bentley
Implement rebase_url
683
3242.3.35 by Aaron Bentley
Cleanups and documentation
684
3242.3.26 by Aaron Bentley
Implement rebase_url
685
def _is_absolute(url):
686
    return (osutils.pathjoin('/foo', url) == url)
687
3242.3.35 by Aaron Bentley
Cleanups and documentation
688
3242.3.26 by Aaron Bentley
Implement rebase_url
689
def rebase_url(url, old_base, new_base):
690
    """Convert a relative path from an old base URL to a new base URL.
691
692
    The result will be a relative path.
693
    Absolute paths and full URLs are returned unaltered.
694
    """
695
    scheme, separator = _find_scheme_and_separator(url)
696
    if scheme is not None:
697
        return url
698
    if _is_absolute(url):
699
        return url
700
    old_parsed = urlparse.urlparse(old_base)
701
    new_parsed = urlparse.urlparse(new_base)
702
    if (old_parsed[:2]) != (new_parsed[:2]):
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
703
        raise errors.InvalidRebaseURLs(old_base, new_base)
3242.3.36 by Aaron Bentley
Updates from review comments
704
    return determine_relative_path(new_parsed[2],
3567.2.1 by Michael Hudson
urlutils.rebase_url handles '..' path segments in 'url'
705
                                   join(old_parsed[2], url))
3242.3.26 by Aaron Bentley
Implement rebase_url
706
707
708
def determine_relative_path(from_path, to_path):
709
    """Determine a relative path from from_path to to_path."""
710
    from_segments = osutils.splitpath(from_path)
711
    to_segments = osutils.splitpath(to_path)
712
    count = -1
713
    for count, (from_element, to_element) in enumerate(zip(from_segments,
714
                                                       to_segments)):
715
        if from_element != to_element:
716
            break
717
    else:
718
        count += 1
719
    unique_from = from_segments[count:]
720
    unique_to = to_segments[count:]
721
    segments = (['..'] * len(unique_from) + unique_to)
722
    if len(segments) == 0:
723
        return '.'
724
    return osutils.pathjoin(*segments)
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
725
726
727
728
def parse_url(url):
729
    """Extract the server address, the credentials and the path from the url.
730
731
    user, password, host and path should be quoted if they contain reserved
732
    chars.
733
734
    :param url: an quoted url
735
736
    :return: (scheme, user, password, host, port, path) tuple, all fields
737
        are unquoted.
738
    """
739
    if isinstance(url, unicode):
740
        raise errors.InvalidURL('should be ascii:\n%r' % url)
741
    url = url.encode('utf-8')
742
    (scheme, netloc, path, params,
743
     query, fragment) = urlparse.urlparse(url, allow_fragments=False)
744
    user = password = host = port = None
745
    if '@' in netloc:
746
        user, host = netloc.rsplit('@', 1)
747
        if ':' in user:
748
            user, password = user.split(':', 1)
749
            password = urllib.unquote(password)
750
        user = urllib.unquote(user)
751
    else:
752
        host = netloc
753
4253.4.2 by Jelmer Vernooij
Still parse port in case of ipv6.
754
    if ':' in host and not (host[0] == '[' and host[-1] == ']'): #there *is* port
755
        host, port = host.rsplit(':',1)
756
        try:
757
            port = int(port)
758
        except ValueError:
759
            raise errors.InvalidURL('invalid port number %s in url:\n%s' %
760
                                    (port, url))
4253.4.3 by Jelmer Vernooij
Support empty host name.
761
    if host != "" and host[0] == '[' and host[-1] == ']': #IPv6
4253.4.2 by Jelmer Vernooij
Still parse port in case of ipv6.
762
        host = host[1:-1]
3873.3.2 by Martin Pool
Accept ipv6 literals in URLs
763
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
764
    host = urllib.unquote(host)
765
    path = urllib.unquote(path)
766
767
    return (scheme, user, password, host, port, path)