~bzr-pqm/bzr/bzr.dev

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
#
3
# Copyright (C) 2006 by Canonical Ltd
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')
138
            path = m.group('path').split('/')
139
        else:
140
            for chunk in arg.split('/'):
141
                if chunk == '.':
142
                    continue
143
                elif chunk == '..':
144
                    if len(path) >= 2:
145
                        # Don't pop off the host portion
146
                        path.pop()
147
                    else:
148
                        raise errors.InvalidURLJoin('Cannot go above root',
149
                                base, args)
150
                else:
151
                    path.append(chunk)
1685.1.80 by Wouter van Heyst
more code cleanup
152
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
153
    if scheme is None:
154
        return '/'.join(path)
155
    return scheme + '://' + '/'.join(path)
156
157
1685.1.46 by John Arbash Meinel
Sorting functions by name.
158
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
159
def _posix_local_path_from_url(url):
160
    """Convert a url like file:///path/to/foo into /path/to/foo"""
161
    if not url.startswith('file:///'):
162
        raise errors.InvalidURL(url, 'local urls must start with file:///')
163
    # We only strip off 2 slashes
164
    return unescape(url[len('file://'):])
165
166
167
def _posix_local_path_to_url(path):
168
    """Convert a local path like ./foo into a URL like file:///path/to/foo
169
170
    This also handles transforming escaping unicode characters, etc.
171
    """
172
    # importing directly from posixpath allows us to test this 
173
    # 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
174
    return 'file://' + escape(_posix_normpath(
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
175
        osutils._posix_abspath(path)))
1685.1.46 by John Arbash Meinel
Sorting functions by name.
176
177
178
def _win32_local_path_from_url(url):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
179
    """Convert a url like file:///C:/path/to/foo into C:/path/to/foo"""
1685.1.46 by John Arbash Meinel
Sorting functions by name.
180
    if not url.startswith('file:///'):
181
        raise errors.InvalidURL(url, 'local urls must start with file:///')
182
    # We strip off all 3 slashes
183
    win32_url = url[len('file:///'):]
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
184
    if (win32_url[0] not in ('abcdefghijklmnopqrstuvwxyz'
185
                             'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
186
        or win32_url[1] not in  '|:'
187
        or win32_url[2] != '/'):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
188
        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
189
                ' file:///x:/, where x is a valid drive letter')
1809.1.1 by Alexander Belchenko
win32: convert drive letter to uppercase, not lowercase
190
    return win32_url[0].upper() + u':' + unescape(win32_url[2:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
191
192
193
def _win32_local_path_to_url(path):
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
194
    """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.
195
196
    This also handles transforming escaping unicode characters, etc.
197
    """
198
    # 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
199
    # on non-win32 platform
200
    # FIXME: It turns out that on nt, ntpath.abspath uses nt._getfullpathname
201
    #       which actually strips trailing space characters.
202
    #       The worst part is that under linux ntpath.abspath has different
203
    #       semantics, since 'nt' is not an available module.
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
204
    win32_path = osutils._nt_normpath(
205
        osutils._win32_abspath(path)).replace('\\', '/')
1809.1.1 by Alexander Belchenko
win32: convert drive letter to uppercase, not lowercase
206
    return 'file:///' + win32_path[0].upper() + ':' + escape(win32_path[2:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
207
208
209
local_path_to_url = _posix_local_path_to_url
210
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
211
MIN_ABS_FILEURL_LENGTH = len('file:///')
1711.4.17 by John Arbash Meinel
[merge] bzr.dev 1790
212
WIN32_MIN_ABS_FILEURL_LENGTH = len('file:///C:/')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
213
214
if sys.platform == 'win32':
215
    local_path_to_url = _win32_local_path_to_url
216
    local_path_from_url = _win32_local_path_from_url
217
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
218
    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
219
220
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
221
_url_scheme_re = re.compile(r'^(?P<scheme>[^:/]{2,})://(?P<path>.*)$')
222
223
224
def normalize_url(url):
225
    """Make sure that a path string is in fully normalized URL form.
226
    
227
    This handles URLs which have unicode characters, spaces, 
228
    special characters, etc.
229
230
    It has two basic modes of operation, depending on whether the
231
    supplied string starts with a url specifier (scheme://) or not.
232
    If it does not have a specifier it is considered a local path,
233
    and will be converted into a file:/// url. Non-ascii characters
234
    will be encoded using utf-8.
235
    If it does have a url specifier, it will be treated as a "hybrid"
236
    URL. Basically, a URL that should have URL special characters already
237
    escaped (like +?&# etc), but may have unicode characters, etc
238
    which would not be valid in a real URL.
239
240
    :param url: Either a hybrid URL or a local path
241
    :return: A normalized URL which only includes 7-bit ASCII characters.
242
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
243
    m = _url_scheme_re.match(url)
244
    if not m:
245
        return local_path_to_url(url)
246
    if not isinstance(url, unicode):
247
        for c in url:
248
            if c not in _url_safe_characters:
1685.1.53 by John Arbash Meinel
Updated normalize_url
249
                raise errors.InvalidURL(url, 'URLs can only contain specific'
250
                                            ' safe characters (not %r)' % c)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
251
        return url
252
    # We have a unicode (hybrid) url
253
    scheme = m.group('scheme')
254
    path = list(m.group('path'))
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
255
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
256
    for i in xrange(len(path)):
257
        if path[i] not in _url_safe_characters:
258
            chars = path[i].encode('utf-8')
259
            path[i] = ''.join(['%%%02X' % ord(c) for c in path[i].encode('utf-8')])
260
    return scheme + '://' + ''.join(path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
261
262
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
263
def relative_url(base, other):
264
    """Return a path to other from base.
265
266
    If other is unrelated to base, return other. Else return a relative path.
267
    This assumes no symlinks as part of the url.
268
    """
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
269
    dummy, base_first_slash = _find_scheme_and_separator(base)
270
    if base_first_slash is None:
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
271
        return other
272
    
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
273
    dummy, other_first_slash = _find_scheme_and_separator(other)
274
    if other_first_slash is None:
275
        return other
276
277
    # this takes care of differing schemes or hosts
278
    base_scheme = base[:base_first_slash]
279
    other_scheme = other[:other_first_slash]
280
    if base_scheme != other_scheme:
281
        return other
282
283
    base_path = base[base_first_slash+1:]
284
    other_path = other[other_first_slash+1:]
285
286
    if base_path.endswith('/'):
287
        base_path = base_path[:-1]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
288
289
    base_sections = base_path.split('/')
290
    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
291
292
    if base_sections == ['']:
293
        base_sections = []
294
    if other_sections == ['']:
295
        other_sections = []
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
296
297
    output_sections = []
298
    for b, o in zip(base_sections, other_sections):
299
        if b != o:
300
            break
301
        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
302
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
303
    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
304
    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
305
    output_sections.extend(other_sections[match_len:])
306
307
    return "/".join(output_sections) or "."
308
309
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
310
def _win32_extract_drive_letter(url_base, path):
311
    """On win32 the drive letter needs to be added to the url base."""
312
    # Strip off the drive letter
313
    # path is currently /C:/foo
314
    if len(path) < 3 or path[2] not in ':|' or path[3] != '/':
315
        raise errors.InvalidURL(url_base + path, 
316
            'win32 file:/// paths need a drive letter')
317
    url_base += path[0:3] # file:// + /C:
318
    path = path[3:] # /foo
319
    return url_base, path
320
321
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
322
def split(url, exclude_trailing_slash=True):
323
    """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
324
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
325
    :param url: A relative or absolute URL
326
    :param exclude_trailing_slash: Strip off a final '/' if it is part
327
        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
328
329
    :return: (parent_url, child_dir).  child_dir may be the empty string if we're at 
330
        the root.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
331
    """
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
332
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
333
334
    if first_path_slash is None:
335
        # We have either a relative path, or no separating slash
336
        if scheme_loc is None:
337
            # Relative path
338
            if exclude_trailing_slash and url.endswith('/'):
339
                url = url[:-1]
340
            return _posix_split(url)
341
        else:
342
            # Scheme with no path
343
            return url, ''
344
345
    # We have a fully defined path
346
    url_base = url[:first_path_slash] # http://host, file://
347
    path = url[first_path_slash:] # /file/foo
348
349
    if sys.platform == 'win32' and url.startswith('file:///'):
350
        # 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.
351
        # url_base is currently file://
1711.2.39 by John Arbash Meinel
Fix bzrlib.urlutils.split() to work properly on win32 local paths.
352
        # 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.
353
        url_base, path = _win32_extract_drive_letter(url_base, path)
354
        # now it should be file:///C: and /foo
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
355
356
    if exclude_trailing_slash and len(path) > 1 and path.endswith('/'):
357
        path = path[:-1]
358
    head, tail = _posix_split(path)
359
    return url_base + head, tail
360
1685.1.46 by John Arbash Meinel
Sorting functions by name.
361
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
362
def _win32_strip_local_trailing_slash(url):
363
    """Strip slashes after the drive letter"""
364
    if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
365
        return url[:-1]
366
    else:
367
        return url
368
369
1685.1.47 by John Arbash Meinel
s comes before u
370
def strip_trailing_slash(url):
371
    """Strip trailing slash, except for root paths.
372
373
    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
374
    This assumes that all URLs are valid netloc urls, such that they
375
    form:
376
    scheme://host/path
377
    It searches for ://, and then refuses to remove the next '/'.
378
    It can also handle relative paths
379
    Examples:
380
        path/to/foo       => path/to/foo
381
        path/to/foo/      => path/to/foo
382
        http://host/path/ => http://host/path
383
        http://host/path  => http://host/path
384
        http://host/      => http://host/
385
        file:///          => file:///
386
        file:///foo/      => file:///foo
387
        # This is unique on win32 platforms, and is the only URL
388
        # 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
389
        file:///c|/       => file:///c:/
1685.1.47 by John Arbash Meinel
s comes before u
390
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
391
    if not url.endswith('/'):
392
        # Nothing to do
393
        return url
394
    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.
395
        return _win32_strip_local_trailing_slash(url)
1685.1.80 by Wouter van Heyst
more code cleanup
396
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
397
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
398
    if scheme_loc is None:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
399
        # This is a relative path, as it has no scheme
400
        # so just chop off the last character
1685.1.47 by John Arbash Meinel
s comes before u
401
        return url[:-1]
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
402
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
403
    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
404
        # Don't chop off anything if the only slash is the path
405
        # separating slash
1685.1.47 by John Arbash Meinel
s comes before u
406
        return url
407
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
408
    return url[:-1]
409
1685.1.47 by John Arbash Meinel
s comes before u
410
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
411
def unescape(url):
412
    """Unescape relpath from url format.
413
414
    This returns a Unicode path from a URL
415
    """
416
    # jam 20060427 URLs are supposed to be ASCII only strings
417
    #       If they are passed in as unicode, urllib.unquote
418
    #       will return a UNICODE string, which actually contains
419
    #       utf-8 bytes. So we have to ensure that they are
420
    #       plain ASCII strings, or the final .decode will
421
    #       try to encode the UNICODE => ASCII, and then decode
422
    #       it into utf-8.
423
    try:
424
        url = str(url)
425
    except UnicodeError, e:
426
        raise errors.InvalidURL(url, 'URL was not a plain ASCII url: %s' % (e,))
1685.1.80 by Wouter van Heyst
more code cleanup
427
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
428
    unquoted = urllib.unquote(url)
429
    try:
430
        unicode_path = unquoted.decode('utf-8')
431
    except UnicodeError, e:
432
        raise errors.InvalidURL(url, 'Unable to encode the URL as utf-8: %s' % (e,))
433
    return unicode_path
434
435
436
# These are characters that if escaped, should stay that way
437
_no_decode_chars = ';/?:@&=+$,#'
438
_no_decode_ords = [ord(c) for c in _no_decode_chars]
439
_no_decode_hex = (['%02x' % o for o in _no_decode_ords] 
440
                + ['%02X' % o for o in _no_decode_ords])
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
441
_hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
442
                    + [('%02X' % o, chr(o)) for o in range(256)]))
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
443
#These entries get mapped to themselves
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
444
_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.
445
446
# These characters should not be escaped
447
_url_safe_characters = set('abcdefghijklmnopqrstuvwxyz'
448
                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
449
                        '0123456789' '_.-/'
450
                        ';?:@&=+$,%#')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
451
452
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
453
def unescape_for_display(url, encoding):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
454
    """Decode what you can for a URL, so that we get a nice looking path.
455
456
    This will turn file:// urls into local paths, and try to decode
457
    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.
458
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
459
    Any sections of the URL which can't be represented in the encoding or 
460
    need to stay as escapes are left alone.
461
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
462
    :param url: A 7-bit ASCII URL
463
    :param encoding: The final output encoding
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
464
465
    :return: A unicode string which can be safely encoded into the 
466
         specified encoding.
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
467
    """
1711.2.40 by John Arbash Meinel
codecs.getwriter() doesn't set '.encoding' properly, so do the work for it.
468
    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
469
    if url.startswith('file://'):
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
470
        try:
471
            path = local_path_from_url(url)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
472
            path.encode(encoding)
473
            return path
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
474
        except UnicodeError:
475
            return url
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
476
477
    # Split into sections to try to decode utf-8
478
    res = url.split('/')
479
    for i in xrange(1, len(res)):
480
        escaped_chunks = res[i].split('%')
481
        for j in xrange(1, len(escaped_chunks)):
482
            item = escaped_chunks[j]
483
            try:
484
                escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]
485
            except KeyError:
486
                # Put back the percent symbol
487
                escaped_chunks[j] = '%' + item
488
            except UnicodeDecodeError:
489
                escaped_chunks[j] = unichr(int(item[:2], 16)) + item[2:]
490
        unescaped = ''.join(escaped_chunks)
491
        try:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
492
            decoded = unescaped.decode('utf-8')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
493
        except UnicodeDecodeError:
494
            # If this path segment cannot be properly utf-8 decoded
495
            # after doing unescaping we will just leave it alone
496
            pass
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
497
        else:
498
            try:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
499
                decoded.encode(encoding)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
500
            except UnicodeEncodeError:
501
                # If this chunk cannot be encoded in the local
502
                # encoding, then we should leave it alone
503
                pass
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
504
            else:
505
                # Otherwise take the url decoded one
506
                res[i] = decoded
507
    return u'/'.join(res)