/brz/remove-bazaar

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