~bzr-pqm/bzr/bzr.dev

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