~bzr-pqm/bzr/bzr.dev

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