~bzr-pqm/bzr/bzr.dev

2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1390 by Robert Collins
pair programming worx... merge integration and weave
17
from cStringIO import StringIO
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
18
import os
19
import re
20
import stat
21
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
22
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
23
import sys
24
import time
25
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
28
import codecs
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
29
from datetime import datetime
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import errno
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
31
from ntpath import (abspath as _nt_abspath,
32
                    join as _nt_join,
33
                    normpath as _nt_normpath,
34
                    realpath as _nt_realpath,
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
35
                    splitdrive as _nt_splitdrive,
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
36
                    )
37
import posixpath
1236 by Martin Pool
- fix up imports
38
import sha
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
39
import shutil
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
40
from shutil import (
41
    rmtree,
42
    )
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
43
import tempfile
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
44
from tempfile import (
45
    mkdtemp,
46
    )
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
47
import unicodedata
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
48
49
from bzrlib import (
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
50
    cache_utf8,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
51
    errors,
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
52
    win32utils,
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
53
    )
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
54
""")
1 by mbp at sourcefrog
import from baz patch-364
55
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
56
import bzrlib
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
57
from bzrlib.symbol_versioning import (
58
    deprecated_function,
59
    zero_nine,
60
    )
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
61
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
62
1 by mbp at sourcefrog
import from baz patch-364
63
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
64
# On win32, O_BINARY is used to indicate the file should
65
# be opened in binary mode, rather than text mode.
66
# On other platforms, O_BINARY doesn't exist, because
67
# they always open in binary mode, so it is okay to
68
# OR with 0 on those platforms
69
O_BINARY = getattr(os, 'O_BINARY', 0)
70
71
1 by mbp at sourcefrog
import from baz patch-364
72
def make_readonly(filename):
73
    """Make a filename read-only."""
74
    mod = os.stat(filename).st_mode
75
    mod = mod & 0777555
76
    os.chmod(filename, mod)
77
78
79
def make_writable(filename):
80
    mod = os.stat(filename).st_mode
81
    mod = mod | 0200
82
    os.chmod(filename, mod)
83
84
1077 by Martin Pool
- avoid compiling REs at module load time
85
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
86
87
1 by mbp at sourcefrog
import from baz patch-364
88
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
89
    """Return a quoted filename filename
90
91
    This previously used backslash quoting, but that works poorly on
92
    Windows."""
93
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
94
    global _QUOTE_RE
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
95
    if _QUOTE_RE is None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
96
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
1077 by Martin Pool
- avoid compiling REs at module load time
97
        
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
98
    if _QUOTE_RE.search(f):
99
        return '"' + f + '"'
100
    else:
101
        return f
1 by mbp at sourcefrog
import from baz patch-364
102
103
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
104
_directory_kind = 'directory'
105
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
106
_formats = {
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
107
    stat.S_IFDIR:_directory_kind,
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
108
    stat.S_IFCHR:'chardev',
109
    stat.S_IFBLK:'block',
110
    stat.S_IFREG:'file',
111
    stat.S_IFIFO:'fifo',
112
    stat.S_IFLNK:'symlink',
113
    stat.S_IFSOCK:'socket',
114
}
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
115
116
117
def file_kind_from_stat_mode(stat_mode, _formats=_formats, _unknown='unknown'):
118
    """Generate a file kind from a stat mode. This is used in walkdirs.
119
120
    Its performance is critical: Do not mutate without careful benchmarking.
121
    """
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
122
    try:
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
123
        return _formats[stat_mode & 0170000]
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
124
    except KeyError:
1732.1.30 by John Arbash Meinel
More file_kind tweaks. Use keyword parameters to make everything a local variable.
125
        return _unknown
488 by Martin Pool
- new helper function kind_marker()
126
127
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
128
def file_kind(f, _lstat=os.lstat, _mapper=file_kind_from_stat_mode):
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
129
    try:
130
        return _mapper(_lstat(f).st_mode)
131
    except OSError, e:
132
        if getattr(e, 'errno', None) == errno.ENOENT:
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
133
            raise errors.NoSuchFile(f)
1757.2.4 by Robert Collins
Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add.
134
        raise
135
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
136
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
137
def get_umask():
138
    """Return the current umask"""
139
    # Assume that people aren't messing with the umask while running
140
    # XXX: This is not thread safe, but there is no way to get the
141
    #      umask without setting it
142
    umask = os.umask(0)
143
    os.umask(umask)
144
    return umask
145
146
488 by Martin Pool
- new helper function kind_marker()
147
def kind_marker(kind):
148
    if kind == 'file':
149
        return ''
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
150
    elif kind == _directory_kind:
488 by Martin Pool
- new helper function kind_marker()
151
        return '/'
152
    elif kind == 'symlink':
153
        return '@'
154
    else:
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
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
157
lexists = getattr(os.path, 'lexists', None)
158
if lexists is None:
159
    def lexists(f):
160
        try:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
161
            if getattr(os, 'lstat') is not None:
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
162
                os.lstat(f)
163
            else:
164
                os.stat(f)
165
            return True
166
        except OSError,e:
167
            if e.errno == errno.ENOENT:
168
                return False;
169
            else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
170
                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
171
1 by mbp at sourcefrog
import from baz patch-364
172
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
173
def fancy_rename(old, new, rename_func, unlink_func):
174
    """A fancy rename, when you don't have atomic rename.
175
    
176
    :param old: The old path, to rename from
177
    :param new: The new path, to rename to
178
    :param rename_func: The potentially non-atomic rename function
179
    :param unlink_func: A way to delete the target file if the full rename succeeds
180
    """
181
182
    # sftp rename doesn't allow overwriting, so play tricks:
183
    import random
184
    base = os.path.basename(new)
185
    dirname = os.path.dirname(new)
1553.5.22 by Martin Pool
Change fancy_rename to use rand_chars rather than reinvent it.
186
    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.
187
    tmp_name = pathjoin(dirname, tmp_name)
188
189
    # Rename the file out of the way, but keep track if it didn't exist
190
    # We don't want to grab just any exception
191
    # something like EACCES should prevent us from continuing
192
    # The downside is that the rename_func has to throw an exception
193
    # with an errno = ENOENT, or NoSuchFile
194
    file_existed = False
195
    try:
196
        rename_func(new, tmp_name)
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
197
    except (errors.NoSuchFile,), e:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
198
        pass
1532 by Robert Collins
Merge in John Meinels integration branch.
199
    except IOError, e:
200
        # 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'.
201
        # function raises an IOError with errno is None when a rename fails.
1532 by Robert Collins
Merge in John Meinels integration branch.
202
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
203
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
204
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
205
    except Exception, e:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
206
        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.
207
            or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
208
            raise
209
    else:
210
        file_existed = True
211
212
    success = False
213
    try:
214
        # This may throw an exception, in which case success will
215
        # not be set.
216
        rename_func(old, new)
217
        success = True
218
    finally:
219
        if file_existed:
220
            # If the file used to exist, rename it back into place
221
            # otherwise just delete it from the tmp location
222
            if success:
223
                unlink_func(tmp_name)
224
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
225
                rename_func(tmp_name, new)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
226
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
227
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
228
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
229
# choke on a Unicode string containing a relative path if
230
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
231
# string.
2093.1.1 by John Arbash Meinel
(Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8'
232
_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
233
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
234
    # jam 20060426 rather than encoding to fsencoding
235
    # copy posixpath.abspath, but use os.getcwdu instead
236
    if not posixpath.isabs(path):
237
        path = posixpath.join(getcwd(), path)
238
    return posixpath.normpath(path)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
239
240
241
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
242
    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
243
244
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
245
def _win32_fixdrive(path):
246
    """Force drive letters to be consistent.
247
248
    win32 is inconsistent whether it returns lower or upper case
249
    and even if it was consistent the user might type the other
250
    so we force it to uppercase
251
    running python.exe under cmd.exe return capital C:\\
252
    running win32 python inside a cygwin shell returns lowercase c:\\
253
    """
254
    drive, path = _nt_splitdrive(path)
255
    return drive.upper() + path
256
257
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
258
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'
259
    # 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
260
    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
261
262
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
263
def _win98_abspath(path):
264
    """Return the absolute version of a path.
265
    Windows 98 safe implementation (python reimplementation
266
    of Win32 API function GetFullPathNameW)
267
    """
268
    # Corner cases:
269
    #   C:\path     => C:/path
270
    #   C:/path     => C:/path
271
    #   \\HOST\path => //HOST/path
272
    #   //HOST/path => //HOST/path
273
    #   path        => C:/cwd/path
274
    #   /path       => C:/path
275
    path = unicode(path)
276
    # check for absolute path
277
    drive = _nt_splitdrive(path)[0]
278
    if drive == '' and path[:2] not in('//','\\\\'):
279
        cwd = os.getcwdu()
280
        # we cannot simply os.path.join cwd and path
281
        # because os.path.join('C:','/path') produce '/path'
282
        # and this is incorrect
283
        if path[:1] in ('/','\\'):
284
            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
285
            path = path[1:]
2279.4.1 by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe
286
        path = cwd + '\\' + path
287
    return _win32_fixdrive(_nt_normpath(path).replace('\\', '/'))
288
289
if win32utils.winver == 'Windows 98':
290
    _win32_abspath = _win98_abspath
291
292
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
293
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'
294
    # 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
295
    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
296
297
298
def _win32_pathjoin(*args):
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
299
    return _nt_join(*args).replace('\\', '/')
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
300
301
302
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
303
    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
304
305
306
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
307
    return _win32_fixdrive(os.getcwdu().replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
308
309
310
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
311
    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
312
313
314
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.
315
    """We expect to be able to atomically replace 'new' with old.
316
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
317
    On win32, if new exists, it must be moved out of the way first,
318
    and then deleted. 
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
319
    """
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
320
    try:
321
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
322
    except OSError, e:
1830.3.15 by John Arbash Meinel
On Mac we get EINVAL when renaming cwd
323
        if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL):
324
            # If we try to rename a non-existant file onto cwd, we get 
325
            # EPERM or EACCES instead of ENOENT, this will raise ENOENT 
326
            # if the old path doesn't exist, sometimes we get EACCES
327
            # 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.
328
            os.lstat(old)
329
        raise
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
330
331
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
332
def _mac_getcwd():
333
    return unicodedata.normalize('NFKC', os.getcwdu())
334
335
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
336
# Default is to just use the python builtins, but these can be rebound on
337
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
338
abspath = _posix_abspath
339
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
340
pathjoin = os.path.join
341
normpath = os.path.normpath
342
getcwd = os.getcwdu
343
rename = os.rename
344
dirname = os.path.dirname
345
basename = os.path.basename
2215.4.2 by Alexander Belchenko
split and splitext now the part of osutils
346
split = os.path.split
347
splitext = os.path.splitext
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
348
# These were already imported into local scope
349
# mkdtemp = tempfile.mkdtemp
350
# rmtree = shutil.rmtree
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
351
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
352
MIN_ABS_PATHLENGTH = 1
353
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
354
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
355
if sys.platform == 'win32':
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
356
    abspath = _win32_abspath
357
    realpath = _win32_realpath
358
    pathjoin = _win32_pathjoin
359
    normpath = _win32_normpath
360
    getcwd = _win32_getcwd
361
    mkdtemp = _win32_mkdtemp
362
    rename = _win32_rename
363
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
364
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
365
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
366
    def _win32_delete_readonly(function, path, excinfo):
367
        """Error handler for shutil.rmtree function [for win32]
368
        Helps to remove files and dirs marked as read-only.
369
        """
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
370
        exception = excinfo[1]
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
371
        if function in (os.remove, os.rmdir) \
2116.5.1 by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5
372
            and isinstance(exception, OSError) \
373
            and exception.errno == errno.EACCES:
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
374
            make_writable(path)
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
375
            function(path)
376
        else:
377
            raise
378
379
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
380
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
381
        return shutil.rmtree(path, ignore_errors, onerror)
1830.3.11 by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path.
382
elif sys.platform == 'darwin':
383
    getcwd = _mac_getcwd
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
384
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
385
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.
386
def get_terminal_encoding():
387
    """Find the best encoding for printing to the screen.
388
389
    This attempts to check both sys.stdout and sys.stdin to see
390
    what encoding they are in, and if that fails it falls back to
391
    bzrlib.user_encoding.
392
    The problem is that on Windows, locale.getpreferredencoding()
393
    is not the same encoding as that used by the console:
394
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
395
396
    On my standard US Windows XP, the preferred encoding is
397
    cp1252, but the console is cp437
398
    """
399
    output_encoding = getattr(sys.stdout, 'encoding', None)
400
    if not output_encoding:
401
        input_encoding = getattr(sys.stdin, 'encoding', None)
402
        if not input_encoding:
403
            output_encoding = bzrlib.user_encoding
404
            mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding)
405
        else:
406
            output_encoding = input_encoding
407
            mutter('encoding stdout as sys.stdin encoding %r', output_encoding)
408
    else:
409
        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
410
    if output_encoding == 'cp0':
411
        # invalid encoding (cp0 means 'no codepage' on Windows)
412
        output_encoding = bzrlib.user_encoding
413
        mutter('cp0 is invalid encoding.'
414
               ' encoding stdout as bzrlib.user_encoding %r', output_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
415
    # check encoding
416
    try:
417
        codecs.lookup(output_encoding)
418
    except LookupError:
419
        sys.stderr.write('bzr: warning:'
2192.1.9 by Alexander Belchenko
final fix suggested by John Meinel
420
                         ' unknown terminal encoding %s.\n'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
421
                         '  Using encoding %s instead.\n'
422
                         % (output_encoding, bzrlib.user_encoding)
423
                        )
424
        output_encoding = bzrlib.user_encoding
425
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.
426
    return output_encoding
427
428
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 \
429
def normalizepath(f):
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
430
    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 \
431
        F = realpath
432
    else:
433
        F = abspath
434
    [p,e] = os.path.split(f)
435
    if e == "" or e == "." or e == "..":
436
        return F(f)
437
    else:
438
        return pathjoin(F(p), e)
439
1 by mbp at sourcefrog
import from baz patch-364
440
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
441
def backup_file(fn):
442
    """Copy a file to a backup.
443
444
    Backups are named in GNU-style, with a ~ suffix.
445
446
    If the file is already a backup, it's not copied.
447
    """
448
    if fn[-1] == '~':
449
        return
450
    bfn = fn + '~'
451
1448 by Robert Collins
revert symlinks correctly
452
    if has_symlinks() and os.path.islink(fn):
453
        target = os.readlink(fn)
454
        os.symlink(target, bfn)
455
        return
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
456
    inf = file(fn, 'rb')
457
    try:
458
        content = inf.read()
459
    finally:
460
        inf.close()
461
    
462
    outf = file(bfn, 'wb')
463
    try:
464
        outf.write(content)
465
    finally:
466
        outf.close()
467
468
1 by mbp at sourcefrog
import from baz patch-364
469
def isdir(f):
470
    """True if f is an accessible directory."""
471
    try:
472
        return S_ISDIR(os.lstat(f)[ST_MODE])
473
    except OSError:
474
        return False
475
476
477
def isfile(f):
478
    """True if f is a regular file."""
479
    try:
480
        return S_ISREG(os.lstat(f)[ST_MODE])
481
    except OSError:
482
        return False
483
1092.2.6 by Robert Collins
symlink support updated to work
484
def islink(f):
485
    """True if f is a symlink."""
486
    try:
487
        return S_ISLNK(os.lstat(f)[ST_MODE])
488
    except OSError:
489
        return False
1 by mbp at sourcefrog
import from baz patch-364
490
485 by Martin Pool
- move commit code into its own module
491
def is_inside(dir, fname):
492
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
493
    
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
494
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
495
    that . and .. and repeated slashes are eliminated, and the separators
496
    are canonical for the platform.
497
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
498
    The empty string as a dir name is taken as top-of-tree and matches 
499
    everything.
485 by Martin Pool
- move commit code into its own module
500
    """
969 by Martin Pool
- Add less-sucky is_within_any
501
    # XXX: Most callers of this can actually do something smarter by 
502
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
503
    if dir == fname:
504
        return True
505
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
506
    if dir == '':
507
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
508
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
509
    if dir[-1] != '/':
510
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
511
972 by Martin Pool
- less dodgy is_inside function
512
    return fname.startswith(dir)
513
485 by Martin Pool
- move commit code into its own module
514
515
def is_inside_any(dir_list, fname):
516
    """True if fname is inside any of given dirs."""
517
    for dirname in dir_list:
518
        if is_inside(dirname, fname):
519
            return True
520
    else:
521
        return False
522
523
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
524
def is_inside_or_parent_of_any(dir_list, fname):
525
    """True if fname is a child or a parent of any of the given files."""
526
    for dirname in dir_list:
527
        if is_inside(dirname, fname) or is_inside(fname, dirname):
528
            return True
529
    else:
530
        return False
531
532
1 by mbp at sourcefrog
import from baz patch-364
533
def pumpfile(fromfile, tofile):
534
    """Copy contents of one file to another."""
1185.49.12 by John Arbash Meinel
Changed pumpfile to work on blocks, rather than reading the entire file at once.
535
    BUFSIZE = 32768
536
    while True:
537
        b = fromfile.read(BUFSIZE)
538
        if not b:
539
            break
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
540
        tofile.write(b)
1 by mbp at sourcefrog
import from baz patch-364
541
542
1185.67.7 by Aaron Bentley
Refactored a bit
543
def file_iterator(input_file, readsize=32768):
544
    while True:
545
        b = input_file.read(readsize)
546
        if len(b) == 0:
547
            break
548
        yield b
549
550
1 by mbp at sourcefrog
import from baz patch-364
551
def sha_file(f):
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
552
    if getattr(f, 'tell', None) is not None:
1 by mbp at sourcefrog
import from baz patch-364
553
        assert f.tell() == 0
554
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
555
    BUFSIZE = 128<<10
556
    while True:
557
        b = f.read(BUFSIZE)
558
        if not b:
559
            break
560
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
561
    return s.hexdigest()
562
563
1235 by Martin Pool
- split sha_strings into osutils
564
565
def sha_strings(strings):
566
    """Return the sha-1 of concatenation of strings"""
567
    s = sha.new()
568
    map(s.update, strings)
569
    return s.hexdigest()
570
571
1 by mbp at sourcefrog
import from baz patch-364
572
def sha_string(f):
573
    s = sha.new()
574
    s.update(f)
575
    return s.hexdigest()
576
577
124 by mbp at sourcefrog
- check file text for past revisions is correct
578
def fingerprint_file(f):
579
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
580
    b = f.read()
581
    s.update(b)
582
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
583
    return {'size': size,
584
            'sha1': s.hexdigest()}
585
586
1 by mbp at sourcefrog
import from baz patch-364
587
def compare_files(a, b):
588
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
589
    BUFSIZE = 4096
590
    while True:
591
        ai = a.read(BUFSIZE)
592
        bi = b.read(BUFSIZE)
593
        if ai != bi:
594
            return False
595
        if ai == '':
596
            return True
1 by mbp at sourcefrog
import from baz patch-364
597
598
49 by mbp at sourcefrog
fix local-time-offset calculation
599
def local_time_offset(t=None):
600
    """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'.
601
    if t is None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
602
        t = time.time()
2215.6.1 by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(),
603
    offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t)
604
    return offset.days * 86400 + offset.seconds
8 by mbp at sourcefrog
store committer's timezone in revision and show
605
606
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
607
def format_date(t, offset=0, timezone='original', date_fmt=None, 
608
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
609
    ## TODO: Perhaps a global option to use either universal or local time?
610
    ## Or perhaps just let people set $TZ?
611
    assert isinstance(t, float)
612
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
613
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
614
        tt = time.gmtime(t)
615
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
616
    elif timezone == 'original':
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
617
        if offset is None:
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
618
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
619
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
620
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
621
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
622
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
623
    else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
624
        raise errors.BzrError("unsupported timezone format %r" % timezone,
625
                              ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
626
    if date_fmt is None:
627
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
628
    if show_offset:
629
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
630
    else:
631
        offset_str = ''
632
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
633
634
635
def compact_date(when):
636
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
637
    
638
1957.1.4 by John Arbash Meinel
create a helper for formatting a time delta
639
def format_delta(delta):
640
    """Get a nice looking string for a time delta.
641
642
    :param delta: The time difference in seconds, can be positive or negative.
643
        positive indicates time in the past, negative indicates time in the
644
        future. (usually time.time() - stored_time)
645
    :return: String formatted to show approximate resolution
646
    """
647
    delta = int(delta)
648
    if delta >= 0:
649
        direction = 'ago'
650
    else:
651
        direction = 'in the future'
652
        delta = -delta
653
654
    seconds = delta
655
    if seconds < 90: # print seconds up to 90 seconds
656
        if seconds == 1:
657
            return '%d second %s' % (seconds, direction,)
658
        else:
659
            return '%d seconds %s' % (seconds, direction)
660
661
    minutes = int(seconds / 60)
662
    seconds -= 60 * minutes
663
    if seconds == 1:
664
        plural_seconds = ''
665
    else:
666
        plural_seconds = 's'
667
    if minutes < 90: # print minutes, seconds up to 90 minutes
668
        if minutes == 1:
669
            return '%d minute, %d second%s %s' % (
670
                    minutes, seconds, plural_seconds, direction)
671
        else:
672
            return '%d minutes, %d second%s %s' % (
673
                    minutes, seconds, plural_seconds, direction)
674
675
    hours = int(minutes / 60)
676
    minutes -= 60 * hours
677
    if minutes == 1:
678
        plural_minutes = ''
679
    else:
680
        plural_minutes = 's'
681
682
    if hours == 1:
683
        return '%d hour, %d minute%s %s' % (hours, minutes,
684
                                            plural_minutes, direction)
685
    return '%d hours, %d minute%s %s' % (hours, minutes,
686
                                         plural_minutes, direction)
1 by mbp at sourcefrog
import from baz patch-364
687
688
def filesize(f):
689
    """Return size of given open file."""
690
    return os.fstat(f.fileno())[ST_SIZE]
691
1553.5.5 by Martin Pool
New utility routine rand_chars
692
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
693
# Define rand_bytes based on platform.
694
try:
695
    # Python 2.4 and later have os.urandom,
696
    # but it doesn't work on some arches
697
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
698
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
699
except (NotImplementedError, AttributeError):
700
    # If python doesn't have os.urandom, or it doesn't work,
701
    # 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()
702
    try:
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
703
        rand_bytes = file('/dev/urandom', 'rb').read
704
    # 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()
705
    except (IOError, OSError):
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
706
        # not well seeded, but better than nothing
707
        def rand_bytes(n):
708
            import random
709
            s = ''
710
            while n:
711
                s += chr(random.randint(0, 255))
712
                n -= 1
713
            return s
1 by mbp at sourcefrog
import from baz patch-364
714
1553.5.5 by Martin Pool
New utility routine rand_chars
715
716
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
717
def rand_chars(num):
718
    """Return a random string of num alphanumeric characters
719
    
720
    The result only contains lowercase chars because it may be used on 
721
    case-insensitive filesystems.
722
    """
723
    s = ''
724
    for raw_byte in rand_bytes(num):
725
        s += ALNUM[ord(raw_byte) % 36]
726
    return s
727
728
1 by mbp at sourcefrog
import from baz patch-364
729
## 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.
730
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
731
732
def splitpath(p):
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
733
    """Turn string into list of parts."""
734
    assert isinstance(p, basestring)
271 by Martin Pool
- Windows path fixes
735
736
    # split on either delimiter because people might use either on
737
    # Windows
738
    ps = re.split(r'[\\/]', p)
739
740
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
741
    for f in ps:
742
        if f == '..':
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
743
            raise errors.BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
744
        elif (f == '.') or (f == ''):
745
            pass
746
        else:
747
            rps.append(f)
748
    return rps
1 by mbp at sourcefrog
import from baz patch-364
749
750
def joinpath(p):
2255.7.40 by Robert Collins
Tweak pathjoin to be correct in its assertion about parameter types.
751
    assert isinstance(p, (list, tuple))
1 by mbp at sourcefrog
import from baz patch-364
752
    for f in p:
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
753
        if (f == '..') or (f is None) or (f == ''):
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
754
            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 \
755
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
756
757
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
758
@deprecated_function(zero_nine)
1 by mbp at sourcefrog
import from baz patch-364
759
def appendpath(p1, p2):
760
    if p1 == '':
761
        return p2
762
    else:
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 \
763
        return pathjoin(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
764
    
765
1231 by Martin Pool
- more progress on fetch on top of weaves
766
def split_lines(s):
767
    """Split s into lines, but without removing the newline characters."""
1666.1.6 by Robert Collins
Make knit the default format.
768
    lines = s.split('\n')
769
    result = [line + '\n' for line in lines[:-1]]
770
    if lines[-1]:
771
        result.append(lines[-1])
772
    return result
1391 by Robert Collins
merge from integration
773
774
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
775
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
776
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
777
1185.1.46 by Robert Collins
Aarons branch --basis patch
778
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
779
def link_or_copy(src, dest):
780
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
781
    if not hardlinks_good():
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
782
        shutil.copyfile(src, dest)
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
783
        return
784
    try:
785
        os.link(src, dest)
786
    except (OSError, IOError), e:
787
        if e.errno != errno.EXDEV:
788
            raise
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
789
        shutil.copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
790
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
791
def delete_any(full_path):
792
    """Delete a file or directory."""
793
    try:
794
        os.unlink(full_path)
795
    except OSError, e:
796
    # We may be renaming a dangling inventory id
797
        if e.errno not in (errno.EISDIR, errno.EACCES, errno.EPERM):
798
            raise
799
        os.rmdir(full_path)
800
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
801
802
def has_symlinks():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
803
    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
804
        return True
805
    else:
806
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
807
        
808
809
def contains_whitespace(s):
810
    """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.
811
    # string.whitespace can include '\xa0' in certain locales, because it is
812
    # considered "non-breaking-space" as part of ISO-8859-1. But it
813
    # 1) Isn't a breaking whitespace
814
    # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
815
    #    separators
816
    # 3) '\xa0' isn't unicode safe since it is >128.
2249.5.16 by John Arbash Meinel
[merge] bzr.dev 2283
817
818
    # This should *not* be a unicode set of characters in case the source
819
    # string is not a Unicode string. We can auto-up-cast the characters since
820
    # they are ascii, but we don't want to auto-up-cast the string in case it
821
    # is utf-8
822
    for ch in ' \t\n\r\v\f':
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
823
        if ch in s:
824
            return True
825
    else:
826
        return False
827
828
829
def contains_linebreaks(s):
830
    """True if there is any vertical whitespace in s."""
831
    for ch in '\f\n\r':
832
        if ch in s:
833
            return True
834
    else:
835
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
836
837
838
def relpath(base, path):
839
    """Return path relative to base, or raise exception.
840
841
    The path may be either an absolute path or a path relative to the
842
    current working directory.
843
844
    os.path.commonprefix (python2.4) has a bad bug that it works just
845
    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.
846
    avoids that problem.
847
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
848
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
849
    assert len(base) >= MIN_ABS_PATHLENGTH, ('Length of base must be equal or'
850
        ' exceed the platform minimum length (which is %d)' % 
851
        MIN_ABS_PATHLENGTH)
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
852
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
853
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
854
855
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
856
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
857
    while len(head) >= len(base):
858
        if head == base:
859
            break
860
        head, tail = os.path.split(head)
861
        if tail:
862
            s.insert(0, tail)
863
    else:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
864
        raise errors.PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
865
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
866
    if s:
867
        return pathjoin(*s)
868
    else:
869
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
870
871
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
872
def safe_unicode(unicode_or_utf8_string):
873
    """Coerce unicode_or_utf8_string into unicode.
874
875
    If it is unicode, it is returned.
876
    Otherwise it is decoded from utf-8. If a decoding error
877
    occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
878
    as a BzrBadParameter exception.
879
    """
880
    if isinstance(unicode_or_utf8_string, unicode):
881
        return unicode_or_utf8_string
882
    try:
883
        return unicode_or_utf8_string.decode('utf8')
884
    except UnicodeDecodeError:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
885
        raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
886
887
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
888
def safe_utf8(unicode_or_utf8_string):
889
    """Coerce unicode_or_utf8_string to a utf8 string.
890
891
    If it is a str, it is returned.
892
    If it is Unicode, it is encoded into a utf-8 string.
893
    """
894
    if isinstance(unicode_or_utf8_string, str):
895
        # TODO: jam 20070209 This is overkill, and probably has an impact on
896
        #       performance if we are dealing with lots of apis that want a
897
        #       utf-8 revision id
898
        try:
899
            # Make sure it is a valid utf-8 string
900
            unicode_or_utf8_string.decode('utf-8')
901
        except UnicodeDecodeError:
902
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
903
        return unicode_or_utf8_string
904
    return unicode_or_utf8_string.encode('utf-8')
905
906
907
def safe_revision_id(unicode_or_utf8_string):
908
    """Revision ids should now be utf8, but at one point they were unicode.
909
910
    This is the same as safe_utf8, except it uses the cached encode functions
911
    to save a little bit of performance.
912
    """
2249.5.9 by John Arbash Meinel
Update WorkingTree to use safe_revision_id when appropriate
913
    if unicode_or_utf8_string is None:
914
        return None
2249.5.8 by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work.
915
    if isinstance(unicode_or_utf8_string, str):
916
        # TODO: jam 20070209 Eventually just remove this check.
917
        try:
918
            utf8_str = cache_utf8.get_cached_utf8(unicode_or_utf8_string)
919
        except UnicodeDecodeError:
920
            raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string)
921
        return utf8_str
922
    return cache_utf8.encode(unicode_or_utf8_string)
923
924
2294.1.4 by John Arbash Meinel
Add safe_file_id as a helper in osutils.
925
# TODO: jam 20070217 We start by just re-using safe_revision_id, but ultimately
926
#       we want to use a different dictionary cache, because trapping file ids
927
#       and revision ids in the same dict seemed to have a noticable effect on
928
#       performance.
929
safe_file_id = safe_revision_id
930
931
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
932
_platform_normalizes_filenames = False
933
if sys.platform == 'darwin':
934
    _platform_normalizes_filenames = True
935
936
937
def normalizes_filenames():
938
    """Return True if this platform normalizes unicode filenames.
939
940
    Mac OSX does, Windows/Linux do not.
941
    """
942
    return _platform_normalizes_filenames
943
944
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
945
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
946
    """Get the unicode normalized path, and if you can access the file.
947
948
    On platforms where the system normalizes filenames (Mac OSX),
949
    you can access a file by any path which will normalize correctly.
950
    On platforms where the system does not normalize filenames 
951
    (Windows, Linux), you have to access a file by its exact path.
952
953
    Internally, bzr only supports NFC/NFKC normalization, since that is 
954
    the standard for XML documents.
955
956
    So return the normalized path, and a flag indicating if the file
957
    can be accessed by that path.
958
    """
959
1830.3.8 by John Arbash Meinel
unicodedata.normalize requires unicode strings
960
    return unicodedata.normalize('NFKC', unicode(path)), True
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
961
962
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
963
def _inaccessible_normalized_filename(path):
964
    __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
965
1830.3.8 by John Arbash Meinel
unicodedata.normalize requires unicode strings
966
    normalized = unicodedata.normalize('NFKC', unicode(path))
1830.3.1 by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms
967
    return normalized, normalized == path
968
969
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
970
if _platform_normalizes_filenames:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
971
    normalized_filename = _accessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
972
else:
1830.3.2 by John Arbash Meinel
normalized_filename is a much better name
973
    normalized_filename = _inaccessible_normalized_filename
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
974
975
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
976
def terminal_width():
977
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
978
    if sys.platform == 'win32':
2245.4.6 by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size()
979
        return win32utils.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
980
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
981
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
982
        import struct, fcntl, termios
983
        s = struct.pack('HHHH', 0, 0, 0, 0)
984
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
985
        width = struct.unpack('HHHH', x)[1]
986
    except IOError:
987
        pass
988
    if width <= 0:
989
        try:
990
            width = int(os.environ['COLUMNS'])
991
        except:
992
            pass
993
    if width <= 0:
994
        width = 80
995
996
    return width
1534.7.25 by Aaron Bentley
Added set_executability
997
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
998
1534.7.25 by Aaron Bentley
Added set_executability
999
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
1000
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
1001
1002
1551.10.4 by Aaron Bentley
Update to skip on win32
1003
def supports_posix_readonly():
1004
    """Return True if 'readonly' has POSIX semantics, False otherwise.
1005
1006
    Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
1007
    directory controls creation/deletion, etc.
1008
1009
    And under win32, readonly means that the directory itself cannot be
1010
    deleted.  The contents of a readonly directory can be changed, unlike POSIX
1011
    where files in readonly directories cannot be added, deleted or renamed.
1012
    """
1013
    return sys.platform != "win32"
1014
1015
1963.1.5 by John Arbash Meinel
Create an osutils helper function for modifying the environment
1016
def set_or_unset_env(env_variable, value):
1017
    """Modify the environment, setting or removing the env_variable.
1018
1019
    :param env_variable: The environment variable in question
1020
    :param value: The value to set the environment to. If None, then
1021
        the variable will be removed.
1022
    :return: The original value of the environment variable.
1023
    """
1024
    orig_val = os.environ.get(env_variable)
1025
    if value is None:
1026
        if orig_val is not None:
1027
            del os.environ[env_variable]
1028
    else:
1029
        if isinstance(value, unicode):
1030
            value = value.encode(bzrlib.user_encoding)
1031
        os.environ[env_variable] = value
1032
    return orig_val
1033
1034
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
1035
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
1036
1037
1038
def check_legal_path(path):
1039
    """Check whether the supplied path is legal.  
1040
    This is only required on Windows, so we don't test on other platforms
1041
    right now.
1042
    """
1043
    if sys.platform != "win32":
1044
        return
1045
    if _validWin32PathRE.match(path) is None:
1996.3.25 by John Arbash Meinel
Make importing errors lazy for osutils
1046
        raise errors.IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1047
1048
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
1049
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1050
    """Yield data about all the directories in a tree.
1051
    
1052
    This yields all the data about the contents of a directory at a time.
1053
    After each directory has been yielded, if the caller has mutated the list
1054
    to exclude some directories, they are then not descended into.
1055
    
1056
    The data yielded is of the form:
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1057
    ((directory-relpath, directory-path-from-top),
2255.7.26 by John Arbash Meinel
correct the docstring for walkdirs.
1058
    [(directory-relpath, basename, kind, lstat, path-from-top), ...]),
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1059
     - directory-relpath is the relative path of the directory being returned
1060
       with respect to top. prefix is prepended to this.
1061
     - directory-path-from-root is the path including top for this directory. 
1062
       It is suitable for use with os functions.
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1063
     - relpath is the relative path within the subtree being walked.
1064
     - basename is the basename of the path
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1065
     - 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.
1066
       present within the tree - but it may be recorded as versioned. See
1067
       versioned_kind.
1068
     - lstat is the stat data *if* the file was statted.
1069
     - planned, not implemented: 
1070
       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.
1071
1757.2.16 by Robert Collins
Review comments.
1072
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
1073
        allows one to walk a subtree but get paths that are relative to a tree
1074
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1075
    :return: an iterator over the dirs.
1076
    """
1897.1.1 by Robert Collins
Add some useful summary data to osutils.walkdirs output.
1077
    #TODO there is a bit of a smell where the results of the directory-
1078
    # summary in this, and the path from the root, may not agree 
1079
    # depending on top and prefix - i.e. ./foo and foo as a pair leads to
1080
    # potentially confusing output. We should make this more robust - but
1897.1.2 by Robert Collins
cleanup osutils.walkdirs changes after review.
1081
    # 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%
1082
    _lstat = os.lstat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1083
    _directory = _directory_kind
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
1084
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1085
    _kind_from_mode = _formats.get
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1086
    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.
1087
    while pending:
1088
        # 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%
1089
        relroot, _, _, _, top = pending.pop()
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1090
        if relroot:
1091
            relprefix = relroot + u'/'
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1092
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1093
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1094
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1095
1096
        dirblock = []
1097
        append = dirblock.append
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1098
        for name in sorted(_listdir(top)):
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1099
            abspath = top_slash + name
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1100
            statvalue = _lstat(abspath)
1101
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1102
            append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1103
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1104
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
1105
        # push the user specified dirs from dirblock
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1106
        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.
1107
1108
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
1109
def _walkdirs_utf8(top, prefix=""):
1110
    """Yield data about all the directories in a tree.
1111
1112
    This yields the same information as walkdirs() only each entry is yielded
1113
    in utf-8. On platforms which have a filesystem encoding of utf8 the paths
1114
    are returned as exact byte-strings.
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1115
1116
    :return: yields a tuple of (dir_info, [file_info])
1117
        dir_info is (utf8_relpath, path-from-top)
1118
        file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
1119
        if top is an absolute path, path-from-top is also an absolute path.
1120
        path-from-top might be unicode or utf8, but it is the correct path to
1121
        pass to os functions to affect the file in question. (such as os.lstat)
1122
    """
1123
    fs_encoding = sys.getfilesystemencoding()
1124
    if (sys.platform == 'win32' or
1125
        fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968')): # ascii
1126
        return _walkdirs_unicode_to_utf8(top, prefix=prefix)
1127
    else:
1128
        return _walkdirs_fs_utf8(top, prefix=prefix)
1129
1130
1131
def _walkdirs_fs_utf8(top, prefix=""):
1132
    """See _walkdirs_utf8.
1133
1134
    This sub-function is called when we know the filesystem is already in utf8
1135
    encoding. So we don't need to transcode filenames.
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
1136
    """
1137
    _lstat = os.lstat
1138
    _directory = _directory_kind
1139
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1140
    _kind_from_mode = _formats.get
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
1141
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1142
    # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
1143
    # But we don't actually uses 1-3 in pending, so set them to None
1144
    pending = [(safe_utf8(prefix), None, None, None, safe_utf8(top))]
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
1145
    while pending:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1146
        relroot, _, _, _, top = pending.pop()
1147
        if relroot:
1148
            relprefix = relroot + '/'
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
1149
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1150
            relprefix = ''
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
1151
        top_slash = top + '/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1152
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
1153
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1154
        append = dirblock.append
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
1155
        for name in sorted(_listdir(top)):
1156
            abspath = top_slash + name
1157
            statvalue = _lstat(abspath)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1158
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1159
            append((relprefix + name, name, kind, statvalue, abspath))
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1160
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1161
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1162
        # push the user specified dirs from dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1163
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1164
1165
1166
def _walkdirs_unicode_to_utf8(top, prefix=""):
1167
    """See _walkdirs_utf8
1168
1169
    Because Win32 has a Unicode api, all of the 'path-from-top' entries will be
1170
    Unicode paths.
1171
    This is currently the fallback code path when the filesystem encoding is
1172
    not UTF-8. It may be better to implement an alternative so that we can
1173
    safely handle paths that are not properly decodable in the current
1174
    encoding.
1175
    """
1176
    _utf8_encode = codecs.getencoder('utf8')
1177
    _lstat = os.lstat
1178
    _directory = _directory_kind
1179
    _listdir = os.listdir
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1180
    _kind_from_mode = _formats.get
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1181
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1182
    pending = [(safe_utf8(prefix), None, None, None, safe_unicode(top))]
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1183
    while pending:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1184
        relroot, _, _, _, top = pending.pop()
1185
        if relroot:
1186
            relprefix = relroot + '/'
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1187
        else:
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1188
            relprefix = ''
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1189
        top_slash = top + u'/'
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1190
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1191
        dirblock = []
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1192
        append = dirblock.append
2255.7.32 by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths.
1193
        for name in sorted(_listdir(top)):
1194
            name_utf8 = _utf8_encode(name)[0]
1195
            abspath = top_slash + name
1196
            statvalue = _lstat(abspath)
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1197
            kind = _kind_from_mode(statvalue.st_mode & 0170000, 'unknown')
1198
            append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath))
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
1199
        yield (relroot, top), dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1200
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
1201
        # push the user specified dirs from dirblock
2255.7.33 by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5%
1202
        pending.extend(d for d in reversed(dirblock) if d[2] == _directory)
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
1203
1204
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1205
def copy_tree(from_path, to_path, handlers={}):
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1206
    """Copy all of the entries in from_path into to_path.
1207
1208
    :param from_path: The base directory to copy. 
1209
    :param to_path: The target directory. If it does not exist, it will
1210
        be created.
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1211
    :param handlers: A dictionary of functions, which takes a source and
1212
        destinations for files, directories, etc.
1213
        It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
1214
        'file', 'directory', and 'symlink' should always exist.
1215
        If they are missing, they will be replaced with 'os.mkdir()',
1216
        'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1217
    """
1218
    # Now, just copy the existing cached tree to the new location
1219
    # We use a cheap trick here.
1220
    # Absolute paths are prefixed with the first parameter
1221
    # relative paths are prefixed with the second.
1222
    # So we can get both the source and target returned
1223
    # without any extra work.
1224
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1225
    def copy_dir(source, dest):
1226
        os.mkdir(dest)
1227
1228
    def copy_link(source, dest):
1229
        """Copy the contents of a symlink"""
1230
        link_to = os.readlink(source)
1231
        os.symlink(link_to, dest)
1232
1233
    real_handlers = {'file':shutil.copy2,
1234
                     'symlink':copy_link,
1235
                     'directory':copy_dir,
1236
                    }
1237
    real_handlers.update(handlers)
1238
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1239
    if not os.path.exists(to_path):
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1240
        real_handlers['directory'](from_path, to_path)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1241
1242
    for dir_info, entries in walkdirs(from_path, prefix=to_path):
1243
        for relpath, name, kind, st, abspath in entries:
1907.3.2 by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality.
1244
            real_handlers[kind](abspath, relpath)
1907.3.1 by John Arbash Meinel
create a copy_tree wrapper around walkdirs()
1245
1246
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1247
def path_prefix_key(path):
1248
    """Generate a prefix-order path key for path.
1249
1250
    This can be used to sort paths in the same way that walkdirs does.
1251
    """
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.
1252
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
1253
1254
1255
def compare_paths_prefix_order(path_a, path_b):
1256
    """Compare path_a and path_b to generate the same order walkdirs uses."""
1257
    key_a = path_prefix_key(path_a)
1258
    key_b = path_prefix_key(path_b)
1259
    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
1260
1261
1262
_cached_user_encoding = None
1263
1264
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1265
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
1266
    """Find out what the preferred user encoding is.
1267
1268
    This is generally the encoding that is used for command line parameters
1269
    and file contents. This may be different from the terminal encoding
1270
    or the filesystem encoding.
1271
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1272
    :param  use_cache:  Enable cache for detected encoding.
1273
                        (This parameter is turned on by default,
1274
                        and required only for selftesting)
1275
1955.2.2 by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py
1276
    :return: A string defining the preferred user encoding
1277
    """
1278
    global _cached_user_encoding
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1279
    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
1280
        return _cached_user_encoding
1281
1282
    if sys.platform == 'darwin':
1283
        # work around egregious python 2.4 bug
1284
        sys.platform = 'posix'
1285
        try:
1286
            import locale
1287
        finally:
1288
            sys.platform = 'darwin'
1289
    else:
1290
        import locale
1291
1292
    try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1293
        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
1294
    except locale.Error, e:
1955.2.3 by John Arbash Meinel
Change error message text
1295
        sys.stderr.write('bzr: warning: %s\n'
2001.2.1 by Jelmer Vernooij
Fix typo in encoding warning.
1296
                         '  Could not determine what text encoding to use.\n'
1955.2.3 by John Arbash Meinel
Change error message text
1297
                         '  This error usually means your Python interpreter\n'
1298
                         '  doesn\'t support the locale set by $LANG (%s)\n'
1299
                         "  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
1300
                         % (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
1301
        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
1302
2127.4.1 by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows
1303
    # Windows returns 'cp0' to indicate there is no code page. So we'll just
1304
    # treat that as ASCII, and not support printing unicode characters to the
1305
    # console.
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1306
    if user_encoding in (None, 'cp0'):
1307
        user_encoding = 'ascii'
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1308
    else:
1309
        # check encoding
1310
        try:
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1311
            codecs.lookup(user_encoding)
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1312
        except LookupError:
1313
            sys.stderr.write('bzr: warning:'
1314
                             ' unknown encoding %s.'
1315
                             ' Continuing with ascii encoding.\n'
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1316
                             % user_encoding
2192.1.1 by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec
1317
                            )
2192.1.3 by Alexander Belchenko
Tests for osutils.get_user_encoding
1318
            user_encoding = 'ascii'
1319
1320
    if use_cache:
1321
        _cached_user_encoding = user_encoding
1322
1323
    return user_encoding
2091.1.1 by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows
1324
1325
1326
def recv_all(socket, bytes):
1327
    """Receive an exact number of bytes.
1328
1329
    Regular Socket.recv() may return less than the requested number of bytes,
1330
    dependning on what's in the OS buffer.  MSG_WAITALL is not available
1331
    on all platforms, but this should work everywhere.  This will return
1332
    less than the requested amount if the remote end closes.
1333
1334
    This isn't optimized and is intended mostly for use in testing.
1335
    """
1336
    b = ''
1337
    while len(b) < bytes:
1338
        new = socket.recv(bytes - len(b))
1339
        if new == '':
1340
            break # eof
1341
        b += new
1342
    return b
1343
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
1344
def dereference_path(path):
1345
    """Determine the real path to a file.
1346
1347
    All parent elements are dereferenced.  But the file itself is not
1348
    dereferenced.
1349
    :param path: The original path.  May be absolute or relative.
1350
    :return: the real path *to* the file
1351
    """
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
1352
    parent, base = os.path.split(path)
1353
    # The pathjoin for '.' is a workaround for Python bug #1213894.
1354
    # (initial path components aren't dereferenced)
1355
    return pathjoin(realpath(pathjoin('.', parent)), base)