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