~bzr-pqm/bzr/bzr.dev

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