/brz/remove-bazaar

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