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