/brz/remove-bazaar

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