/brz/remove-bazaar

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