~bzr-pqm/bzr/bzr.dev

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