/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1390 by Robert Collins
pair programming worx... merge integration and weave
17
from cStringIO import StringIO
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
18
import os
19
import re
20
import stat
21
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
22
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
23
import sys
24
import time
25
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
28
import codecs
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
29
from datetime import datetime
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import errno
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
31
from ntpath import (abspath as _nt_abspath,
32
                    join as _nt_join,
33
                    normpath as _nt_normpath,
34
                    realpath as _nt_realpath,
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
35
                    splitdrive as _nt_splitdrive,
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
36
                    )
37
import posixpath
1236 by Martin Pool
- fix up imports
38
import sha
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
39
import shutil
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
40
from shutil import (
41
    rmtree,
42
    )
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
43
import tempfile
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
44
from tempfile import (
45
    mkdtemp,
46
    )
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
47
import unicodedata
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
48
49
from bzrlib import (
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
50
    cache_utf8,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
51
    errors,
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
52
    win32utils,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
53
    )
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
54
""")
1 by mbp at sourcefrog
import from baz patch-364
55
3504.4.1 by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis.
56
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
57
import bzrlib
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
58
from bzrlib import symbol_versioning
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
59
from bzrlib.symbol_versioning import (
60
    deprecated_function,
61
    )
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
62
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
63
1 by mbp at sourcefrog
import from baz patch-364
64
1755.3.7 by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size
65
# On win32, O_BINARY is used to indicate the file should
66
# be opened in binary mode, rather than text mode.
67
# On other platforms, O_BINARY doesn't exist, because
68
# they always open in binary mode, so it is okay to
69
# OR with 0 on those platforms
70
O_BINARY = getattr(os, 'O_BINARY', 0)
71
72
1 by mbp at sourcefrog
import from baz patch-364
73
def make_readonly(filename):
74
    """Make a filename read-only."""
2949.6.1 by Alexander Belchenko
windows python has os.lstat
75
    mod = os.lstat(filename).st_mode
2568.1.1 by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
76
    if not stat.S_ISLNK(mod):
77
        mod = mod & 0777555
78
        os.chmod(filename, mod)
1 by mbp at sourcefrog
import from baz patch-364
79
80
81
def make_writable(filename):
2949.6.1 by Alexander Belchenko
windows python has os.lstat
82
    mod = os.lstat(filename).st_mode
2568.1.1 by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable
83
    if not stat.S_ISLNK(mod):
84
        mod = mod | 0200
85
        os.chmod(filename, mod)
1 by mbp at sourcefrog
import from baz patch-364
86
87
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
88
def minimum_path_selection(paths):
89
    """Return the smallset subset of paths which are outside paths.
90
2843.1.1 by Ian Clatworthy
Faster partial commits by walking less data (Robert Collins)
91
    :param paths: A container (and hence not None) of paths.
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
92
    :return: A set of paths sufficient to include everything in paths via
93
        is_inside_any, drawn from the paths parameter.
94
    """
95
    search_paths = set()
96
    paths = set(paths)
97
    for path in paths:
2843.1.1 by Ian Clatworthy
Faster partial commits by walking less data (Robert Collins)
98
        other_paths = paths.difference([path])
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
99
        if not is_inside_any(other_paths, path):
100
            # this is a top level path, we must check it.
101
            search_paths.add(path)
102
    return search_paths
103
104
1077 by Martin Pool
- avoid compiling REs at module load time
105
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
106
107
1 by mbp at sourcefrog
import from baz patch-364
108
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
109
    """Return a quoted filename filename
110
111
    This previously used backslash quoting, but that works poorly on
112
    Windows."""
113
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
114
    global _QUOTE_RE
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
115
    if _QUOTE_RE is None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
116
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
1077 by Martin Pool
- avoid compiling REs at module load time
117
        
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
118
    if _QUOTE_RE.search(f):
119
        return '"' + f + '"'
120
    else:
121
        return f
1 by mbp at sourcefrog
import from baz patch-364
122
123
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
124
_directory_kind = 'directory'
125
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
126
_formats = {
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
127
    stat.S_IFDIR:_directory_kind,
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
128
    stat.S_IFCHR:'chardev',
129
    stat.S_IFBLK:'block',
130
    stat.S_IFREG:'file',
131
    stat.S_IFIFO:'fifo',
132
    stat.S_IFLNK:'symlink',
133
    stat.S_IFSOCK:'socket',
134
}
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
135
136
137
def file_kind_from_stat_mode(stat_mode, _formats=_formats, _unknown='unknown'):
138
    """Generate a file kind from a stat mode. This is used in walkdirs.
139
140
    Its performance is critical: Do not mutate without careful benchmarking.
141
    """
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
142
    try:
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
143
        return _formats[stat_mode & 0170000]
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
144
    except KeyError:
1732.1.30 by John Arbash Meinel
More file_kind tweaks. Use keyword parameters to make everything a local variable.
145
        return _unknown
488 by Martin Pool
- new helper function kind_marker()
146
147
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
148
def file_kind(f, _lstat=os.lstat, _mapper=file_kind_from_stat_mode):
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
149
    try:
150
        return _mapper(_lstat(f).st_mode)
151
    except OSError, e:
3146.8.18 by Aaron Bentley
Merge with dev
152
        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
153
            raise errors.NoSuchFile(f)
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
154
        raise
155
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
156
1755.3.7 by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size
157
def get_umask():
158
    """Return the current umask"""
159
    # Assume that people aren't messing with the umask while running
160
    # XXX: This is not thread safe, but there is no way to get the
161
    #      umask without setting it
162
    umask = os.umask(0)
163
    os.umask(umask)
164
    return umask
165
166
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
167
_kind_marker_map = {
168
    "file": "",
169
    _directory_kind: "/",
170
    "symlink": "@",
1551.10.30 by Aaron Bentley
Merge from bzr.dev
171
    'tree-reference': '+',
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
172
}
1551.10.30 by Aaron Bentley
Merge from bzr.dev
173
174
488 by Martin Pool
- new helper function kind_marker()
175
def kind_marker(kind):
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
176
    try:
177
        return _kind_marker_map[kind]
178
    except KeyError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
179
        raise errors.BzrError('invalid file kind %r' % kind)
1 by mbp at sourcefrog
import from baz patch-364
180
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
181
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
182
lexists = getattr(os.path, 'lexists', None)
183
if lexists is None:
184
    def lexists(f):
185
        try:
2324.2.2 by Dmitry Vasiliev
Fixed lexists() implementation
186
            stat = getattr(os, 'lstat', os.stat)
187
            stat(f)
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
188
            return True
2324.2.2 by Dmitry Vasiliev
Fixed lexists() implementation
189
        except OSError, e:
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
190
            if e.errno == errno.ENOENT:
191
                return False;
192
            else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
193
                raise errors.BzrError("lstat/stat of (%r): %r" % (f, e))
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
194
1 by mbp at sourcefrog
import from baz patch-364
195
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
196
def fancy_rename(old, new, rename_func, unlink_func):
197
    """A fancy rename, when you don't have atomic rename.
198
    
199
    :param old: The old path, to rename from
200
    :param new: The new path, to rename to
201
    :param rename_func: The potentially non-atomic rename function
202
    :param unlink_func: A way to delete the target file if the full rename succeeds
203
    """
204
205
    # sftp rename doesn't allow overwriting, so play tricks:
206
    import random
207
    base = os.path.basename(new)
208
    dirname = os.path.dirname(new)
1553.5.22 by Martin Pool
Change fancy_rename to use rand_chars rather than reinvent it.
209
    tmp_name = u'tmp.%s.%.9f.%d.%s' % (base, time.time(), os.getpid(), rand_chars(10))
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
210
    tmp_name = pathjoin(dirname, tmp_name)
211
212
    # Rename the file out of the way, but keep track if it didn't exist
213
    # We don't want to grab just any exception
214
    # something like EACCES should prevent us from continuing
215
    # The downside is that the rename_func has to throw an exception
216
    # with an errno = ENOENT, or NoSuchFile
217
    file_existed = False
218
    try:
219
        rename_func(new, tmp_name)
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
220
    except (errors.NoSuchFile,), e:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
221
        pass
1532 by Robert Collins
Merge in John Meinels integration branch.
222
    except IOError, e:
223
        # RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
224
        # function raises an IOError with errno is None when a rename fails.
1532 by Robert Collins
Merge in John Meinels integration branch.
225
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
226
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
227
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
228
    except Exception, e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
229
        if (getattr(e, 'errno', None) is None
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
230
            or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
231
            raise
232
    else:
233
        file_existed = True
234
235
    success = False
236
    try:
2978.8.2 by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem
237
        try:
238
            # This may throw an exception, in which case success will
239
            # not be set.
240
            rename_func(old, new)
241
            success = True
242
        except (IOError, OSError), e:
2978.8.3 by Alexander Belchenko
Aaron's review
243
            # source and target may be aliases of each other (e.g. on a
244
            # case-insensitive filesystem), so we may have accidentally renamed
245
            # source by when we tried to rename target
2978.8.4 by Alexander Belchenko
fancy_rename: lower() test removed.
246
            if not (file_existed and e.errno in (None, errno.ENOENT)):
2978.8.2 by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem
247
                raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
248
    finally:
249
        if file_existed:
250
            # If the file used to exist, rename it back into place
251
            # otherwise just delete it from the tmp location
252
            if success:
1551.15.4 by Aaron Bentley
Revert now-unnecessary changes
253
                unlink_func(tmp_name)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
254
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
255
                rename_func(tmp_name, new)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
256
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
257
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
258
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
259
# choke on a Unicode string containing a relative path if
260
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
261
# string.
2093.1.1 by John Arbash Meinel
(Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'
262
_fs_enc = sys.getfilesystemencoding() or 'utf-8'
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
263
def _posix_abspath(path):
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
264
    # jam 20060426 rather than encoding to fsencoding
265
    # copy posixpath.abspath, but use os.getcwdu instead
266
    if not posixpath.isabs(path):
267
        path = posixpath.join(getcwd(), path)
268
    return posixpath.normpath(path)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
269
270
271
def _posix_realpath(path):
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
272
    return posixpath.realpath(path.encode(_fs_enc)).decode(_fs_enc)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
273
274
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
275
def _win32_fixdrive(path):
276
    """Force drive letters to be consistent.
277
278
    win32 is inconsistent whether it returns lower or upper case
279
    and even if it was consistent the user might type the other
280
    so we force it to uppercase
281
    running python.exe under cmd.exe return capital C:\\
282
    running win32 python inside a cygwin shell returns lowercase c:\\
283
    """
284
    drive, path = _nt_splitdrive(path)
285
    return drive.upper() + path
286
287
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
288
def _win32_abspath(path):
1711.4.6 by John Arbash Meinel
Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'
289
    # Real _nt_abspath doesn't have a problem with a unicode cwd
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
290
    return _win32_fixdrive(_nt_abspath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
291
292
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
293
def _win98_abspath(path):
294
    """Return the absolute version of a path.
295
    Windows 98 safe implementation (python reimplementation
296
    of Win32 API function GetFullPathNameW)
297
    """
298
    # Corner cases:
299
    #   C:\path     => C:/path
300
    #   C:/path     => C:/path
301
    #   \\HOST\path => //HOST/path
302
    #   //HOST/path => //HOST/path
303
    #   path        => C:/cwd/path
304
    #   /path       => C:/path
305
    path = unicode(path)
306
    # check for absolute path
307
    drive = _nt_splitdrive(path)[0]
308
    if drive == '' and path[:2] not in('//','\\\\'):
309
        cwd = os.getcwdu()
310
        # we cannot simply os.path.join cwd and path
311
        # because os.path.join('C:','/path') produce '/path'
312
        # and this is incorrect
313
        if path[:1] in ('/','\\'):
314
            cwd = _nt_splitdrive(cwd)[0]
2279.4.3 by Alexander Belchenko
win98_abspath: support for running in POSIX environment: cwd path has not drive letter
315
            path = path[1:]
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
316
        path = cwd + '\\' + path
317
    return _win32_fixdrive(_nt_normpath(path).replace('\\', '/'))
318
319
if win32utils.winver == 'Windows 98':
320
    _win32_abspath = _win98_abspath
321
322
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
323
def _win32_realpath(path):
1711.4.6 by John Arbash Meinel
Removing hacks for _win32_abspath, on real win32 abspath handles unicode just fine, it doesn't handle encoding into 'mbcs'
324
    # Real _nt_realpath doesn't have a problem with a unicode cwd
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
325
    return _win32_fixdrive(_nt_realpath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
326
327
328
def _win32_pathjoin(*args):
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
329
    return _nt_join(*args).replace('\\', '/')
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
330
331
332
def _win32_normpath(path):
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
333
    return _win32_fixdrive(_nt_normpath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
334
335
336
def _win32_getcwd():
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
337
    return _win32_fixdrive(os.getcwdu().replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
338
339
340
def _win32_mkdtemp(*args, **kwargs):
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
341
    return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
342
343
344
def _win32_rename(old, new):
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
345
    """We expect to be able to atomically replace 'new' with old.
346
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
347
    On win32, if new exists, it must be moved out of the way first,
348
    and then deleted. 
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
349
    """
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
350
    try:
351
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
352
    except OSError, e:
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
353
        if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL):
354
            # If we try to rename a non-existant file onto cwd, we get 
355
            # EPERM or EACCES instead of ENOENT, this will raise ENOENT 
356
            # if the old path doesn't exist, sometimes we get EACCES
357
            # On Linux, we seem to get EBUSY, on Mac we get EINVAL
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
358
            os.lstat(old)
359
        raise
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
360
361
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
362
def _mac_getcwd():
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
363
    return unicodedata.normalize('NFC', os.getcwdu())
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
364
365
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
366
# Default is to just use the python builtins, but these can be rebound on
367
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
368
abspath = _posix_abspath
369
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
370
pathjoin = os.path.join
371
normpath = os.path.normpath
372
getcwd = os.getcwdu
373
rename = os.rename
374
dirname = os.path.dirname
375
basename = os.path.basename
2215.4.2 by Alexander Belchenko
split and splitext now the part of osutils
376
split = os.path.split
377
splitext = os.path.splitext
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
378
# These were already imported into local scope
379
# mkdtemp = tempfile.mkdtemp
380
# rmtree = shutil.rmtree
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
381
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
382
MIN_ABS_PATHLENGTH = 1
383
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
384
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
385
if sys.platform == 'win32':
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
386
    abspath = _win32_abspath
387
    realpath = _win32_realpath
388
    pathjoin = _win32_pathjoin
389
    normpath = _win32_normpath
390
    getcwd = _win32_getcwd
391
    mkdtemp = _win32_mkdtemp
392
    rename = _win32_rename
393
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
394
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
395
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
396
    def _win32_delete_readonly(function, path, excinfo):
397
        """Error handler for shutil.rmtree function [for win32]
398
        Helps to remove files and dirs marked as read-only.
399
        """
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
400
        exception = excinfo[1]
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
401
        if function in (os.remove, os.rmdir) \
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
402
            and isinstance(exception, OSError) \
403
            and exception.errno == errno.EACCES:
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
404
            make_writable(path)
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
405
            function(path)
406
        else:
407
            raise
408
409
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
410
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
411
        return shutil.rmtree(path, ignore_errors, onerror)
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
412
elif sys.platform == 'darwin':
413
    getcwd = _mac_getcwd
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
414
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
415
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
416
def get_terminal_encoding():
417
    """Find the best encoding for printing to the screen.
418
419
    This attempts to check both sys.stdout and sys.stdin to see
420
    what encoding they are in, and if that fails it falls back to
421
    bzrlib.user_encoding.
422
    The problem is that on Windows, locale.getpreferredencoding()
423
    is not the same encoding as that used by the console:
424
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
425
426
    On my standard US Windows XP, the preferred encoding is
427
    cp1252, but the console is cp437
428
    """
429
    output_encoding = getattr(sys.stdout, 'encoding', None)
430
    if not output_encoding:
431
        input_encoding = getattr(sys.stdin, 'encoding', None)
432
        if not input_encoding:
433
            output_encoding = bzrlib.user_encoding
434
            mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding)
435
        else:
436
            output_encoding = input_encoding
437
            mutter('encoding stdout as sys.stdin encoding %r', output_encoding)
438
    else:
439
        mutter('encoding stdout as sys.stdout encoding %r', output_encoding)
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
440
    if output_encoding == 'cp0':
441
        # invalid encoding (cp0 means 'no codepage' on Windows)
442
        output_encoding = bzrlib.user_encoding
443
        mutter('cp0 is invalid encoding.'
444
               ' encoding stdout as bzrlib.user_encoding %r', output_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
445
    # check encoding
446
    try:
447
        codecs.lookup(output_encoding)
448
    except LookupError:
449
        sys.stderr.write('bzr: warning:'
2192.1.9 by Alexander Belchenko
final fix suggested by John Meinel
450
                         ' unknown terminal encoding %s.\n'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
451
                         '  Using encoding %s instead.\n'
452
                         % (output_encoding, bzrlib.user_encoding)
453
                        )
454
        output_encoding = bzrlib.user_encoding
455
1711.4.10 by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere.
456
    return output_encoding
457
458
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
459
def normalizepath(f):
3287.18.2 by Matt McClure
Reverts to 3290.
460
    if getattr(os.path, 'realpath', None) is not None:
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
461
        F = realpath
462
    else:
463
        F = abspath
464
    [p,e] = os.path.split(f)
465
    if e == "" or e == "." or e == "..":
466
        return F(f)
467
    else:
468
        return pathjoin(F(p), e)
469
1 by mbp at sourcefrog
import from baz patch-364
470
471
def isdir(f):
472
    """True if f is an accessible directory."""
473
    try:
474
        return S_ISDIR(os.lstat(f)[ST_MODE])
475
    except OSError:
476
        return False
477
478
479
def isfile(f):
480
    """True if f is a regular file."""
481
    try:
482
        return S_ISREG(os.lstat(f)[ST_MODE])
483
    except OSError:
484
        return False
485
1092.2.6 by Robert Collins
symlink support updated to work
486
def islink(f):
487
    """True if f is a symlink."""
488
    try:
489
        return S_ISLNK(os.lstat(f)[ST_MODE])
490
    except OSError:
491
        return False
1 by mbp at sourcefrog
import from baz patch-364
492
485 by Martin Pool
- move commit code into its own module
493
def is_inside(dir, fname):
494
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
495
    
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
496
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
497
    that . and .. and repeated slashes are eliminated, and the separators
498
    are canonical for the platform.
499
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
500
    The empty string as a dir name is taken as top-of-tree and matches 
501
    everything.
485 by Martin Pool
- move commit code into its own module
502
    """
969 by Martin Pool
- Add less-sucky is_within_any
503
    # XXX: Most callers of this can actually do something smarter by 
504
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
505
    if dir == fname:
506
        return True
507
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
508
    if dir == '':
509
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
510
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
511
    if dir[-1] != '/':
512
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
513
972 by Martin Pool
- less dodgy is_inside function
514
    return fname.startswith(dir)
515
485 by Martin Pool
- move commit code into its own module
516
517
def is_inside_any(dir_list, fname):
518
    """True if fname is inside any of given dirs."""
519
    for dirname in dir_list:
520
        if is_inside(dirname, fname):
521
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
522
    return False
485 by Martin Pool
- move commit code into its own module
523
524
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
525
def is_inside_or_parent_of_any(dir_list, fname):
526
    """True if fname is a child or a parent of any of the given files."""
527
    for dirname in dir_list:
528
        if is_inside(dirname, fname) or is_inside(fname, dirname):
529
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
530
    return False
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
531
532
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
533
def pumpfile(from_file, to_file, read_length=-1, buff_size=32768):
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
534
    """Copy contents of one file to another.
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
535
536
    The read_length can either be -1 to read to end-of-file (EOF) or
537
    it can specify the maximum number of bytes to read.
538
539
    The buff_size represents the maximum size for each read operation
540
    performed on from_file.
541
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
542
    :return: The number of bytes copied.
543
    """
544
    length = 0
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
545
    if read_length >= 0:
546
        # read specified number of bytes
547
548
        while read_length > 0:
549
            num_bytes_to_read = min(read_length, buff_size)
550
551
            block = from_file.read(num_bytes_to_read)
552
            if not block:
553
                # EOF reached
554
                break
555
            to_file.write(block)
556
557
            actual_bytes_read = len(block)
558
            read_length -= actual_bytes_read
559
            length += actual_bytes_read
560
    else:
561
        # read to EOF
562
        while True:
563
            block = from_file.read(buff_size)
564
            if not block:
565
                # EOF reached
566
                break
567
            to_file.write(block)
568
            length += len(block)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
569
    return length
1 by mbp at sourcefrog
import from baz patch-364
570
571
1185.67.7 by Aaron Bentley
Refactored a bit
572
def file_iterator(input_file, readsize=32768):
573
    while True:
574
        b = input_file.read(readsize)
575
        if len(b) == 0:
576
            break
577
        yield b
578
579
1 by mbp at sourcefrog
import from baz patch-364
580
def sha_file(f):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
581
    """Calculate the hexdigest of an open file.
582
583
    The file cursor should be already at the start.
584
    """
1 by mbp at sourcefrog
import from baz patch-364
585
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
586
    BUFSIZE = 128<<10
587
    while True:
588
        b = f.read(BUFSIZE)
589
        if not b:
590
            break
591
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
592
    return s.hexdigest()
593
594
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
595
def sha_file_by_name(fname):
596
    """Calculate the SHA1 of a file by reading the full text"""
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
597
    s = sha.new()
2922.1.1 by John Arbash Meinel
Fix bug #153493, use O_BINARY when reading files.
598
    f = os.open(fname, os.O_RDONLY | O_BINARY)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
599
    try:
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
600
        while True:
601
            b = os.read(f, 1<<16)
602
            if not b:
603
                return s.hexdigest()
604
            s.update(b)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
605
    finally:
2872.3.2 by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster
606
        os.close(f)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
607
608
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
609
def sha_strings(strings, _factory=sha.new):
1235 by Martin Pool
- split sha_strings into osutils
610
    """Return the sha-1 of concatenation of strings"""
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
611
    s = _factory()
1235 by Martin Pool
- split sha_strings into osutils
612
    map(s.update, strings)
613
    return s.hexdigest()
614
615
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
616
def sha_string(f, _factory=sha.new):
617
    return _factory(f).hexdigest()
1 by mbp at sourcefrog
import from baz patch-364
618
619
124 by mbp at sourcefrog
- check file text for past revisions is correct
620
def fingerprint_file(f):
126 by mbp at sourcefrog
Use just one big read to fingerprint files
621
    b = f.read()
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
622
    return {'size': len(b),
623
            'sha1': sha.new(b).hexdigest()}
124 by mbp at sourcefrog
- check file text for past revisions is correct
624
625
1 by mbp at sourcefrog
import from baz patch-364
626
def compare_files(a, b):
627
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
628
    BUFSIZE = 4096
629
    while True:
630
        ai = a.read(BUFSIZE)
631
        bi = b.read(BUFSIZE)
632
        if ai != bi:
633
            return False
634
        if ai == '':
635
            return True
1 by mbp at sourcefrog
import from baz patch-364
636
637
49 by mbp at sourcefrog
fix local-time-offset calculation
638
def local_time_offset(t=None):
639
    """Return offset of local zone from GMT, either at present or at time t."""
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
640
    if t is None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
641
        t = time.time()
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
642
    offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)
643
    return offset.days * 86400 + offset.seconds
8 by mbp at sourcefrog
store committer's timezone in revision and show
644
645
    
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
646
def format_date(t, offset=0, timezone='original', date_fmt=None,
1185.12.24 by Aaron Bentley
Made format_date more flexible
647
                show_offset=True):
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
648
    """Return a formatted date string.
649
650
    :param t: Seconds since the epoch.
651
    :param offset: Timezone offset in seconds east of utc.
652
    :param timezone: How to display the time: 'utc', 'original' for the
653
         timezone specified by offset, or 'local' for the process's current
654
         timezone.
655
    :param show_offset: Whether to append the timezone.
656
    :param date_fmt: strftime format.
657
    """
8 by mbp at sourcefrog
store committer's timezone in revision and show
658
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
659
        tt = time.gmtime(t)
660
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
661
    elif timezone == 'original':
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
662
        if offset is None:
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
663
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
664
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
665
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
666
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
667
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
668
    else:
3144.1.1 by Lukáš Lalinský
Fixed error reporting of unsupported timezone format.
669
        raise errors.UnsupportedTimezoneFormat(timezone)
1185.12.24 by Aaron Bentley
Made format_date more flexible
670
    if date_fmt is None:
671
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
672
    if show_offset:
673
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
674
    else:
675
        offset_str = ''
676
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
677
678
679
def compact_date(when):
680
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
681
    
682
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
683
def format_delta(delta):
684
    """Get a nice looking string for a time delta.
685
686
    :param delta: The time difference in seconds, can be positive or negative.
687
        positive indicates time in the past, negative indicates time in the
688
        future. (usually time.time() - stored_time)
689
    :return: String formatted to show approximate resolution
690
    """
691
    delta = int(delta)
692
    if delta >= 0:
693
        direction = 'ago'
694
    else:
695
        direction = 'in the future'
696
        delta = -delta
697
698
    seconds = delta
699
    if seconds < 90: # print seconds up to 90 seconds
700
        if seconds == 1:
701
            return '%d second %s' % (seconds, direction,)
702
        else:
703
            return '%d seconds %s' % (seconds, direction)
704
705
    minutes = int(seconds / 60)
706
    seconds -= 60 * minutes
707
    if seconds == 1:
708
        plural_seconds = ''
709
    else:
710
        plural_seconds = 's'
711
    if minutes < 90: # print minutes, seconds up to 90 minutes
712
        if minutes == 1:
713
            return '%d minute, %d second%s %s' % (
714
                    minutes, seconds, plural_seconds, direction)
715
        else:
716
            return '%d minutes, %d second%s %s' % (
717
                    minutes, seconds, plural_seconds, direction)
718
719
    hours = int(minutes / 60)
720
    minutes -= 60 * hours
721
    if minutes == 1:
722
        plural_minutes = ''
723
    else:
724
        plural_minutes = 's'
725
726
    if hours == 1:
727
        return '%d hour, %d minute%s %s' % (hours, minutes,
728
                                            plural_minutes, direction)
729
    return '%d hours, %d minute%s %s' % (hours, minutes,
730
                                         plural_minutes, direction)
1 by mbp at sourcefrog
import from baz patch-364
731
732
def filesize(f):
733
    """Return size of given open file."""
734
    return os.fstat(f.fileno())[ST_SIZE]
735
1553.5.5 by Martin Pool
New utility routine rand_chars
736
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
737
# Define rand_bytes based on platform.
738
try:
739
    # Python 2.4 and later have os.urandom,
740
    # but it doesn't work on some arches
741
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
742
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
743
except (NotImplementedError, AttributeError):
744
    # If python doesn't have os.urandom, or it doesn't work,
745
    # then try to first pull random data from /dev/urandom
2067.1.1 by John Arbash Meinel
Catch an exception while opening /dev/urandom rather than using os.path.exists()
746
    try:
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
747
        rand_bytes = file('/dev/urandom', 'rb').read
748
    # Otherwise, use this hack as a last resort
2067.1.1 by John Arbash Meinel
Catch an exception while opening /dev/urandom rather than using os.path.exists()
749
    except (IOError, OSError):
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
750
        # not well seeded, but better than nothing
751
        def rand_bytes(n):
752
            import random
753
            s = ''
754
            while n:
755
                s += chr(random.randint(0, 255))
756
                n -= 1
757
            return s
1 by mbp at sourcefrog
import from baz patch-364
758
1553.5.5 by Martin Pool
New utility routine rand_chars
759
760
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
761
def rand_chars(num):
762
    """Return a random string of num alphanumeric characters
763
    
764
    The result only contains lowercase chars because it may be used on 
765
    case-insensitive filesystems.
766
    """
767
    s = ''
768
    for raw_byte in rand_bytes(num):
769
        s += ALNUM[ord(raw_byte) % 36]
770
    return s
771
772
1 by mbp at sourcefrog
import from baz patch-364
773
## TODO: We could later have path objects that remember their list
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
774
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
775
776
def splitpath(p):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
777
    """Turn string into list of parts."""
271 by Martin Pool
- Windows path fixes
778
    # split on either delimiter because people might use either on
779
    # Windows
780
    ps = re.split(r'[\\/]', p)
781
782
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
783
    for f in ps:
784
        if f == '..':
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
785
            raise errors.BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
786
        elif (f == '.') or (f == ''):
787
            pass
788
        else:
789
            rps.append(f)
790
    return rps
1 by mbp at sourcefrog
import from baz patch-364
791
792
def joinpath(p):
793
    for f in p:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
794
        if (f == '..') or (f is None) or (f == ''):
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
795
            raise errors.BzrError("sorry, %r not allowed in path" % f)
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
796
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
797
798
1231 by Martin Pool
- more progress on fetch on top of weaves
799
def split_lines(s):
800
    """Split s into lines, but without removing the newline characters."""
1666.1.6 by Robert Collins
Make knit the default format.
801
    lines = s.split('\n')
802
    result = [line + '\n' for line in lines[:-1]]
803
    if lines[-1]:
804
        result.append(lines[-1])
805
    return result
1391 by Robert Collins
merge from integration
806
807
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
808
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
809
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
810
1185.1.46 by Robert Collins
Aarons branch --basis patch
811
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
812
def link_or_copy(src, dest):
813
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
814
    if not hardlinks_good():
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
815
        shutil.copyfile(src, dest)
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
816
        return
817
    try:
818
        os.link(src, dest)
819
    except (OSError, IOError), e:
820
        if e.errno != errno.EXDEV:
821
            raise
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
822
        shutil.copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
823
2831.5.2 by Vincent Ladeuil
Review feedback.
824
825
# Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
826
# Forgiveness than Permission (EAFP) because:
827
# - root can damage a solaris file system by using unlink,
828
# - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
829
#   EACCES, OSX: EPERM) when invoked on a directory.
830
def delete_any(path):
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
831
    """Delete a file or directory."""
2831.5.2 by Vincent Ladeuil
Review feedback.
832
    if isdir(path): # Takes care of symlinks
833
        os.rmdir(path)
834
    else:
835
        os.unlink(path)
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
836
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
837
838
def has_symlinks():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
839
    if getattr(os, 'symlink', None) is not None:
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
840
        return True
841
    else:
842
        return False
2831.5.2 by Vincent Ladeuil
Review feedback.
843
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
844
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
845
def has_hardlinks():
846
    if getattr(os, 'link', None) is not None:
847
        return True
848
    else:
849
        return False
850
851
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
852
def host_os_dereferences_symlinks():
853
    return (has_symlinks()
3287.18.19 by Matt McClure
Changed tested sys.platform value from 'windows' (mistaken) to 'win32'
854
            and sys.platform not in ('cygwin', 'win32'))
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
855
856
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
857
def contains_whitespace(s):
858
    """True if there are any whitespace characters in s."""
2249.2.1 by John Arbash Meinel
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
859
    # string.whitespace can include '\xa0' in certain locales, because it is
860
    # considered "non-breaking-space" as part of ISO-8859-1. But it
861
    # 1) Isn't a breaking whitespace
862
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
863
    #    separators
864
    # 3) '\xa0' isn't unicode safe since it is >128.
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
865
866
    # This should *not* be a unicode set of characters in case the source
867
    # string is not a Unicode string. We can auto-up-cast the characters since
868
    # they are ascii, but we don't want to auto-up-cast the string in case it
869
    # is utf-8
870
    for ch in ' \t\n\r\v\f':
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
871
        if ch in s:
872
            return True
873
    else:
874
        return False
875
876
877
def contains_linebreaks(s):
878
    """True if there is any vertical whitespace in s."""
879
    for ch in '\f\n\r':
880
        if ch in s:
881
            return True
882
    else:
883
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
884
885
886
def relpath(base, path):
887
    """Return path relative to base, or raise exception.
888
889
    The path may be either an absolute path or a path relative to the
890
    current working directory.
891
892
    os.path.commonprefix (python2.4) has a bad bug that it works just
893
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
894
    avoids that problem.
895
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
896
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
897
    if len(base) < MIN_ABS_PATHLENGTH:
898
        # must have space for e.g. a drive letter
899
        raise ValueError('%r is too short to calculate a relative path'
900
            % (base,))
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
901
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
902
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
903
904
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
905
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
906
    while len(head) >= len(base):
907
        if head == base:
908
            break
909
        head, tail = os.path.split(head)
910
        if tail:
911
            s.insert(0, tail)
912
    else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
913
        raise errors.PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
914
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
915
    if s:
916
        return pathjoin(*s)
917
    else:
918
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
919
920
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
921
def safe_unicode(unicode_or_utf8_string):
922
    """Coerce unicode_or_utf8_string into unicode.
923
924
    If it is unicode, it is returned.
925
    Otherwise it is decoded from utf-8. If a decoding error
926
    occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
927
    as a BzrBadParameter exception.
928
    """
929
    if isinstance(unicode_or_utf8_string, unicode):
930
        return unicode_or_utf8_string
931
    try:
932
        return unicode_or_utf8_string.decode('utf8')
933
    except UnicodeDecodeError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
934
        raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
935
936
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
937
def safe_utf8(unicode_or_utf8_string):
938
    """Coerce unicode_or_utf8_string to a utf8 string.
939
940
    If it is a str, it is returned.
941
    If it is Unicode, it is encoded into a utf-8 string.
942
    """
943
    if isinstance(unicode_or_utf8_string, str):
944
        # TODO: jam 20070209 This is overkill, and probably has an impact on
945
        #       performance if we are dealing with lots of apis that want a
946
        #       utf-8 revision id
947
        try:
948
            # Make sure it is a valid utf-8 string
949
            unicode_or_utf8_string.decode('utf-8')
950
        except UnicodeDecodeError:
951
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
952
        return unicode_or_utf8_string
953
    return unicode_or_utf8_string.encode('utf-8')
954
955
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
956
_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.'
957
                        ' Revision id generators should be creating utf8'
958
                        ' revision ids.')
959
960
961
def safe_revision_id(unicode_or_utf8_string, warn=True):
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
962
    """Revision ids should now be utf8, but at one point they were unicode.
963
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
964
    :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
965
        utf8 or None).
966
    :param warn: Functions that are sanitizing user data can set warn=False
967
    :return: None or a utf8 revision id.
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
968
    """
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
969
    if (unicode_or_utf8_string is None
970
        or unicode_or_utf8_string.__class__ == str):
971
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
972
    if warn:
973
        symbol_versioning.warn(_revision_id_warning, DeprecationWarning,
974
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
975
    return cache_utf8.encode(unicode_or_utf8_string)
976
977
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
978
_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id'
979
                    ' generators should be creating utf8 file ids.')
980
981
982
def safe_file_id(unicode_or_utf8_string, warn=True):
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
983
    """File ids should now be utf8, but at one point they were unicode.
984
985
    This is the same as safe_utf8, except it uses the cached encode functions
986
    to save a little bit of performance.
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
987
988
    :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
989
        utf8 or None).
990
    :param warn: Functions that are sanitizing user data can set warn=False
991
    :return: None or a utf8 file id.
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
992
    """
993
    if (unicode_or_utf8_string is None
994
        or unicode_or_utf8_string.__class__ == str):
995
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
996
    if warn:
997
        symbol_versioning.warn(_file_id_warning, DeprecationWarning,
998
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
999
    return cache_utf8.encode(unicode_or_utf8_string)
2294.1.4 by John Arbash Meinel
Add safe_file_id as a helper in osutils.
1000
1001
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1002
_platform_normalizes_filenames = False
1003
if sys.platform == 'darwin':
1004
    _platform_normalizes_filenames = True
1005
1006
1007
def normalizes_filenames():
1008
    """Return True if this platform normalizes unicode filenames.
1009
1010
    Mac OSX does, Windows/Linux do not.
1011
    """
1012
    return _platform_normalizes_filenames
1013
1014
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1015
def _accessible_normalized_filename(path):
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1016
    """Get the unicode normalized path, and if you can access the file.
1017
1018
    On platforms where the system normalizes filenames (Mac OSX),
1019
    you can access a file by any path which will normalize correctly.
1020
    On platforms where the system does not normalize filenames 
1021
    (Windows, Linux), you have to access a file by its exact path.
1022
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1023
    Internally, bzr only supports NFC normalization, since that is 
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1024
    the standard for XML documents.
1025
1026
    So return the normalized path, and a flag indicating if the file
1027
    can be accessed by that path.
1028
    """
1029
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1030
    return unicodedata.normalize('NFC', unicode(path)), True
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1031
1032
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1033
def _inaccessible_normalized_filename(path):
1034
    __doc__ = _accessible_normalized_filename.__doc__
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1035
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1036
    normalized = unicodedata.normalize('NFC', unicode(path))
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1037
    return normalized, normalized == path
1038
1039
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1040
if _platform_normalizes_filenames:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1041
    normalized_filename = _accessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1042
else:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1043
    normalized_filename = _inaccessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1044
1045
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1046
def terminal_width():
1047
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
1048
    if sys.platform == 'win32':
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
1049
        return win32utils.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1050
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1051
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1052
        import struct, fcntl, termios
1053
        s = struct.pack('HHHH', 0, 0, 0, 0)
1054
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
1055
        width = struct.unpack('HHHH', x)[1]
1056
    except IOError:
1057
        pass
1058
    if width <= 0:
1059
        try:
1060
            width = int(os.environ['COLUMNS'])
1061
        except:
1062
            pass
1063
    if width <= 0:
1064
        width = 80
1065
1066
    return width
1534.7.25 by Aaron Bentley
Added set_executability
1067
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1068
1534.7.25 by Aaron Bentley
Added set_executability
1069
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
1070
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
1071
1072
1551.10.4 by Aaron Bentley
Update to skip on win32
1073
def supports_posix_readonly():
1074
    """Return True if 'readonly' has POSIX semantics, False otherwise.
1075
1076
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
1077
    directory controls creation/deletion, etc.
1078
1079
    And under win32, readonly means that the directory itself cannot be
1080
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
1081
    where files in readonly directories cannot be added, deleted or renamed.
1082
    """
1083
    return sys.platform != "win32"
1084
1085
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1086
def set_or_unset_env(env_variable, value):
1087
    """Modify the environment, setting or removing the env_variable.
1088
1089
    :param env_variable: The environment variable in question
1090
    :param value: The value to set the environment to. If None, then
1091
        the variable will be removed.
1092
    :return: The original value of the environment variable.
1093
    """
1094
    orig_val = os.environ.get(env_variable)
1095
    if value is None:
1096
        if orig_val is not None:
1097
            del os.environ[env_variable]
1098
    else:
1099
        if isinstance(value, unicode):
1100
            value = value.encode(bzrlib.user_encoding)
1101
        os.environ[env_variable] = value
1102
    return orig_val
1103
1104
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1105
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
1106
1107
1108
def check_legal_path(path):
1109
    """Check whether the supplied path is legal.  
1110
    This is only required on Windows, so we don't test on other platforms
1111
    right now.
1112
    """
1113
    if sys.platform != "win32":
1114
        return
1115
    if _validWin32PathRE.match(path) is None:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1116
        raise errors.IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1117
1118
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
1119
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1120
    """Yield data about all the directories in a tree.
1121
    
1122
    This yields all the data about the contents of a directory at a time.
1123
    After each directory has been yielded, if the caller has mutated the list
1124
    to exclude some directories, they are then not descended into.
1125
    
1126
    The data yielded is of the form:
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1127
    ((directory-relpath, directory-path-from-top),
2694.4.1 by Alexander Belchenko
trivial fix for docstring of osutils.walkdirs()
1128
    [(relpath, basename, kind, lstat, path-from-top), ...]),
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1129
     - directory-relpath is the relative path of the directory being returned
1130
       with respect to top. prefix is prepended to this.
1131
     - directory-path-from-root is the path including top for this directory. 
1132
       It is suitable for use with os functions.
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1133
     - relpath is the relative path within the subtree being walked.
1134
     - basename is the basename of the path
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1135
     - kind is the kind of the file now. If unknown then the file is not
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1136
       present within the tree - but it may be recorded as versioned. See
1137
       versioned_kind.
1138
     - lstat is the stat data *if* the file was statted.
1139
     - planned, not implemented: 
1140
       path_from_tree_root is the path from the root of the tree.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1141
1757.2.16 by Robert Collins
Review comments.
1142
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
1143
        allows one to walk a subtree but get paths that are relative to a tree
1144
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1145
    :return: an iterator over the dirs.
1146
    """
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1147
    #TODO there is a bit of a smell where the results of the directory-
1148
    # summary in this, and the path from the root, may not agree 
1149
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
1150
    # potentially confusing output. We should make this more robust - but
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1151
    # not at a speed cost. RBC 20060731
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1152
    _lstat = os.lstat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1153
    _directory = _directory_kind
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1154
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1155
    _kind_from_mode = _formats.get
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1156
    pending = [(safe_unicode(prefix), "", _directory, None, safe_unicode(top))]
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1157
    while pending:
1158
        # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1159
        relroot, _, _, _, top = pending.pop()
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1160
        if relroot:
1161
            relprefix = relroot + u'/'
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1162
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1163
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1164
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1165
1166
        dirblock = []
1167
        append = dirblock.append
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1168
        for name in sorted(_listdir(top)):
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1169
            abspath = top_slash + name
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1170
            statvalue = _lstat(abspath)
1171
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1172
            append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1173
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1174
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1175
        # push the user specified dirs from dirblock
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1176
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1177
1178
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1179
def _walkdirs_utf8(top, prefix=""):
1180
    """Yield data about all the directories in a tree.
1181
1182
    This yields the same information as walkdirs() only each entry is yielded
1183
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
1184
    are returned as exact byte-strings.
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1185
1186
    :return: yields a tuple of (dir_info, [file_info])
1187
        dir_info is (utf8_relpath, path-from-top)
1188
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
1189
        if top is an absolute path, path-from-top is also an absolute path.
1190
        path-from-top might be unicode or utf8, but it is the correct path to
1191
        pass to os functions to affect the file in question. (such as os.lstat)
1192
    """
2522.2.2 by Ian Clatworthy
Apply Colin Watson's patch fixing 120647
1193
    fs_encoding = _fs_enc.upper()
3504.4.5 by John Arbash Meinel
Add tests to ensure that you can skip subdirs, start exposing the function.
1194
    if (sys.platform == 'win32'):
1195
        try:
1196
            from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file
1197
        except ImportError:
1198
            return _walkdirs_unicode_to_utf8(top, prefix=prefix)
1199
        else:
1200
            return _walkdirs_utf8_win32_find_file(top, prefix=prefix)
1201
    if (fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968')): # ascii
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1202
        return _walkdirs_unicode_to_utf8(top, prefix=prefix)
1203
    else:
1204
        return _walkdirs_fs_utf8(top, prefix=prefix)
1205
1206
1207
def _walkdirs_fs_utf8(top, prefix=""):
1208
    """See _walkdirs_utf8.
1209
1210
    This sub-function is called when we know the filesystem is already in utf8
1211
    encoding. So we don't need to transcode filenames.
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1212
    """
1213
    _lstat = os.lstat
1214
    _directory = _directory_kind
1215
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1216
    _kind_from_mode = _formats.get
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1217
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1218
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
1219
    # But we don't actually uses 1-3 in pending, so set them to None
1220
    pending = [(safe_utf8(prefix), None, None, None, safe_utf8(top))]
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1221
    while pending:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1222
        relroot, _, _, _, top = pending.pop()
1223
        if relroot:
1224
            relprefix = relroot + '/'
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1225
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1226
            relprefix = ''
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1227
        top_slash = top + '/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1228
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1229
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1230
        append = dirblock.append
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1231
        for name in sorted(_listdir(top)):
1232
            abspath = top_slash + name
1233
            statvalue = _lstat(abspath)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1234
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1235
            append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1236
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1237
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1238
        # push the user specified dirs from dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1239
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1240
1241
1242
def _walkdirs_unicode_to_utf8(top, prefix=""):
1243
    """See _walkdirs_utf8
1244
1245
    Because Win32 has a Unicode api, all of the 'path-from-top' entries will be
1246
    Unicode paths.
1247
    This is currently the fallback code path when the filesystem encoding is
1248
    not UTF-8. It may be better to implement an alternative so that we can
1249
    safely handle paths that are not properly decodable in the current
1250
    encoding.
1251
    """
1252
    _utf8_encode = codecs.getencoder('utf8')
1253
    _lstat = os.lstat
1254
    _directory = _directory_kind
1255
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1256
    _kind_from_mode = _formats.get
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1257
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1258
    pending = [(safe_utf8(prefix), None, None, None, safe_unicode(top))]
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1259
    while pending:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1260
        relroot, _, _, _, top = pending.pop()
1261
        if relroot:
1262
            relprefix = relroot + '/'
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1263
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1264
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1265
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1266
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1267
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1268
        append = dirblock.append
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1269
        for name in sorted(_listdir(top)):
1270
            name_utf8 = _utf8_encode(name)[0]
1271
            abspath = top_slash + name
1272
            statvalue = _lstat(abspath)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1273
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1274
            append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1275
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1276
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1277
        # push the user specified dirs from dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1278
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
2255.7.27 by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
1279
1280
3504.4.1 by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis.
1281
def _walkdirs_utf8_win32_find_file(top, prefix=""):
1282
    """
1283
    Because Win32 has a Unicode api, all of the 'path-from-top' entries will be
1284
    Unicode paths.
1285
    """
3504.4.4 by John Arbash Meinel
We have walkdirs basically working, only without timestamps
1286
    from bzrlib._walkdirs_win32 import _walkdirs_utf8_win32_find_file as wd
1287
    return wd(top, prefix=prefix)
3504.4.1 by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis.
1288
1289
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1290
def copy_tree(from_path, to_path, handlers={}):
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1291
    """Copy all of the entries in from_path into to_path.
1292
1293
    :param from_path: The base directory to copy. 
1294
    :param to_path: The target directory. If it does not exist, it will
1295
        be created.
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1296
    :param handlers: A dictionary of functions, which takes a source and
1297
        destinations for files, directories, etc.
1298
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
1299
        'file', 'directory', and 'symlink' should always exist.
1300
        If they are missing, they will be replaced with 'os.mkdir()',
1301
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1302
    """
1303
    # Now, just copy the existing cached tree to the new location
1304
    # We use a cheap trick here.
1305
    # Absolute paths are prefixed with the first parameter
1306
    # relative paths are prefixed with the second.
1307
    # So we can get both the source and target returned
1308
    # without any extra work.
1309
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1310
    def copy_dir(source, dest):
1311
        os.mkdir(dest)
1312
1313
    def copy_link(source, dest):
1314
        """Copy the contents of a symlink"""
1315
        link_to = os.readlink(source)
1316
        os.symlink(link_to, dest)
1317
1318
    real_handlers = {'file':shutil.copy2,
1319
                     'symlink':copy_link,
1320
                     'directory':copy_dir,
1321
                    }
1322
    real_handlers.update(handlers)
1323
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1324
    if not os.path.exists(to_path):
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1325
        real_handlers['directory'](from_path, to_path)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1326
1327
    for dir_info, entries in walkdirs(from_path, prefix=to_path):
1328
        for relpath, name, kind, st, abspath in entries:
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1329
            real_handlers[kind](abspath, relpath)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1330
1331
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1332
def path_prefix_key(path):
1333
    """Generate a prefix-order path key for path.
1334
1335
    This can be used to sort paths in the same way that walkdirs does.
1336
    """
1773.3.2 by Robert Collins
New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed.
1337
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1338
1339
1340
def compare_paths_prefix_order(path_a, path_b):
1341
    """Compare path_a and path_b to generate the same order walkdirs uses."""
1342
    key_a = path_prefix_key(path_a)
1343
    key_b = path_prefix_key(path_b)
1344
    return cmp(key_a, key_b)
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1345
1346
1347
_cached_user_encoding = None
1348
1349
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1350
def get_user_encoding(use_cache=True):
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1351
    """Find out what the preferred user encoding is.
1352
1353
    This is generally the encoding that is used for command line parameters
1354
    and file contents. This may be different from the terminal encoding
1355
    or the filesystem encoding.
1356
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1357
    :param  use_cache:  Enable cache for detected encoding.
1358
                        (This parameter is turned on by default,
1359
                        and required only for selftesting)
1360
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1361
    :return: A string defining the preferred user encoding
1362
    """
1363
    global _cached_user_encoding
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1364
    if _cached_user_encoding is not None and use_cache:
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1365
        return _cached_user_encoding
1366
1367
    if sys.platform == 'darwin':
1368
        # work around egregious python 2.4 bug
1369
        sys.platform = 'posix'
1370
        try:
1371
            import locale
1372
        finally:
1373
            sys.platform = 'darwin'
1374
    else:
1375
        import locale
1376
1377
    try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1378
        user_encoding = locale.getpreferredencoding()
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1379
    except locale.Error, e:
1955.2.3 by John Arbash Meinel
Change error message text
1380
        sys.stderr.write('bzr: warning: %s\n'
2001.2.1 by Jelmer Vernooij
Fix typo in encoding warning.
1381
                         '  Could not determine what text encoding to use.\n'
1955.2.3 by John Arbash Meinel
Change error message text
1382
                         '  This error usually means your Python interpreter\n'
1383
                         '  doesn\'t support the locale set by $LANG (%s)\n'
1384
                         "  Continuing with ascii encoding.\n"
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1385
                         % (e, os.environ.get('LANG')))
2192.1.7 by Alexander Belchenko
get_user_encoding: if locale.Error raised we need to set user_encoding to 'ascii' as warning says
1386
        user_encoding = 'ascii'
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1387
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
1388
    # Windows returns 'cp0' to indicate there is no code page. So we'll just
1389
    # treat that as ASCII, and not support printing unicode characters to the
1390
    # console.
3405.3.1 by Neil Martinsen-Burrell
accept for an encoding to mean ascii
1391
    #
1392
    # For python scripts run under vim, we get '', so also treat that as ASCII
1393
    if user_encoding in (None, 'cp0', ''):
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1394
        user_encoding = 'ascii'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1395
    else:
1396
        # check encoding
1397
        try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1398
            codecs.lookup(user_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1399
        except LookupError:
1400
            sys.stderr.write('bzr: warning:'
1401
                             ' unknown encoding %s.'
1402
                             ' Continuing with ascii encoding.\n'
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1403
                             % user_encoding
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1404
                            )
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1405
            user_encoding = 'ascii'
1406
1407
    if use_cache:
1408
        _cached_user_encoding = user_encoding
1409
1410
    return user_encoding
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
1411
1412
1413
def recv_all(socket, bytes):
1414
    """Receive an exact number of bytes.
1415
1416
    Regular Socket.recv() may return less than the requested number of bytes,
1417
    dependning on what's in the OS buffer.  MSG_WAITALL is not available
1418
    on all platforms, but this should work everywhere.  This will return
1419
    less than the requested amount if the remote end closes.
1420
1421
    This isn't optimized and is intended mostly for use in testing.
1422
    """
1423
    b = ''
1424
    while len(b) < bytes:
1425
        new = socket.recv(bytes - len(b))
1426
        if new == '':
1427
            break # eof
1428
        b += new
1429
    return b
1430
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
1431
1432
def send_all(socket, bytes):
1433
    """Send all bytes on a socket.
1434
1435
    Regular socket.sendall() can give socket error 10053 on Windows.  This
1436
    implementation sends no more than 64k at a time, which avoids this problem.
1437
    """
1438
    chunk_size = 2**16
1439
    for pos in xrange(0, len(bytes), chunk_size):
1440
        socket.sendall(bytes[pos:pos+chunk_size])
1441
1442
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
1443
def dereference_path(path):
1444
    """Determine the real path to a file.
1445
1446
    All parent elements are dereferenced.  But the file itself is not
1447
    dereferenced.
1448
    :param path: The original path.  May be absolute or relative.
1449
    :return: the real path *to* the file
1450
    """
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
1451
    parent, base = os.path.split(path)
1452
    # The pathjoin for '.' is a workaround for Python bug #1213894.
1453
    # (initial path components aren't dereferenced)
1454
    return pathjoin(realpath(pathjoin('.', parent)), base)
2681.3.4 by Lukáš Lalinsky
- Rename 'windows' to 'mapi'
1455
1456
1457
def supports_mapi():
1458
    """Return True if we can use MAPI to launch a mail client."""
1459
    return sys.platform == "win32"
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
1460
1461
1462
def resource_string(package, resource_name):
1463
    """Load a resource from a package and return it as a string.
1464
1465
    Note: Only packages that start with bzrlib are currently supported.
1466
1467
    This is designed to be a lightweight implementation of resource
1468
    loading in a way which is API compatible with the same API from
1469
    pkg_resources. See
1470
    http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
1471
    If and when pkg_resources becomes a standard library, this routine
1472
    can delegate to it.
1473
    """
1474
    # Check package name is within bzrlib
1475
    if package == "bzrlib":
1476
        resource_relpath = resource_name
1477
    elif package.startswith("bzrlib."):
1478
        package = package[len("bzrlib."):].replace('.', os.sep)
1479
        resource_relpath = pathjoin(package, resource_name)
1480
    else:
1481
        raise errors.BzrError('resource package %s not in bzrlib' % package)
1482
1483
    # Map the resource to a file and read its contents
1484
    base = dirname(bzrlib.__file__)
1485
    if getattr(sys, 'frozen', None):    # bzr.exe
1486
        base = abspath(pathjoin(base, '..', '..'))
1487
    filename = pathjoin(base, resource_relpath)
1488
    return open(filename, 'rU').read()