~bzr-pqm/bzr/bzr.dev

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