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