/brz/remove-bazaar

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