/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1861.2.6 by Alexander Belchenko
branding: change Bazaar-NG to Bazaar
1
# Bazaar -- distributed version control
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2
#
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
3
# Copyright (C) 2006 Canonical Ltd
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
4
#
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
9
#
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
19
"""A collection of function for handling URL operations."""
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
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
27
from posixpath import split as _posix_split, normpath as _posix_normpath
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
28
import urllib
29
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
30
from bzrlib import (
31
    errors,
32
    osutils,
33
    )
34
""")
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
35
36
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
37
def basename(url, exclude_trailing_slash=True):
38
    """Return the last component of a URL.
39
40
    :param url: The URL in question
41
    :param exclude_trailing_slash: If the url looks like "path/to/foo/"
42
        ignore the final slash and return 'foo' rather than ''
43
    :return: Just the final component of the URL. This can return ''
44
        if you don't exclude_trailing_slash, or if you are at the
45
        root of the URL.
46
    """
47
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[1]
48
49
50
def dirname(url, exclude_trailing_slash=True):
51
    """Return the parent directory of the given path.
52
53
    :param url: Relative or absolute URL
54
    :param exclude_trailing_slash: Remove a final slash
55
        (treat http://host/foo/ as http://host/foo, but
56
        http://host/ stays http://host/)
57
    :return: Everything in the URL except the last path chunk
58
    """
59
    # TODO: jam 20060502 This was named dirname to be consistent
60
    #       with the os functions, but maybe "parent" would be better
61
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[0]
62
63
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
64
def escape(relpath):
65
    """Escape relpath to be a valid url."""
66
    if isinstance(relpath, unicode):
67
        relpath = relpath.encode('utf-8')
68
    # After quoting and encoding, the path should be perfectly
69
    # safe as a plain ASCII string, str() just enforces this
70
    return str(urllib.quote(relpath))
71
72
1685.1.46 by John Arbash Meinel
Sorting functions by name.
73
def file_relpath(base, path):
74
    """Compute just the relative sub-portion of a url
75
    
76
    This assumes that both paths are already fully specified file:// URLs.
77
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
78
    assert len(base) >= MIN_ABS_FILEURL_LENGTH, ('Length of base must be equal or'
1685.1.46 by John Arbash Meinel
Sorting functions by name.
79
        ' exceed the platform minimum url length (which is %d)' % 
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
80
        MIN_ABS_FILEURL_LENGTH)
1685.1.46 by John Arbash Meinel
Sorting functions by name.
81
82
    base = local_path_from_url(base)
83
    path = local_path_from_url(path)
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
84
    return escape(osutils.relpath(base, path))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
85
86
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
87
def _find_scheme_and_separator(url):
88
    """Find the scheme separator (://) and the first path separator
89
90
    This is just a helper functions for other path utilities.
91
    It could probably be replaced by urlparse
92
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
93
    m = _url_scheme_re.match(url)
94
    if not m:
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
95
        return None, None
96
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
97
    scheme = m.group('scheme')
98
    path = m.group('path')
99
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
100
    # Find the path separating slash
101
    # (first slash after the ://)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
102
    first_path_slash = path.find('/')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
103
    if first_path_slash == -1:
1685.1.56 by John Arbash Meinel
Fixing _find_scheme_and_separator
104
        return len(scheme), None
105
    return len(scheme), first_path_slash+len(scheme)+3
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
106
107
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
108
def join(base, *args):
109
    """Create a URL by joining sections.
110
111
    This will normalize '..', assuming that paths are absolute
112
    (it assumes no symlinks in either path)
113
114
    If any of *args is an absolute URL, it will be treated correctly.
115
    Example:
116
        join('http://foo', 'http://bar') => 'http://bar'
117
        join('http://foo', 'bar') => 'http://foo/bar'
118
        join('http://foo', 'bar', '../baz') => 'http://foo/baz'
119
    """
120
    m = _url_scheme_re.match(base)
121
    scheme = None
122
    if m:
123
        scheme = m.group('scheme')
124
        path = m.group('path').split('/')
1711.2.49 by John Arbash Meinel
urlutils.join should work for root paths.
125
        if path[-1:] == ['']:
126
            # Strip off a trailing slash
127
            # This helps both when we are at the root, and when
128
            # 'base' has an extra slash at the end
129
            path = path[:-1]
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
130
    else:
131
        path = base.split('/')
132
133
    for arg in args:
134
        m = _url_scheme_re.match(arg)
135
        if m:
136
            # Absolute URL
137
            scheme = m.group('scheme')
1986.1.10 by Robert Collins
Merge from bzr.dev, fixing found bugs handling 'has('/')' in MemoryTransport and SFTP transports.
138
            # this skips .. normalisation, making http://host/../../..
139
            # be rather strange.
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
140
            path = m.group('path').split('/')
141
        else:
142
            for chunk in arg.split('/'):
143
                if chunk == '.':
144
                    continue
145
                elif chunk == '..':
146
                    if len(path) >= 2:
147
                        # Don't pop off the host portion
148
                        path.pop()
149
                    else:
150
                        raise errors.InvalidURLJoin('Cannot go above root',
151
                                base, args)
152
                else:
153
                    path.append(chunk)
1685.1.80 by Wouter van Heyst
more code cleanup
154
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
155
    if scheme is None:
156
        return '/'.join(path)
157
    return scheme + '://' + '/'.join(path)
158
159
2018.5.46 by Andrew Bennetts
Fix ChrootTransportDecorator's clone to pass less surprising offsets to the decorated transport's clone.
160
def joinpath(base, *args):
161
    """Join URL path segments to a URL path segment.
162
    
163
    This is somewhat like osutils.joinpath, but intended for URLs.
164
165
    XXX: this duplicates some normalisation logic, and also duplicates a lot of
166
    path handling logic that already exists in some Transport implementations.
167
    We really should try to have exactly one place in the code base responsible
168
    for combining paths of URLs.
169
    """
170
    if base == '/':
171
        path = ['']
172
    else:
173
        path = base.split('/')
174
    for arg in args:
175
        if arg.startswith('/'):
176
            path = []
177
        for chunk in arg.split('/'):
178
            if chunk == '.':
179
                continue
180
            elif chunk == '..':
181
                if path == ['']:
182
                    raise errors.InvalidURLJoin('Cannot go above root',
183
                            base, args)
184
                path.pop()
185
            else:
186
                path.append(chunk)
187
    if path == ['']:
188
        return '/'
189
    else:
190
        return '/'.join(path)
191
192
1685.1.46 by John Arbash Meinel
Sorting functions by name.
193
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
194
def _posix_local_path_from_url(url):
195
    """Convert a url like file:///path/to/foo into /path/to/foo"""
196
    if not url.startswith('file:///'):
197
        raise errors.InvalidURL(url, 'local urls must start with file:///')
198
    # We only strip off 2 slashes
199
    return unescape(url[len('file://'):])
200
201
202
def _posix_local_path_to_url(path):
203
    """Convert a local path like ./foo into a URL like file:///path/to/foo
204
205
    This also handles transforming escaping unicode characters, etc.
206
    """
207
    # importing directly from posixpath allows us to test this 
208
    # on non-posix platforms
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
209
    return 'file://' + escape(_posix_normpath(
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
210
        osutils._posix_abspath(path)))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
211
212
213
def _win32_local_path_from_url(url):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
214
    """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
215
    if not url.startswith('file://'):
216
        raise errors.InvalidURL(url, 'local urls must start with file:///, '
217
                                     'UNC path urls must start with file://')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
218
    # We strip off all 3 slashes
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
219
    win32_url = url[len('file:'):]
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
220
    # check for UNC path: //HOST/path
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
221
    if not win32_url.startswith('///'):
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
222
        if (win32_url[2] == '/'
223
            or win32_url[3] in '|:'):
224
            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
225
                ' have form file://HOST/path')
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
226
        return unescape(win32_url)
227
    # usual local path with drive letter
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
228
    if (win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
229
                             'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
230
        or win32_url[4] not in  '|:'
231
        or win32_url[5] != '/'):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
232
        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
233
                ' 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
234
    return win32_url[3].upper() + u':' + unescape(win32_url[5:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
235
236
237
def _win32_local_path_to_url(path):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
238
    """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.
239
240
    This also handles transforming escaping unicode characters, etc.
241
    """
242
    # 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
243
    # on non-win32 platform
244
    # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
245
    #       which actually strips trailing space characters.
246
    #       The worst part is that under linux ntpath.abspath has different
247
    #       semantics, since 'nt' is not an available module.
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
248
    win32_path = osutils._nt_normpath(
249
        osutils._win32_abspath(path)).replace('\\', '/')
2162.2.2 by Alexander Belchenko
Support for win32 UNC path (like: \\HOST\path)
250
    # check for UNC path \\HOST\path
251
    if win32_path.startswith('//'):
2162.2.7 by Alexander Belchenko
Win32 UNC path \\HOST\path mapped to URL file://HOST/path
252
        return 'file:' + escape(win32_path)
1809.1.1 by Alexander Belchenko
win32: convert drive letter to uppercase, not lowercase
253
    return 'file:///' + win32_path[0].upper() + ':' + escape(win32_path[2:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
254
255
256
local_path_to_url = _posix_local_path_to_url
257
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
258
MIN_ABS_FILEURL_LENGTH = len('file:///')
1711.4.17 by John Arbash Meinel
[merge] bzr.dev 1790
259
WIN32_MIN_ABS_FILEURL_LENGTH = len('file:///C:/')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
260
261
if sys.platform == 'win32':
262
    local_path_to_url = _win32_local_path_to_url
263
    local_path_from_url = _win32_local_path_from_url
264
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
265
    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
266
267
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
268
_url_scheme_re = re.compile(r'^(?P<scheme>[^:/]{2,})://(?P<path>.*)$')
269
270
271
def normalize_url(url):
272
    """Make sure that a path string is in fully normalized URL form.
273
    
274
    This handles URLs which have unicode characters, spaces, 
275
    special characters, etc.
276
277
    It has two basic modes of operation, depending on whether the
278
    supplied string starts with a url specifier (scheme://) or not.
279
    If it does not have a specifier it is considered a local path,
280
    and will be converted into a file:/// url. Non-ascii characters
281
    will be encoded using utf-8.
282
    If it does have a url specifier, it will be treated as a "hybrid"
283
    URL. Basically, a URL that should have URL special characters already
284
    escaped (like +?&# etc), but may have unicode characters, etc
285
    which would not be valid in a real URL.
286
287
    :param url: Either a hybrid URL or a local path
288
    :return: A normalized URL which only includes 7-bit ASCII characters.
289
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
290
    m = _url_scheme_re.match(url)
291
    if not m:
292
        return local_path_to_url(url)
293
    if not isinstance(url, unicode):
294
        for c in url:
295
            if c not in _url_safe_characters:
1685.1.53 by John Arbash Meinel
Updated normalize_url
296
                raise errors.InvalidURL(url, 'URLs can only contain specific'
297
                                            ' safe characters (not %r)' % c)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
298
        return url
299
    # We have a unicode (hybrid) url
300
    scheme = m.group('scheme')
301
    path = list(m.group('path'))
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
302
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
303
    for i in xrange(len(path)):
304
        if path[i] not in _url_safe_characters:
305
            chars = path[i].encode('utf-8')
306
            path[i] = ''.join(['%%%02X' % ord(c) for c in path[i].encode('utf-8')])
2167.2.1 by Aaron Bentley
Fix reading bundles from http URLs
307
    return str(scheme + '://' + ''.join(path))
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
308
309
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
310
def relative_url(base, other):
311
    """Return a path to other from base.
312
313
    If other is unrelated to base, return other. Else return a relative path.
314
    This assumes no symlinks as part of the url.
315
    """
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
316
    dummy, base_first_slash = _find_scheme_and_separator(base)
317
    if base_first_slash is None:
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
318
        return other
319
    
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
320
    dummy, other_first_slash = _find_scheme_and_separator(other)
321
    if other_first_slash is None:
322
        return other
323
324
    # this takes care of differing schemes or hosts
325
    base_scheme = base[:base_first_slash]
326
    other_scheme = other[:other_first_slash]
327
    if base_scheme != other_scheme:
328
        return other
329
330
    base_path = base[base_first_slash+1:]
331
    other_path = other[other_first_slash+1:]
332
333
    if base_path.endswith('/'):
334
        base_path = base_path[:-1]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
335
336
    base_sections = base_path.split('/')
337
    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
338
339
    if base_sections == ['']:
340
        base_sections = []
341
    if other_sections == ['']:
342
        other_sections = []
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
343
344
    output_sections = []
345
    for b, o in zip(base_sections, other_sections):
346
        if b != o:
347
            break
348
        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
349
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
350
    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
351
    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
352
    output_sections.extend(other_sections[match_len:])
353
354
    return "/".join(output_sections) or "."
355
356
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
357
def _win32_extract_drive_letter(url_base, path):
358
    """On win32 the drive letter needs to be added to the url base."""
359
    # Strip off the drive letter
360
    # path is currently /C:/foo
361
    if len(path) < 3 or path[2] not in ':|' or path[3] != '/':
362
        raise errors.InvalidURL(url_base + path, 
363
            'win32 file:/// paths need a drive letter')
364
    url_base += path[0:3] # file:// + /C:
365
    path = path[3:] # /foo
366
    return url_base, path
367
368
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
369
def split(url, exclude_trailing_slash=True):
370
    """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
371
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
372
    :param url: A relative or absolute URL
373
    :param exclude_trailing_slash: Strip off a final '/' if it is part
374
        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
375
376
    :return: (parent_url, child_dir).  child_dir may be the empty string if we're at 
377
        the root.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
378
    """
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
379
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
380
381
    if first_path_slash is None:
382
        # We have either a relative path, or no separating slash
383
        if scheme_loc is None:
384
            # Relative path
385
            if exclude_trailing_slash and url.endswith('/'):
386
                url = url[:-1]
387
            return _posix_split(url)
388
        else:
389
            # Scheme with no path
390
            return url, ''
391
392
    # We have a fully defined path
393
    url_base = url[:first_path_slash] # http://host, file://
394
    path = url[first_path_slash:] # /file/foo
395
396
    if sys.platform == 'win32' and url.startswith('file:///'):
397
        # 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.
398
        # url_base is currently file://
1711.2.39 by John Arbash Meinel
Fix bzrlib.urlutils.split() to work properly on win32 local paths.
399
        # 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.
400
        url_base, path = _win32_extract_drive_letter(url_base, path)
401
        # now it should be file:///C: and /foo
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
402
403
    if exclude_trailing_slash and len(path) > 1 and path.endswith('/'):
404
        path = path[:-1]
405
    head, tail = _posix_split(path)
406
    return url_base + head, tail
407
1685.1.46 by John Arbash Meinel
Sorting functions by name.
408
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
409
def _win32_strip_local_trailing_slash(url):
410
    """Strip slashes after the drive letter"""
411
    if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
412
        return url[:-1]
413
    else:
414
        return url
415
416
1685.1.47 by John Arbash Meinel
s comes before u
417
def strip_trailing_slash(url):
418
    """Strip trailing slash, except for root paths.
419
420
    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
421
    This assumes that all URLs are valid netloc urls, such that they
422
    form:
423
    scheme://host/path
424
    It searches for ://, and then refuses to remove the next '/'.
425
    It can also handle relative paths
426
    Examples:
427
        path/to/foo       => path/to/foo
428
        path/to/foo/      => path/to/foo
429
        http://host/path/ => http://host/path
430
        http://host/path  => http://host/path
431
        http://host/      => http://host/
432
        file:///          => file:///
433
        file:///foo/      => file:///foo
434
        # This is unique on win32 platforms, and is the only URL
435
        # 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
436
        file:///c|/       => file:///c:/
1685.1.47 by John Arbash Meinel
s comes before u
437
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
438
    if not url.endswith('/'):
439
        # Nothing to do
440
        return url
441
    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.
442
        return _win32_strip_local_trailing_slash(url)
1685.1.80 by Wouter van Heyst
more code cleanup
443
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
444
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
445
    if scheme_loc is None:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
446
        # This is a relative path, as it has no scheme
447
        # so just chop off the last character
1685.1.47 by John Arbash Meinel
s comes before u
448
        return url[:-1]
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
449
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
450
    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
451
        # Don't chop off anything if the only slash is the path
452
        # separating slash
1685.1.47 by John Arbash Meinel
s comes before u
453
        return url
454
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
455
    return url[:-1]
456
1685.1.47 by John Arbash Meinel
s comes before u
457
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
458
def unescape(url):
459
    """Unescape relpath from url format.
460
461
    This returns a Unicode path from a URL
462
    """
463
    # jam 20060427 URLs are supposed to be ASCII only strings
464
    #       If they are passed in as unicode, urllib.unquote
465
    #       will return a UNICODE string, which actually contains
466
    #       utf-8 bytes. So we have to ensure that they are
467
    #       plain ASCII strings, or the final .decode will
468
    #       try to encode the UNICODE => ASCII, and then decode
469
    #       it into utf-8.
470
    try:
471
        url = str(url)
472
    except UnicodeError, e:
473
        raise errors.InvalidURL(url, 'URL was not a plain ASCII url: %s' % (e,))
1685.1.80 by Wouter van Heyst
more code cleanup
474
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
475
    unquoted = urllib.unquote(url)
476
    try:
477
        unicode_path = unquoted.decode('utf-8')
478
    except UnicodeError, e:
479
        raise errors.InvalidURL(url, 'Unable to encode the URL as utf-8: %s' % (e,))
480
    return unicode_path
481
482
483
# These are characters that if escaped, should stay that way
484
_no_decode_chars = ';/?:@&=+$,#'
485
_no_decode_ords = [ord(c) for c in _no_decode_chars]
486
_no_decode_hex = (['%02x' % o for o in _no_decode_ords] 
487
                + ['%02X' % o for o in _no_decode_ords])
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
488
_hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
489
                    + [('%02X' % o, chr(o)) for o in range(256)]))
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
490
#These entries get mapped to themselves
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
491
_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.
492
493
# These characters should not be escaped
2167.2.2 by Aaron Bentley
Update safe character list
494
_url_safe_characters = set(
495
   "abcdefghijklmnopqrstuvwxyz" # Lowercase alpha
496
   "ABCDEFGHIJKLMNOPQRSTUVWXYZ" # Uppercase alpha
497
   "0123456789" # Numbers
498
   "_.-!~*'()"  # Unreserved characters
499
   "/;?:@&=+$," # Reserved characters
500
   "%#"         # Extra reserved characters
501
)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
502
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
503
def unescape_for_display(url, encoding):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
504
    """Decode what you can for a URL, so that we get a nice looking path.
505
506
    This will turn file:// urls into local paths, and try to decode
507
    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.
508
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
509
    Any sections of the URL which can't be represented in the encoding or 
510
    need to stay as escapes are left alone.
511
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
512
    :param url: A 7-bit ASCII URL
513
    :param encoding: The final output encoding
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
514
515
    :return: A unicode string which can be safely encoded into the 
516
         specified encoding.
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
517
    """
1711.2.40 by John Arbash Meinel
codecs.getwriter() doesn't set '.encoding' properly, so do the work for it.
518
    assert encoding is not None, 'you cannot specify None for the display encoding.'
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
519
    if url.startswith('file://'):
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
520
        try:
521
            path = local_path_from_url(url)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
522
            path.encode(encoding)
523
            return path
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
524
        except UnicodeError:
525
            return url
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
526
527
    # Split into sections to try to decode utf-8
528
    res = url.split('/')
529
    for i in xrange(1, len(res)):
530
        escaped_chunks = res[i].split('%')
531
        for j in xrange(1, len(escaped_chunks)):
532
            item = escaped_chunks[j]
533
            try:
534
                escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]
535
            except KeyError:
536
                # Put back the percent symbol
537
                escaped_chunks[j] = '%' + item
538
            except UnicodeDecodeError:
539
                escaped_chunks[j] = unichr(int(item[:2], 16)) + item[2:]
540
        unescaped = ''.join(escaped_chunks)
541
        try:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
542
            decoded = unescaped.decode('utf-8')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
543
        except UnicodeDecodeError:
544
            # If this path segment cannot be properly utf-8 decoded
545
            # after doing unescaping we will just leave it alone
546
            pass
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
547
        else:
548
            try:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
549
                decoded.encode(encoding)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
550
            except UnicodeEncodeError:
551
                # If this chunk cannot be encoded in the local
552
                # encoding, then we should leave it alone
553
                pass
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
554
            else:
555
                # Otherwise take the url decoded one
556
                res[i] = decoded
557
    return u'/'.join(res)