~bzr-pqm/bzr/bzr.dev

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
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""A collection of function for handling URL operations."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
21
import os
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
22
import re
23
import sys
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
24
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
27
from posixpath import split as _posix_split
3242.3.26 by Aaron Bentley
Implement rebase_url
28
import urlparse
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
29
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
30
from bzrlib import (
31
    errors,
32
    osutils,
33
    )
34
""")
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
35
36
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
37
def basename(url, exclude_trailing_slash=True):
38
    """Return the last component of a URL.
39
40
    :param url: The URL in question
41
    :param exclude_trailing_slash: If the url looks like "path/to/foo/"
42
        ignore the final slash and return 'foo' rather than ''
43
    :return: Just the final component of the URL. This can return ''
44
        if you don't exclude_trailing_slash, or if you are at the
45
        root of the URL.
46
    """
47
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[1]
48
49
50
def dirname(url, exclude_trailing_slash=True):
51
    """Return the parent directory of the given path.
52
53
    :param url: Relative or absolute URL
54
    :param exclude_trailing_slash: Remove a final slash
55
        (treat http://host/foo/ as http://host/foo, but
56
        http://host/ stays http://host/)
57
    :return: Everything in the URL except the last path chunk
58
    """
59
    # TODO: jam 20060502 This was named dirname to be consistent
60
    #       with the os functions, but maybe "parent" would be better
61
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[0]
62
63
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
64
# Private copies of quote and unquote, copied from Python's
65
# urllib module because urllib unconditionally imports socket, which imports
66
# ssl.
67
68
always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
69
               'abcdefghijklmnopqrstuvwxyz'
70
               '0123456789' '_.-')
71
_safe_map = {}
72
for i, c in zip(xrange(256), str(bytearray(xrange(256)))):
6379.4.8 by Jelmer Vernooij
Fix 2.6 compatibility.
73
    _safe_map[c] = c if (i < 128 and c in always_safe) else '%{0:02X}'.format(i)
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
74
_safe_quoters = {}
75
76
77
def quote(s, safe='/'):
78
    """quote('abc def') -> 'abc%20def'
79
80
    Each part of a URL, e.g. the path info, the query, etc., has a
81
    different set of reserved characters that must be quoted.
82
83
    RFC 2396 Uniform Resource Identifiers (URI): Generic Syntax lists
84
    the following reserved characters.
85
86
    reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
87
                  "$" | ","
88
89
    Each of these characters is reserved in some component of a URL,
90
    but not necessarily in all of them.
91
92
    By default, the quote function is intended for quoting the path
93
    section of a URL.  Thus, it will not encode '/'.  This character
94
    is reserved, but in typical usage the quote function is being
95
    called on a path where the existing slash characters are used as
96
    reserved characters.
97
    """
98
    # fastpath
99
    if not s:
100
        if s is None:
101
            raise TypeError('None object cannot be quoted')
102
        return s
103
    cachekey = (safe, always_safe)
104
    try:
105
        (quoter, safe) = _safe_quoters[cachekey]
106
    except KeyError:
107
        safe_map = _safe_map.copy()
108
        safe_map.update([(c, c) for c in safe])
109
        quoter = safe_map.__getitem__
110
        safe = always_safe + safe
111
        _safe_quoters[cachekey] = (quoter, safe)
112
    if not s.rstrip(safe):
113
        return s
114
    return ''.join(map(quoter, s))
115
116
117
_hexdig = '0123456789ABCDEFabcdef'
118
_hextochr = dict((a + b, chr(int(a + b, 16)))
119
                 for a in _hexdig for b in _hexdig)
120
121
def unquote(s):
122
    """unquote('abc%20def') -> 'abc def'."""
123
    res = s.split('%')
124
    # fastpath
125
    if len(res) == 1:
126
        return s
127
    s = res[0]
128
    for item in res[1:]:
129
        try:
130
            s += _hextochr[item[:2]] + item[2:]
131
        except KeyError:
132
            s += '%' + item
133
        except UnicodeDecodeError:
134
            s += unichr(int(item[:2], 16)) + item[2:]
135
    return s
136
137
5268.7.11 by Jelmer Vernooij
revert some unnecessary changes
138
def escape(relpath):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
139
    """Escape relpath to be a valid url."""
140
    if isinstance(relpath, unicode):
141
        relpath = relpath.encode('utf-8')
142
    # After quoting and encoding, the path should be perfectly
143
    # safe as a plain ASCII string, str() just enforces this
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
144
    return str(quote(relpath, safe='/~'))
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
145
146
1685.1.46 by John Arbash Meinel
Sorting functions by name.
147
def file_relpath(base, path):
148
    """Compute just the relative sub-portion of a url
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
149
1685.1.46 by John Arbash Meinel
Sorting functions by name.
150
    This assumes that both paths are already fully specified file:// URLs.
151
    """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
152
    if len(base) < MIN_ABS_FILEURL_LENGTH:
4539.1.1 by Andrew Bennetts
Improve error message in osutils.file_relpath.
153
        raise ValueError('Length of base (%r) must equal or'
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
154
            ' exceed the platform minimum url length (which is %d)' %
4539.1.1 by Andrew Bennetts
Improve error message in osutils.file_relpath.
155
            (base, MIN_ABS_FILEURL_LENGTH))
6240.4.3 by Martin Packman
Use filesystem rather than url path function to strip terminal slash
156
    base = osutils.normpath(local_path_from_url(base))
157
    path = osutils.normpath(local_path_from_url(path))
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
158
    return escape(osutils.relpath(base, path))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
159
160
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
161
def _find_scheme_and_separator(url):
162
    """Find the scheme separator (://) and the first path separator
163
164
    This is just a helper functions for other path utilities.
165
    It could probably be replaced by urlparse
166
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
167
    m = _url_scheme_re.match(url)
168
    if not m:
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
169
        return None, None
170
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
171
    scheme = m.group('scheme')
172
    path = m.group('path')
173
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
174
    # Find the path separating slash
175
    # (first slash after the ://)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
176
    first_path_slash = path.find('/')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
177
    if first_path_slash == -1:
1685.1.56 by John Arbash Meinel
Fixing _find_scheme_and_separator
178
        return len(scheme), None
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
179
    return len(scheme), first_path_slash+m.start('path')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
180
181
5254.2.1 by Gordon Tyler
Fixed how get_transport's convert_path_to_url tests whether a path is actually a URL.
182
def is_url(url):
183
    """Tests whether a URL is in actual fact a URL."""
184
    return _url_scheme_re.match(url) is not None
185
186
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
187
def join(base, *args):
188
    """Create a URL by joining sections.
189
190
    This will normalize '..', assuming that paths are absolute
191
    (it assumes no symlinks in either path)
192
193
    If any of *args is an absolute URL, it will be treated correctly.
194
    Example:
195
        join('http://foo', 'http://bar') => 'http://bar'
196
        join('http://foo', 'bar') => 'http://foo/bar'
197
        join('http://foo', 'bar', '../baz') => 'http://foo/baz'
198
    """
2018.5.100 by Andrew Bennetts
Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
199
    if not args:
200
        return base
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
201
    scheme_end, path_start = _find_scheme_and_separator(base)
202
    if scheme_end is None and path_start is None:
203
        path_start = 0
204
    elif path_start is None:
205
        path_start = len(base)
206
    path = base[path_start:]
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
207
    for arg in args:
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
208
        arg_scheme_end, arg_path_start = _find_scheme_and_separator(arg)
209
        if arg_scheme_end is None and arg_path_start is None:
210
            arg_path_start = 0
211
        elif arg_path_start is None:
212
            arg_path_start = len(arg)
5254.1.5 by Gordon Tyler
Fixes according to spiv's review.
213
        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.
214
            base = arg
215
            path = arg[arg_path_start:]
216
            scheme_end = arg_scheme_end
217
            path_start = arg_path_start
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
218
        else:
2018.5.54 by Andrew Bennetts
Fix ChrootTransportDecorator's abspath method to be consistent with its clone
219
            path = joinpath(path, arg)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
220
    return base[:path_start] + path
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
221
222
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
223
def joinpath(base, *args):
224
    """Join URL path segments to a URL path segment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
225
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
226
    This is somewhat like osutils.joinpath, but intended for URLs.
227
228
    XXX: this duplicates some normalisation logic, and also duplicates a lot of
229
    path handling logic that already exists in some Transport implementations.
230
    We really should try to have exactly one place in the code base responsible
231
    for combining paths of URLs.
232
    """
2018.5.100 by Andrew Bennetts
Fix IndexError in urlutils.join with 'http://host/a' and '../../b'.
233
    path = base.split('/')
234
    if len(path) > 1 and path[-1] == '':
235
        #If the path ends in a trailing /, remove it.
236
        path.pop()
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
237
    for arg in args:
238
        if arg.startswith('/'):
239
            path = []
240
        for chunk in arg.split('/'):
241
            if chunk == '.':
242
                continue
243
            elif chunk == '..':
244
                if path == ['']:
245
                    raise errors.InvalidURLJoin('Cannot go above root',
246
                            base, args)
247
                path.pop()
248
            else:
249
                path.append(chunk)
250
    if path == ['']:
251
        return '/'
252
    else:
253
        return '/'.join(path)
254
255
1685.1.46 by John Arbash Meinel
Sorting functions by name.
256
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
257
def _posix_local_path_from_url(url):
258
    """Convert a url like file:///path/to/foo into /path/to/foo"""
5268.7.21 by Jelmer Vernooij
Cope with segment parameters in urls.
259
    url = split_segment_parameters_raw(url)[0]
4828.1.1 by Michael Hudson
test and fix
260
    file_localhost_prefix = 'file://localhost/'
261
    if url.startswith(file_localhost_prefix):
262
        path = url[len(file_localhost_prefix) - 1:]
263
    elif not url.startswith('file:///'):
264
        raise errors.InvalidURL(
265
            url, 'local urls must start with file:/// or file://localhost/')
266
    else:
267
        path = url[len('file://'):]
1685.1.46 by John Arbash Meinel
Sorting functions by name.
268
    # We only strip off 2 slashes
4828.1.1 by Michael Hudson
test and fix
269
    return unescape(path)
1685.1.46 by John Arbash Meinel
Sorting functions by name.
270
271
272
def _posix_local_path_to_url(path):
273
    """Convert a local path like ./foo into a URL like file:///path/to/foo
274
275
    This also handles transforming escaping unicode characters, etc.
276
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
277
    # importing directly from posixpath allows us to test this
1685.1.46 by John Arbash Meinel
Sorting functions by name.
278
    # on non-posix platforms
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
279
    return 'file://' + escape(osutils._posix_abspath(path))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
280
281
282
def _win32_local_path_from_url(url):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
283
    """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
284
    if not url.startswith('file://'):
285
        raise errors.InvalidURL(url, 'local urls must start with file:///, '
286
                                     'UNC path urls must start with file://')
5268.7.21 by Jelmer Vernooij
Cope with segment parameters in urls.
287
    url = split_segment_parameters_raw(url)[0]
1685.1.46 by John Arbash Meinel
Sorting functions by name.
288
    # We strip off all 3 slashes
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
289
    win32_url = url[len('file:'):]
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
290
    # check for UNC path: //HOST/path
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
291
    if not win32_url.startswith('///'):
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
292
        if (win32_url[2] == '/'
293
            or win32_url[3] in '|:'):
294
            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
295
                ' have form file://HOST/path')
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
296
        return unescape(win32_url)
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
297
298
    # allow empty paths so we can serve all roots
299
    if win32_url == '///':
300
        return '/'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
301
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
302
    # usual local path with drive letter
5510.2.3 by Jared Bunting
Changed _win32_local_path_from_url to not allow "file:///C:" form.
303
    if (len(win32_url) < 6
5510.2.1 by Jared Bunting
Modified _win32_local_path_from_url to:
304
        or win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
305
                                'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
306
        or win32_url[4] not in  '|:'
5510.2.3 by Jared Bunting
Changed _win32_local_path_from_url to not allow "file:///C:" form.
307
        or win32_url[5] != '/'):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
308
        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
309
                ' 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
310
    return win32_url[3].upper() + u':' + unescape(win32_url[5:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
311
312
313
def _win32_local_path_to_url(path):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
314
    """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.
315
316
    This also handles transforming escaping unicode characters, etc.
317
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
318
    # 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
319
    # on non-win32 platform
320
    # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
321
    #       which actually strips trailing space characters.
5278.1.5 by Martin Pool
Correct more sloppy use of the term 'Linux'
322
    #       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
323
    #       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
324
    if path == '/':
3503.1.2 by adwi2
Permits Windows to serve all paths on all drives.
325
        return 'file:///'
3503.1.1 by Adrian Wilkins
Add a couple of special cases to urlutils._win32_path_(from|to)_url
326
2279.4.2 by Alexander Belchenko
Don't do normpath after abspath, because this function is called inside abspath
327
    win32_path = osutils._win32_abspath(path)
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
328
    # check for UNC path \\HOST\path
329
    if win32_path.startswith('//'):
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
330
        return 'file:' + escape(win32_path)
3234.3.1 by Alexander Belchenko
ensure that local_path_to_url() always returns plain string, not unicode.
331
    return ('file:///' + str(win32_path[0].upper()) + ':' +
332
        escape(win32_path[2:]))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
333
334
335
local_path_to_url = _posix_local_path_to_url
336
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
337
MIN_ABS_FILEURL_LENGTH = len('file:///')
1711.4.17 by John Arbash Meinel
[merge] bzr.dev 1790
338
WIN32_MIN_ABS_FILEURL_LENGTH = len('file:///C:/')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
339
340
if sys.platform == 'win32':
341
    local_path_to_url = _win32_local_path_to_url
342
    local_path_from_url = _win32_local_path_from_url
343
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
344
    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
345
346
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
347
_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 '~'.
348
_url_hex_escapes_re = re.compile(r'(%[0-9a-fA-F]{2})')
349
350
351
def _unescape_safe_chars(matchobj):
352
    """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
353
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
354
    e.g. '%7E' will be converted to '~'.
355
    """
356
    hex_digits = matchobj.group(0)[1:]
357
    char = chr(int(hex_digits, 16))
358
    if char in _url_dont_escape_characters:
359
        return char
360
    else:
361
        return matchobj.group(0).upper()
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
362
363
364
def normalize_url(url):
365
    """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
366
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
367
    This handles URLs which have unicode characters, spaces,
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
368
    special characters, etc.
369
370
    It has two basic modes of operation, depending on whether the
371
    supplied string starts with a url specifier (scheme://) or not.
372
    If it does not have a specifier it is considered a local path,
373
    and will be converted into a file:/// url. Non-ascii characters
374
    will be encoded using utf-8.
375
    If it does have a url specifier, it will be treated as a "hybrid"
376
    URL. Basically, a URL that should have URL special characters already
377
    escaped (like +?&# etc), but may have unicode characters, etc
378
    which would not be valid in a real URL.
379
380
    :param url: Either a hybrid URL or a local path
381
    :return: A normalized URL which only includes 7-bit ASCII characters.
382
    """
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
383
    scheme_end, path_start = _find_scheme_and_separator(url)
384
    if scheme_end is None:
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
385
        return local_path_to_url(url)
5254.1.1 by Gordon Tyler
Added support to urlutils for URLs such as Launchpad's lp:foobar.
386
    prefix = url[:path_start]
387
    path = url[path_start:]
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
388
    if not isinstance(url, unicode):
389
        for c in url:
390
            if c not in _url_safe_characters:
1685.1.53 by John Arbash Meinel
Updated normalize_url
391
                raise errors.InvalidURL(url, 'URLs can only contain specific'
392
                                            ' safe characters (not %r)' % c)
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
393
        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.
394
        return str(prefix + ''.join(path))
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
395
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
396
    # We have a unicode (hybrid) url
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
397
    path_chars = list(path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
398
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
399
    for i in xrange(len(path_chars)):
400
        if path_chars[i] not in _url_safe_characters:
401
            chars = path_chars[i].encode('utf-8')
402
            path_chars[i] = ''.join(
403
                ['%%%02X' % ord(c) for c in path_chars[i].encode('utf-8')])
404
    path = ''.join(path_chars)
405
    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.
406
    return str(prefix + path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
407
408
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
409
def relative_url(base, other):
410
    """Return a path to other from base.
411
412
    If other is unrelated to base, return other. Else return a relative path.
413
    This assumes no symlinks as part of the url.
414
    """
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
415
    dummy, base_first_slash = _find_scheme_and_separator(base)
416
    if base_first_slash is None:
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
417
        return other
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
418
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
419
    dummy, other_first_slash = _find_scheme_and_separator(other)
420
    if other_first_slash is None:
421
        return other
422
423
    # this takes care of differing schemes or hosts
424
    base_scheme = base[:base_first_slash]
425
    other_scheme = other[:other_first_slash]
426
    if base_scheme != other_scheme:
427
        return other
3139.2.1 by Alexander Belchenko
bugfix #90847: fix problem with parent location on another logical drive
428
    elif sys.platform == 'win32' and base_scheme == 'file://':
429
        base_drive = base[base_first_slash+1:base_first_slash+3]
430
        other_drive = other[other_first_slash+1:other_first_slash+3]
431
        if base_drive != other_drive:
432
            return other
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
433
434
    base_path = base[base_first_slash+1:]
435
    other_path = other[other_first_slash+1:]
436
437
    if base_path.endswith('/'):
438
        base_path = base_path[:-1]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
439
440
    base_sections = base_path.split('/')
441
    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
442
443
    if base_sections == ['']:
444
        base_sections = []
445
    if other_sections == ['']:
446
        other_sections = []
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
447
448
    output_sections = []
449
    for b, o in zip(base_sections, other_sections):
450
        if b != o:
451
            break
452
        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
453
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
454
    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
455
    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
456
    output_sections.extend(other_sections[match_len:])
457
458
    return "/".join(output_sections) or "."
459
460
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
461
def _win32_extract_drive_letter(url_base, path):
462
    """On win32 the drive letter needs to be added to the url base."""
463
    # Strip off the drive letter
464
    # path is currently /C:/foo
6123.3.2 by Martin
Treat file:///C: as invalid on windows instead of throwing an IndexError
465
    if len(path) < 4 or path[2] not in ':|' or path[3] != '/':
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
466
        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.
467
            'win32 file:/// paths need a drive letter')
468
    url_base += path[0:3] # file:// + /C:
469
    path = path[3:] # /foo
470
    return url_base, path
471
472
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
473
def split(url, exclude_trailing_slash=True):
474
    """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
475
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
476
    :param url: A relative or absolute URL
477
    :param exclude_trailing_slash: Strip off a final '/' if it is part
478
        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
479
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
480
    :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
481
        the root.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
482
    """
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
483
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
484
485
    if first_path_slash is None:
486
        # We have either a relative path, or no separating slash
487
        if scheme_loc is None:
488
            # Relative path
489
            if exclude_trailing_slash and url.endswith('/'):
490
                url = url[:-1]
491
            return _posix_split(url)
492
        else:
493
            # Scheme with no path
494
            return url, ''
495
496
    # We have a fully defined path
497
    url_base = url[:first_path_slash] # http://host, file://
498
    path = url[first_path_slash:] # /file/foo
499
500
    if sys.platform == 'win32' and url.startswith('file:///'):
501
        # 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.
502
        # url_base is currently file://
1711.2.39 by John Arbash Meinel
Fix bzrlib.urlutils.split() to work properly on win32 local paths.
503
        # 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.
504
        url_base, path = _win32_extract_drive_letter(url_base, path)
505
        # now it should be file:///C: and /foo
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
506
507
    if exclude_trailing_slash and len(path) > 1 and path.endswith('/'):
508
        path = path[:-1]
509
    head, tail = _posix_split(path)
510
    return url_base + head, tail
511
1685.1.46 by John Arbash Meinel
Sorting functions by name.
512
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
513
def split_segment_parameters_raw(url):
5163.2.1 by Jelmer Vernooij
Add urlutils.split_subsegments.
514
    """Split the subsegment of the last segment of a URL.
515
516
    :param url: A relative or absolute URL
517
    :return: (url, subsegments)
518
    """
6278.1.4 by Martin Packman
Fix fallout on per_transport tests from suspect terminal slash handling
519
    # GZ 2011-11-18: Dodgy removing the terminal slash like this, function
520
    #                operates on urls not url+segments, and Transport classes
6278.1.5 by Martin Packman
Spelling tweaks suggested by vila in review
521
    #                should not be blindly adding slashes in the first place. 
6278.1.4 by Martin Packman
Fix fallout on per_transport tests from suspect terminal slash handling
522
    lurl = strip_trailing_slash(url)
6278.1.5 by Martin Packman
Spelling tweaks suggested by vila in review
523
    # Segments begin at first comma after last forward slash, if one exists
6278.1.4 by Martin Packman
Fix fallout on per_transport tests from suspect terminal slash handling
524
    segment_start = lurl.find(",", lurl.rfind("/")+1)
6278.1.3 by Martin Packman
Stop using urlutils.split before segment parameters have been removed
525
    if segment_start == -1:
5163.2.1 by Jelmer Vernooij
Add urlutils.split_subsegments.
526
        return (url, [])
6278.1.5 by Martin Packman
Spelling tweaks suggested by vila in review
527
    return (lurl[:segment_start], lurl[segment_start+1:].split(","))
5163.2.1 by Jelmer Vernooij
Add urlutils.split_subsegments.
528
529
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
530
def split_segment_parameters(url):
531
    """Split the segment parameters of the last segment of a URL.
532
533
    :param url: A relative or absolute URL
534
    :return: (url, segment_parameters)
535
    """
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
536
    (base_url, subsegments) = split_segment_parameters_raw(url)
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
537
    parameters = {}
538
    for subsegment in subsegments:
539
        (key, value) = subsegment.split("=", 1)
540
        parameters[key] = value
541
    return (base_url, parameters)
542
543
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
544
def join_segment_parameters_raw(base, *subsegments):
5163.2.7 by Jelmer Vernooij
Add type checking.
545
    """Create a new URL by adding subsegments to an existing one. 
546
547
    This adds the specified subsegments to the last path in the specified
548
    base URL. The subsegments should be bytestrings.
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
549
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
550
    :note: You probably want to use join_segment_parameters instead.
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
551
    """
552
    if not subsegments:
553
        return base
554
    for subsegment in subsegments:
5163.2.7 by Jelmer Vernooij
Add type checking.
555
        if type(subsegment) is not str:
556
            raise TypeError("Subsegment %r is not a bytestring" % subsegment)
5163.2.2 by Jelmer Vernooij
Add bzrlib.urlutils.join_subsegments.
557
        if "," in subsegment:
558
            raise errors.InvalidURLJoin(", exists in subsegments",
559
                                        base, subsegments)
560
    return ",".join((base,) + subsegments)
561
562
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
563
def join_segment_parameters(url, parameters):
564
    """Create a new URL by adding segment parameters to an existing one.
565
5163.2.7 by Jelmer Vernooij
Add type checking.
566
    The parameters of the last segment in the URL will be updated; if a
567
    parameter with the same key already exists it will be overwritten.
568
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
569
    :param url: A URL, as string
5163.2.7 by Jelmer Vernooij
Add type checking.
570
    :param parameters: Dictionary of parameters, keys and values as bytestrings
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
571
    """
572
    (base, existing_parameters) = split_segment_parameters(url)
573
    new_parameters = {}
574
    new_parameters.update(existing_parameters)
575
    for key, value in parameters.iteritems():
5163.2.7 by Jelmer Vernooij
Add type checking.
576
        if type(key) is not str:
577
            raise TypeError("parameter key %r is not a bytestring" % key)
578
        if type(value) is not str:
579
            raise TypeError("parameter value %r for %s is not a bytestring" %
580
                (key, value))
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
581
        if "=" in key:
582
            raise errors.InvalidURLJoin("= exists in parameter key", url,
583
                parameters)
584
        new_parameters[key] = value
5163.2.5 by Jelmer Vernooij
rename {split,join}_subsegments -> {split,join}_segment_parameters_raw and add more tests.
585
    return join_segment_parameters_raw(base, 
5163.2.6 by Jelmer Vernooij
Fix example names in tests.
586
        *["%s=%s" % item for item in sorted(new_parameters.items())])
5163.2.3 by Jelmer Vernooij
Add join_segment_parameters / split_segment_parameters.
587
588
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
589
def _win32_strip_local_trailing_slash(url):
590
    """Strip slashes after the drive letter"""
591
    if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
592
        return url[:-1]
593
    else:
594
        return url
595
596
1685.1.47 by John Arbash Meinel
s comes before u
597
def strip_trailing_slash(url):
598
    """Strip trailing slash, except for root paths.
599
600
    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
601
    This assumes that all URLs are valid netloc urls, such that they
602
    form:
603
    scheme://host/path
604
    It searches for ://, and then refuses to remove the next '/'.
605
    It can also handle relative paths
606
    Examples:
607
        path/to/foo       => path/to/foo
608
        path/to/foo/      => path/to/foo
609
        http://host/path/ => http://host/path
610
        http://host/path  => http://host/path
611
        http://host/      => http://host/
612
        file:///          => file:///
613
        file:///foo/      => file:///foo
614
        # This is unique on win32 platforms, and is the only URL
615
        # 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
616
        file:///c|/       => file:///c:/
1685.1.47 by John Arbash Meinel
s comes before u
617
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
618
    if not url.endswith('/'):
619
        # Nothing to do
620
        return url
2245.6.1 by Alexander Belchenko
win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
621
    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.
622
        return _win32_strip_local_trailing_slash(url)
1685.1.80 by Wouter van Heyst
more code cleanup
623
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
624
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
625
    if scheme_loc is None:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
626
        # This is a relative path, as it has no scheme
627
        # so just chop off the last character
1685.1.47 by John Arbash Meinel
s comes before u
628
        return url[:-1]
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
629
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
630
    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
631
        # Don't chop off anything if the only slash is the path
632
        # separating slash
1685.1.47 by John Arbash Meinel
s comes before u
633
        return url
634
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
635
    return url[:-1]
636
1685.1.47 by John Arbash Meinel
s comes before u
637
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
638
def unescape(url):
639
    """Unescape relpath from url format.
640
641
    This returns a Unicode path from a URL
642
    """
643
    # jam 20060427 URLs are supposed to be ASCII only strings
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
644
    #       If they are passed in as unicode, unquote
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
645
    #       will return a UNICODE string, which actually contains
646
    #       utf-8 bytes. So we have to ensure that they are
647
    #       plain ASCII strings, or the final .decode will
648
    #       try to encode the UNICODE => ASCII, and then decode
649
    #       it into utf-8.
650
    try:
651
        url = str(url)
652
    except UnicodeError, e:
653
        raise errors.InvalidURL(url, 'URL was not a plain ASCII url: %s' % (e,))
1685.1.80 by Wouter van Heyst
more code cleanup
654
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
655
    unquoted = unquote(url)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
656
    try:
657
        unicode_path = unquoted.decode('utf-8')
658
    except UnicodeError, e:
659
        raise errors.InvalidURL(url, 'Unable to encode the URL as utf-8: %s' % (e,))
660
    return unicode_path
661
662
663
# These are characters that if escaped, should stay that way
664
_no_decode_chars = ';/?:@&=+$,#'
665
_no_decode_ords = [ord(c) for c in _no_decode_chars]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
666
_no_decode_hex = (['%02x' % o for o in _no_decode_ords]
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
667
                + ['%02X' % o for o in _no_decode_ords])
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
668
_hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
669
                    + [('%02X' % o, chr(o)) for o in range(256)]))
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
670
#These entries get mapped to themselves
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
671
_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.
672
2208.4.1 by Andrew Bennetts
normalize_url should normalise escaping of unreserved characters, like '~'.
673
# These characters shouldn't be percent-encoded, and it's always safe to
674
# unencode them if they are.
675
_url_dont_escape_characters = set(
676
   "abcdefghijklmnopqrstuvwxyz" # Lowercase alpha
677
   "ABCDEFGHIJKLMNOPQRSTUVWXYZ" # Uppercase alpha
678
   "0123456789" # Numbers
679
   "-._~"  # Unreserved characters
680
)
681
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
682
# These characters should not be escaped
2167.2.2 by Aaron Bentley
Update safe character list
683
_url_safe_characters = set(
684
   "abcdefghijklmnopqrstuvwxyz" # Lowercase alpha
685
   "ABCDEFGHIJKLMNOPQRSTUVWXYZ" # Uppercase alpha
686
   "0123456789" # Numbers
687
   "_.-!~*'()"  # Unreserved characters
688
   "/;?:@&=+$," # Reserved characters
689
   "%#"         # Extra reserved characters
690
)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
691
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
692
def unescape_for_display(url, encoding):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
693
    """Decode what you can for a URL, so that we get a nice looking path.
694
695
    This will turn file:// urls into local paths, and try to decode
696
    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.
697
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
698
    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
699
    need to stay as escapes are left alone.
700
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
701
    :param url: A 7-bit ASCII URL
702
    :param encoding: The final output encoding
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
703
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
704
    :return: A unicode string which can be safely encoded into the
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
705
         specified encoding.
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
706
    """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
707
    if encoding is None:
708
        raise ValueError('you cannot specify None for the display encoding')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
709
    if url.startswith('file://'):
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
710
        try:
711
            path = local_path_from_url(url)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
712
            path.encode(encoding)
713
            return path
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
714
        except UnicodeError:
715
            return url
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
716
717
    # Split into sections to try to decode utf-8
718
    res = url.split('/')
719
    for i in xrange(1, len(res)):
720
        escaped_chunks = res[i].split('%')
721
        for j in xrange(1, len(escaped_chunks)):
722
            item = escaped_chunks[j]
723
            try:
724
                escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]
725
            except KeyError:
726
                # Put back the percent symbol
727
                escaped_chunks[j] = '%' + item
728
            except UnicodeDecodeError:
729
                escaped_chunks[j] = unichr(int(item[:2], 16)) + item[2:]
730
        unescaped = ''.join(escaped_chunks)
731
        try:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
732
            decoded = unescaped.decode('utf-8')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
733
        except UnicodeDecodeError:
734
            # If this path segment cannot be properly utf-8 decoded
735
            # after doing unescaping we will just leave it alone
736
            pass
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
737
        else:
738
            try:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
739
                decoded.encode(encoding)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
740
            except UnicodeEncodeError:
741
                # If this chunk cannot be encoded in the local
742
                # encoding, then we should leave it alone
743
                pass
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
744
            else:
745
                # Otherwise take the url decoded one
746
                res[i] = decoded
747
    return u'/'.join(res)
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
748
749
750
def derive_to_location(from_location):
751
    """Derive a TO_LOCATION given a FROM_LOCATION.
752
753
    The normal case is a FROM_LOCATION of http://foo/bar => bar.
754
    The Right Thing for some logical destinations may differ though
755
    because no / may be present at all. In that case, the result is
756
    the full name without the scheme indicator, e.g. lp:foo-bar => foo-bar.
757
    This latter case also applies when a Windows drive
758
    is used without a path, e.g. c:foo-bar => foo-bar.
759
    If no /, path separator or : is found, the from_location is returned.
760
    """
761
    if from_location.find("/") >= 0 or from_location.find(os.sep) >= 0:
762
        return os.path.basename(from_location.rstrip("/\\"))
763
    else:
764
        sep = from_location.find(":")
765
        if sep > 0:
766
            return from_location[sep+1:]
767
        else:
768
            return from_location
3242.3.26 by Aaron Bentley
Implement rebase_url
769
3242.3.35 by Aaron Bentley
Cleanups and documentation
770
3242.3.26 by Aaron Bentley
Implement rebase_url
771
def _is_absolute(url):
772
    return (osutils.pathjoin('/foo', url) == url)
773
3242.3.35 by Aaron Bentley
Cleanups and documentation
774
3242.3.26 by Aaron Bentley
Implement rebase_url
775
def rebase_url(url, old_base, new_base):
776
    """Convert a relative path from an old base URL to a new base URL.
777
778
    The result will be a relative path.
779
    Absolute paths and full URLs are returned unaltered.
780
    """
781
    scheme, separator = _find_scheme_and_separator(url)
782
    if scheme is not None:
783
        return url
784
    if _is_absolute(url):
785
        return url
786
    old_parsed = urlparse.urlparse(old_base)
787
    new_parsed = urlparse.urlparse(new_base)
788
    if (old_parsed[:2]) != (new_parsed[:2]):
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
789
        raise errors.InvalidRebaseURLs(old_base, new_base)
3242.3.36 by Aaron Bentley
Updates from review comments
790
    return determine_relative_path(new_parsed[2],
3567.2.1 by Michael Hudson
urlutils.rebase_url handles '..' path segments in 'url'
791
                                   join(old_parsed[2], url))
3242.3.26 by Aaron Bentley
Implement rebase_url
792
793
794
def determine_relative_path(from_path, to_path):
795
    """Determine a relative path from from_path to to_path."""
796
    from_segments = osutils.splitpath(from_path)
797
    to_segments = osutils.splitpath(to_path)
798
    count = -1
799
    for count, (from_element, to_element) in enumerate(zip(from_segments,
800
                                                       to_segments)):
801
        if from_element != to_element:
802
            break
803
    else:
804
        count += 1
805
    unique_from = from_segments[count:]
806
    unique_to = to_segments[count:]
807
    segments = (['..'] * len(unique_from) + unique_to)
808
    if len(segments) == 0:
809
        return '.'
810
    return osutils.pathjoin(*segments)
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
811
812
6055.2.7 by Jelmer Vernooij
Change parse_url to URL.from_string.
813
class URL(object):
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
814
    """Parsed URL."""
815
6055.2.7 by Jelmer Vernooij
Change parse_url to URL.from_string.
816
    def __init__(self, scheme, quoted_user, quoted_password, quoted_host,
817
            port, quoted_path):
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
818
        self.scheme = scheme
819
        self.quoted_host = quoted_host
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
820
        self.host = unquote(self.quoted_host)
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
821
        self.quoted_user = quoted_user
822
        if self.quoted_user is not None:
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
823
            self.user = unquote(self.quoted_user)
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
824
        else:
825
            self.user = None
826
        self.quoted_password = quoted_password
827
        if self.quoted_password is not None:
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
828
            self.password = unquote(self.quoted_password)
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
829
        else:
830
            self.password = None
831
        self.port = port
6061.1.4 by Martin Packman
Unescape unreserved characters for quoted_path member of URL class
832
        self.quoted_path = _url_hex_escapes_re.sub(_unescape_safe_chars, quoted_path)
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
833
        self.path = unquote(self.quoted_path)
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
834
6055.2.8 by Jelmer Vernooij
Add repr()
835
    def __eq__(self, other):
836
        return (isinstance(other, self.__class__) and
837
                self.scheme == other.scheme and
838
                self.host == other.host and
839
                self.user == other.user and
840
                self.password == other.password and
841
                self.path == other.path)
842
843
    def __repr__(self):
6055.2.11 by Jelmer Vernooij
Fix tests.
844
        return "<%s(%r, %r, %r, %r, %r, %r)>" % (
6055.2.8 by Jelmer Vernooij
Add repr()
845
            self.__class__.__name__,
6055.2.11 by Jelmer Vernooij
Fix tests.
846
            self.scheme, self.quoted_user, self.quoted_password,
847
            self.quoted_host, self.port, self.quoted_path)
6055.2.8 by Jelmer Vernooij
Add repr()
848
6055.2.6 by Jelmer Vernooij
Split out parse_url.
849
    @classmethod
6055.2.7 by Jelmer Vernooij
Change parse_url to URL.from_string.
850
    def from_string(cls, url):
851
        """Create a URL object from a string.
6055.2.6 by Jelmer Vernooij
Split out parse_url.
852
853
        :param url: URL as bytestring
854
        """
855
        if isinstance(url, unicode):
856
            raise errors.InvalidURL('should be ascii:\n%r' % url)
857
        url = url.encode('utf-8')
858
        (scheme, netloc, path, params,
859
         query, fragment) = urlparse.urlparse(url, allow_fragments=False)
860
        user = password = host = port = None
861
        if '@' in netloc:
862
            user, host = netloc.rsplit('@', 1)
863
            if ':' in user:
864
                user, password = user.split(':', 1)
865
        else:
866
            host = netloc
867
6055.2.14 by Jelmer Vernooij
Fix long line.
868
        if ':' in host and not (host[0] == '[' and host[-1] == ']'):
869
            # there *is* port
6055.2.6 by Jelmer Vernooij
Split out parse_url.
870
            host, port = host.rsplit(':',1)
871
            try:
872
                port = int(port)
873
            except ValueError:
874
                raise errors.InvalidURL('invalid port number %s in url:\n%s' %
875
                                        (port, url))
876
        if host != "" and host[0] == '[' and host[-1] == ']': #IPv6
877
            host = host[1:-1]
878
879
        return cls(scheme, user, password, host, port, path)
880
6055.2.13 by Jelmer Vernooij
Add URL.__str__.
881
    def __str__(self):
882
        netloc = self.quoted_host
883
        if ":" in netloc:
884
            netloc = "[%s]" % netloc
885
        if self.quoted_user is not None:
886
            # Note that we don't put the password back even if we
887
            # have one so that it doesn't get accidentally
888
            # exposed.
889
            netloc = '%s@%s' % (self.quoted_user, netloc)
890
        if self.port is not None:
891
            netloc = '%s:%d' % (netloc, self.port)
892
        return urlparse.urlunparse(
893
            (self.scheme, netloc, self.quoted_path, None, None, None))
894
6055.2.15 by Jelmer Vernooij
Add URL._combine_paths.
895
    @staticmethod
896
    def _combine_paths(base_path, relpath):
897
        """Transform a Transport-relative path to a remote absolute path.
898
899
        This does not handle substitution of ~ but does handle '..' and '.'
900
        components.
901
902
        Examples::
903
904
            t._combine_paths('/home/sarah', 'project/foo')
905
                => '/home/sarah/project/foo'
906
            t._combine_paths('/home/sarah', '../../etc')
907
                => '/etc'
908
            t._combine_paths('/home/sarah', '/etc')
909
                => '/etc'
910
911
        :param base_path: base path
912
        :param relpath: relative url string for relative part of remote path.
913
        :return: urlencoded string for final path.
914
        """
915
        if not isinstance(relpath, str):
916
            raise errors.InvalidURL(relpath)
6061.1.5 by Martin Packman
Unescape unreserved characters in relative portion when combining paths
917
        relpath = _url_hex_escapes_re.sub(_unescape_safe_chars, relpath)
6055.2.15 by Jelmer Vernooij
Add URL._combine_paths.
918
        if relpath.startswith('/'):
919
            base_parts = []
920
        else:
921
            base_parts = base_path.split('/')
922
        if len(base_parts) > 0 and base_parts[-1] == '':
923
            base_parts = base_parts[:-1]
924
        for p in relpath.split('/'):
925
            if p == '..':
926
                if len(base_parts) == 0:
927
                    # In most filesystems, a request for the parent
928
                    # of root, just returns root.
929
                    continue
930
                base_parts.pop()
931
            elif p == '.':
932
                continue # No-op
933
            elif p != '':
934
                base_parts.append(p)
935
        path = '/'.join(base_parts)
936
        if not path.startswith('/'):
937
            path = '/' + path
938
        return path
939
6055.2.17 by Jelmer Vernooij
Add URL.clone().
940
    def clone(self, offset=None):
941
        """Return a new URL for a path relative to this URL.
942
943
        :param offset: A relative path, already urlencoded
944
        :return: `URL` instance
945
        """
946
        if offset is not None:
947
            relative = unescape(offset).encode('utf-8')
948
            path = self._combine_paths(self.path, relative)
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
949
            path = quote(path, safe="/~")
6055.2.17 by Jelmer Vernooij
Add URL.clone().
950
        else:
951
            path = self.quoted_path
952
        return self.__class__(self.scheme, self.quoted_user,
953
                self.quoted_password, self.quoted_host, self.port,
954
                path)
955
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
956
957
def parse_url(url):
958
    """Extract the server address, the credentials and the path from the url.
959
960
    user, password, host and path should be quoted if they contain reserved
961
    chars.
962
963
    :param url: an quoted url
964
    :return: (scheme, user, password, host, port, path) tuple, all fields
965
        are unquoted.
966
    """
6055.2.7 by Jelmer Vernooij
Change parse_url to URL.from_string.
967
    parsed_url = URL.from_string(url)
6055.2.6 by Jelmer Vernooij
Split out parse_url.
968
    return (parsed_url.scheme, parsed_url.user, parsed_url.password,
969
        parsed_url.host, parsed_url.port, parsed_url.path)