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