/brz/remove-bazaar

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