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