~bzr-pqm/bzr/bzr.dev

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