~bzr-pqm/bzr/bzr.dev

4183.6.4 by Martin Pool
Separate out re_compile_checked
1
# Copyright (C) 2005, 2006, 2007, 2009 Canonical Ltd
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
17
import os
18
import re
19
import stat
20
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
21
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
22
import sys
23
import time
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
3368.2.49 by Ian Clatworthy
added osutils.size_sha_file() with tests
600
def size_sha_file(f):
601
    """Calculate the size and hexdigest of an open file.
602
603
    The file cursor should be already at the start and
604
    the caller is responsible for closing the file afterwards.
605
    """
606
    size = 0
607
    s = sha()
608
    BUFSIZE = 128<<10
609
    while True:
610
        b = f.read(BUFSIZE)
611
        if not b:
612
            break
613
        size += len(b)
614
        s.update(b)
615
    return size, s.hexdigest()
616
617
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
618
def sha_file_by_name(fname):
619
    """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).
620
    s = sha()
2922.1.1 by John Arbash Meinel
Fix bug #153493, use O_BINARY when reading files.
621
    f = os.open(fname, os.O_RDONLY | O_BINARY)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
622
    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
623
        while True:
624
            b = os.read(f, 1<<16)
625
            if not b:
626
                return s.hexdigest()
627
            s.update(b)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
628
    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
629
        os.close(f)
2872.3.1 by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code
630
631
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
632
def sha_strings(strings, _factory=sha):
1235 by Martin Pool
- split sha_strings into osutils
633
    """Return the sha-1 of concatenation of strings"""
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
634
    s = _factory()
1235 by Martin Pool
- split sha_strings into osutils
635
    map(s.update, strings)
636
    return s.hexdigest()
637
638
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
639
def sha_string(f, _factory=sha):
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
640
    return _factory(f).hexdigest()
1 by mbp at sourcefrog
import from baz patch-364
641
642
124 by mbp at sourcefrog
- check file text for past revisions is correct
643
def fingerprint_file(f):
126 by mbp at sourcefrog
Use just one big read to fingerprint files
644
    b = f.read()
2825.2.1 by Robert Collins
Micro-tweaks to sha routines.
645
    return {'size': len(b),
2929.3.1 by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite).
646
            'sha1': sha(b).hexdigest()}
124 by mbp at sourcefrog
- check file text for past revisions is correct
647
648
1 by mbp at sourcefrog
import from baz patch-364
649
def compare_files(a, b):
650
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
651
    BUFSIZE = 4096
652
    while True:
653
        ai = a.read(BUFSIZE)
654
        bi = b.read(BUFSIZE)
655
        if ai != bi:
656
            return False
657
        if ai == '':
658
            return True
1 by mbp at sourcefrog
import from baz patch-364
659
660
49 by mbp at sourcefrog
fix local-time-offset calculation
661
def local_time_offset(t=None):
662
    """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'.
663
    if t is None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
664
        t = time.time()
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
665
    offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)
666
    return offset.days * 86400 + offset.seconds
8 by mbp at sourcefrog
store committer's timezone in revision and show
667
3512.3.1 by Martin von Gagern
Hand-selected minimalistic set of changes from my setlocale branch.
668
weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
669
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
670
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.
671
                show_offset=True):
2425.6.2 by Martin Pool
Make timestamps use existing format_date; document that function more
672
    """Return a formatted date string.
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.
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
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_fmt = date_fmt.replace('%a', weekdays[tt[6]])
685
    date_str = time.strftime(date_fmt, tt)
686
    return date_str + offset_str
687
688
def format_local_date(t, offset=0, timezone='original', date_fmt=None,
689
                      show_offset=True):
690
    """Return an unicode date string formatted according to the current locale.
691
692
    :param t: Seconds since the epoch.
693
    :param offset: Timezone offset in seconds east of utc.
694
    :param timezone: How to display the time: 'utc', 'original' for the
695
         timezone specified by offset, or 'local' for the process's current
696
         timezone.
697
    :param date_fmt: strftime format.
698
    :param show_offset: Whether to append the timezone.
699
    """
700
    (date_fmt, tt, offset_str) = \
701
               _format_date(t, offset, timezone, date_fmt, show_offset)
702
    date_str = time.strftime(date_fmt, tt)
703
    if not isinstance(date_str, unicode):
704
        date_str = date_str.decode(bzrlib.user_encoding, 'replace')
705
    return date_str + offset_str
706
707
def _format_date(t, offset, timezone, date_fmt, show_offset):
8 by mbp at sourcefrog
store committer's timezone in revision and show
708
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
709
        tt = time.gmtime(t)
710
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
711
    elif timezone == 'original':
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
712
        if offset is None:
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
713
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
714
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
715
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
716
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
717
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
718
    else:
3144.1.1 by Lukáš Lalinský
Fixed error reporting of unsupported timezone format.
719
        raise errors.UnsupportedTimezoneFormat(timezone)
1185.12.24 by Aaron Bentley
Made format_date more flexible
720
    if date_fmt is None:
721
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
722
    if show_offset:
723
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
724
    else:
725
        offset_str = ''
3526.5.4 by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode.
726
    return (date_fmt, tt, offset_str)
1 by mbp at sourcefrog
import from baz patch-364
727
728
729
def compact_date(when):
730
    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
731
1 by mbp at sourcefrog
import from baz patch-364
732
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
733
def format_delta(delta):
734
    """Get a nice looking string for a time delta.
735
736
    :param delta: The time difference in seconds, can be positive or negative.
737
        positive indicates time in the past, negative indicates time in the
738
        future. (usually time.time() - stored_time)
739
    :return: String formatted to show approximate resolution
740
    """
741
    delta = int(delta)
742
    if delta >= 0:
743
        direction = 'ago'
744
    else:
745
        direction = 'in the future'
746
        delta = -delta
747
748
    seconds = delta
749
    if seconds < 90: # print seconds up to 90 seconds
750
        if seconds == 1:
751
            return '%d second %s' % (seconds, direction,)
752
        else:
753
            return '%d seconds %s' % (seconds, direction)
754
755
    minutes = int(seconds / 60)
756
    seconds -= 60 * minutes
757
    if seconds == 1:
758
        plural_seconds = ''
759
    else:
760
        plural_seconds = 's'
761
    if minutes < 90: # print minutes, seconds up to 90 minutes
762
        if minutes == 1:
763
            return '%d minute, %d second%s %s' % (
764
                    minutes, seconds, plural_seconds, direction)
765
        else:
766
            return '%d minutes, %d second%s %s' % (
767
                    minutes, seconds, plural_seconds, direction)
768
769
    hours = int(minutes / 60)
770
    minutes -= 60 * hours
771
    if minutes == 1:
772
        plural_minutes = ''
773
    else:
774
        plural_minutes = 's'
775
776
    if hours == 1:
777
        return '%d hour, %d minute%s %s' % (hours, minutes,
778
                                            plural_minutes, direction)
779
    return '%d hours, %d minute%s %s' % (hours, minutes,
780
                                         plural_minutes, direction)
1 by mbp at sourcefrog
import from baz patch-364
781
782
def filesize(f):
783
    """Return size of given open file."""
784
    return os.fstat(f.fileno())[ST_SIZE]
785
1553.5.5 by Martin Pool
New utility routine rand_chars
786
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
787
# Define rand_bytes based on platform.
788
try:
789
    # Python 2.4 and later have os.urandom,
790
    # but it doesn't work on some arches
791
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
792
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
793
except (NotImplementedError, AttributeError):
794
    # If python doesn't have os.urandom, or it doesn't work,
795
    # 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()
796
    try:
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
797
        rand_bytes = file('/dev/urandom', 'rb').read
798
    # 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()
799
    except (IOError, OSError):
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
800
        # not well seeded, but better than nothing
801
        def rand_bytes(n):
802
            import random
803
            s = ''
804
            while n:
805
                s += chr(random.randint(0, 255))
806
                n -= 1
807
            return s
1 by mbp at sourcefrog
import from baz patch-364
808
1553.5.5 by Martin Pool
New utility routine rand_chars
809
810
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
811
def rand_chars(num):
812
    """Return a random string of num alphanumeric characters
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
813
814
    The result only contains lowercase chars because it may be used on
1553.5.5 by Martin Pool
New utility routine rand_chars
815
    case-insensitive filesystems.
816
    """
817
    s = ''
818
    for raw_byte in rand_bytes(num):
819
        s += ALNUM[ord(raw_byte) % 36]
820
    return s
821
822
1 by mbp at sourcefrog
import from baz patch-364
823
## 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.
824
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
825
826
def splitpath(p):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
827
    """Turn string into list of parts."""
271 by Martin Pool
- Windows path fixes
828
    # split on either delimiter because people might use either on
829
    # Windows
830
    ps = re.split(r'[\\/]', p)
831
832
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
833
    for f in ps:
834
        if f == '..':
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
835
            raise errors.BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
836
        elif (f == '.') or (f == ''):
837
            pass
838
        else:
839
            rps.append(f)
840
    return rps
1 by mbp at sourcefrog
import from baz patch-364
841
3890.2.4 by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format.
842
1 by mbp at sourcefrog
import from baz patch-364
843
def joinpath(p):
844
    for f in p:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
845
        if (f == '..') or (f is None) or (f == ''):
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
846
            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 \
847
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
848
849
3890.2.7 by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write.
850
try:
851
    from bzrlib._chunks_to_lines_pyx import chunks_to_lines
852
except ImportError:
3890.2.8 by John Arbash Meinel
Move everything into properly parameterized tests.
853
    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.
854
855
1231 by Martin Pool
- more progress on fetch on top of weaves
856
def split_lines(s):
857
    """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.
858
    # Trivially convert a fulltext into a 'chunked' representation, and let
859
    # chunks_to_lines do the heavy lifting.
860
    if isinstance(s, str):
861
        # chunks_to_lines only supports 8-bit strings
862
        return chunks_to_lines([s])
863
    else:
864
        return _split_lines(s)
865
866
867
def _split_lines(s):
868
    """Split s into lines, but without removing the newline characters.
869
870
    This supports Unicode or plain string objects.
871
    """
1666.1.6 by Robert Collins
Make knit the default format.
872
    lines = s.split('\n')
873
    result = [line + '\n' for line in lines[:-1]]
874
    if lines[-1]:
875
        result.append(lines[-1])
876
    return result
1391 by Robert Collins
merge from integration
877
878
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
879
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
880
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
881
1185.1.46 by Robert Collins
Aarons branch --basis patch
882
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
883
def link_or_copy(src, dest):
884
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
885
    if not hardlinks_good():
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
886
        shutil.copyfile(src, dest)
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
887
        return
888
    try:
889
        os.link(src, dest)
890
    except (OSError, IOError), e:
891
        if e.errno != errno.EXDEV:
892
            raise
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
893
        shutil.copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
894
2831.5.2 by Vincent Ladeuil
Review feedback.
895
896
# Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
897
# Forgiveness than Permission (EAFP) because:
898
# - root can damage a solaris file system by using unlink,
899
# - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
900
#   EACCES, OSX: EPERM) when invoked on a directory.
901
def delete_any(path):
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
902
    """Delete a file or directory."""
2831.5.2 by Vincent Ladeuil
Review feedback.
903
    if isdir(path): # Takes care of symlinks
904
        os.rmdir(path)
905
    else:
906
        os.unlink(path)
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
907
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
908
909
def has_symlinks():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
910
    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
911
        return True
912
    else:
913
        return False
2831.5.2 by Vincent Ladeuil
Review feedback.
914
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
915
3136.1.1 by Aaron Bentley
Add support for hardlinks to TreeTransform
916
def has_hardlinks():
917
    if getattr(os, 'link', None) is not None:
918
        return True
919
    else:
920
        return False
921
922
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
923
def host_os_dereferences_symlinks():
924
    return (has_symlinks()
3287.18.19 by Matt McClure
Changed tested sys.platform value from 'windows' (mistaken) to 'win32'
925
            and sys.platform not in ('cygwin', 'win32'))
3287.18.14 by Matt McClure
Extracted a host_os_dereferences_symlinks method.
926
927
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
928
def contains_whitespace(s):
929
    """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.
930
    # string.whitespace can include '\xa0' in certain locales, because it is
931
    # considered "non-breaking-space" as part of ISO-8859-1. But it
932
    # 1) Isn't a breaking whitespace
933
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
934
    #    separators
935
    # 3) '\xa0' isn't unicode safe since it is >128.
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
936
937
    # This should *not* be a unicode set of characters in case the source
938
    # string is not a Unicode string. We can auto-up-cast the characters since
939
    # they are ascii, but we don't want to auto-up-cast the string in case it
940
    # is utf-8
941
    for ch in ' \t\n\r\v\f':
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
942
        if ch in s:
943
            return True
944
    else:
945
        return False
946
947
948
def contains_linebreaks(s):
949
    """True if there is any vertical whitespace in s."""
950
    for ch in '\f\n\r':
951
        if ch in s:
952
            return True
953
    else:
954
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
955
956
957
def relpath(base, path):
958
    """Return path relative to base, or raise exception.
959
960
    The path may be either an absolute path or a path relative to the
961
    current working directory.
962
963
    os.path.commonprefix (python2.4) has a bad bug that it works just
964
    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.
965
    avoids that problem.
966
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
967
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
968
    if len(base) < MIN_ABS_PATHLENGTH:
969
        # must have space for e.g. a drive letter
970
        raise ValueError('%r is too short to calculate a relative path'
971
            % (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
972
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
973
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
974
975
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
976
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
977
    while len(head) >= len(base):
978
        if head == base:
979
            break
980
        head, tail = os.path.split(head)
981
        if tail:
982
            s.insert(0, tail)
983
    else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
984
        raise errors.PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
985
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
986
    if s:
987
        return pathjoin(*s)
988
    else:
989
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
990
991
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
992
def _cicp_canonical_relpath(base, path):
3794.5.1 by Mark Hammond
Add canonical_relpath api function
993
    """Return the canonical path relative to base.
994
995
    Like relpath, but on case-insensitive-case-preserving file-systems, this
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
996
    will return the relpath as stored on the file-system rather than in the
997
    case specified in the input string, for all existing portions of the path.
998
3794.5.28 by Mark Hammond
Update comments.
999
    This will cause O(N) behaviour if called for every path in a tree; if you
1000
    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.
1001
    """
1002
    # TODO: it should be possible to optimize this for Windows by using the
1003
    # win32 API FindFiles function to look for the specified name - but using
1004
    # os.listdir() still gives us the correct, platform agnostic semantics in
1005
    # the short term.
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1006
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1007
    rel = relpath(base, path)
1008
    # '.' will have been turned into ''
1009
    if not rel:
1010
        return rel
1011
1012
    abs_base = abspath(base)
1013
    current = abs_base
1014
    _listdir = os.listdir
1015
1016
    # 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.
1017
    bit_iter = iter(rel.split('/'))
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1018
    for bit in bit_iter:
1019
        lbit = bit.lower()
1020
        for look in _listdir(current):
1021
            if lbit == look.lower():
1022
                current = pathjoin(current, look)
1023
                break
1024
        else:
1025
            # got to the end, nothing matched, so we just return the
1026
            # non-existing bits as they were specified (the filename may be
1027
            # the target of a move, for example).
1028
            current = pathjoin(current, bit, *list(bit_iter))
1029
            break
1030
    return current[len(abs_base)+1:]
1031
3794.5.13 by Mark Hammond
Tweaks suggested by Martin
1032
# XXX - TODO - we need better detection/integration of case-insensitive
4241.9.5 by Vincent Ladeuil
Fix unicode related OSX failures.
1033
# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
1034
# filesystems), for example, so could probably benefit from the same basic
1035
# support there.  For now though, only Windows and OSX get that support, and
1036
# they get it for *all* file-systems!
4241.9.2 by Vincent Ladeuil
Fix most of cicp related failures on OSX.
1037
if sys.platform in ('win32', 'darwin'):
3794.5.29 by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath
1038
    canonical_relpath = _cicp_canonical_relpath
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1039
else:
1040
    canonical_relpath = relpath
1041
3794.5.15 by Mark Hammond
Add canonical_relpaths() as a placeholder for a future caching implementation.
1042
def canonical_relpaths(base, paths):
1043
    """Create an iterable to canonicalize a sequence of relative paths.
1044
1045
    The intent is for this implementation to use a cache, vastly speeding
1046
    up multiple transformations in the same directory.
1047
    """
1048
    # but for now, we haven't optimized...
1049
    return [canonical_relpath(base, p) for p in paths]
3794.5.1 by Mark Hammond
Add canonical_relpath api function
1050
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1051
def safe_unicode(unicode_or_utf8_string):
1052
    """Coerce unicode_or_utf8_string into unicode.
1053
1054
    If it is unicode, it is returned.
4204.2.1 by Matt Nordhoff
Fix a broken sentence in osutils.safe_unicode's docstring
1055
    Otherwise it is decoded from utf-8. If decoding fails, the exception is
1056
    wrapped in a BzrBadParameterNotUnicode exception.
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1057
    """
1058
    if isinstance(unicode_or_utf8_string, unicode):
1059
        return unicode_or_utf8_string
1060
    try:
1061
        return unicode_or_utf8_string.decode('utf8')
1062
    except UnicodeDecodeError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1063
        raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
1064
1065
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
1066
def safe_utf8(unicode_or_utf8_string):
1067
    """Coerce unicode_or_utf8_string to a utf8 string.
1068
1069
    If it is a str, it is returned.
1070
    If it is Unicode, it is encoded into a utf-8 string.
1071
    """
1072
    if isinstance(unicode_or_utf8_string, str):
1073
        # TODO: jam 20070209 This is overkill, and probably has an impact on
1074
        #       performance if we are dealing with lots of apis that want a
1075
        #       utf-8 revision id
1076
        try:
1077
            # Make sure it is a valid utf-8 string
1078
            unicode_or_utf8_string.decode('utf-8')
1079
        except UnicodeDecodeError:
1080
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1081
        return unicode_or_utf8_string
1082
    return unicode_or_utf8_string.encode('utf-8')
1083
1084
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1085
_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.'
1086
                        ' Revision id generators should be creating utf8'
1087
                        ' revision ids.')
1088
1089
1090
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.
1091
    """Revision ids should now be utf8, but at one point they were unicode.
1092
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1093
    :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
1094
        utf8 or None).
1095
    :param warn: Functions that are sanitizing user data can set warn=False
1096
    :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.
1097
    """
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1098
    if (unicode_or_utf8_string is None
1099
        or unicode_or_utf8_string.__class__ == str):
1100
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1101
    if warn:
1102
        symbol_versioning.warn(_revision_id_warning, DeprecationWarning,
1103
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1104
    return cache_utf8.encode(unicode_or_utf8_string)
1105
1106
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1107
_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id'
1108
                    ' generators should be creating utf8 file ids.')
1109
1110
1111
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.
1112
    """File ids should now be utf8, but at one point they were unicode.
1113
1114
    This is the same as safe_utf8, except it uses the cached encode functions
1115
    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.
1116
1117
    :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
1118
        utf8 or None).
1119
    :param warn: Functions that are sanitizing user data can set warn=False
1120
    :return: None or a utf8 file id.
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1121
    """
1122
    if (unicode_or_utf8_string is None
1123
        or unicode_or_utf8_string.__class__ == str):
1124
        return unicode_or_utf8_string
2309.4.4 by John Arbash Meinel
Change what warnings are raised, and add tests that they are used.
1125
    if warn:
1126
        symbol_versioning.warn(_file_id_warning, DeprecationWarning,
1127
                               stacklevel=2)
2309.4.3 by John Arbash Meinel
(broken) change safe_*_id to emit a warning.
1128
    return cache_utf8.encode(unicode_or_utf8_string)
2294.1.4 by John Arbash Meinel
Add safe_file_id as a helper in osutils.
1129
1130
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1131
_platform_normalizes_filenames = False
1132
if sys.platform == 'darwin':
1133
    _platform_normalizes_filenames = True
1134
1135
1136
def normalizes_filenames():
1137
    """Return True if this platform normalizes unicode filenames.
1138
1139
    Mac OSX does, Windows/Linux do not.
1140
    """
1141
    return _platform_normalizes_filenames
1142
1143
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1144
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
1145
    """Get the unicode normalized path, and if you can access the file.
1146
1147
    On platforms where the system normalizes filenames (Mac OSX),
1148
    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
1149
    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
1150
    (Windows, Linux), you have to access a file by its exact path.
1151
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1152
    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
1153
    the standard for XML documents.
1154
1155
    So return the normalized path, and a flag indicating if the file
1156
    can be accessed by that path.
1157
    """
1158
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1159
    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
1160
1161
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1162
def _inaccessible_normalized_filename(path):
1163
    __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
1164
3201.1.1 by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC
1165
    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
1166
    return normalized, normalized == path
1167
1168
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1169
if _platform_normalizes_filenames:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1170
    normalized_filename = _accessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1171
else:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
1172
    normalized_filename = _inaccessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
1173
1174
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1175
def terminal_width():
1176
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
1177
    if sys.platform == 'win32':
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
1178
        return win32utils.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1179
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
1180
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
1181
        import struct, fcntl, termios
1182
        s = struct.pack('HHHH', 0, 0, 0, 0)
1183
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
1184
        width = struct.unpack('HHHH', x)[1]
1185
    except IOError:
1186
        pass
1187
    if width <= 0:
1188
        try:
1189
            width = int(os.environ['COLUMNS'])
1190
        except:
1191
            pass
1192
    if width <= 0:
1193
        width = 80
1194
1195
    return width
1534.7.25 by Aaron Bentley
Added set_executability
1196
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1197
1534.7.25 by Aaron Bentley
Added set_executability
1198
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
1199
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
1200
1201
1551.10.4 by Aaron Bentley
Update to skip on win32
1202
def supports_posix_readonly():
1203
    """Return True if 'readonly' has POSIX semantics, False otherwise.
1204
1205
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
1206
    directory controls creation/deletion, etc.
1207
1208
    And under win32, readonly means that the directory itself cannot be
1209
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
1210
    where files in readonly directories cannot be added, deleted or renamed.
1211
    """
1212
    return sys.platform != "win32"
1213
1214
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1215
def set_or_unset_env(env_variable, value):
1216
    """Modify the environment, setting or removing the env_variable.
1217
1218
    :param env_variable: The environment variable in question
1219
    :param value: The value to set the environment to. If None, then
1220
        the variable will be removed.
1221
    :return: The original value of the environment variable.
1222
    """
1223
    orig_val = os.environ.get(env_variable)
1224
    if value is None:
1225
        if orig_val is not None:
1226
            del os.environ[env_variable]
1227
    else:
1228
        if isinstance(value, unicode):
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
1229
            value = value.encode(get_user_encoding())
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1230
        os.environ[env_variable] = value
1231
    return orig_val
1232
1233
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1234
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
1235
1236
1237
def check_legal_path(path):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1238
    """Check whether the supplied path is legal.
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1239
    This is only required on Windows, so we don't test on other platforms
1240
    right now.
1241
    """
1242
    if sys.platform != "win32":
1243
        return
1244
    if _validWin32PathRE.match(path) is None:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1245
        raise errors.IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1246
1247
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1248
_WIN32_ERROR_DIRECTORY = 267 # Similar to errno.ENOTDIR
1249
1250
def _is_error_enotdir(e):
1251
    """Check if this exception represents ENOTDIR.
1252
1253
    Unfortunately, python is very inconsistent about the exception
1254
    here. The cases are:
1255
      1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
1256
      2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
1257
         which is the windows error code.
1258
      3) Windows, Python2.5 uses errno == EINVAL and
1259
         winerror == ERROR_DIRECTORY
1260
1261
    :param e: An Exception object (expected to be OSError with an errno
1262
        attribute, but we should be able to cope with anything)
1263
    :return: True if this represents an ENOTDIR error. False otherwise.
1264
    """
1265
    en = getattr(e, 'errno', None)
1266
    if (en == errno.ENOTDIR
1267
        or (sys.platform == 'win32'
1268
            and (en == _WIN32_ERROR_DIRECTORY
1269
                 or (en == errno.EINVAL
1270
                     and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY)
1271
        ))):
1272
        return True
1273
    return False
1274
1275
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
1276
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1277
    """Yield data about all the directories in a tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1278
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1279
    This yields all the data about the contents of a directory at a time.
1280
    After each directory has been yielded, if the caller has mutated the list
1281
    to exclude some directories, they are then not descended into.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1282
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1283
    The data yielded is of the form:
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1284
    ((directory-relpath, directory-path-from-top),
2694.4.1 by Alexander Belchenko
trivial fix for docstring of osutils.walkdirs()
1285
    [(relpath, basename, kind, lstat, path-from-top), ...]),
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1286
     - directory-relpath is the relative path of the directory being returned
1287
       with respect to top. prefix is prepended to this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1288
     - directory-path-from-root is the path including top for this directory.
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1289
       It is suitable for use with os functions.
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1290
     - relpath is the relative path within the subtree being walked.
1291
     - basename is the basename of the path
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1292
     - 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.
1293
       present within the tree - but it may be recorded as versioned. See
1294
       versioned_kind.
1295
     - lstat is the stat data *if* the file was statted.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1296
     - planned, not implemented:
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1297
       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.
1298
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1299
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This
1757.2.16 by Robert Collins
Review comments.
1300
        allows one to walk a subtree but get paths that are relative to a tree
1301
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1302
    :return: an iterator over the dirs.
1303
    """
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1304
    #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
1305
    # 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.
1306
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
1307
    # potentially confusing output. We should make this more robust - but
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1308
    # 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%
1309
    _lstat = os.lstat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1310
    _directory = _directory_kind
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1311
    _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)
1312
    _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.
1313
    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.
1314
    while pending:
1315
        # 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%
1316
        relroot, _, _, _, top = pending.pop()
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1317
        if relroot:
1318
            relprefix = relroot + u'/'
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1319
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1320
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1321
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1322
1323
        dirblock = []
1324
        append = dirblock.append
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1325
        try:
1326
            names = sorted(_listdir(top))
3596.2.2 by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it
1327
        except OSError, e:
1328
            if not _is_error_enotdir(e):
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1329
                raise
1330
        else:
1331
            for name in names:
1332
                abspath = top_slash + name
1333
                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)
1334
                kind = _kind_from_mode(statvalue.st_mode)
3585.2.4 by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not
1335
                append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1336
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1337
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1338
        # push the user specified dirs from dirblock
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1339
        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.
1340
1341
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1342
class DirReader(object):
1343
    """An interface for reading directories."""
1344
1345
    def top_prefix_to_starting_dir(self, top, prefix=""):
1346
        """Converts top and prefix to a starting dir entry
1347
1348
        :param top: A utf8 path
1349
        :param prefix: An optional utf8 path to prefix output relative paths
1350
            with.
1351
        :return: A tuple starting with prefix, and ending with the native
1352
            encoding of top.
1353
        """
1354
        raise NotImplementedError(self.top_prefix_to_starting_dir)
1355
1356
    def read_dir(self, prefix, top):
1357
        """Read a specific dir.
1358
1359
        :param prefix: A utf8 prefix to be preprended to the path basenames.
1360
        :param top: A natively encoded path to read.
3696.3.10 by Robert Collins
Review feedback.
1361
        :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.
1362
            (utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
1363
        """
1364
        raise NotImplementedError(self.read_dir)
1365
1366
1367
_selected_dir_reader = None
1368
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1369
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
1370
def _walkdirs_utf8(top, prefix=""):
1371
    """Yield data about all the directories in a tree.
1372
1373
    This yields the same information as walkdirs() only each entry is yielded
1374
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
1375
    are returned as exact byte-strings.
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1376
1377
    :return: yields a tuple of (dir_info, [file_info])
1378
        dir_info is (utf8_relpath, path-from-top)
1379
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
1380
        if top is an absolute path, path-from-top is also an absolute path.
1381
        path-from-top might be unicode or utf8, but it is the correct path to
1382
        pass to os functions to affect the file in question. (such as os.lstat)
1383
    """
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1384
    global _selected_dir_reader
1385
    if _selected_dir_reader is None:
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1386
        fs_encoding = _fs_enc.upper()
3224.5.17 by Andrew Bennetts
Avoid importing win32utils when sys.platform != win32
1387
        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'
1388
            # Win98 doesn't have unicode apis like FindFirstFileW
1389
            # TODO: We possibly could support Win98 by falling back to the
1390
            #       original FindFirstFile, and using TCHAR instead of WCHAR,
1391
            #       but that gets a bit tricky, and requires custom compiling
1392
            #       for win98 anyway.
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1393
            try:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1394
                from bzrlib._walkdirs_win32 import Win32ReadDir
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1395
            except ImportError:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1396
                _selected_dir_reader = UnicodeDirReader()
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1397
            else:
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1398
                _selected_dir_reader = Win32ReadDir()
3557.2.3 by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation,
1399
        elif fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'):
1400
            # 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.
1401
            _selected_dir_reader = UnicodeDirReader()
3504.4.5 by John Arbash Meinel
Add tests to ensure that you can skip subdirs, start exposing the function.
1402
        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)
1403
            try:
1404
                from bzrlib._readdir_pyx import UTF8DirReader
1405
            except ImportError:
1406
                # No optimised code path
1407
                _selected_dir_reader = UnicodeDirReader()
1408
            else:
1409
                _selected_dir_reader = UTF8DirReader()
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1410
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
1411
    # 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)
1412
    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.
1413
    read_dir = _selected_dir_reader.read_dir
1414
    _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
1415
    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)
1416
        relroot, _, _, _, top = pending[-1].pop()
1417
        if not pending[-1]:
1418
            pending.pop()
1419
        dirblock = sorted(read_dir(relroot, top))
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1420
        yield (relroot, top), dirblock
1421
        # 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)
1422
        next = [d for d in reversed(dirblock) if d[2] == _directory]
1423
        if next:
1424
            pending.append(next)
3696.3.1 by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future.
1425
1426
1427
class UnicodeDirReader(DirReader):
1428
    """A dir reader for non-utf8 file systems, which transcodes."""
1429
1430
    __slots__ = ['_utf8_encode']
1431
1432
    def __init__(self):
1433
        self._utf8_encode = codecs.getencoder('utf8')
1434
1435
    def top_prefix_to_starting_dir(self, top, prefix=""):
1436
        """See DirReader.top_prefix_to_starting_dir."""
1437
        return (safe_utf8(prefix), None, None, None, safe_unicode(top))
1438
1439
    def read_dir(self, prefix, top):
1440
        """Read a single directory from a non-utf8 file system.
1441
1442
        top, and the abspath element in the output are unicode, all other paths
1443
        are utf8. Local disk IO is done via unicode calls to listdir etc.
1444
1445
        This is currently the fallback code path when the filesystem encoding is
1446
        not UTF-8. It may be better to implement an alternative so that we can
1447
        safely handle paths that are not properly decodable in the current
1448
        encoding.
1449
1450
        See DirReader.read_dir for details.
1451
        """
1452
        _utf8_encode = self._utf8_encode
1453
        _lstat = os.lstat
1454
        _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)
1455
        _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.
1456
1457
        if prefix:
1458
            relprefix = prefix + '/'
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1459
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1460
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1461
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1462
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1463
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1464
        append = dirblock.append
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1465
        for name in sorted(_listdir(top)):
3696.3.12 by Robert Collins
Fix PQM test failure.
1466
            try:
1467
                name_utf8 = _utf8_encode(name)[0]
1468
            except UnicodeDecodeError:
1469
                raise errors.BadFilenameEncoding(
1470
                    _utf8_encode(relprefix)[0] + name, _fs_enc)
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1471
            abspath = top_slash + name
1472
            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)
1473
            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%
1474
            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.
1475
        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
1476
1477
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1478
def copy_tree(from_path, to_path, handlers={}):
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1479
    """Copy all of the entries in from_path into to_path.
1480
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1481
    :param from_path: The base directory to copy.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1482
    :param to_path: The target directory. If it does not exist, it will
1483
        be created.
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1484
    :param handlers: A dictionary of functions, which takes a source and
1485
        destinations for files, directories, etc.
1486
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
1487
        'file', 'directory', and 'symlink' should always exist.
1488
        If they are missing, they will be replaced with 'os.mkdir()',
1489
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1490
    """
1491
    # Now, just copy the existing cached tree to the new location
1492
    # We use a cheap trick here.
1493
    # Absolute paths are prefixed with the first parameter
1494
    # relative paths are prefixed with the second.
1495
    # So we can get both the source and target returned
1496
    # without any extra work.
1497
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1498
    def copy_dir(source, dest):
1499
        os.mkdir(dest)
1500
1501
    def copy_link(source, dest):
1502
        """Copy the contents of a symlink"""
1503
        link_to = os.readlink(source)
1504
        os.symlink(link_to, dest)
1505
1506
    real_handlers = {'file':shutil.copy2,
1507
                     'symlink':copy_link,
1508
                     'directory':copy_dir,
1509
                    }
1510
    real_handlers.update(handlers)
1511
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1512
    if not os.path.exists(to_path):
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1513
        real_handlers['directory'](from_path, to_path)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1514
1515
    for dir_info, entries in walkdirs(from_path, prefix=to_path):
1516
        for relpath, name, kind, st, abspath in entries:
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1517
            real_handlers[kind](abspath, relpath)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1518
1519
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1520
def path_prefix_key(path):
1521
    """Generate a prefix-order path key for path.
1522
1523
    This can be used to sort paths in the same way that walkdirs does.
1524
    """
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.
1525
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1526
1527
1528
def compare_paths_prefix_order(path_a, path_b):
1529
    """Compare path_a and path_b to generate the same order walkdirs uses."""
1530
    key_a = path_prefix_key(path_a)
1531
    key_b = path_prefix_key(path_b)
1532
    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
1533
1534
1535
_cached_user_encoding = None
1536
1537
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1538
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
1539
    """Find out what the preferred user encoding is.
1540
1541
    This is generally the encoding that is used for command line parameters
1542
    and file contents. This may be different from the terminal encoding
1543
    or the filesystem encoding.
1544
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1545
    :param  use_cache:  Enable cache for detected encoding.
1546
                        (This parameter is turned on by default,
1547
                        and required only for selftesting)
1548
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1549
    :return: A string defining the preferred user encoding
1550
    """
1551
    global _cached_user_encoding
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1552
    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
1553
        return _cached_user_encoding
1554
1555
    if sys.platform == 'darwin':
3638.3.10 by Vincent Ladeuil
Provides a better default encoding on OSX.
1556
        # python locale.getpreferredencoding() always return
1557
        # '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
1558
        sys.platform = 'posix'
1559
        try:
3638.3.10 by Vincent Ladeuil
Provides a better default encoding on OSX.
1560
            if os.environ.get('LANG', None) is None:
1561
                # If LANG is not set, we end up with 'ascii', which is bad
1562
                # ('mac-roman' is more than ascii), so we set a default which
1563
                # will give us UTF-8 (which appears to work in all cases on
1564
                # OSX). Users are still free to override LANG of course, as
1565
                # long as it give us something meaningful. This work-around
1566
                # *may* not be needed with python 3k and/or OSX 10.5, but will
1567
                # work with them too -- vila 20080908
1568
                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
1569
            import locale
1570
        finally:
1571
            sys.platform = 'darwin'
1572
    else:
1573
        import locale
1574
1575
    try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1576
        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
1577
    except locale.Error, e:
1955.2.3 by John Arbash Meinel
Change error message text
1578
        sys.stderr.write('bzr: warning: %s\n'
2001.2.1 by Jelmer Vernooij
Fix typo in encoding warning.
1579
                         '  Could not determine what text encoding to use.\n'
1955.2.3 by John Arbash Meinel
Change error message text
1580
                         '  This error usually means your Python interpreter\n'
1581
                         '  doesn\'t support the locale set by $LANG (%s)\n'
1582
                         "  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
1583
                         % (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
1584
        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
1585
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
1586
    # Windows returns 'cp0' to indicate there is no code page. So we'll just
1587
    # treat that as ASCII, and not support printing unicode characters to the
1588
    # console.
3405.3.1 by Neil Martinsen-Burrell
accept for an encoding to mean ascii
1589
    #
1590
    # For python scripts run under vim, we get '', so also treat that as ASCII
1591
    if user_encoding in (None, 'cp0', ''):
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1592
        user_encoding = 'ascii'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1593
    else:
1594
        # check encoding
1595
        try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1596
            codecs.lookup(user_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1597
        except LookupError:
1598
            sys.stderr.write('bzr: warning:'
1599
                             ' unknown encoding %s.'
1600
                             ' Continuing with ascii encoding.\n'
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1601
                             % user_encoding
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1602
                            )
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1603
            user_encoding = 'ascii'
1604
1605
    if use_cache:
1606
        _cached_user_encoding = user_encoding
1607
1608
    return user_encoding
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
1609
1610
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
1611
def get_host_name():
3626.1.4 by John Arbash Meinel
Document the difference in get_host_name, per Robert's request.
1612
    """Return the current unicode host name.
1613
1614
    This is meant to be used in place of socket.gethostname() because that
1615
    behaves inconsistently on different platforms.
1616
    """
3626.1.1 by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent
1617
    if sys.platform == "win32":
1618
        import win32utils
1619
        return win32utils.get_host_name()
1620
    else:
1621
        import socket
1622
        return socket.gethostname().decode(get_user_encoding())
1623
1624
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
1625
def recv_all(socket, bytes):
1626
    """Receive an exact number of bytes.
1627
1628
    Regular Socket.recv() may return less than the requested number of bytes,
1629
    dependning on what's in the OS buffer.  MSG_WAITALL is not available
1630
    on all platforms, but this should work everywhere.  This will return
1631
    less than the requested amount if the remote end closes.
1632
1633
    This isn't optimized and is intended mostly for use in testing.
1634
    """
1635
    b = ''
1636
    while len(b) < bytes:
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
1637
        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
1638
        if new == '':
1639
            break # eof
1640
        b += new
1641
    return b
1642
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
1643
3958.1.5 by Andrew Bennetts
Remove unnecessary 'direction' argument to osutils.send_all.
1644
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.
1645
    """Send all bytes on a socket.
1646
1647
    Regular socket.sendall() can give socket error 10053 on Windows.  This
1648
    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.
1649
1650
    :param report_activity: Call this as bytes are read, see
1651
        Transport._report_activity
3118.2.1 by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.
1652
    """
1653
    chunk_size = 2**16
1654
    for pos in xrange(0, len(bytes), chunk_size):
3958.1.1 by Andrew Bennetts
Report traffic on smart media as transport activity.
1655
        block = bytes[pos:pos+chunk_size]
1656
        if report_activity is not None:
3958.1.5 by Andrew Bennetts
Remove unnecessary 'direction' argument to osutils.send_all.
1657
            report_activity(len(block), 'write')
3958.1.1 by Andrew Bennetts
Report traffic on smart media as transport activity.
1658
        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.
1659
1660
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
1661
def dereference_path(path):
1662
    """Determine the real path to a file.
1663
1664
    All parent elements are dereferenced.  But the file itself is not
1665
    dereferenced.
1666
    :param path: The original path.  May be absolute or relative.
1667
    :return: the real path *to* the file
1668
    """
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
1669
    parent, base = os.path.split(path)
1670
    # The pathjoin for '.' is a workaround for Python bug #1213894.
1671
    # (initial path components aren't dereferenced)
1672
    return pathjoin(realpath(pathjoin('.', parent)), base)
2681.3.4 by Lukáš Lalinsky
- Rename 'windows' to 'mapi'
1673
1674
1675
def supports_mapi():
1676
    """Return True if we can use MAPI to launch a mail client."""
1677
    return sys.platform == "win32"
3089.3.8 by Ian Clatworthy
move resource loading into a reusable function
1678
1679
1680
def resource_string(package, resource_name):
1681
    """Load a resource from a package and return it as a string.
1682
1683
    Note: Only packages that start with bzrlib are currently supported.
1684
1685
    This is designed to be a lightweight implementation of resource
1686
    loading in a way which is API compatible with the same API from
1687
    pkg_resources. See
1688
    http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
1689
    If and when pkg_resources becomes a standard library, this routine
1690
    can delegate to it.
1691
    """
1692
    # Check package name is within bzrlib
1693
    if package == "bzrlib":
1694
        resource_relpath = resource_name
1695
    elif package.startswith("bzrlib."):
1696
        package = package[len("bzrlib."):].replace('.', os.sep)
1697
        resource_relpath = pathjoin(package, resource_name)
1698
    else:
1699
        raise errors.BzrError('resource package %s not in bzrlib' % package)
1700
1701
    # Map the resource to a file and read its contents
1702
    base = dirname(bzrlib.__file__)
1703
    if getattr(sys, 'frozen', None):    # bzr.exe
1704
        base = abspath(pathjoin(base, '..', '..'))
1705
    filename = pathjoin(base, resource_relpath)
1706
    return open(filename, 'rU').read()
1739.2.7 by Robert Collins
Update readdir pyrex source files and usage in line with current practice.
1707
1708
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)
1709
def file_kind_from_stat_mode_thunk(mode):
1710
    global file_kind_from_stat_mode
1711
    if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk:
1712
        try:
1713
            from bzrlib._readdir_pyx import UTF8DirReader
1714
            file_kind_from_stat_mode = UTF8DirReader().kind_from_mode
1715
        except ImportError:
1716
            from bzrlib._readdir_py import (
3696.4.8 by Robert Collins
Fix up inter_changes with dirstate both C and python.
1717
                _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)
1718
                )
1719
    return file_kind_from_stat_mode(mode)
1720
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk
1721
1722
1723
def file_kind(f, _lstat=os.lstat):
1724
    try:
1725
        return file_kind_from_stat_mode(_lstat(f).st_mode)
1726
    except OSError, e:
1727
        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
1728
            raise errors.NoSuchFile(f)
1729
        raise
1730
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
1731
1732
def until_no_eintr(f, *a, **kw):
3923.3.2 by Andrew Bennetts
Use e.errno rather than e.args[0].
1733
    """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.
1734
    # Borrowed from Twisted's twisted.python.util.untilConcludes function.
1735
    while True:
1736
        try:
1737
            return f(*a, **kw)
1738
        except (IOError, OSError), e:
3923.3.2 by Andrew Bennetts
Use e.errno rather than e.args[0].
1739
            if e.errno == errno.EINTR:
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
1740
                continue
1741
            raise
1742
4183.6.4 by Martin Pool
Separate out re_compile_checked
1743
def re_compile_checked(re_string, flags=0, where=""):
1744
    """Return a compiled re, or raise a sensible error.
1745
    
1746
    This should only be used when compiling user-supplied REs.
1747
1748
    :param re_string: Text form of regular expression.
1749
    :param flags: eg re.IGNORECASE
1750
    :param where: Message explaining to the user the context where 
1751
        it occurred, eg 'log search filter'.
1752
    """
1753
    # from https://bugs.launchpad.net/bzr/+bug/251352
1754
    try:
1755
        re_obj = re.compile(re_string, flags)
1756
        re_obj.search("")
1757
        return re_obj
1758
    except re.error, e:
1759
        if where:
1760
            where = ' in ' + where
1761
        # despite the name 'error' is a type
1762
        raise errors.BzrCommandError('Invalid regular expression%s: %r: %s'
1763
            % (where, re_string, e))
1764
3923.3.1 by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code.
1765
0.16.79 by Aaron Bentley
Remove dependencies on bzrtools
1766
if sys.platform == "win32":
1767
    import msvcrt
1768
    def getchar():
1769
        return msvcrt.getch()
1770
else:
1771
    import tty
1772
    import termios
1773
    def getchar():
1774
        fd = sys.stdin.fileno()
1775
        settings = termios.tcgetattr(fd)
1776
        try:
1777
            tty.setraw(fd)
1778
            ch = sys.stdin.read(1)
1779
        finally:
1780
            termios.tcsetattr(fd, termios.TCSADRAIN, settings)
1781
        return ch