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