~bzr-pqm/bzr/bzr.dev

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