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