/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5594.1.1 by Vincent Ladeuil
Fix socketpair-based SSH transport leaking socket into other child processes
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
5225.1.1 by Andrew Bennetts
Don't lazy_import errno in osutils; it's a builtin module, and that lazy_import is implicated in a FreeBSD builder failure.
17
import errno
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
18
import os
19
import re
20
import stat
21
import sys
22
import time
5051.2.1 by Benjamin Peterson
move codecs import out of lazy section since it is used on module import
23
import codecs
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
24
25
from bzrlib.lazy_import import lazy_import
26
lazy_import(globals(), """
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
27
from datetime import datetime
5187.2.7 by Parth Malwankar
moved getuser_unicode to osutils.
28
import getpass
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
29
import ntpath
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
30
import posixpath
5273.1.11 by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol.
31
# We need to import both shutil and rmtree as we export the later on posix
32
# and need the former on windows
33
import shutil
5273.1.10 by Vincent Ladeuil
Fixed as per jam's review.
34
from shutil import rmtree
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
35
import socket
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
36
import subprocess
5273.1.11 by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol.
37
# We need to import both tempfile and mkdtemp as we export the later on posix
38
# and need the former on windows
39
import tempfile
40
from tempfile import mkdtemp
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
41
import unicodedata
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
42
43
from bzrlib import (
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
44
    cache_utf8,
6059.4.2 by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config.
45
    config,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
46
    errors,
5011.3.16 by Andrew Bennetts
Merge lp:bzr.
47
    trace,
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
48
    win32utils,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
49
    )
6138.3.8 by Jonathan Riddell
more error gettext()ing
50
from bzrlib.i18n import gettext
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
51
""")
1 by mbp at sourcefrog
import from baz patch-364
52
5011.3.3 by Martin
Reintroduce EINTR handling only for socket object functions and general cleanup
53
from bzrlib.symbol_versioning import (
54
    deprecated_function,
55
    deprecated_in,
56
    )
57
5848.2.1 by John Arbash Meinel
Break compatibility with python <2.6.
58
from hashlib import (
59
    md5,
60
    sha1 as sha,
61
    )
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
62
3504.4.1 by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis.
63
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
64
import bzrlib
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
65
from bzrlib import symbol_versioning
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
66
1 by mbp at sourcefrog
import from baz patch-364
67
4889.2.5 by John Arbash Meinel
Review feedback from Andrew.
68
# Cross platform wall-clock time functionality with decent resolution.
69
# On Linux ``time.clock`` returns only CPU time. On Windows, ``time.time()``
70
# only has a resolution of ~15ms. Note that ``time.clock()`` is not
71
# synchronized with ``time.time()``, this is only meant to be used to find
72
# delta times by subtracting from another call to this function.
4889.2.1 by John Arbash Meinel
Make -Dhpss log debug information for the server process.
73
timer_func = time.time
74
if sys.platform == 'win32':
75
    timer_func = time.clock
76
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
77
# On win32, O_BINARY is used to indicate the file should
78
# be opened in binary mode, rather than text mode.
79
# On other platforms, O_BINARY doesn't exist, because
80
# they always open in binary mode, so it is okay to
4634.140.12 by INADA Naoki
small clean up.
81
# OR with 0 on those platforms.
82
# O_NOINHERIT and O_TEXT exists only on win32 too.
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
83
O_BINARY = getattr(os, 'O_BINARY', 0)
4634.140.12 by INADA Naoki
small clean up.
84
O_TEXT = getattr(os, 'O_TEXT', 0)
4634.140.1 by INADA Naoki
Avoids child process inherits file handles on win32. by using os.fdopen and os.open with O_NOINHERIT instead of builtin open.
85
O_NOINHERIT = getattr(os, 'O_NOINHERIT', 0)
86
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
87
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
88
def get_unicode_argv():
89
    try:
90
        user_encoding = get_user_encoding()
5274.4.8 by Jason Spashett
Reverse merge -r 5280..5279
91
        return [a.decode(user_encoding) for a in sys.argv[1:]]
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
92
    except UnicodeDecodeError:
6138.3.8 by Jonathan Riddell
more error gettext()ing
93
        raise errors.BzrError(gettext("Parameter {0!r} encoding is unsupported by {1} "
94
            "application locale.").format(a, user_encoding))
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
95
96
1 by mbp at sourcefrog
import from baz patch-364
97
def make_readonly(filename):
98
    """Make a filename read-only."""
2949.6.1 by Alexander Belchenko
windows python has os.lstat
99
    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
100
    if not stat.S_ISLNK(mod):
101
        mod = mod & 0777555
102
        os.chmod(filename, mod)
1 by mbp at sourcefrog
import from baz patch-364
103
104
105
def make_writable(filename):
2949.6.1 by Alexander Belchenko
windows python has os.lstat
106
    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
107
    if not stat.S_ISLNK(mod):
108
        mod = mod | 0200
109
        os.chmod(filename, mod)
1 by mbp at sourcefrog
import from baz patch-364
110
111
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
112
def minimum_path_selection(paths):
113
    """Return the smallset subset of paths which are outside paths.
114
2843.1.1 by Ian Clatworthy
Faster partial commits by walking less data (Robert Collins)
115
    :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
116
    :return: A set of paths sufficient to include everything in paths via
4325.3.3 by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with
117
        is_inside, drawn from the paths parameter.
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
118
    """
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
119
    if len(paths) < 2:
120
        return set(paths)
4325.3.3 by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with
121
122
    def sort_key(path):
123
        return path.split('/')
124
    sorted_paths = sorted(list(paths), key=sort_key)
125
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
126
    search_paths = [sorted_paths[0]]
127
    for path in sorted_paths[1:]:
4325.3.2 by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection().
128
        if not is_inside(search_paths[-1], path):
129
            # This path is unique, add it
130
            search_paths.append(path)
4325.3.7 by Johan Walles
Style fixes for minimum_path_selection().
131
4325.3.2 by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection().
132
    return set(search_paths)
2825.7.1 by Robert Collins
* Partial commits are now approximately 40% faster by walking over the
133
134
1077 by Martin Pool
- avoid compiling REs at module load time
135
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
136
137
1 by mbp at sourcefrog
import from baz patch-364
138
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
139
    """Return a quoted filename filename
140
141
    This previously used backslash quoting, but that works poorly on
142
    Windows."""
143
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
144
    global _QUOTE_RE
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
145
    if _QUOTE_RE is None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
146
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
147
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
148
    if _QUOTE_RE.search(f):
149
        return '"' + f + '"'
150
    else:
151
        return f
1 by mbp at sourcefrog
import from baz patch-364
152
153
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
154
_directory_kind = 'directory'
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:
5024.1.2 by John Arbash Meinel
Switch so that all unknown files get an empty marker, rather than failing.
178
        # Slightly faster than using .get(, '') when the common case is that
179
        # kind will be found
180
        return ''
1 by mbp at sourcefrog
import from baz patch-364
181
2324.2.1 by Dmitry Vasiliev
kind_marker() optimization
182
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
183
lexists = getattr(os.path, 'lexists', None)
184
if lexists is None:
185
    def lexists(f):
186
        try:
2324.2.2 by Dmitry Vasiliev
Fixed lexists() implementation
187
            stat = getattr(os, 'lstat', os.stat)
188
            stat(f)
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
189
            return True
2324.2.2 by Dmitry Vasiliev
Fixed lexists() implementation
190
        except OSError, e:
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
191
            if e.errno == errno.ENOENT:
192
                return False;
193
            else:
6138.3.8 by Jonathan Riddell
more error gettext()ing
194
                raise errors.BzrError(gettext("lstat/stat of ({0!r}): {1!r}").format(f, e))
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
195
1 by mbp at sourcefrog
import from baz patch-364
196
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
197
def fancy_rename(old, new, rename_func, unlink_func):
198
    """A fancy rename, when you don't have atomic rename.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
199
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
200
    :param old: The old path, to rename from
201
    :param new: The new path, to rename to
202
    :param rename_func: The potentially non-atomic rename function
4935.1.1 by Vincent Ladeuil
Support Unicode paths for ftp transport (encoded as utf8).
203
    :param unlink_func: A way to delete the target file if the full rename
204
        succeeds
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
205
    """
206
    # sftp rename doesn't allow overwriting, so play tricks:
207
    base = os.path.basename(new)
208
    dirname = os.path.dirname(new)
4935.1.3 by Vincent Ladeuil
Better fix for fancy_rename respecting callers file encoding.
209
    # callers use different encodings for the paths so the following MUST
210
    # respect that. We rely on python upcasting to unicode if new is unicode
211
    # and keeping a str if not.
212
    tmp_name = 'tmp.%s.%.9f.%d.%s' % (base, time.time(),
213
                                      os.getpid(), rand_chars(10))
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
214
    tmp_name = pathjoin(dirname, tmp_name)
215
216
    # Rename the file out of the way, but keep track if it didn't exist
217
    # We don't want to grab just any exception
218
    # something like EACCES should prevent us from continuing
219
    # The downside is that the rename_func has to throw an exception
220
    # with an errno = ENOENT, or NoSuchFile
221
    file_existed = False
222
    try:
223
        rename_func(new, tmp_name)
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
224
    except (errors.NoSuchFile,), e:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
225
        pass
1532 by Robert Collins
Merge in John Meinels integration branch.
226
    except IOError, e:
227
        # 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'.
228
        # function raises an IOError with errno is None when a rename fails.
1532 by Robert Collins
Merge in John Meinels integration branch.
229
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
230
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
231
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
232
    except Exception, e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
233
        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.
234
            or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
235
            raise
236
    else:
237
        file_existed = True
238
4789.17.1 by John Arbash Meinel
Change fancy_rename slightly.
239
    failure_exc = None
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
240
    success = False
241
    try:
2978.8.2 by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem
242
        try:
243
            # This may throw an exception, in which case success will
244
            # not be set.
245
            rename_func(old, new)
246
            success = True
247
        except (IOError, OSError), e:
2978.8.3 by Alexander Belchenko
Aaron's review
248
            # source and target may be aliases of each other (e.g. on a
249
            # case-insensitive filesystem), so we may have accidentally renamed
250
            # source by when we tried to rename target
4789.17.1 by John Arbash Meinel
Change fancy_rename slightly.
251
            failure_exc = sys.exc_info()
252
            if (file_existed and e.errno in (None, errno.ENOENT)
253
                and old.lower() == new.lower()):
254
                # source and target are the same file on a case-insensitive
255
                # filesystem, so we don't generate an exception
256
                failure_exc = None
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
257
    finally:
258
        if file_existed:
259
            # If the file used to exist, rename it back into place
260
            # otherwise just delete it from the tmp location
261
            if success:
1551.15.4 by Aaron Bentley
Revert now-unnecessary changes
262
                unlink_func(tmp_name)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
263
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
264
                rename_func(tmp_name, new)
4789.17.2 by John Arbash Meinel
Also handle the case when source *and* target does not exist.
265
    if failure_exc is not None:
5340.15.2 by John Arbash Meinel
supercede 2.4-613247-cleanup-tests
266
        try:
267
            raise failure_exc[0], failure_exc[1], failure_exc[2]
268
        finally:
269
            del failure_exc
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
270
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
271
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
272
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
273
# choke on a Unicode string containing a relative path if
274
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
275
# string.
2093.1.1 by John Arbash Meinel
(Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'
276
_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
277
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
278
    # jam 20060426 rather than encoding to fsencoding
279
    # copy posixpath.abspath, but use os.getcwdu instead
280
    if not posixpath.isabs(path):
281
        path = posixpath.join(getcwd(), path)
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
282
    return _posix_normpath(path)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
283
284
285
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
286
    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
287
288
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
289
def _posix_normpath(path):
290
    path = posixpath.normpath(path)
291
    # Bug 861008: posixpath.normpath() returns a path normalized according to
292
    # the POSIX standard, which stipulates (for compatibility reasons) that two
293
    # leading slashes must not be simplified to one, and only if there are 3 or
294
    # more should they be simplified as one. So we treat the leading 2 slashes
295
    # as a special case here by simply removing the first slash, as we consider
296
    # that breaking POSIX compatibility for this obscure feature is acceptable.
297
    # This is not a paranoid precaution, as we notably get paths like this when
298
    # the repo is hosted at the root of the filesystem, i.e. in "/".    
299
    if path.startswith('//'):
300
        path = path[1:]
301
    return path
302
303
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
304
def _win32_fixdrive(path):
305
    """Force drive letters to be consistent.
306
307
    win32 is inconsistent whether it returns lower or upper case
308
    and even if it was consistent the user might type the other
309
    so we force it to uppercase
310
    running python.exe under cmd.exe return capital C:\\
311
    running win32 python inside a cygwin shell returns lowercase c:\\
312
    """
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
313
    drive, path = ntpath.splitdrive(path)
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
314
    return drive.upper() + path
315
316
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
317
def _win32_abspath(path):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
318
    # Real ntpath.abspath doesn't have a problem with a unicode cwd
319
    return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
320
321
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
322
def _win98_abspath(path):
323
    """Return the absolute version of a path.
324
    Windows 98 safe implementation (python reimplementation
325
    of Win32 API function GetFullPathNameW)
326
    """
327
    # Corner cases:
328
    #   C:\path     => C:/path
329
    #   C:/path     => C:/path
330
    #   \\HOST\path => //HOST/path
331
    #   //HOST/path => //HOST/path
332
    #   path        => C:/cwd/path
333
    #   /path       => C:/path
334
    path = unicode(path)
335
    # check for absolute path
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
336
    drive = ntpath.splitdrive(path)[0]
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
337
    if drive == '' and path[:2] not in('//','\\\\'):
338
        cwd = os.getcwdu()
339
        # we cannot simply os.path.join cwd and path
340
        # because os.path.join('C:','/path') produce '/path'
341
        # and this is incorrect
342
        if path[:1] in ('/','\\'):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
343
            cwd = ntpath.splitdrive(cwd)[0]
2279.4.3 by Alexander Belchenko
win98_abspath: support for running in POSIX environment: cwd path has not drive letter
344
            path = path[1:]
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
345
        path = cwd + '\\' + path
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
346
    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
347
348
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
349
def _win32_realpath(path):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
350
    # Real ntpath.realpath doesn't have a problem with a unicode cwd
351
    return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
352
353
354
def _win32_pathjoin(*args):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
355
    return ntpath.join(*args).replace('\\', '/')
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
356
357
358
def _win32_normpath(path):
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
359
    return _win32_fixdrive(ntpath.normpath(unicode(path)).replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
360
361
362
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
363
    return _win32_fixdrive(os.getcwdu().replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
364
365
366
def _win32_mkdtemp(*args, **kwargs):
5331.3.1 by Martin
Avoid infinite recursion with _win32_mkdtemp by using module namespaced name
367
    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
368
369
370
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.
371
    """We expect to be able to atomically replace 'new' with old.
372
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
373
    On win32, if new exists, it must be moved out of the way first,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
374
    and then deleted.
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
375
    """
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
376
    try:
5186.2.11 by Martin Pool
_win32_rename no longer relies on _wrapped_rename
377
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
378
    except OSError, e:
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
379
        if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
380
            # If we try to rename a non-existant file onto cwd, we get
381
            # EPERM or EACCES instead of ENOENT, this will raise ENOENT
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
382
            # if the old path doesn't exist, sometimes we get EACCES
383
            # 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.
384
            os.lstat(old)
385
        raise
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
386
387
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
388
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
389
    return unicodedata.normalize('NFC', os.getcwdu())
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
390
391
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
392
# Default is to just use the python builtins, but these can be rebound on
393
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
394
abspath = _posix_abspath
395
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
396
pathjoin = os.path.join
6015.39.2 by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem,
397
normpath = _posix_normpath
5186.2.11 by Martin Pool
_win32_rename no longer relies on _wrapped_rename
398
getcwd = os.getcwdu
5186.2.3 by Martin Pool
Remove OS-level rename wrapper
399
rename = os.rename
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
400
dirname = os.path.dirname
401
basename = os.path.basename
2215.4.2 by Alexander Belchenko
split and splitext now the part of osutils
402
split = os.path.split
403
splitext = os.path.splitext
5273.1.10 by Vincent Ladeuil
Fixed as per jam's review.
404
# These were already lazily imported into local scope
405
# mkdtemp = tempfile.mkdtemp
406
# rmtree = shutil.rmtree
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
407
lstat = os.lstat
408
fstat = os.fstat
409
410
def wrap_stat(st):
411
    return st
412
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
413
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
414
MIN_ABS_PATHLENGTH = 1
415
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
416
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
417
if sys.platform == 'win32':
3224.5.35 by Andrew Bennetts
More improvements suggested by John's review.
418
    if win32utils.winver == 'Windows 98':
419
        abspath = _win98_abspath
420
    else:
421
        abspath = _win32_abspath
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
422
    realpath = _win32_realpath
423
    pathjoin = _win32_pathjoin
424
    normpath = _win32_normpath
425
    getcwd = _win32_getcwd
426
    mkdtemp = _win32_mkdtemp
427
    rename = _win32_rename
5609.29.5 by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache.
428
    try:
429
        from bzrlib import _walkdirs_win32
430
    except ImportError:
431
        pass
432
    else:
433
        lstat = _walkdirs_win32.lstat
434
        fstat = _walkdirs_win32.fstat
435
        wrap_stat = _walkdirs_win32.wrap_stat
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
436
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
437
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
438
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
439
    def _win32_delete_readonly(function, path, excinfo):
440
        """Error handler for shutil.rmtree function [for win32]
441
        Helps to remove files and dirs marked as read-only.
442
        """
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
443
        exception = excinfo[1]
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
444
        if function in (os.remove, os.rmdir) \
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
445
            and isinstance(exception, OSError) \
446
            and exception.errno == errno.EACCES:
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
447
            make_writable(path)
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
448
            function(path)
449
        else:
450
            raise
451
452
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
453
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
454
        return shutil.rmtree(path, ignore_errors, onerror)
4355.2.2 by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel.
455
456
    f = win32utils.get_unicode_argv     # special function or None
457
    if f is not None:
458
        get_unicode_argv = f
459
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
460
elif sys.platform == 'darwin':
461
    getcwd = _mac_getcwd
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
462
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
463
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
464
def get_terminal_encoding(trace=False):
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.
465
    """Find the best encoding for printing to the screen.
466
467
    This attempts to check both sys.stdout and sys.stdin to see
468
    what encoding they are in, and if that fails it falls back to
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
469
    osutils.get_user_encoding().
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.
470
    The problem is that on Windows, locale.getpreferredencoding()
471
    is not the same encoding as that used by the console:
472
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
473
474
    On my standard US Windows XP, the preferred encoding is
475
    cp1252, but the console is cp437
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
476
477
    :param trace: If True trace the selected encoding via mutter().
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.
478
    """
5523.2.3 by Parth Malwankar
message is now shown to the user but is not too scary.
479
    from bzrlib.trace import mutter
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.
480
    output_encoding = getattr(sys.stdout, 'encoding', None)
481
    if not output_encoding:
482
        input_encoding = getattr(sys.stdin, 'encoding', None)
483
        if not input_encoding:
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
484
            output_encoding = get_user_encoding()
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
485
            if trace:
486
                mutter('encoding stdout as osutils.get_user_encoding() %r',
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
487
                   output_encoding)
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.
488
        else:
489
            output_encoding = input_encoding
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
490
            if trace:
491
                mutter('encoding stdout as sys.stdin encoding %r',
492
                    output_encoding)
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.
493
    else:
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
494
        if trace:
495
            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
496
    if output_encoding == 'cp0':
497
        # invalid encoding (cp0 means 'no codepage' on Windows)
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
498
        output_encoding = get_user_encoding()
5320.2.4 by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
499
        if trace:
500
            mutter('cp0 is invalid encoding.'
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
501
               ' encoding stdout as osutils.get_user_encoding() %r',
502
               output_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
503
    # check encoding
504
    try:
505
        codecs.lookup(output_encoding)
506
    except LookupError:
507
        sys.stderr.write('bzr: warning:'
2192.1.9 by Alexander Belchenko
final fix suggested by John Meinel
508
                         ' unknown terminal encoding %s.\n'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
509
                         '  Using encoding %s instead.\n'
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
510
                         % (output_encoding, get_user_encoding())
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
511
                        )
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
512
        output_encoding = get_user_encoding()
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
513
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.
514
    return output_encoding
515
516
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 \
517
def normalizepath(f):
3287.18.2 by Matt McClure
Reverts to 3290.
518
    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 \
519
        F = realpath
520
    else:
521
        F = abspath
522
    [p,e] = os.path.split(f)
523
    if e == "" or e == "." or e == "..":
524
        return F(f)
525
    else:
526
        return pathjoin(F(p), e)
527
1 by mbp at sourcefrog
import from baz patch-364
528
529
def isdir(f):
530
    """True if f is an accessible directory."""
531
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
532
        return stat.S_ISDIR(os.lstat(f)[stat.ST_MODE])
1 by mbp at sourcefrog
import from baz patch-364
533
    except OSError:
534
        return False
535
536
537
def isfile(f):
538
    """True if f is a regular file."""
539
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
540
        return stat.S_ISREG(os.lstat(f)[stat.ST_MODE])
1 by mbp at sourcefrog
import from baz patch-364
541
    except OSError:
542
        return False
543
1092.2.6 by Robert Collins
symlink support updated to work
544
def islink(f):
545
    """True if f is a symlink."""
546
    try:
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
547
        return stat.S_ISLNK(os.lstat(f)[stat.ST_MODE])
1092.2.6 by Robert Collins
symlink support updated to work
548
    except OSError:
549
        return False
1 by mbp at sourcefrog
import from baz patch-364
550
485 by Martin Pool
- move commit code into its own module
551
def is_inside(dir, fname):
552
    """True if fname is inside dir.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
553
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
554
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
555
    that . and .. and repeated slashes are eliminated, and the separators
556
    are canonical for the platform.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
557
558
    The empty string as a dir name is taken as top-of-tree and matches
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
559
    everything.
485 by Martin Pool
- move commit code into its own module
560
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
561
    # XXX: Most callers of this can actually do something smarter by
969 by Martin Pool
- Add less-sucky is_within_any
562
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
563
    if dir == fname:
564
        return True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
565
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
566
    if dir == '':
567
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
568
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
569
    if dir[-1] != '/':
570
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
571
972 by Martin Pool
- less dodgy is_inside function
572
    return fname.startswith(dir)
573
485 by Martin Pool
- move commit code into its own module
574
575
def is_inside_any(dir_list, fname):
576
    """True if fname is inside any of given dirs."""
577
    for dirname in dir_list:
578
        if is_inside(dirname, fname):
579
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
580
    return False
485 by Martin Pool
- move commit code into its own module
581
582
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
583
def is_inside_or_parent_of_any(dir_list, fname):
584
    """True if fname is a child or a parent of any of the given files."""
585
    for dirname in dir_list:
586
        if is_inside(dirname, fname) or is_inside(fname, dirname):
587
            return True
2324.2.3 by Dmitry Vasiliev
Fixed is_inside_* methods implementation
588
    return False
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
589
590
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
591
def pumpfile(from_file, to_file, read_length=-1, buff_size=32768,
592
             report_activity=None, direction='read'):
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
593
    """Copy contents of one file to another.
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
594
595
    The read_length can either be -1 to read to end-of-file (EOF) or
596
    it can specify the maximum number of bytes to read.
597
598
    The buff_size represents the maximum size for each read operation
599
    performed on from_file.
600
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
601
    :param report_activity: Call this as bytes are read, see
602
        Transport._report_activity
603
    :param direction: Will be passed to report_activity
604
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
605
    :return: The number of bytes copied.
606
    """
607
    length = 0
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
608
    if read_length >= 0:
609
        # read specified number of bytes
610
611
        while read_length > 0:
612
            num_bytes_to_read = min(read_length, buff_size)
613
614
            block = from_file.read(num_bytes_to_read)
615
            if not block:
616
                # EOF reached
617
                break
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
618
            if report_activity is not None:
619
                report_activity(len(block), direction)
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
620
            to_file.write(block)
621
622
            actual_bytes_read = len(block)
623
            read_length -= actual_bytes_read
624
            length += actual_bytes_read
625
    else:
626
        # read to EOF
627
        while True:
628
            block = from_file.read(buff_size)
629
            if not block:
630
                # EOF reached
631
                break
3956.2.1 by John Arbash Meinel
Add report_activity to osutils.pumpfile
632
            if report_activity is not None:
633
                report_activity(len(block), direction)
3408.6.1 by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while
634
            to_file.write(block)
635
            length += len(block)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
636
    return length
1 by mbp at sourcefrog
import from baz patch-364
637
638
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
639
def pump_string_file(bytes, file_handle, segment_size=None):
640
    """Write bytes to file_handle in many smaller writes.
641
642
    :param bytes: The string to write.
643
    :param file_handle: The file to write to.
644
    """
645
    # Write data in chunks rather than all at once, because very large
646
    # writes fail on some platforms (e.g. Windows with SMB  mounted
647
    # drives).
648
    if not segment_size:
649
        segment_size = 5242880 # 5MB
650
    segments = range(len(bytes) / segment_size + 1)
651
    write = file_handle.write
652
    for segment_index in segments:
653
        segment = buffer(bytes, segment_index * segment_size, segment_size)
654
        write(segment)
655
656
1185.67.7 by Aaron Bentley
Refactored a bit
657
def file_iterator(input_file, readsize=32768):
658
    while True:
659
        b = input_file.read(readsize)
660
        if len(b) == 0:
661
            break
662
        yield b
663
664
1 by mbp at sourcefrog
import from baz patch-364
665
def sha_file(f):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
666
    """Calculate the hexdigest of an open file.
667
668
    The file cursor should be already at the start.
669
    """
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
670
    s = sha()
320 by Martin Pool
- Compute SHA-1 of files in chunks
671
    BUFSIZE = 128<<10
672
    while True:
673
        b = f.read(BUFSIZE)
674
        if not b:
675
            break
676
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
677
    return s.hexdigest()
678
679
3368.2.49 by Ian Clatworthy
added osutils.size_sha_file() with tests
680
def size_sha_file(f):
681
    """Calculate the size and hexdigest of an open file.
682
683
    The file cursor should be already at the start and
684
    the caller is responsible for closing the file afterwards.
685
    """
686
    size = 0
687
    s = sha()
688
    BUFSIZE = 128<<10
689
    while True:
690
        b = f.read(BUFSIZE)
691
        if not b:
692
            break
693
        size += len(b)
694
        s.update(b)
695
    return size, s.hexdigest()
696
697
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
698
def sha_file_by_name(fname):
699
    """Calculate the SHA1 of a file by reading the full text"""
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
700
    s = sha()
4634.140.1 by INADA Naoki
Avoids child process inherits file handles on win32. by using os.fdopen and os.open with O_NOINHERIT instead of builtin open.
701
    f = os.open(fname, os.O_RDONLY | O_BINARY | O_NOINHERIT)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
702
    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
703
        while True:
704
            b = os.read(f, 1<<16)
705
            if not b:
706
                return s.hexdigest()
707
            s.update(b)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
708
    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
709
        os.close(f)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
710
711
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
712
def sha_strings(strings, _factory=sha):
1235 by Martin Pool
- split sha_strings into osutils
713
    """Return the sha-1 of concatenation of strings"""
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
714
    s = _factory()
1235 by Martin Pool
- split sha_strings into osutils
715
    map(s.update, strings)
716
    return s.hexdigest()
717
718
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
719
def sha_string(f, _factory=sha):
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
720
    return _factory(f).hexdigest()
1 by mbp at sourcefrog
import from baz patch-364
721
722
124 by mbp at sourcefrog
- check file text for past revisions is correct
723
def fingerprint_file(f):
126 by mbp at sourcefrog
Use just one big read to fingerprint files
724
    b = f.read()
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
725
    return {'size': len(b),
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
726
            'sha1': sha(b).hexdigest()}
124 by mbp at sourcefrog
- check file text for past revisions is correct
727
728
1 by mbp at sourcefrog
import from baz patch-364
729
def compare_files(a, b):
730
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
731
    BUFSIZE = 4096
732
    while True:
733
        ai = a.read(BUFSIZE)
734
        bi = b.read(BUFSIZE)
735
        if ai != bi:
736
            return False
737
        if ai == '':
738
            return True
1 by mbp at sourcefrog
import from baz patch-364
739
740
49 by mbp at sourcefrog
fix local-time-offset calculation
741
def local_time_offset(t=None):
742
    """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'.
743
    if t is None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
744
        t = time.time()
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
745
    offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)
746
    return offset.days * 86400 + offset.seconds
8 by mbp at sourcefrog
store committer's timezone in revision and show
747
3512.3.1 by Martin von Gagern
Hand-selected minimalistic set of changes from my setlocale branch.
748
weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
4379.4.1 by Ian Clatworthy
make log --long faster
749
_default_format_by_weekday_num = [wd + " %Y-%m-%d %H:%M:%S" for wd in weekdays]
750
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
751
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
752
def format_date(t, offset=0, timezone='original', date_fmt=None,
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
753
                show_offset=True):
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
754
    """Return a formatted date string.
755
756
    :param t: Seconds since the epoch.
757
    :param offset: Timezone offset in seconds east of utc.
758
    :param timezone: How to display the time: 'utc', 'original' for the
759
         timezone specified by offset, or 'local' for the process's current
760
         timezone.
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
761
    :param date_fmt: strftime format.
762
    :param show_offset: Whether to append the timezone.
763
    """
764
    (date_fmt, tt, offset_str) = \
765
               _format_date(t, offset, timezone, date_fmt, show_offset)
766
    date_fmt = date_fmt.replace('%a', weekdays[tt[6]])
767
    date_str = time.strftime(date_fmt, tt)
768
    return date_str + offset_str
769
4379.4.1 by Ian Clatworthy
make log --long faster
770
771
# Cache of formatted offset strings
772
_offset_cache = {}
773
774
4379.4.2 by Ian Clatworthy
add NEWS item and tests for new date formatting API
775
def format_date_with_offset_in_original_timezone(t, offset=0,
4379.4.1 by Ian Clatworthy
make log --long faster
776
    _cache=_offset_cache):
777
    """Return a formatted date string in the original timezone.
778
779
    This routine may be faster then format_date.
780
781
    :param t: Seconds since the epoch.
782
    :param offset: Timezone offset in seconds east of utc.
783
    """
784
    if offset is None:
785
        offset = 0
786
    tt = time.gmtime(t + offset)
787
    date_fmt = _default_format_by_weekday_num[tt[6]]
788
    date_str = time.strftime(date_fmt, tt)
789
    offset_str = _cache.get(offset, None)
790
    if offset_str is None:
791
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
792
        _cache[offset] = offset_str
793
    return date_str + offset_str
794
795
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
796
def format_local_date(t, offset=0, timezone='original', date_fmt=None,
797
                      show_offset=True):
798
    """Return an unicode date string formatted according to the current locale.
799
800
    :param t: Seconds since the epoch.
801
    :param offset: Timezone offset in seconds east of utc.
802
    :param timezone: How to display the time: 'utc', 'original' for the
803
         timezone specified by offset, or 'local' for the process's current
804
         timezone.
805
    :param date_fmt: strftime format.
806
    :param show_offset: Whether to append the timezone.
807
    """
808
    (date_fmt, tt, offset_str) = \
809
               _format_date(t, offset, timezone, date_fmt, show_offset)
810
    date_str = time.strftime(date_fmt, tt)
811
    if not isinstance(date_str, unicode):
4385.4.1 by Alexander Belchenko
removed all references to bzrlib.user_encoding
812
        date_str = date_str.decode(get_user_encoding(), 'replace')
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
813
    return date_str + offset_str
814
4379.4.1 by Ian Clatworthy
make log --long faster
815
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
816
def _format_date(t, offset, timezone, date_fmt, show_offset):
8 by mbp at sourcefrog
store committer's timezone in revision and show
817
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
818
        tt = time.gmtime(t)
819
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
820
    elif timezone == 'original':
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
821
        if offset is None:
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
822
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
823
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
824
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
825
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
826
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
827
    else:
3144.1.1 by Lukáš Lalinský
Fixed error reporting of unsupported timezone format.
828
        raise errors.UnsupportedTimezoneFormat(timezone)
1185.12.24 by Aaron Bentley
Made format_date more flexible
829
    if date_fmt is None:
830
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
831
    if show_offset:
832
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
833
    else:
834
        offset_str = ''
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
835
    return (date_fmt, tt, offset_str)
1 by mbp at sourcefrog
import from baz patch-364
836
837
838
def compact_date(when):
839
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
840
1 by mbp at sourcefrog
import from baz patch-364
841
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
842
def format_delta(delta):
843
    """Get a nice looking string for a time delta.
844
845
    :param delta: The time difference in seconds, can be positive or negative.
846
        positive indicates time in the past, negative indicates time in the
847
        future. (usually time.time() - stored_time)
848
    :return: String formatted to show approximate resolution
849
    """
850
    delta = int(delta)
851
    if delta >= 0:
852
        direction = 'ago'
853
    else:
854
        direction = 'in the future'
855
        delta = -delta
856
857
    seconds = delta
858
    if seconds < 90: # print seconds up to 90 seconds
859
        if seconds == 1:
860
            return '%d second %s' % (seconds, direction,)
861
        else:
862
            return '%d seconds %s' % (seconds, direction)
863
864
    minutes = int(seconds / 60)
865
    seconds -= 60 * minutes
866
    if seconds == 1:
867
        plural_seconds = ''
868
    else:
869
        plural_seconds = 's'
870
    if minutes < 90: # print minutes, seconds up to 90 minutes
871
        if minutes == 1:
872
            return '%d minute, %d second%s %s' % (
873
                    minutes, seconds, plural_seconds, direction)
874
        else:
875
            return '%d minutes, %d second%s %s' % (
876
                    minutes, seconds, plural_seconds, direction)
877
878
    hours = int(minutes / 60)
879
    minutes -= 60 * hours
880
    if minutes == 1:
881
        plural_minutes = ''
882
    else:
883
        plural_minutes = 's'
884
885
    if hours == 1:
886
        return '%d hour, %d minute%s %s' % (hours, minutes,
887
                                            plural_minutes, direction)
888
    return '%d hours, %d minute%s %s' % (hours, minutes,
889
                                         plural_minutes, direction)
1 by mbp at sourcefrog
import from baz patch-364
890
891
def filesize(f):
892
    """Return size of given open file."""
5273.1.2 by Vincent Ladeuil
Cleanup imports in osutils.py.
893
    return os.fstat(f.fileno())[stat.ST_SIZE]
1 by mbp at sourcefrog
import from baz patch-364
894
1553.5.5 by Martin Pool
New utility routine rand_chars
895
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
896
# Define rand_bytes based on platform.
897
try:
898
    # Python 2.4 and later have os.urandom,
899
    # but it doesn't work on some arches
900
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
901
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
902
except (NotImplementedError, AttributeError):
903
    # If python doesn't have os.urandom, or it doesn't work,
904
    # 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()
905
    try:
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
906
        rand_bytes = file('/dev/urandom', 'rb').read
907
    # 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()
908
    except (IOError, OSError):
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
909
        # not well seeded, but better than nothing
910
        def rand_bytes(n):
911
            import random
912
            s = ''
913
            while n:
914
                s += chr(random.randint(0, 255))
915
                n -= 1
916
            return s
1 by mbp at sourcefrog
import from baz patch-364
917
1553.5.5 by Martin Pool
New utility routine rand_chars
918
919
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
920
def rand_chars(num):
921
    """Return a random string of num alphanumeric characters
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
922
923
    The result only contains lowercase chars because it may be used on
1553.5.5 by Martin Pool
New utility routine rand_chars
924
    case-insensitive filesystems.
925
    """
926
    s = ''
927
    for raw_byte in rand_bytes(num):
928
        s += ALNUM[ord(raw_byte) % 36]
929
    return s
930
931
1 by mbp at sourcefrog
import from baz patch-364
932
## 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.
933
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
934
935
def splitpath(p):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
936
    """Turn string into list of parts."""
271 by Martin Pool
- Windows path fixes
937
    # split on either delimiter because people might use either on
938
    # Windows
939
    ps = re.split(r'[\\/]', p)
940
941
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
942
    for f in ps:
943
        if f == '..':
6138.3.8 by Jonathan Riddell
more error gettext()ing
944
            raise errors.BzrError(gettext("sorry, %r not allowed in path") % f)
271 by Martin Pool
- Windows path fixes
945
        elif (f == '.') or (f == ''):
946
            pass
947
        else:
948
            rps.append(f)
949
    return rps
1 by mbp at sourcefrog
import from baz patch-364
950
3890.2.4 by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format.
951
1 by mbp at sourcefrog
import from baz patch-364
952
def joinpath(p):
953
    for f in p:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
954
        if (f == '..') or (f is None) or (f == ''):
6138.3.8 by Jonathan Riddell
more error gettext()ing
955
            raise errors.BzrError(gettext("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 \
956
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
957
958
4370.1.1 by Ian Clatworthy
add osutils.parent_directories() API
959
def parent_directories(filename):
4371.1.1 by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy)
960
    """Return the list of parent directories, deepest first.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
961
4371.1.1 by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy)
962
    For example, parent_directories("a/b/c") -> ["a/b", "a"].
963
    """
4370.1.1 by Ian Clatworthy
add osutils.parent_directories() API
964
    parents = []
965
    parts = splitpath(dirname(filename))
966
    while parts:
967
        parents.append(joinpath(parts))
968
        parts.pop()
969
    return parents
970
971
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
972
_extension_load_failures = []
973
974
975
def failed_to_load_extension(exception):
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
976
    """Handle failing to load a binary extension.
977
978
    This should be called from the ImportError block guarding the attempt to
979
    import the native extension.  If this function returns, the pure-Python
980
    implementation should be loaded instead::
981
982
    >>> try:
983
    >>>     import bzrlib._fictional_extension_pyx
984
    >>> except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
985
    >>>     bzrlib.osutils.failed_to_load_extension(e)
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
986
    >>>     import bzrlib._fictional_extension_py
987
    """
988
    # NB: This docstring is just an example, not a doctest, because doctest
989
    # currently can't cope with the use of lazy imports in this namespace --
990
    # mbp 20090729
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
991
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
992
    # This currently doesn't report the failure at the time it occurs, because
993
    # they tend to happen very early in startup when we can't check config
994
    # files etc, and also we want to report all failures but not spam the user
995
    # with 10 warnings.
996
    exception_str = str(exception)
997
    if exception_str not in _extension_load_failures:
5523.2.3 by Parth Malwankar
message is now shown to the user but is not too scary.
998
        trace.mutter("failed to load compiled extension: %s" % exception_str)
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
999
        _extension_load_failures.append(exception_str)
1000
1001
1002
def report_extension_load_failures():
1003
    if not _extension_load_failures:
1004
        return
6059.4.2 by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config.
1005
    if config.GlobalStack().get('ignore_missing_extensions'):
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1006
        return
1007
    # the warnings framework should by default show this only once
4695.4.1 by Martin Pool
Give a shorter/cleaner message for missing extensions
1008
    from bzrlib.trace import warning
1009
    warning(
1010
        "bzr: warning: some compiled extensions could not be loaded; "
1011
        "see <https://answers.launchpad.net/bzr/+faq/703>")
1012
    # we no longer show the specific missing extensions here, because it makes
1013
    # the message too long and scary - see
1014
    # https://bugs.launchpad.net/bzr/+bug/430529
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1015
1016
3890.2.7 by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write.
1017
try:
1018
    from bzrlib._chunks_to_lines_pyx import chunks_to_lines
4574.3.1 by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx
1019
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1020
    failed_to_load_extension(e)
3890.2.8 by John Arbash Meinel
Move everything into properly parameterized tests.
1021
    from bzrlib._chunks_to_lines_py import chunks_to_lines
3890.2.7 by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write.
1022
1023
1231 by Martin Pool
- more progress on fetch on top of weaves
1024
def split_lines(s):
1025
    """Split s into lines, but without removing the newline characters."""
3890.2.18 by John Arbash Meinel
Implement osutils.split_lines() in terms of chunks_to_lines if possible.
1026
    # Trivially convert a fulltext into a 'chunked' representation, and let
1027
    # chunks_to_lines do the heavy lifting.
1028
    if isinstance(s, str):
1029
        # chunks_to_lines only supports 8-bit strings
1030
        return chunks_to_lines([s])
1031
    else:
1032
        return _split_lines(s)
1033
1034
1035
def _split_lines(s):
1036
    """Split s into lines, but without removing the newline characters.
1037
1038
    This supports Unicode or plain string objects.
1039
    """
1666.1.6 by Robert Collins
Make knit the default format.
1040
    lines = s.split('\n')
1041
    result = [line + '\n' for line in lines[:-1]]
1042
    if lines[-1]:
1043
        result.append(lines[-1])
1044
    return result
1391 by Robert Collins
merge from integration
1045
1046
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1047
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
1048
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1049
1185.1.46 by Robert Collins
Aarons branch --basis patch
1050
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
1051
def link_or_copy(src, dest):
1052
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
1053
    if not hardlinks_good():
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1054
        shutil.copyfile(src, dest)
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
1055
        return
1056
    try:
1057
        os.link(src, dest)
1058
    except (OSError, IOError), e:
1059
        if e.errno != errno.EXDEV:
1060
            raise
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1061
        shutil.copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
1062
2831.5.2 by Vincent Ladeuil
Review feedback.
1063
1064
def delete_any(path):
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1065
    """Delete a file, symlink or directory.
1066
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1067
    Will delete even if readonly.
1068
    """
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1069
    try:
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1070
       _delete_file_or_dir(path)
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1071
    except (OSError, IOError), e:
1072
        if e.errno in (errno.EPERM, errno.EACCES):
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1073
            # make writable and try again
1074
            try:
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1075
                make_writable(path)
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1076
            except (OSError, IOError):
4440.1.2 by Craig Hewetson
Fixes made after first code review.
1077
                pass
4490.1.1 by Martin Pool
merge fix for forcing readonly deletion, and tweak
1078
            _delete_file_or_dir(path)
1079
        else:
1080
            raise
1081
1082
1083
def _delete_file_or_dir(path):
1084
    # Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
1085
    # Forgiveness than Permission (EAFP) because:
1086
    # - root can damage a solaris file system by using unlink,
1087
    # - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
1088
    #   EACCES, OSX: EPERM) when invoked on a directory.
2831.5.2 by Vincent Ladeuil
Review feedback.
1089
    if isdir(path): # Takes care of symlinks
1090
        os.rmdir(path)
1091
    else:
1092
        os.unlink(path)
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
1093
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
1094
1095
def has_symlinks():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1096
    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
1097
        return True
1098
    else:
1099
        return False
2831.5.2 by Vincent Ladeuil
Review feedback.
1100
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1101
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
1102
def has_hardlinks():
1103
    if getattr(os, 'link', None) is not None:
1104
        return True
1105
    else:
1106
        return False
1107
1108
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
1109
def host_os_dereferences_symlinks():
1110
    return (has_symlinks()
3287.18.19 by Matt McClure
Changed tested sys.platform value from 'windows' (mistaken) to 'win32'
1111
            and sys.platform not in ('cygwin', 'win32'))
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
1112
1113
4241.14.14 by Vincent Ladeuil
Test and implements osutils.readlink().
1114
def readlink(abspath):
1115
    """Return a string representing the path to which the symbolic link points.
1116
1117
    :param abspath: The link absolute unicode path.
1118
1119
    This his guaranteed to return the symbolic link in unicode in all python
1120
    versions.
1121
    """
1122
    link = abspath.encode(_fs_enc)
1123
    target = os.readlink(link)
1124
    target = target.decode(_fs_enc)
1125
    return target
1126
1127
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1128
def contains_whitespace(s):
1129
    """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.
1130
    # string.whitespace can include '\xa0' in certain locales, because it is
1131
    # considered "non-breaking-space" as part of ISO-8859-1. But it
1132
    # 1) Isn't a breaking whitespace
1133
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
1134
    #    separators
1135
    # 3) '\xa0' isn't unicode safe since it is >128.
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
1136
1137
    # This should *not* be a unicode set of characters in case the source
1138
    # string is not a Unicode string. We can auto-up-cast the characters since
1139
    # they are ascii, but we don't want to auto-up-cast the string in case it
1140
    # is utf-8
1141
    for ch in ' \t\n\r\v\f':
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
1142
        if ch in s:
1143
            return True
1144
    else:
1145
        return False
1146
1147
1148
def contains_linebreaks(s):
1149
    """True if there is any vertical whitespace in s."""
1150
    for ch in '\f\n\r':
1151
        if ch in s:
1152
            return True
1153
    else:
1154
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1155
1156
1157
def relpath(base, path):
5193.2.1 by Alexander Belchenko
update docstring for osutils.relpath() function.
1158
    """Return path relative to base, or raise PathNotChild exception.
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1159
1160
    The path may be either an absolute path or a path relative to the
1161
    current working directory.
1162
1163
    os.path.commonprefix (python2.4) has a bad bug that it works just
1164
    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.
1165
    avoids that problem.
5193.2.1 by Alexander Belchenko
update docstring for osutils.relpath() function.
1166
5193.2.2 by Alexander Belchenko
update wording based on spiv's review.
1167
    NOTE: `base` should not have a trailing slash otherwise you'll get
1168
    PathNotChild exceptions regardless of `path`.
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
1169
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1170
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1171
    if len(base) < MIN_ABS_PATHLENGTH:
1172
        # must have space for e.g. a drive letter
6138.3.8 by Jonathan Riddell
more error gettext()ing
1173
        raise ValueError(gettext('%r is too short to calculate a relative path')
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1174
            % (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
1175
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1176
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1177
1178
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
1179
    head = rp
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1180
    while True:
1181
        if len(head) <= len(base) and head != base:
1182
            raise errors.PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1183
        if head == base:
1184
            break
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1185
        head, tail = split(head)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1186
        if tail:
4555.2.1 by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop.
1187
            s.append(tail)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
1188
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
1189
    if s:
4555.2.3 by John Arbash Meinel
Fix a trivial bug that should have been caught earlier. :)
1190
        return pathjoin(*reversed(s))
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
1191
    else:
1192
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1193
1194
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
1195
def _cicp_canonical_relpath(base, path):
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1196
    """Return the canonical path relative to base.
1197
1198
    Like relpath, but on case-insensitive-case-preserving file-systems, this
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1199
    will return the relpath as stored on the file-system rather than in the
1200
    case specified in the input string, for all existing portions of the path.
1201
3794.5.28 by Mark Hammond
Update comments.
1202
    This will cause O(N) behaviour if called for every path in a tree; if you
1203
    have a number of paths to convert, you should use canonical_relpaths().
3794.5.31 by Mark Hammond
bulk of the simple review comments from igc.
1204
    """
1205
    # TODO: it should be possible to optimize this for Windows by using the
1206
    # win32 API FindFiles function to look for the specified name - but using
1207
    # os.listdir() still gives us the correct, platform agnostic semantics in
1208
    # the short term.
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1209
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1210
    rel = relpath(base, path)
1211
    # '.' will have been turned into ''
1212
    if not rel:
1213
        return rel
1214
1215
    abs_base = abspath(base)
1216
    current = abs_base
1217
    _listdir = os.listdir
1218
1219
    # use an explicit iterator so we can easily consume the rest on early exit.
3794.5.36 by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist.
1220
    bit_iter = iter(rel.split('/'))
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1221
    for bit in bit_iter:
1222
        lbit = bit.lower()
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1223
        try:
1224
            next_entries = _listdir(current)
4634.70.3 by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv.
1225
        except OSError: # enoent, eperm, etc
1226
            # We can't find this in the filesystem, so just append the
1227
            # remaining bits.
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1228
            current = pathjoin(current, bit, *list(bit_iter))
1229
            break
4634.70.3 by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv.
1230
        for look in next_entries:
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1231
            if lbit == look.lower():
1232
                current = pathjoin(current, look)
1233
                break
1234
        else:
1235
            # got to the end, nothing matched, so we just return the
1236
            # non-existing bits as they were specified (the filename may be
1237
            # the target of a move, for example).
1238
            current = pathjoin(current, bit, *list(bit_iter))
1239
            break
4634.70.2 by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle
1240
    return current[len(abs_base):].lstrip('/')
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1241
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1242
# XXX - TODO - we need better detection/integration of case-insensitive
4241.9.5 by Vincent Ladeuil
Fix unicode related OSX failures.
1243
# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
1244
# filesystems), for example, so could probably benefit from the same basic
1245
# support there.  For now though, only Windows and OSX get that support, and
1246
# they get it for *all* file-systems!
4241.9.2 by Vincent Ladeuil
Fix most of cicp related failures on OSX.
1247
if sys.platform in ('win32', 'darwin'):
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
1248
    canonical_relpath = _cicp_canonical_relpath
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1249
else:
1250
    canonical_relpath = relpath
1251
3794.5.15 by Mark Hammond
Add canonical_relpaths() as a placeholder for a future caching implementation.
1252
def canonical_relpaths(base, paths):
1253
    """Create an iterable to canonicalize a sequence of relative paths.
1254
1255
    The intent is for this implementation to use a cache, vastly speeding
1256
    up multiple transformations in the same directory.
1257
    """
1258
    # but for now, we haven't optimized...
1259
    return [canonical_relpath(base, p) for p in paths]
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1260
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1261
1262
def decode_filename(filename):
1263
    """Decode the filename using the filesystem encoding
1264
1265
    If it is unicode, it is returned.
1266
    Otherwise it is decoded from the the filesystem's encoding. If decoding
1267
    fails, a errors.BadFilenameEncoding exception is raised.
1268
    """
5279.2.15 by Eric Moritz
used "type(filename) == unicode" per John A Meinel's suggestion. This will
1269
    if type(filename) is unicode:
5279.2.4 by Eric Moritz
Added the filename_decode
1270
        return filename
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1271
    try:
1272
        return filename.decode(_fs_enc)
1273
    except UnicodeDecodeError:
1274
        raise errors.BadFilenameEncoding(filename, _fs_enc)
1275
5279.2.4 by Eric Moritz
Added the filename_decode
1276
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1277
def safe_unicode(unicode_or_utf8_string):
1278
    """Coerce unicode_or_utf8_string into unicode.
1279
1280
    If it is unicode, it is returned.
4204.2.1 by Matt Nordhoff
Fix a broken sentence in osutils.safe_unicode's docstring
1281
    Otherwise it is decoded from utf-8. If decoding fails, the exception is
1282
    wrapped in a BzrBadParameterNotUnicode exception.
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1283
    """
1284
    if isinstance(unicode_or_utf8_string, unicode):
1285
        return unicode_or_utf8_string
1286
    try:
1287
        return unicode_or_utf8_string.decode('utf8')
1288
    except UnicodeDecodeError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1289
        raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1290
1291
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1292
def safe_utf8(unicode_or_utf8_string):
1293
    """Coerce unicode_or_utf8_string to a utf8 string.
1294
1295
    If it is a str, it is returned.
1296
    If it is Unicode, it is encoded into a utf-8 string.
1297
    """
1298
    if isinstance(unicode_or_utf8_string, str):
1299
        # TODO: jam 20070209 This is overkill, and probably has an impact on
1300
        #       performance if we are dealing with lots of apis that want a
1301
        #       utf-8 revision id
1302
        try:
1303
            # Make sure it is a valid utf-8 string
1304
            unicode_or_utf8_string.decode('utf-8')
1305
        except UnicodeDecodeError:
1306
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1307
        return unicode_or_utf8_string
1308
    return unicode_or_utf8_string.encode('utf-8')
1309
1310
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1311
_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.'
1312
                        ' Revision id generators should be creating utf8'
1313
                        ' revision ids.')
1314
1315
1316
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.
1317
    """Revision ids should now be utf8, but at one point they were unicode.
1318
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1319
    :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
1320
        utf8 or None).
1321
    :param warn: Functions that are sanitizing user data can set warn=False
1322
    :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.
1323
    """
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1324
    if (unicode_or_utf8_string is None
1325
        or unicode_or_utf8_string.__class__ == str):
1326
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1327
    if warn:
1328
        symbol_versioning.warn(_revision_id_warning, DeprecationWarning,
1329
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1330
    return cache_utf8.encode(unicode_or_utf8_string)
1331
1332
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1333
_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id'
1334
                    ' generators should be creating utf8 file ids.')
1335
1336
1337
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.
1338
    """File ids should now be utf8, but at one point they were unicode.
1339
1340
    This is the same as safe_utf8, except it uses the cached encode functions
1341
    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.
1342
1343
    :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
1344
        utf8 or None).
1345
    :param warn: Functions that are sanitizing user data can set warn=False
1346
    :return: None or a utf8 file id.
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1347
    """
1348
    if (unicode_or_utf8_string is None
1349
        or unicode_or_utf8_string.__class__ == str):
1350
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1351
    if warn:
1352
        symbol_versioning.warn(_file_id_warning, DeprecationWarning,
1353
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1354
    return cache_utf8.encode(unicode_or_utf8_string)
2294.1.4 by John Arbash Meinel
Add safe_file_id as a helper in osutils.
1355
1356
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1357
_platform_normalizes_filenames = False
1358
if sys.platform == 'darwin':
1359
    _platform_normalizes_filenames = True
1360
1361
1362
def normalizes_filenames():
1363
    """Return True if this platform normalizes unicode filenames.
1364
5283.2.1 by Martin Pool
Additional platform name tweaks
1365
    Only Mac OSX.
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1366
    """
1367
    return _platform_normalizes_filenames
1368
1369
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1370
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
1371
    """Get the unicode normalized path, and if you can access the file.
1372
1373
    On platforms where the system normalizes filenames (Mac OSX),
1374
    you can access a file by any path which will normalize correctly.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1375
    On platforms where the system does not normalize filenames
5283.2.1 by Martin Pool
Additional platform name tweaks
1376
    (everything else), you have to access a file by its exact path.
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
1377
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1378
    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
1379
    the standard for XML documents.
1380
1381
    So return the normalized path, and a flag indicating if the file
1382
    can be accessed by that path.
1383
    """
1384
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1385
    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
1386
1387
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1388
def _inaccessible_normalized_filename(path):
1389
    __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
1390
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1391
    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
1392
    return normalized, normalized == path
1393
1394
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1395
if _platform_normalizes_filenames:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1396
    normalized_filename = _accessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1397
else:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1398
    normalized_filename = _inaccessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1399
1400
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1401
def set_signal_handler(signum, handler, restart_syscall=True):
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1402
    """A wrapper for signal.signal that also calls siginterrupt(signum, False)
1403
    on platforms that support that.
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1404
1405
    :param restart_syscall: if set, allow syscalls interrupted by a signal to
1406
        automatically restart (by calling `signal.siginterrupt(signum,
1407
        False)`).  May be ignored if the feature is not available on this
1408
        platform or Python version.
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1409
    """
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1410
    try:
5169.2.2 by Vincent Ladeuil
Just rely on python to tell us what it supports.
1411
        import signal
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1412
        siginterrupt = signal.siginterrupt
5169.2.2 by Vincent Ladeuil
Just rely on python to tell us what it supports.
1413
    except ImportError:
1414
        # This python implementation doesn't provide signal support, hence no
1415
        # handler exists
1416
        return None
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1417
    except AttributeError:
1418
        # siginterrupt doesn't exist on this platform, or for this version
1419
        # of Python.
1420
        siginterrupt = lambda signum, flag: None
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1421
    if restart_syscall:
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1422
        def sig_handler(*args):
1423
            # Python resets the siginterrupt flag when a signal is
5141.4.3 by Andrew Bennetts
Link to Python bug in comment.
1424
            # received.  <http://bugs.python.org/issue8354>
1425
            # As a workaround for some cases, set it back the way we want it.
4634.142.2 by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import.
1426
            siginterrupt(signum, False)
5141.4.1 by Andrew Bennetts
Reset siginterrupt every time we handle a signal.
1427
            # Now run the handler function passed to set_signal_handler.
1428
            handler(*args)
1429
    else:
1430
        sig_handler = handler
1431
    old_handler = signal.signal(signum, sig_handler)
1432
    if restart_syscall:
1433
        siginterrupt(signum, False)
4634.142.1 by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib.
1434
    return old_handler
1435
1436
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1437
default_terminal_width = 80
1438
"""The default terminal width for ttys.
1439
1440
This is defined so that higher levels can share a common fallback value when
1441
terminal_width() returns None.
1442
"""
1443
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1444
# Keep some state so that terminal_width can detect if _terminal_size has
1445
# returned a different size since the process started.  See docstring and
1446
# comments of terminal_width for details.
1447
# _terminal_size_state has 3 possible values: no_data, unchanged, and changed.
1448
_terminal_size_state = 'no_data'
1449
_first_terminal_size = None
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1450
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1451
def terminal_width():
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1452
    """Return terminal width.
1453
1454
    None is returned if the width can't established precisely.
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1455
1456
    The rules are:
1457
    - if BZR_COLUMNS is set, returns its value
1458
    - if there is no controlling terminal, returns None
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1459
    - query the OS, if the queried size has changed since the last query,
1460
      return its value,
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1461
    - if COLUMNS is set, returns its value,
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1462
    - if the OS has a value (even though it's never changed), return its value.
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1463
1464
    From there, we need to query the OS to get the size of the controlling
1465
    terminal.
1466
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1467
    On Unices we query the OS by:
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1468
    - get termios.TIOCGWINSZ
1469
    - if an error occurs or a negative value is obtained, returns None
1470
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1471
    On Windows we query the OS by:
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1472
    - win32utils.get_console_size() decides,
1473
    - returns None on error (provided default value)
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1474
    """
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1475
    # Note to implementors: if changing the rules for determining the width,
1476
    # make sure you've considered the behaviour in these cases:
1477
    #  - M-x shell in emacs, where $COLUMNS is set and TIOCGWINSZ returns 0,0.
1478
    #  - bzr log | less, in bash, where $COLUMNS not set and TIOCGWINSZ returns
1479
    #    0,0.
1480
    #  - (add more interesting cases here, if you find any)
1481
    # Some programs implement "Use $COLUMNS (if set) until SIGWINCH occurs",
1482
    # but we don't want to register a signal handler because it is impossible
1483
    # to do so without risking EINTR errors in Python <= 2.6.5 (see
1484
    # <http://bugs.python.org/issue8354>).  Instead we check TIOCGWINSZ every
1485
    # time so we can notice if the reported size has changed, which should have
1486
    # a similar effect.
4747.3.4 by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS.
1487
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1488
    # If BZR_COLUMNS is set, take it, user is always right
5582.7.1 by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0
1489
    # Except if they specified 0 in which case, impose no limit here
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1490
    try:
5582.7.1 by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0
1491
        width = int(os.environ['BZR_COLUMNS'])
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1492
    except (KeyError, ValueError):
5582.7.1 by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0
1493
        width = None
1494
    if width is not None:
1495
        if width > 0:
1496
            return width
1497
        else:
1498
            return None
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1499
4747.3.3 by Vincent Ladeuil
More complete fix (previous one changed the focus).
1500
    isatty = getattr(sys.stdout, 'isatty', None)
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1501
    if isatty is None or not isatty():
4747.3.7 by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure.
1502
        # Don't guess, setting BZR_COLUMNS is the recommended way to override.
4747.3.6 by Vincent Ladeuil
terminal_width can now returns None.
1503
        return None
4747.3.1 by Joke de Buhr
Prevent linebreaks in output if it's not connected to a tty.
1504
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1505
    # Query the OS
1506
    width, height = os_size = _terminal_size(None, None)
1507
    global _first_terminal_size, _terminal_size_state
1508
    if _terminal_size_state == 'no_data':
1509
        _first_terminal_size = os_size
1510
        _terminal_size_state = 'unchanged'
1511
    elif (_terminal_size_state == 'unchanged' and
1512
          _first_terminal_size != os_size):
1513
        _terminal_size_state = 'changed'
1514
1515
    # If the OS claims to know how wide the terminal is, and this value has
1516
    # ever changed, use that.
1517
    if _terminal_size_state == 'changed':
1518
        if width is not None and width > 0:
1519
            return width
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1520
1521
    # If COLUMNS is set, use it.
4747.4.3 by Vincent Ladeuil
Re-fix the priority order since there is a known valid case.
1522
    try:
1523
        return int(os.environ['COLUMNS'])
1524
    except (KeyError, ValueError):
1525
        pass
1526
4797.54.2 by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible.
1527
    # Finally, use an unchanged size from the OS, if we have one.
1528
    if _terminal_size_state == 'unchanged':
1529
        if width is not None and width > 0:
1530
            return width
1531
1532
    # The width could not be determined.
4797.54.1 by Andrew Bennetts
Remove the SIGWINCH signal handler.
1533
    return None
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1534
1535
1536
def _win32_terminal_size(width, height):
1537
    width, height = win32utils.get_console_size(defaultx=width, defaulty=height)
1538
    return width, height
1539
1540
1541
def _ioctl_terminal_size(width, height):
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1542
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1543
        import struct, fcntl, termios
1544
        s = struct.pack('HHHH', 0, 0, 0, 0)
1545
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
4747.4.6 by Vincent Ladeuil
Fix parameter order.
1546
        height, width = struct.unpack('HHHH', x)[0:2]
4747.3.4 by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS.
1547
    except (IOError, AttributeError):
4747.4.5 by Vincent Ladeuil
More robusts tests for osutils.terminal_width().
1548
        pass
1549
    return width, height
1550
1551
_terminal_size = None
1552
"""Returns the terminal size as (width, height).
1553
1554
:param width: Default value for width.
1555
:param height: Default value for height.
1556
1557
This is defined specifically for each OS and query the size of the controlling
1558
terminal. If any error occurs, the provided default values should be returned.
1559
"""
1560
if sys.platform == 'win32':
1561
    _terminal_size = _win32_terminal_size
1562
else:
1563
    _terminal_size = _ioctl_terminal_size
1534.7.25 by Aaron Bentley
Added set_executability
1564
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1565
1534.7.25 by Aaron Bentley
Added set_executability
1566
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
1567
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
1568
1569
1551.10.4 by Aaron Bentley
Update to skip on win32
1570
def supports_posix_readonly():
1571
    """Return True if 'readonly' has POSIX semantics, False otherwise.
1572
1573
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
1574
    directory controls creation/deletion, etc.
1575
1576
    And under win32, readonly means that the directory itself cannot be
1577
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
1578
    where files in readonly directories cannot be added, deleted or renamed.
1579
    """
1580
    return sys.platform != "win32"
1581
1582
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1583
def set_or_unset_env(env_variable, value):
1584
    """Modify the environment, setting or removing the env_variable.
1585
1586
    :param env_variable: The environment variable in question
1587
    :param value: The value to set the environment to. If None, then
1588
        the variable will be removed.
1589
    :return: The original value of the environment variable.
1590
    """
1591
    orig_val = os.environ.get(env_variable)
1592
    if value is None:
1593
        if orig_val is not None:
1594
            del os.environ[env_variable]
1595
    else:
1596
        if isinstance(value, unicode):
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
1597
            value = value.encode(get_user_encoding())
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1598
        os.environ[env_variable] = value
1599
    return orig_val
1600
1601
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1602
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
1603
1604
1605
def check_legal_path(path):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1606
    """Check whether the supplied path is legal.
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1607
    This is only required on Windows, so we don't test on other platforms
1608
    right now.
1609
    """
1610
    if sys.platform != "win32":
1611
        return
1612
    if _validWin32PathRE.match(path) is None:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1613
        raise errors.IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1614
1615
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1616
_WIN32_ERROR_DIRECTORY = 267 # Similar to errno.ENOTDIR
1617
1618
def _is_error_enotdir(e):
1619
    """Check if this exception represents ENOTDIR.
1620
1621
    Unfortunately, python is very inconsistent about the exception
1622
    here. The cases are:
1623
      1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
1624
      2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
1625
         which is the windows error code.
1626
      3) Windows, Python2.5 uses errno == EINVAL and
1627
         winerror == ERROR_DIRECTORY
1628
1629
    :param e: An Exception object (expected to be OSError with an errno
1630
        attribute, but we should be able to cope with anything)
1631
    :return: True if this represents an ENOTDIR error. False otherwise.
1632
    """
1633
    en = getattr(e, 'errno', None)
1634
    if (en == errno.ENOTDIR
1635
        or (sys.platform == 'win32'
1636
            and (en == _WIN32_ERROR_DIRECTORY
1637
                 or (en == errno.EINVAL
1638
                     and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY)
1639
        ))):
1640
        return True
1641
    return False
1642
1643
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
1644
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1645
    """Yield data about all the directories in a tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1646
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1647
    This yields all the data about the contents of a directory at a time.
1648
    After each directory has been yielded, if the caller has mutated the list
1649
    to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1650
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1651
    The data yielded is of the form:
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1652
    ((directory-relpath, directory-path-from-top),
2694.4.1 by Alexander Belchenko
trivial fix for docstring of osutils.walkdirs()
1653
    [(relpath, basename, kind, lstat, path-from-top), ...]),
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1654
     - directory-relpath is the relative path of the directory being returned
1655
       with respect to top. prefix is prepended to this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1656
     - directory-path-from-root is the path including top for this directory.
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1657
       It is suitable for use with os functions.
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1658
     - relpath is the relative path within the subtree being walked.
1659
     - basename is the basename of the path
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1660
     - 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.
1661
       present within the tree - but it may be recorded as versioned. See
1662
       versioned_kind.
1663
     - lstat is the stat data *if* the file was statted.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1664
     - planned, not implemented:
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1665
       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.
1666
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1667
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This
1757.2.16 by Robert Collins
Review comments.
1668
        allows one to walk a subtree but get paths that are relative to a tree
1669
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1670
    :return: an iterator over the dirs.
1671
    """
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1672
    #TODO there is a bit of a smell where the results of the directory-
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1673
    # summary in this, and the path from the root, may not agree
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1674
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
1675
    # potentially confusing output. We should make this more robust - but
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1676
    # 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%
1677
    _lstat = os.lstat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1678
    _directory = _directory_kind
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1679
    _listdir = os.listdir
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1680
    _kind_from_mode = file_kind_from_stat_mode
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1681
    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.
1682
    while pending:
1683
        # 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%
1684
        relroot, _, _, _, top = pending.pop()
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1685
        if relroot:
1686
            relprefix = relroot + u'/'
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1687
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1688
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1689
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1690
1691
        dirblock = []
1692
        append = dirblock.append
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1693
        try:
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
1694
            names = sorted(map(decode_filename, _listdir(top)))
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1695
        except OSError, e:
1696
            if not _is_error_enotdir(e):
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1697
                raise
1698
        else:
1699
            for name in names:
1700
                abspath = top_slash + name
1701
                statvalue = _lstat(abspath)
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1702
                kind = _kind_from_mode(statvalue.st_mode)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1703
                append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1704
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1705
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1706
        # push the user specified dirs from dirblock
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1707
        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.
1708
1709
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1710
class DirReader(object):
1711
    """An interface for reading directories."""
1712
1713
    def top_prefix_to_starting_dir(self, top, prefix=""):
1714
        """Converts top and prefix to a starting dir entry
1715
1716
        :param top: A utf8 path
1717
        :param prefix: An optional utf8 path to prefix output relative paths
1718
            with.
1719
        :return: A tuple starting with prefix, and ending with the native
1720
            encoding of top.
1721
        """
1722
        raise NotImplementedError(self.top_prefix_to_starting_dir)
1723
1724
    def read_dir(self, prefix, top):
1725
        """Read a specific dir.
1726
1727
        :param prefix: A utf8 prefix to be preprended to the path basenames.
1728
        :param top: A natively encoded path to read.
3696.3.10 by Robert Collins
Review feedback.
1729
        :return: A list of the directories contents. Each item contains:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1730
            (utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
1731
        """
1732
        raise NotImplementedError(self.read_dir)
1733
1734
1735
_selected_dir_reader = None
1736
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1737
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
1738
def _walkdirs_utf8(top, prefix=""):
1739
    """Yield data about all the directories in a tree.
1740
1741
    This yields the same information as walkdirs() only each entry is yielded
1742
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
1743
    are returned as exact byte-strings.
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1744
1745
    :return: yields a tuple of (dir_info, [file_info])
1746
        dir_info is (utf8_relpath, path-from-top)
1747
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
1748
        if top is an absolute path, path-from-top is also an absolute path.
1749
        path-from-top might be unicode or utf8, but it is the correct path to
1750
        pass to os functions to affect the file in question. (such as os.lstat)
1751
    """
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1752
    global _selected_dir_reader
1753
    if _selected_dir_reader is None:
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1754
        fs_encoding = _fs_enc.upper()
3224.5.17 by Andrew Bennetts
Avoid importing win32utils when sys.platform != win32
1755
        if sys.platform == "win32" and win32utils.winver == 'Windows NT':
3557.2.4 by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt'
1756
            # Win98 doesn't have unicode apis like FindFirstFileW
1757
            # TODO: We possibly could support Win98 by falling back to the
1758
            #       original FindFirstFile, and using TCHAR instead of WCHAR,
1759
            #       but that gets a bit tricky, and requires custom compiling
1760
            #       for win98 anyway.
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1761
            try:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1762
                from bzrlib._walkdirs_win32 import Win32ReadDir
1763
                _selected_dir_reader = Win32ReadDir()
4241.14.6 by Vincent Ladeuil
Start DirReader parametrized tests.
1764
            except ImportError:
1765
                pass
1766
        elif fs_encoding in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1767
            # ANSI_X3.4-1968 is a form of ASCII
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1768
            try:
1769
                from bzrlib._readdir_pyx import UTF8DirReader
1770
                _selected_dir_reader = UTF8DirReader()
4574.3.6 by Martin Pool
More warnings when failing to load extensions
1771
            except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
1772
                failed_to_load_extension(e)
4241.14.6 by Vincent Ladeuil
Start DirReader parametrized tests.
1773
                pass
1774
1775
    if _selected_dir_reader is None:
1776
        # Fallback to the python version
1777
        _selected_dir_reader = UnicodeDirReader()
1778
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1779
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
1780
    # But we don't actually uses 1-3 in pending, so set them to None
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1781
    pending = [[_selected_dir_reader.top_prefix_to_starting_dir(top, prefix)]]
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1782
    read_dir = _selected_dir_reader.read_dir
1783
    _directory = _directory_kind
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
1784
    while pending:
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1785
        relroot, _, _, _, top = pending[-1].pop()
1786
        if not pending[-1]:
1787
            pending.pop()
1788
        dirblock = sorted(read_dir(relroot, top))
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1789
        yield (relroot, top), dirblock
1790
        # push the user specified dirs from dirblock
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1791
        next = [d for d in reversed(dirblock) if d[2] == _directory]
1792
        if next:
1793
            pending.append(next)
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1794
1795
1796
class UnicodeDirReader(DirReader):
1797
    """A dir reader for non-utf8 file systems, which transcodes."""
1798
1799
    __slots__ = ['_utf8_encode']
1800
1801
    def __init__(self):
1802
        self._utf8_encode = codecs.getencoder('utf8')
1803
1804
    def top_prefix_to_starting_dir(self, top, prefix=""):
1805
        """See DirReader.top_prefix_to_starting_dir."""
1806
        return (safe_utf8(prefix), None, None, None, safe_unicode(top))
1807
1808
    def read_dir(self, prefix, top):
1809
        """Read a single directory from a non-utf8 file system.
1810
1811
        top, and the abspath element in the output are unicode, all other paths
1812
        are utf8. Local disk IO is done via unicode calls to listdir etc.
1813
1814
        This is currently the fallback code path when the filesystem encoding is
1815
        not UTF-8. It may be better to implement an alternative so that we can
1816
        safely handle paths that are not properly decodable in the current
1817
        encoding.
1818
1819
        See DirReader.read_dir for details.
1820
        """
1821
        _utf8_encode = self._utf8_encode
1822
        _lstat = os.lstat
1823
        _listdir = os.listdir
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1824
        _kind_from_mode = file_kind_from_stat_mode
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1825
1826
        if prefix:
1827
            relprefix = prefix + '/'
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1828
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1829
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1830
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1831
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1832
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1833
        append = dirblock.append
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1834
        for name in sorted(_listdir(top)):
3696.3.12 by Robert Collins
Fix PQM test failure.
1835
            try:
1836
                name_utf8 = _utf8_encode(name)[0]
1837
            except UnicodeDecodeError:
1838
                raise errors.BadFilenameEncoding(
1839
                    _utf8_encode(relprefix)[0] + name, _fs_enc)
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1840
            abspath = top_slash + name
1841
            statvalue = _lstat(abspath)
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
1842
            kind = _kind_from_mode(statvalue.st_mode)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1843
            append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1844
        return dirblock
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
1845
1846
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1847
def copy_tree(from_path, to_path, handlers={}):
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1848
    """Copy all of the entries in from_path into to_path.
1849
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1850
    :param from_path: The base directory to copy.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1851
    :param to_path: The target directory. If it does not exist, it will
1852
        be created.
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1853
    :param handlers: A dictionary of functions, which takes a source and
1854
        destinations for files, directories, etc.
1855
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
1856
        'file', 'directory', and 'symlink' should always exist.
1857
        If they are missing, they will be replaced with 'os.mkdir()',
1858
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1859
    """
1860
    # Now, just copy the existing cached tree to the new location
1861
    # We use a cheap trick here.
1862
    # Absolute paths are prefixed with the first parameter
1863
    # relative paths are prefixed with the second.
1864
    # So we can get both the source and target returned
1865
    # without any extra work.
1866
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1867
    def copy_dir(source, dest):
1868
        os.mkdir(dest)
1869
1870
    def copy_link(source, dest):
1871
        """Copy the contents of a symlink"""
1872
        link_to = os.readlink(source)
1873
        os.symlink(link_to, dest)
1874
1875
    real_handlers = {'file':shutil.copy2,
1876
                     'symlink':copy_link,
1877
                     'directory':copy_dir,
1878
                    }
1879
    real_handlers.update(handlers)
1880
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1881
    if not os.path.exists(to_path):
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1882
        real_handlers['directory'](from_path, to_path)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1883
1884
    for dir_info, entries in walkdirs(from_path, prefix=to_path):
1885
        for relpath, name, kind, st, abspath in entries:
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1886
            real_handlers[kind](abspath, relpath)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1887
1888
5116.2.6 by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path.
1889
def copy_ownership_from_path(dst, src=None):
5051.4.11 by Parth Malwankar
closed Martins review comments.
1890
    """Copy usr/grp ownership from src file/dir to dst file/dir.
1891
1892
    If src is None, the containing directory is used as source. If chown
1893
    fails, the error is ignored and a warning is printed.
1894
    """
5074.4.6 by John Arbash Meinel
Unbreak bzr on windows.
1895
    chown = getattr(os, 'chown', None)
1896
    if chown is None:
1897
        return
5051.4.9 by Parth Malwankar
removed parent_dir.
1898
1899
    if src == None:
1900
        src = os.path.dirname(dst)
1901
        if src == '':
1902
            src = '.'
1903
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
1904
    try:
4634.143.1 by Parth Malwankar
default .bazaar, .bzr.log and .bazaar/bazaar.conf retain
1905
        s = os.stat(src)
5074.4.6 by John Arbash Meinel
Unbreak bzr on windows.
1906
        chown(dst, s.st_uid, s.st_gid)
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
1907
    except OSError, e:
5523.2.3 by Parth Malwankar
message is now shown to the user but is not too scary.
1908
        trace.warning(
1909
            'Unable to copy ownership from "%s" to "%s". '
1910
            'You may want to set it manually.', src, dst)
1911
        trace.log_exception_quietly()
4634.143.4 by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally
1912
1913
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1914
def path_prefix_key(path):
1915
    """Generate a prefix-order path key for path.
1916
1917
    This can be used to sort paths in the same way that walkdirs does.
1918
    """
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.
1919
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1920
1921
1922
def compare_paths_prefix_order(path_a, path_b):
1923
    """Compare path_a and path_b to generate the same order walkdirs uses."""
1924
    key_a = path_prefix_key(path_a)
1925
    key_b = path_prefix_key(path_b)
1926
    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
1927
1928
1929
_cached_user_encoding = None
1930
1931
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1932
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
1933
    """Find out what the preferred user encoding is.
1934
1935
    This is generally the encoding that is used for command line parameters
1936
    and file contents. This may be different from the terminal encoding
1937
    or the filesystem encoding.
1938
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1939
    :param  use_cache:  Enable cache for detected encoding.
1940
                        (This parameter is turned on by default,
1941
                        and required only for selftesting)
1942
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1943
    :return: A string defining the preferred user encoding
1944
    """
1945
    global _cached_user_encoding
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1946
    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
1947
        return _cached_user_encoding
1948
1949
    if sys.platform == 'darwin':
3638.3.10 by Vincent Ladeuil
Provides a better default encoding on OSX.
1950
        # python locale.getpreferredencoding() always return
1951
        # 'mac-roman' on darwin. That's a lie.
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1952
        sys.platform = 'posix'
1953
        try:
3638.3.10 by Vincent Ladeuil
Provides a better default encoding on OSX.
1954
            if os.environ.get('LANG', None) is None:
1955
                # If LANG is not set, we end up with 'ascii', which is bad
1956
                # ('mac-roman' is more than ascii), so we set a default which
1957
                # will give us UTF-8 (which appears to work in all cases on
1958
                # OSX). Users are still free to override LANG of course, as
1959
                # long as it give us something meaningful. This work-around
1960
                # *may* not be needed with python 3k and/or OSX 10.5, but will
1961
                # work with them too -- vila 20080908
1962
                os.environ['LANG'] = 'en_US.UTF-8'
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1963
            import locale
1964
        finally:
1965
            sys.platform = 'darwin'
1966
    else:
1967
        import locale
1968
1969
    try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1970
        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
1971
    except locale.Error, e:
1955.2.3 by John Arbash Meinel
Change error message text
1972
        sys.stderr.write('bzr: warning: %s\n'
2001.2.1 by Jelmer Vernooij
Fix typo in encoding warning.
1973
                         '  Could not determine what text encoding to use.\n'
1955.2.3 by John Arbash Meinel
Change error message text
1974
                         '  This error usually means your Python interpreter\n'
1975
                         '  doesn\'t support the locale set by $LANG (%s)\n'
1976
                         "  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
1977
                         % (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
1978
        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
1979
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
1980
    # Windows returns 'cp0' to indicate there is no code page. So we'll just
1981
    # treat that as ASCII, and not support printing unicode characters to the
1982
    # console.
3405.3.1 by Neil Martinsen-Burrell
accept for an encoding to mean ascii
1983
    #
1984
    # For python scripts run under vim, we get '', so also treat that as ASCII
1985
    if user_encoding in (None, 'cp0', ''):
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1986
        user_encoding = 'ascii'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1987
    else:
1988
        # check encoding
1989
        try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1990
            codecs.lookup(user_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1991
        except LookupError:
1992
            sys.stderr.write('bzr: warning:'
1993
                             ' unknown encoding %s.'
1994
                             ' Continuing with ascii encoding.\n'
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1995
                             % user_encoding
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1996
                            )
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1997
            user_encoding = 'ascii'
1998
1999
    if use_cache:
2000
        _cached_user_encoding = user_encoding
2001
2002
    return user_encoding
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
2003
2004
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
2005
def get_diff_header_encoding():
5258.1.5 by Alexander Belchenko
tweak requested by Martin Pool: use terminal encoding for diff headers on all platforms
2006
    return get_terminal_encoding()
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
2007
2008
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
2009
def get_host_name():
3626.1.4 by John Arbash Meinel
Document the difference in get_host_name, per Robert's request.
2010
    """Return the current unicode host name.
2011
2012
    This is meant to be used in place of socket.gethostname() because that
2013
    behaves inconsistently on different platforms.
2014
    """
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
2015
    if sys.platform == "win32":
2016
        import win32utils
2017
        return win32utils.get_host_name()
2018
    else:
2019
        import socket
2020
        return socket.gethostname().decode(get_user_encoding())
2021
2022
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2023
# We must not read/write any more than 64k at a time from/to a socket so we
2024
# don't risk "no buffer space available" errors on some platforms.  Windows in
2025
# particular is likely to throw WSAECONNABORTED or WSAENOBUFS if given too much
2026
# data at once.
2027
MAX_SOCKET_CHUNK = 64 * 1024
2028
5599.3.1 by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET.
2029
_end_of_stream_errors = [errno.ECONNRESET]
2030
for _eno in ['WSAECONNRESET', 'WSAECONNABORTED']:
2031
    _eno = getattr(errno, _eno, None)
2032
    if _eno is not None:
2033
        _end_of_stream_errors.append(_eno)
2034
del _eno
2035
2036
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2037
def read_bytes_from_socket(sock, report_activity=None,
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2038
        max_read_size=MAX_SOCKET_CHUNK):
2039
    """Read up to max_read_size of bytes from sock and notify of progress.
2040
2041
    Translates "Connection reset by peer" into file-like EOF (return an
2042
    empty string rather than raise an error), and repeats the recv if
2043
    interrupted by a signal.
2044
    """
2045
    while 1:
2046
        try:
2047
            bytes = sock.recv(max_read_size)
2048
        except socket.error, e:
2049
            eno = e.args[0]
5599.3.1 by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET.
2050
            if eno in _end_of_stream_errors:
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2051
                # The connection was closed by the other side.  Callers expect
2052
                # an empty string to signal end-of-stream.
2053
                return ""
2054
            elif eno == errno.EINTR:
2055
                # Retry the interrupted recv.
2056
                continue
2057
            raise
2058
        else:
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2059
            if report_activity is not None:
2060
                report_activity(len(bytes), 'read')
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2061
            return bytes
2062
2063
2064
def recv_all(socket, count):
2065
    """Receive an exact number of bytes.
2066
2067
    Regular Socket.recv() may return less than the requested number of bytes,
2068
    depending on what's in the OS buffer.  MSG_WAITALL is not available
2069
    on all platforms, but this should work everywhere.  This will return
2070
    less than the requested amount if the remote end closes.
2071
2072
    This isn't optimized and is intended mostly for use in testing.
2073
    """
2074
    b = ''
2075
    while len(b) < count:
5011.3.12 by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional.
2076
        new = read_bytes_from_socket(socket, None, count - len(b))
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2077
        if new == '':
2078
            break # eof
2079
        b += new
2080
    return b
2081
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2082
2083
def send_all(sock, bytes, report_activity=None):
2084
    """Send all bytes on a socket.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2085
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2086
    Breaks large blocks in smaller chunks to avoid buffering limitations on
2087
    some platforms, and catches EINTR which may be thrown if the send is
2088
    interrupted by a signal.
2089
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2090
    This is preferred to socket.sendall(), because it avoids portability bugs
2091
    and provides activity reporting.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2092
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2093
    :param report_activity: Call this as bytes are read, see
2094
        Transport._report_activity
2095
    """
2096
    sent_total = 0
2097
    byte_count = len(bytes)
2098
    while sent_total < byte_count:
2099
        try:
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
2100
            sent = sock.send(buffer(bytes, sent_total, MAX_SOCKET_CHUNK))
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2101
        except socket.error, e:
2102
            if e.args[0] != errno.EINTR:
2103
                raise
2104
        else:
2105
            sent_total += sent
2106
            report_activity(sent, 'write')
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
2107
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2108
5247.5.29 by Vincent Ladeuil
Fixed as per jam's review.
2109
def connect_socket(address):
2110
    # Slight variation of the socket.create_connection() function (provided by
2111
    # python-2.6) that can fail if getaddrinfo returns an empty list. We also
2112
    # provide it for previous python versions. Also, we don't use the timeout
2113
    # parameter (provided by the python implementation) so we don't implement
2114
    # it either).
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2115
    err = socket.error('getaddrinfo returns an empty list')
2116
    host, port = address
2117
    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
2118
        af, socktype, proto, canonname, sa = res
2119
        sock = None
2120
        try:
2121
            sock = socket.socket(af, socktype, proto)
2122
            sock.connect(sa)
2123
            return sock
2124
5247.5.15 by Vincent Ladeuil
Hopefully, the right fix this time.
2125
        except socket.error, err:
5247.5.14 by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/
2126
            # 'err' is now the most recent error
2127
            if sock is not None:
2128
                sock.close()
2129
    raise err
5247.3.7 by Vincent Ladeuil
Provide connect_socket (socket.create_connection) for pythons older than 2.6.
2130
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
2131
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
2132
def dereference_path(path):
2133
    """Determine the real path to a file.
2134
2135
    All parent elements are dereferenced.  But the file itself is not
2136
    dereferenced.
2137
    :param path: The original path.  May be absolute or relative.
2138
    :return: the real path *to* the file
2139
    """
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
2140
    parent, base = os.path.split(path)
2141
    # The pathjoin for '.' is a workaround for Python bug #1213894.
2142
    # (initial path components aren't dereferenced)
2143
    return pathjoin(realpath(pathjoin('.', parent)), base)
2681.3.4 by Lukáš Lalinsky
- Rename 'windows' to 'mapi'
2144
2145
2146
def supports_mapi():
2147
    """Return True if we can use MAPI to launch a mail client."""
2148
    return sys.platform == "win32"
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
2149
2150
2151
def resource_string(package, resource_name):
2152
    """Load a resource from a package and return it as a string.
2153
2154
    Note: Only packages that start with bzrlib are currently supported.
2155
2156
    This is designed to be a lightweight implementation of resource
2157
    loading in a way which is API compatible with the same API from
2158
    pkg_resources. See
2159
    http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
2160
    If and when pkg_resources becomes a standard library, this routine
2161
    can delegate to it.
2162
    """
2163
    # Check package name is within bzrlib
2164
    if package == "bzrlib":
2165
        resource_relpath = resource_name
2166
    elif package.startswith("bzrlib."):
2167
        package = package[len("bzrlib."):].replace('.', os.sep)
2168
        resource_relpath = pathjoin(package, resource_name)
2169
    else:
2170
        raise errors.BzrError('resource package %s not in bzrlib' % package)
2171
2172
    # Map the resource to a file and read its contents
2173
    base = dirname(bzrlib.__file__)
2174
    if getattr(sys, 'frozen', None):    # bzr.exe
2175
        base = abspath(pathjoin(base, '..', '..'))
4708.2.2 by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib
2176
    f = file(pathjoin(base, resource_relpath), "rU")
2177
    try:
2178
        return f.read()
2179
    finally:
2180
        f.close()
1739.2.7 by Robert Collins
Update readdir pyrex source files and usage in line with current practice.
2181
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2182
def file_kind_from_stat_mode_thunk(mode):
2183
    global file_kind_from_stat_mode
2184
    if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk:
2185
        try:
2186
            from bzrlib._readdir_pyx import UTF8DirReader
2187
            file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
4574.3.6 by Martin Pool
More warnings when failing to load extensions
2188
        except ImportError, e:
4694.2.1 by John Arbash Meinel
Fix bug #430645, don't issue a warning when failing to import _readdir_pyx the second time.
2189
            # This is one time where we won't warn that an extension failed to
2190
            # load. The extension is never available on Windows anyway.
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2191
            from bzrlib._readdir_py import (
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
2192
                _kind_from_mode as file_kind_from_stat_mode
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2193
                )
2194
    return file_kind_from_stat_mode(mode)
2195
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk
2196
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2197
def file_stat(f, _lstat=os.lstat):
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2198
    try:
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2199
        # XXX cache?
2200
        return _lstat(f)
3696.3.5 by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins)
2201
    except OSError, e:
2202
        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
2203
            raise errors.NoSuchFile(f)
2204
        raise
2205
6046.2.6 by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results.
2206
def file_kind(f, _lstat=os.lstat):
2207
    stat_value = file_stat(f, _lstat)
2208
    return file_kind_from_stat_mode(stat_value.st_mode)
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
2209
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2210
def until_no_eintr(f, *a, **kw):
2211
    """Run f(*a, **kw), retrying if an EINTR error occurs.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2212
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2213
    WARNING: you must be certain that it is safe to retry the call repeatedly
2214
    if EINTR does occur.  This is typically only true for low-level operations
2215
    like os.read.  If in any doubt, don't use this.
5011.3.5 by Andrew Bennetts
Expand until_no_eintr's docstring more with some explanation for why it is not a complete solution.
2216
2217
    Keep in mind that this is not a complete solution to EINTR.  There is
2218
    probably code in the Python standard library and other dependencies that
2219
    may encounter EINTR if a signal arrives (and there is signal handler for
2220
    that signal).  So this function can reduce the impact for IO that bzrlib
2221
    directly controls, but it is not a complete solution.
5011.3.4 by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes.
2222
    """
2223
    # Borrowed from Twisted's twisted.python.util.untilConcludes function.
2224
    while True:
2225
        try:
2226
            return f(*a, **kw)
2227
        except (IOError, OSError), e:
2228
            if e.errno == errno.EINTR:
2229
                continue
2230
            raise
2231
2232
5326.2.6 by Parth Malwankar
deprecate re_compile_checked rather than remove it.
2233
@deprecated_function(deprecated_in((2, 2, 0)))
2234
def re_compile_checked(re_string, flags=0, where=""):
2235
    """Return a compiled re, or raise a sensible error.
2236
2237
    This should only be used when compiling user-supplied REs.
2238
2239
    :param re_string: Text form of regular expression.
2240
    :param flags: eg re.IGNORECASE
2241
    :param where: Message explaining to the user the context where
2242
        it occurred, eg 'log search filter'.
2243
    """
2244
    # from https://bugs.launchpad.net/bzr/+bug/251352
2245
    try:
2246
        re_obj = re.compile(re_string, flags)
2247
        re_obj.search("")
2248
        return re_obj
2249
    except errors.InvalidPattern, e:
2250
        if where:
2251
            where = ' in ' + where
2252
        # despite the name 'error' is a type
2253
        raise errors.BzrCommandError('Invalid regular expression%s: %s'
5339.1.1 by Parth Malwankar
fixes errors.InvalidPattern to work on Python2.5
2254
            % (where, e.msg))
5326.2.6 by Parth Malwankar
deprecate re_compile_checked rather than remove it.
2255
2256
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
2257
if sys.platform == "win32":
2258
    import msvcrt
2259
    def getchar():
2260
        return msvcrt.getch()
2261
else:
2262
    import tty
2263
    import termios
2264
    def getchar():
2265
        fd = sys.stdin.fileno()
2266
        settings = termios.tcgetattr(fd)
2267
        try:
2268
            tty.setraw(fd)
2269
            ch = sys.stdin.read(1)
2270
        finally:
2271
            termios.tcsetattr(fd, termios.TCSADRAIN, settings)
2272
        return ch
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2273
6057.1.1 by Martin Pool
Python can now report a platform of 'linux3' on kernel 3, but it's basically the same
2274
if sys.platform.startswith('linux'):
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2275
    def _local_concurrency():
5677.1.2 by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD.
2276
        try:
2277
            return os.sysconf('SC_NPROCESSORS_ONLN')
2278
        except (ValueError, OSError, AttributeError):
2279
            return None
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2280
elif sys.platform == 'darwin':
2281
    def _local_concurrency():
2282
        return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'],
2283
                                stdout=subprocess.PIPE).communicate()[0]
5677.1.2 by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD.
2284
elif "bsd" in sys.platform:
4413.1.1 by Matthew Fuller
Catch the number of cores on FreeBSD too.
2285
    def _local_concurrency():
2286
        return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'],
2287
                                stdout=subprocess.PIPE).communicate()[0]
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2288
elif sys.platform == 'sunos5':
2289
    def _local_concurrency():
2290
        return subprocess.Popen(['psrinfo', '-p',],
2291
                                stdout=subprocess.PIPE).communicate()[0]
2292
elif sys.platform == "win32":
2293
    def _local_concurrency():
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2294
        # This appears to return the number of cores.
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2295
        return os.environ.get('NUMBER_OF_PROCESSORS')
2296
else:
2297
    def _local_concurrency():
2298
        # Who knows ?
2299
        return None
2300
2301
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2302
_cached_local_concurrency = None
2303
2304
def local_concurrency(use_cache=True):
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2305
    """Return how many processes can be run concurrently.
2306
2307
    Rely on platform specific implementations and default to 1 (one) if
2308
    anything goes wrong.
2309
    """
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2310
    global _cached_local_concurrency
4766.3.4 by Matt Nordhoff
Change the environment variable to a global option.
2311
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2312
    if _cached_local_concurrency is not None and use_cache:
2313
        return _cached_local_concurrency
2314
4766.3.7 by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available.
2315
    concurrency = os.environ.get('BZR_CONCURRENCY', None)
2316
    if concurrency is None:
2317
        try:
5677.1.3 by Jelmer Vernooij
Use try/import rather than checking python version strings.
2318
            import multiprocessing
6241.1.2 by Jelmer Vernooij
Simplify try/finally.
2319
            concurrency = multiprocessing.cpu_count()
2320
        except (ImportError, NotImplementedError):
5677.1.3 by Jelmer Vernooij
Use try/import rather than checking python version strings.
2321
            # multiprocessing is only available on Python >= 2.6
6241.1.2 by Jelmer Vernooij
Simplify try/finally.
2322
            # and multiprocessing.cpu_count() isn't implemented on all
2323
            # platforms
5677.1.3 by Jelmer Vernooij
Use try/import rather than checking python version strings.
2324
            try:
2325
                concurrency = _local_concurrency()
2326
            except (OSError, IOError):
2327
                pass
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2328
    try:
2329
        concurrency = int(concurrency)
2330
    except (TypeError, ValueError):
2331
        concurrency = 1
4398.4.4 by Vincent Ladeuil
Fixed as per John's review.
2332
    if use_cache:
2333
        _cached_concurrency = concurrency
4398.4.3 by Vincent Ladeuil
Detect # cores on win32 and Solaris too.
2334
    return concurrency
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2335
2336
4794.1.15 by Robert Collins
Review feedback.
2337
class UnicodeOrBytesToBytesWriter(codecs.StreamWriter):
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2338
    """A stream writer that doesn't decode str arguments."""
2339
4794.1.21 by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup.
2340
    def __init__(self, encode, stream, errors='strict'):
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2341
        codecs.StreamWriter.__init__(self, stream, errors)
4794.1.21 by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup.
2342
        self.encode = encode
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2343
2344
    def write(self, object):
4794.1.15 by Robert Collins
Review feedback.
2345
        if type(object) is str:
4794.1.12 by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str).
2346
            self.stream.write(object)
2347
        else:
2348
            data, _ = self.encode(object, self.errors)
2349
            self.stream.write(data)
4797.2.27 by Vincent Ladeuil
Merge 2.0 into 2.1 including fix for #524560
2350
4634.140.4 by INADA Naoki
Fix easy miss in previous commit.
2351
if sys.platform == 'win32':
4634.140.10 by INADA Naoki
Change name from osutils.open to osutils.open_file
2352
    def open_file(filename, mode='r', bufsize=-1):
4634.140.13 by Vincent Ladeuil
Fix some typos and add a NEWS entry.
2353
        """This function is used to override the ``open`` builtin.
5279.2.7 by Eric Moritz
1. deleted trailing whitespace
2354
4634.140.13 by Vincent Ladeuil
Fix some typos and add a NEWS entry.
2355
        But it uses O_NOINHERIT flag so the file handle is not inherited by
2356
        child processes.  Deleting or renaming a closed file opened with this
2357
        function is not blocking child processes.
4634.140.6 by INADA Naoki
Add comment to osutils.open()
2358
        """
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2359
        writing = 'w' in mode
2360
        appending = 'a' in mode
2361
        updating = '+' in mode
2362
        binary = 'b' in mode
2363
4634.140.12 by INADA Naoki
small clean up.
2364
        flags = O_NOINHERIT
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2365
        # see http://msdn.microsoft.com/en-us/library/yeby3zcb%28VS.71%29.aspx
2366
        # for flags for each modes.
2367
        if binary:
4634.140.12 by INADA Naoki
small clean up.
2368
            flags |= O_BINARY
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2369
        else:
4634.140.12 by INADA Naoki
small clean up.
2370
            flags |= O_TEXT
4634.140.9 by INADA Naoki
Revert to previous implementation using os.fdopen(os.open())
2371
2372
        if writing:
2373
            if updating:
2374
                flags |= os.O_RDWR
2375
            else:
2376
                flags |= os.O_WRONLY
2377
            flags |= os.O_CREAT | os.O_TRUNC
2378
        elif appending:
2379
            if updating:
2380
                flags |= os.O_RDWR
2381
            else:
2382
                flags |= os.O_WRONLY
2383
            flags |= os.O_CREAT | os.O_APPEND
2384
        else: #reading
2385
            if updating:
2386
                flags |= os.O_RDWR
2387
            else:
2388
                flags |= os.O_RDONLY
2389
2390
        return os.fdopen(os.open(filename, flags), mode, bufsize)
4634.140.2 by INADA Naoki
Add osutils.open() that uses O_NOINHERIT on Win32.
2391
else:
4634.140.10 by INADA Naoki
Change name from osutils.open to osutils.open_file
2392
    open_file = open
5187.2.7 by Parth Malwankar
moved getuser_unicode to osutils.
2393
2394
2395
def getuser_unicode():
2396
    """Return the username as unicode.
2397
    """
2398
    try:
2399
        user_encoding = get_user_encoding()
2400
        username = getpass.getuser().decode(user_encoding)
2401
    except UnicodeDecodeError:
2402
        raise errors.BzrError("Can't decode username as %s." % \
2403
                user_encoding)
5609.47.2 by Alexander Belchenko
getuser_unicode: catch "ImportError: No module named pwd" on Windows when bzr is running as a service.
2404
    except ImportError, e:
2405
        if sys.platform != 'win32':
2406
            raise
2407
        if str(e) != 'No module named pwd':
2408
            raise
2409
        # https://bugs.launchpad.net/bzr/+bug/660174
2410
        # getpass.getuser() is unable to return username on Windows
2411
        # if there is no USERNAME environment variable set.
2412
        # That could be true if bzr is running as a service,
2413
        # e.g. running `bzr serve` as a service on Windows.
5609.47.5 by Alexander Belchenko
fixed typo
2414
        # We should not fail with traceback in this case.
5609.47.2 by Alexander Belchenko
getuser_unicode: catch "ImportError: No module named pwd" on Windows when bzr is running as a service.
2415
        username = u'UNKNOWN'
5187.2.7 by Parth Malwankar
moved getuser_unicode to osutils.
2416
    return username
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
2417
2418
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2419
def available_backup_name(base, exists):
2420
    """Find a non-existing backup file name.
2421
5409.5.6 by Vincent Ladeuil
Add NEWS entry, tweak osutils.available_backup_name docstring.
2422
    This will *not* create anything, this only return a 'free' entry.  This
2423
    should be used for checking names in a directory below a locked
5409.5.8 by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged
2424
    tree/branch/repo to avoid race conditions. This is LBYL (Look Before You
2425
    Leap) and generally discouraged.
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2426
2427
    :param base: The base name.
5409.5.8 by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged
2428
2429
    :param exists: A callable returning True if the path parameter exists.
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2430
    """
2431
    counter = 1
2432
    name = "%s.~%d~" % (base, counter)
2433
    while exists(name):
2434
        counter += 1
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
2435
        name = "%s.~%d~" % (base, counter)
5409.5.3 by Vincent Ladeuil
Implement osutils.available_backup_name.
2436
    return name
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2437
2438
5582.6.1 by Max Bowsher
Fix socketpair-based SSH transport leaking socket into other child processes.
2439
def set_fd_cloexec(fd):
2440
    """Set a Unix file descriptor's FD_CLOEXEC flag.  Do nothing if platform
2441
    support for this is not available.
2442
    """
2443
    try:
2444
        import fcntl
2445
        old = fcntl.fcntl(fd, fcntl.F_GETFD)
2446
        fcntl.fcntl(fd, fcntl.F_SETFD, old | fcntl.FD_CLOEXEC)
2447
    except (ImportError, AttributeError):
2448
        # Either the fcntl module or specific constants are not present
2449
        pass
5321.1.114 by Gordon Tyler
Merged from bzr.dev.
2450
2451
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2452
def find_executable_on_path(name):
2453
    """Finds an executable on the PATH.
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2454
    
2455
    On Windows, this will try to append each extension in the PATHEXT
2456
    environment variable to the name, if it cannot be found with the name
2457
    as given.
2458
    
2459
    :param name: The base name of the executable.
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2460
    :return: The path to the executable found or None.
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2461
    """
2462
    path = os.environ.get('PATH')
2463
    if path is None:
5321.1.81 by Gordon Tyler
find_executable_on_path should return None when the PATH is not defined.
2464
        return None
5321.1.106 by Gordon Tyler
Fixed find_executable_on_path to properly test for executable-ness on win32 and not split the PATH for each extension in PATHEXT.
2465
    path = path.split(os.pathsep)
5321.1.105 by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32.
2466
    if sys.platform == 'win32':
2467
        exts = os.environ.get('PATHEXT', '').split(os.pathsep)
5321.1.106 by Gordon Tyler
Fixed find_executable_on_path to properly test for executable-ness on win32 and not split the PATH for each extension in PATHEXT.
2468
        exts = [ext.lower() for ext in exts]
2469
        base, ext = os.path.splitext(name)
2470
        if ext != '':
2471
            if ext.lower() not in exts:
2472
                return None
2473
            name = base
2474
            exts = [ext]
5321.1.105 by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32.
2475
    else:
2476
        exts = ['']
5321.1.79 by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature.
2477
    for ext in exts:
5321.1.106 by Gordon Tyler
Fixed find_executable_on_path to properly test for executable-ness on win32 and not split the PATH for each extension in PATHEXT.
2478
        for d in path:
2479
            f = os.path.join(d, name) + ext
2480
            if os.access(f, os.X_OK):
2481
                return f
5321.1.80 by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful.
2482
    return None
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2483
2484
2485
def _posix_is_local_pid_dead(pid):
5425.5.4 by Martin
Get docstring of _posix_is_local_pid_dead the right way round
2486
    """True if pid doesn't correspond to live process on this machine"""
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2487
    try:
2488
        # Special meaning of unix kill: just check if it's there.
2489
        os.kill(pid, 0)
2490
    except OSError, e:
2491
        if e.errno == errno.ESRCH:
2492
            # On this machine, and really not found: as sure as we can be
2493
            # that it's dead.
2494
            return True
2495
        elif e.errno == errno.EPERM:
2496
            # exists, though not ours
2497
            return False
2498
        else:
5425.4.20 by Martin Pool
Suppress failures from os.kill when just using it to check for process liveness
2499
            mutter("os.kill(%d, 0) failed: %s" % (pid, e))
2500
            # Don't really know.
2501
            return False
5425.5.2 by Martin
Split pid deadness detection code out into osutils
2502
    else:
2503
        # Exists and our process: not dead.
2504
        return False
2505
5425.5.5 by Martin
Quick implementation of dead process detection on win32
2506
if sys.platform == "win32":
2507
    is_local_pid_dead = win32utils.is_local_pid_dead
2508
else:
2509
    is_local_pid_dead = _posix_is_local_pid_dead
6006.4.8 by Martin Pool
Use fsync when fdatasync is not available
2510
2511
2512
def fdatasync(fileno):
2513
    """Flush file contents to disk if possible.
2514
    
2515
    :param fileno: Integer OS file handle.
2516
    :raises TransportNotPossible: If flushing to disk is not possible.
2517
    """
2518
    fn = getattr(os, 'fdatasync', getattr(os, 'fsync', None))
2519
    if fn is not None:
2520
        fn(fileno)