/brz/remove-bazaar

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