/brz/remove-bazaar

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