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