76
71
from bzrlib import symbol_versioning
79
# Cross platform wall-clock time functionality with decent resolution.
80
# On Linux ``time.clock`` returns only CPU time. On Windows, ``time.time()``
81
# only has a resolution of ~15ms. Note that ``time.clock()`` is not
82
# synchronized with ``time.time()``, this is only meant to be used to find
83
# delta times by subtracting from another call to this function.
84
timer_func = time.time
85
if sys.platform == 'win32':
86
timer_func = time.clock
88
74
# On win32, O_BINARY is used to indicate the file should
89
75
# be opened in binary mode, rather than text mode.
90
76
# On other platforms, O_BINARY doesn't exist, because
91
77
# they always open in binary mode, so it is okay to
92
# OR with 0 on those platforms.
93
# O_NOINHERIT and O_TEXT exists only on win32 too.
78
# OR with 0 on those platforms
94
79
O_BINARY = getattr(os, 'O_BINARY', 0)
95
O_TEXT = getattr(os, 'O_TEXT', 0)
96
O_NOINHERIT = getattr(os, 'O_NOINHERIT', 0)
99
82
def get_unicode_argv():
211
192
:param old: The old path, to rename from
212
193
:param new: The new path, to rename to
213
194
:param rename_func: The potentially non-atomic rename function
214
:param unlink_func: A way to delete the target file if the full rename
195
:param unlink_func: A way to delete the target file if the full rename succeeds
217
198
# sftp rename doesn't allow overwriting, so play tricks:
218
199
base = os.path.basename(new)
219
200
dirname = os.path.dirname(new)
220
# callers use different encodings for the paths so the following MUST
221
# respect that. We rely on python upcasting to unicode if new is unicode
222
# and keeping a str if not.
223
tmp_name = 'tmp.%s.%.9f.%d.%s' % (base, time.time(),
224
os.getpid(), rand_chars(10))
201
tmp_name = u'tmp.%s.%.9f.%d.%s' % (base, time.time(), os.getpid(), rand_chars(10))
225
202
tmp_name = pathjoin(dirname, tmp_name)
227
204
# Rename the file out of the way, but keep track if it didn't exist
1374
1330
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)
1413
default_terminal_width = 80
1414
"""The default terminal width for ttys.
1416
This is defined so that higher levels can share a common fallback value when
1417
terminal_width() returns None.
1421
1333
def terminal_width():
1422
"""Return terminal width.
1424
None is returned if the width can't established precisely.
1427
- if BZR_COLUMNS is set, returns its value
1428
- if there is no controlling terminal, returns None
1429
- if COLUMNS is set, returns its value,
1431
From there, we need to query the OS to get the size of the controlling
1435
- get termios.TIOCGWINSZ
1436
- if an error occurs or a negative value is obtained, returns None
1440
- win32utils.get_console_size() decides,
1441
- returns None on error (provided default value)
1444
# If BZR_COLUMNS is set, take it, user is always right
1446
return int(os.environ['BZR_COLUMNS'])
1447
except (KeyError, ValueError):
1450
isatty = getattr(sys.stdout, 'isatty', None)
1451
if isatty is None or not isatty():
1452
# Don't guess, setting BZR_COLUMNS is the recommended way to override.
1455
# If COLUMNS is set, take it, the terminal knows better (even inside a
1456
# given terminal, the application can decide to set COLUMNS to a lower
1457
# value (splitted screen) or a bigger value (scroll bars))
1459
return int(os.environ['COLUMNS'])
1460
except (KeyError, ValueError):
1463
width, height = _terminal_size(None, None)
1465
# Consider invalid values as meaning no width
1471
def _win32_terminal_size(width, height):
1472
width, height = win32utils.get_console_size(defaultx=width, defaulty=height)
1473
return width, height
1476
def _ioctl_terminal_size(width, height):
1334
"""Return estimated terminal width."""
1335
if sys.platform == 'win32':
1336
return win32utils.get_console_size()[0]
1478
1339
import struct, fcntl, termios
1479
1340
s = struct.pack('HHHH', 0, 0, 0, 0)
1480
1341
x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
1481
height, width = struct.unpack('HHHH', x)[0:2]
1482
except (IOError, AttributeError):
1342
width = struct.unpack('HHHH', x)[1]
1484
return width, height
1486
_terminal_size = None
1487
"""Returns the terminal size as (width, height).
1489
:param width: Default value for width.
1490
:param height: Default value for height.
1492
This is defined specifically for each OS and query the size of the controlling
1493
terminal. If any error occurs, the provided default values should be returned.
1495
if sys.platform == 'win32':
1496
_terminal_size = _win32_terminal_size
1498
_terminal_size = _ioctl_terminal_size
1501
def _terminal_size_changed(signum, frame):
1502
"""Set COLUMNS upon receiving a SIGnal for WINdow size CHange."""
1503
width, height = _terminal_size(None, None)
1504
if width is not None:
1505
os.environ['COLUMNS'] = str(width)
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
1347
width = int(os.environ['COLUMNS'])
1523
_registered_sigwinch = True
1526
1356
def supports_executable():
1973
1781
return socket.gethostname().decode(get_user_encoding())
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):
1784
def recv_all(socket, bytes):
2010
1785
"""Receive an exact number of bytes.
2012
1787
Regular Socket.recv() may return less than the requested number of bytes,
2013
depending on what's in the OS buffer. MSG_WAITALL is not available
1788
dependning on what's in the OS buffer. MSG_WAITALL is not available
2014
1789
on all platforms, but this should work everywhere. This will return
2015
1790
less than the requested amount if the remote end closes.
2017
1792
This isn't optimized and is intended mostly for use in testing.
2020
while len(b) < count:
2021
new = read_bytes_from_socket(socket, None, count - len(b))
1795
while len(b) < bytes:
1796
new = until_no_eintr(socket.recv, bytes - len(b))
2028
def send_all(sock, bytes, report_activity=None):
1803
def send_all(socket, bytes, report_activity=None):
2029
1804
"""Send all bytes on a socket.
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.
1806
Regular socket.sendall() can give socket error 10053 on Windows. This
1807
implementation sends no more than 64k at a time, which avoids this problem.
2038
1809
:param report_activity: Call this as bytes are read, see
2039
1810
Transport._report_activity
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')
1813
for pos in xrange(0, len(bytes), chunk_size):
1814
block = bytes[pos:pos+chunk_size]
1815
if report_activity is not None:
1816
report_activity(len(block), 'write')
1817
until_no_eintr(socket.sendall, block)
2054
1820
def dereference_path(path):
2245
1996
_cached_concurrency = concurrency
2246
1997
return concurrency
2249
class UnicodeOrBytesToBytesWriter(codecs.StreamWriter):
2250
"""A stream writer that doesn't decode str arguments."""
2252
def __init__(self, encode, stream, errors='strict'):
2253
codecs.StreamWriter.__init__(self, stream, errors)
2254
self.encode = encode
2256
def write(self, object):
2257
if type(object) is str:
2258
self.stream.write(object)
2260
data, _ = self.encode(object, self.errors)
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
