20
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
21
S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
20
from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE
26
25
from bzrlib.lazy_import import lazy_import
27
26
lazy_import(globals(), """
29
27
from datetime import datetime
31
29
from ntpath import (abspath as _nt_abspath,
85
89
# be opened in binary mode, rather than text mode.
86
90
# On other platforms, O_BINARY doesn't exist, because
87
91
# they always open in binary mode, so it is okay to
88
# OR with 0 on those platforms
92
# OR with 0 on those platforms.
93
# O_NOINHERIT and O_TEXT exists only on win32 too.
89
94
O_BINARY = getattr(os, 'O_BINARY', 0)
95
O_TEXT = getattr(os, 'O_TEXT', 0)
96
O_NOINHERIT = getattr(os, 'O_NOINHERIT', 0)
92
99
def get_unicode_argv():
351
360
return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
363
def _add_rename_error_details(e, old, new):
364
new_e = OSError(e.errno, "failed to rename %s to %s: %s"
365
% (old, new, e.strerror))
367
new_e.to_filename = new
354
371
def _win32_rename(old, new):
355
372
"""We expect to be able to atomically replace 'new' with old.
1344
1374
normalized_filename = _inaccessible_normalized_filename
1377
def set_signal_handler(signum, handler, restart_syscall=True):
1378
"""A wrapper for signal.signal that also calls siginterrupt(signum, False)
1379
on platforms that support that.
1381
:param restart_syscall: if set, allow syscalls interrupted by a signal to
1382
automatically restart (by calling `signal.siginterrupt(signum,
1383
False)`). May be ignored if the feature is not available on this
1384
platform or Python version.
1388
siginterrupt = signal.siginterrupt
1390
# This python implementation doesn't provide signal support, hence no
1393
except AttributeError:
1394
# siginterrupt doesn't exist on this platform, or for this version
1396
siginterrupt = lambda signum, flag: None
1398
def sig_handler(*args):
1399
# Python resets the siginterrupt flag when a signal is
1400
# received. <http://bugs.python.org/issue8354>
1401
# As a workaround for some cases, set it back the way we want it.
1402
siginterrupt(signum, False)
1403
# Now run the handler function passed to set_signal_handler.
1406
sig_handler = handler
1407
old_handler = signal.signal(signum, sig_handler)
1409
siginterrupt(signum, False)
1347
1413
default_terminal_width = 80
1348
1414
"""The default terminal width for ttys.
1438
1504
if width is not None:
1439
1505
os.environ['COLUMNS'] = str(width)
1441
if sys.platform == 'win32':
1442
# Martin (gz) mentioned WINDOW_BUFFER_SIZE_RECORD from ReadConsoleInput but
1443
# I've no idea how to plug that in the current design -- vila 20091216
1446
signal.signal(signal.SIGWINCH, _terminal_size_changed)
1508
_registered_sigwinch = False
1509
def watch_sigwinch():
1510
"""Register for SIGWINCH, once and only once.
1512
Do nothing if the signal module is not available.
1514
global _registered_sigwinch
1515
if not _registered_sigwinch:
1518
if getattr(signal, "SIGWINCH", None) is not None:
1519
set_signal_handler(signal.SIGWINCH, _terminal_size_changed)
1521
# python doesn't provide signal support, nothing we can do about it
1523
_registered_sigwinch = True
1449
1526
def supports_executable():
1769
1846
real_handlers[kind](abspath, relpath)
1849
def copy_ownership_from_path(dst, src=None):
1850
"""Copy usr/grp ownership from src file/dir to dst file/dir.
1852
If src is None, the containing directory is used as source. If chown
1853
fails, the error is ignored and a warning is printed.
1855
chown = getattr(os, 'chown', None)
1860
src = os.path.dirname(dst)
1866
chown(dst, s.st_uid, s.st_gid)
1868
trace.warning("Unable to copy ownership from '%s' to '%s': IOError: %s." % (src, dst, e))
1772
1871
def path_prefix_key(path):
1773
1872
"""Generate a prefix-order path key for path.
1874
1973
return socket.gethostname().decode(get_user_encoding())
1877
def recv_all(socket, bytes):
1976
# We must not read/write any more than 64k at a time from/to a socket so we
1977
# don't risk "no buffer space available" errors on some platforms. Windows in
1978
# particular is likely to throw WSAECONNABORTED or WSAENOBUFS if given too much
1980
MAX_SOCKET_CHUNK = 64 * 1024
1982
def read_bytes_from_socket(sock, report_activity=None,
1983
max_read_size=MAX_SOCKET_CHUNK):
1984
"""Read up to max_read_size of bytes from sock and notify of progress.
1986
Translates "Connection reset by peer" into file-like EOF (return an
1987
empty string rather than raise an error), and repeats the recv if
1988
interrupted by a signal.
1992
bytes = sock.recv(max_read_size)
1993
except socket.error, e:
1995
if eno == getattr(errno, "WSAECONNRESET", errno.ECONNRESET):
1996
# The connection was closed by the other side. Callers expect
1997
# an empty string to signal end-of-stream.
1999
elif eno == errno.EINTR:
2000
# Retry the interrupted recv.
2004
if report_activity is not None:
2005
report_activity(len(bytes), 'read')
2009
def recv_all(socket, count):
1878
2010
"""Receive an exact number of bytes.
1880
2012
Regular Socket.recv() may return less than the requested number of bytes,
1881
dependning on what's in the OS buffer. MSG_WAITALL is not available
2013
depending on what's in the OS buffer. MSG_WAITALL is not available
1882
2014
on all platforms, but this should work everywhere. This will return
1883
2015
less than the requested amount if the remote end closes.
1885
2017
This isn't optimized and is intended mostly for use in testing.
1888
while len(b) < bytes:
1889
new = until_no_eintr(socket.recv, bytes - len(b))
2020
while len(b) < count:
2021
new = read_bytes_from_socket(socket, None, count - len(b))
1896
def send_all(socket, bytes, report_activity=None):
2028
def send_all(sock, bytes, report_activity=None):
1897
2029
"""Send all bytes on a socket.
1899
Regular socket.sendall() can give socket error 10053 on Windows. This
1900
implementation sends no more than 64k at a time, which avoids this problem.
2031
Breaks large blocks in smaller chunks to avoid buffering limitations on
2032
some platforms, and catches EINTR which may be thrown if the send is
2033
interrupted by a signal.
2035
This is preferred to socket.sendall(), because it avoids portability bugs
2036
and provides activity reporting.
1902
2038
:param report_activity: Call this as bytes are read, see
1903
2039
Transport._report_activity
1906
for pos in xrange(0, len(bytes), chunk_size):
1907
block = bytes[pos:pos+chunk_size]
1908
if report_activity is not None:
1909
report_activity(len(block), 'write')
1910
until_no_eintr(socket.sendall, block)
2042
byte_count = len(bytes)
2043
while sent_total < byte_count:
2045
sent = sock.send(buffer(bytes, sent_total, MAX_SOCKET_CHUNK))
2046
except socket.error, e:
2047
if e.args[0] != errno.EINTR:
2051
report_activity(sent, 'write')
1913
2054
def dereference_path(path):
1986
2127
def until_no_eintr(f, *a, **kw):
1987
"""Run f(*a, **kw), retrying if an EINTR error occurs."""
2128
"""Run f(*a, **kw), retrying if an EINTR error occurs.
2130
WARNING: you must be certain that it is safe to retry the call repeatedly
2131
if EINTR does occur. This is typically only true for low-level operations
2132
like os.read. If in any doubt, don't use this.
2134
Keep in mind that this is not a complete solution to EINTR. There is
2135
probably code in the Python standard library and other dependencies that
2136
may encounter EINTR if a signal arrives (and there is signal handler for
2137
that signal). So this function can reduce the impact for IO that bzrlib
2138
directly controls, but it is not a complete solution.
1988
2140
# Borrowed from Twisted's twisted.python.util.untilConcludes function.
2107
2260
data, _ = self.encode(object, self.errors)
2108
2261
self.stream.write(data)
2263
if sys.platform == 'win32':
2264
def open_file(filename, mode='r', bufsize=-1):
2265
"""This function is used to override the ``open`` builtin.
2267
But it uses O_NOINHERIT flag so the file handle is not inherited by
2268
child processes. Deleting or renaming a closed file opened with this
2269
function is not blocking child processes.
2271
writing = 'w' in mode
2272
appending = 'a' in mode
2273
updating = '+' in mode
2274
binary = 'b' in mode
2277
# see http://msdn.microsoft.com/en-us/library/yeby3zcb%28VS.71%29.aspx
2278
# for flags for each modes.
2288
flags |= os.O_WRONLY
2289
flags |= os.O_CREAT | os.O_TRUNC
2294
flags |= os.O_WRONLY
2295
flags |= os.O_CREAT | os.O_APPEND
2300
flags |= os.O_RDONLY
2302
return os.fdopen(os.open(filename, flags), mode, bufsize)
added
removed
bzrlib/osutils.py
