~bzr-pqm/bzr/bzr.dev

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