/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1
# Bazaar-NG -- distributed version control
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
22
from posixpath import split as _posix_split
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
23
import re
24
import sys
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
25
import urllib
26
27
import bzrlib.errors as errors
28
import bzrlib.osutils
29
30
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
31
def basename(url, exclude_trailing_slash=True):
32
    """Return the last component of a URL.
33
34
    :param url: The URL in question
35
    :param exclude_trailing_slash: If the url looks like "path/to/foo/"
36
        ignore the final slash and return 'foo' rather than ''
37
    :return: Just the final component of the URL. This can return ''
38
        if you don't exclude_trailing_slash, or if you are at the
39
        root of the URL.
40
    """
41
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[1]
42
43
44
def dirname(url, exclude_trailing_slash=True):
45
    """Return the parent directory of the given path.
46
47
    :param url: Relative or absolute URL
48
    :param exclude_trailing_slash: Remove a final slash
49
        (treat http://host/foo/ as http://host/foo, but
50
        http://host/ stays http://host/)
51
    :return: Everything in the URL except the last path chunk
52
    """
53
    # TODO: jam 20060502 This was named dirname to be consistent
54
    #       with the os functions, but maybe "parent" would be better
55
    return split(url, exclude_trailing_slash=exclude_trailing_slash)[0]
56
57
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
58
def escape(relpath):
59
    """Escape relpath to be a valid url."""
60
    if isinstance(relpath, unicode):
61
        relpath = relpath.encode('utf-8')
62
    # After quoting and encoding, the path should be perfectly
63
    # safe as a plain ASCII string, str() just enforces this
64
    return str(urllib.quote(relpath))
65
66
1685.1.46 by John Arbash Meinel
Sorting functions by name.
67
def file_relpath(base, path):
68
    """Compute just the relative sub-portion of a url
69
    
70
    This assumes that both paths are already fully specified file:// URLs.
71
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
72
    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.
73
        ' 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
74
        MIN_ABS_FILEURL_LENGTH)
1685.1.46 by John Arbash Meinel
Sorting functions by name.
75
76
    base = local_path_from_url(base)
77
    path = local_path_from_url(path)
78
    return escape(bzrlib.osutils.relpath(base, path))
79
80
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
81
def _find_scheme_and_separator(url):
82
    """Find the scheme separator (://) and the first path separator
83
84
    This is just a helper functions for other path utilities.
85
    It could probably be replaced by urlparse
86
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
87
    m = _url_scheme_re.match(url)
88
    if not m:
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
89
        return None, None
90
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
91
    scheme = m.group('scheme')
92
    path = m.group('path')
93
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
94
    # Find the path separating slash
95
    # (first slash after the ://)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
96
    first_path_slash = path.find('/')
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
97
    if first_path_slash == -1:
1685.1.56 by John Arbash Meinel
Fixing _find_scheme_and_separator
98
        return len(scheme), None
99
    return len(scheme), first_path_slash+len(scheme)+3
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
100
101
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
102
def join(base, *args):
103
    """Create a URL by joining sections.
104
105
    This will normalize '..', assuming that paths are absolute
106
    (it assumes no symlinks in either path)
107
108
    If any of *args is an absolute URL, it will be treated correctly.
109
    Example:
110
        join('http://foo', 'http://bar') => 'http://bar'
111
        join('http://foo', 'bar') => 'http://foo/bar'
112
        join('http://foo', 'bar', '../baz') => 'http://foo/baz'
113
    """
114
    m = _url_scheme_re.match(base)
115
    scheme = None
116
    if m:
117
        scheme = m.group('scheme')
118
        path = m.group('path').split('/')
119
    else:
120
        path = base.split('/')
121
122
    for arg in args:
123
        m = _url_scheme_re.match(arg)
124
        if m:
125
            # Absolute URL
126
            scheme = m.group('scheme')
127
            path = m.group('path').split('/')
128
        else:
129
            for chunk in arg.split('/'):
130
                if chunk == '.':
131
                    continue
132
                elif chunk == '..':
133
                    if len(path) >= 2:
134
                        # Don't pop off the host portion
135
                        path.pop()
136
                    else:
137
                        raise errors.InvalidURLJoin('Cannot go above root',
138
                                base, args)
139
                else:
140
                    path.append(chunk)
1685.1.80 by Wouter van Heyst
more code cleanup
141
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
142
    if scheme is None:
143
        return '/'.join(path)
144
    return scheme + '://' + '/'.join(path)
145
146
1685.1.46 by John Arbash Meinel
Sorting functions by name.
147
# jam 20060502 Sorted to 'l' because the final target is 'local_path_from_url'
148
def _posix_local_path_from_url(url):
149
    """Convert a url like file:///path/to/foo into /path/to/foo"""
150
    if not url.startswith('file:///'):
151
        raise errors.InvalidURL(url, 'local urls must start with file:///')
152
    # We only strip off 2 slashes
153
    return unescape(url[len('file://'):])
154
155
156
def _posix_local_path_to_url(path):
157
    """Convert a local path like ./foo into a URL like file:///path/to/foo
158
159
    This also handles transforming escaping unicode characters, etc.
160
    """
161
    # importing directly from posixpath allows us to test this 
162
    # on non-posix platforms
163
    from posixpath import normpath
164
    return 'file://' + escape(normpath(bzrlib.osutils._posix_abspath(path)))
165
166
167
def _win32_local_path_from_url(url):
168
    """Convert a url like file:///C|/path/to/foo into C:/path/to/foo"""
169
    if not url.startswith('file:///'):
170
        raise errors.InvalidURL(url, 'local urls must start with file:///')
171
    # We strip off all 3 slashes
172
    win32_url = url[len('file:///'):]
173
    if (win32_url[0] not in 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
174
        or win32_url[1] not in  '|:'
175
        or win32_url[2] != '/'):
176
        raise errors.InvalidURL(url, 'Win32 file urls start with file:///X|/, where X is a valid drive letter')
177
    # TODO: jam 20060426, we could .upper() or .lower() the drive letter
178
    #       for better consistency.
179
    return win32_url[0].upper() + u':' + unescape(win32_url[2:])
180
181
182
def _win32_local_path_to_url(path):
183
    """Convert a local path like ./foo into a URL like file:///C|/path/to/foo
184
185
    This also handles transforming escaping unicode characters, etc.
186
    """
187
    # importing directly from ntpath allows us to test this 
188
    # on non-win32 platforms
189
    win32_path = bzrlib.osutils._nt_normpath(
190
        bzrlib.osutils._win32_abspath(path)).replace('\\', '/')
1685.1.78 by Wouter van Heyst
more code cleanup
191
    return 'file:///' + win32_path[0].upper() + ':' + escape(win32_path[2:])
1685.1.46 by John Arbash Meinel
Sorting functions by name.
192
193
194
local_path_to_url = _posix_local_path_to_url
195
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
196
MIN_ABS_FILEURL_LENGTH = len('file:///')
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
197
WIN32_MIN_ABS_FILEURL_LENGTH = len('file:///C|/')
1685.1.46 by John Arbash Meinel
Sorting functions by name.
198
199
if sys.platform == 'win32':
200
    local_path_to_url = _win32_local_path_to_url
201
    local_path_from_url = _win32_local_path_from_url
202
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
203
    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
204
205
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
206
_url_scheme_re = re.compile(r'^(?P<scheme>[^:/]{2,})://(?P<path>.*)$')
207
208
209
def normalize_url(url):
210
    """Make sure that a path string is in fully normalized URL form.
211
    
212
    This handles URLs which have unicode characters, spaces, 
213
    special characters, etc.
214
215
    It has two basic modes of operation, depending on whether the
216
    supplied string starts with a url specifier (scheme://) or not.
217
    If it does not have a specifier it is considered a local path,
218
    and will be converted into a file:/// url. Non-ascii characters
219
    will be encoded using utf-8.
220
    If it does have a url specifier, it will be treated as a "hybrid"
221
    URL. Basically, a URL that should have URL special characters already
222
    escaped (like +?&# etc), but may have unicode characters, etc
223
    which would not be valid in a real URL.
224
225
    :param url: Either a hybrid URL or a local path
226
    :return: A normalized URL which only includes 7-bit ASCII characters.
227
    """
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
228
    m = _url_scheme_re.match(url)
229
    if not m:
230
        return local_path_to_url(url)
231
    if not isinstance(url, unicode):
232
        for c in url:
233
            if c not in _url_safe_characters:
1685.1.53 by John Arbash Meinel
Updated normalize_url
234
                raise errors.InvalidURL(url, 'URLs can only contain specific'
235
                                            ' safe characters (not %r)' % c)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
236
        return url
237
    # We have a unicode (hybrid) url
238
    scheme = m.group('scheme')
239
    path = list(m.group('path'))
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
240
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
241
    for i in xrange(len(path)):
242
        if path[i] not in _url_safe_characters:
243
            chars = path[i].encode('utf-8')
244
            path[i] = ''.join(['%%%02X' % ord(c) for c in path[i].encode('utf-8')])
245
    return scheme + '://' + ''.join(path)
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
246
247
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
248
def relative_url(base, other):
249
    """Return a path to other from base.
250
251
    If other is unrelated to base, return other. Else return a relative path.
252
    This assumes no symlinks as part of the url.
253
    """
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
254
    dummy, base_first_slash = _find_scheme_and_separator(base)
255
    if base_first_slash is None:
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
256
        return other
257
    
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
258
    dummy, other_first_slash = _find_scheme_and_separator(other)
259
    if other_first_slash is None:
260
        return other
261
262
    # this takes care of differing schemes or hosts
263
    base_scheme = base[:base_first_slash]
264
    other_scheme = other[:other_first_slash]
265
    if base_scheme != other_scheme:
266
        return other
267
268
    base_path = base[base_first_slash+1:]
269
    other_path = other[other_first_slash+1:]
270
271
    if base_path.endswith('/'):
272
        base_path = base_path[:-1]
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
273
274
    base_sections = base_path.split('/')
275
    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
276
277
    if base_sections == ['']:
278
        base_sections = []
279
    if other_sections == ['']:
280
        other_sections = []
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
281
282
    output_sections = []
283
    for b, o in zip(base_sections, other_sections):
284
        if b != o:
285
            break
286
        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
287
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
288
    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
289
    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
290
    output_sections.extend(other_sections[match_len:])
291
292
    return "/".join(output_sections) or "."
293
294
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
295
def _win32_extract_drive_letter(url_base, path):
296
    """On win32 the drive letter needs to be added to the url base."""
297
    # Strip off the drive letter
298
    # path is currently /C:/foo
299
    if len(path) < 3 or path[2] not in ':|' or path[3] != '/':
300
        raise errors.InvalidURL(url_base + path, 
301
            'win32 file:/// paths need a drive letter')
302
    url_base += path[0:3] # file:// + /C:
303
    path = path[3:] # /foo
304
    return url_base, path
305
306
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
307
def split(url, exclude_trailing_slash=True):
308
    """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
309
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
310
    :param url: A relative or absolute URL
311
    :param exclude_trailing_slash: Strip off a final '/' if it is part
312
        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
313
314
    :return: (parent_url, child_dir).  child_dir may be the empty string if we're at 
315
        the root.
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
316
    """
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
317
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
318
319
    if first_path_slash is None:
320
        # We have either a relative path, or no separating slash
321
        if scheme_loc is None:
322
            # Relative path
323
            if exclude_trailing_slash and url.endswith('/'):
324
                url = url[:-1]
325
            return _posix_split(url)
326
        else:
327
            # Scheme with no path
328
            return url, ''
329
330
    # We have a fully defined path
331
    url_base = url[:first_path_slash] # http://host, file://
332
    path = url[first_path_slash:] # /file/foo
333
334
    if sys.platform == 'win32' and url.startswith('file:///'):
335
        # 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.
336
        # url_base is currently file://
1711.2.39 by John Arbash Meinel
Fix bzrlib.urlutils.split() to work properly on win32 local paths.
337
        # 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.
338
        url_base, path = _win32_extract_drive_letter(url_base, path)
339
        # now it should be file:///C: and /foo
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
340
341
    if exclude_trailing_slash and len(path) > 1 and path.endswith('/'):
342
        path = path[:-1]
343
    head, tail = _posix_split(path)
344
    return url_base + head, tail
345
1685.1.46 by John Arbash Meinel
Sorting functions by name.
346
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
347
def _win32_strip_local_trailing_slash(url):
348
    """Strip slashes after the drive letter"""
349
    if len(url) > WIN32_MIN_ABS_FILEURL_LENGTH:
350
        return url[:-1]
351
    else:
352
        return url
353
354
1685.1.47 by John Arbash Meinel
s comes before u
355
def strip_trailing_slash(url):
356
    """Strip trailing slash, except for root paths.
357
358
    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
359
    This assumes that all URLs are valid netloc urls, such that they
360
    form:
361
    scheme://host/path
362
    It searches for ://, and then refuses to remove the next '/'.
363
    It can also handle relative paths
364
    Examples:
365
        path/to/foo       => path/to/foo
366
        path/to/foo/      => path/to/foo
367
        http://host/path/ => http://host/path
368
        http://host/path  => http://host/path
369
        http://host/      => http://host/
370
        file:///          => file:///
371
        file:///foo/      => file:///foo
372
        # This is unique on win32 platforms, and is the only URL
373
        # format which does it differently.
374
        file:///C|/       => file:///C|/
1685.1.47 by John Arbash Meinel
s comes before u
375
    """
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
376
    if not url.endswith('/'):
377
        # Nothing to do
378
        return url
379
    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.
380
        return _win32_strip_local_trailing_slash(url)
1685.1.80 by Wouter van Heyst
more code cleanup
381
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
382
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)
383
    if scheme_loc is None:
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
384
        # This is a relative path, as it has no scheme
385
        # so just chop off the last character
1685.1.47 by John Arbash Meinel
s comes before u
386
        return url[:-1]
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
387
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
388
    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
389
        # Don't chop off anything if the only slash is the path
390
        # separating slash
1685.1.47 by John Arbash Meinel
s comes before u
391
        return url
392
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
393
    return url[:-1]
394
1685.1.47 by John Arbash Meinel
s comes before u
395
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
396
def unescape(url):
397
    """Unescape relpath from url format.
398
399
    This returns a Unicode path from a URL
400
    """
401
    # jam 20060427 URLs are supposed to be ASCII only strings
402
    #       If they are passed in as unicode, urllib.unquote
403
    #       will return a UNICODE string, which actually contains
404
    #       utf-8 bytes. So we have to ensure that they are
405
    #       plain ASCII strings, or the final .decode will
406
    #       try to encode the UNICODE => ASCII, and then decode
407
    #       it into utf-8.
408
    try:
409
        url = str(url)
410
    except UnicodeError, e:
411
        raise errors.InvalidURL(url, 'URL was not a plain ASCII url: %s' % (e,))
1685.1.80 by Wouter van Heyst
more code cleanup
412
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
413
    unquoted = urllib.unquote(url)
414
    try:
415
        unicode_path = unquoted.decode('utf-8')
416
    except UnicodeError, e:
417
        raise errors.InvalidURL(url, 'Unable to encode the URL as utf-8: %s' % (e,))
418
    return unicode_path
419
420
421
# These are characters that if escaped, should stay that way
422
_no_decode_chars = ';/?:@&=+$,#'
423
_no_decode_ords = [ord(c) for c in _no_decode_chars]
424
_no_decode_hex = (['%02x' % o for o in _no_decode_ords] 
425
                + ['%02X' % o for o in _no_decode_ords])
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
426
_hex_display_map = dict(([('%02x' % o, chr(o)) for o in range(256)]
427
                    + [('%02X' % o, chr(o)) for o in range(256)]))
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
428
#These entries get mapped to themselves
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
429
_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.
430
431
# These characters should not be escaped
432
_url_safe_characters = set('abcdefghijklmnopqrstuvwxyz'
433
                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
434
                        '0123456789' '_.-/'
435
                        ';?:@&=+$,%#')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
436
437
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
438
def unescape_for_display(url, encoding):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
439
    """Decode what you can for a URL, so that we get a nice looking path.
440
441
    This will turn file:// urls into local paths, and try to decode
442
    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.
443
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
444
    Any sections of the URL which can't be represented in the encoding or 
445
    need to stay as escapes are left alone.
446
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
447
    :param url: A 7-bit ASCII URL
448
    :param encoding: The final output encoding
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
449
450
    :return: A unicode string which can be safely encoded into the 
451
         specified encoding.
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
452
    """
1711.2.40 by John Arbash Meinel
codecs.getwriter() doesn't set '.encoding' properly, so do the work for it.
453
    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
454
    if url.startswith('file://'):
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
455
        try:
456
            path = local_path_from_url(url)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
457
            path.encode(encoding)
458
            return path
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
459
        except UnicodeError:
460
            return url
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
461
462
    # Split into sections to try to decode utf-8
463
    res = url.split('/')
464
    for i in xrange(1, len(res)):
465
        escaped_chunks = res[i].split('%')
466
        for j in xrange(1, len(escaped_chunks)):
467
            item = escaped_chunks[j]
468
            try:
469
                escaped_chunks[j] = _hex_display_map[item[:2]] + item[2:]
470
            except KeyError:
471
                # Put back the percent symbol
472
                escaped_chunks[j] = '%' + item
473
            except UnicodeDecodeError:
474
                escaped_chunks[j] = unichr(int(item[:2], 16)) + item[2:]
475
        unescaped = ''.join(escaped_chunks)
476
        try:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
477
            decoded = unescaped.decode('utf-8')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
478
        except UnicodeDecodeError:
479
            # If this path segment cannot be properly utf-8 decoded
480
            # after doing unescaping we will just leave it alone
481
            pass
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
482
        else:
483
            try:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
484
                decoded.encode(encoding)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
485
            except UnicodeEncodeError:
486
                # If this chunk cannot be encoded in the local
487
                # encoding, then we should leave it alone
488
                pass
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
489
            else:
490
                # Otherwise take the url decoded one
491
                res[i] = decoded
492
    return u'/'.join(res)