/brz/remove-bazaar

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