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