/brz/remove-bazaar

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