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