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