~bzr-pqm/bzr/bzr.dev

1 by mbp at sourcefrog
import from baz patch-364
1
# Bazaar-NG -- distributed version control
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
# Copyright (C) 2005 by Canonical Ltd
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
4
#
1 by mbp at sourcefrog
import from baz patch-364
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
9
#
1 by mbp at sourcefrog
import from baz patch-364
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# 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
14
#
1 by mbp at sourcefrog
import from baz patch-364
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
1390 by Robert Collins
pair programming worx... merge integration and weave
19
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
20
import errno
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
21
from ntpath import (abspath as _nt_abspath,
22
                    join as _nt_join,
23
                    normpath as _nt_normpath,
24
                    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
25
                    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
26
                    )
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
27
import os
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
28
from os import listdir
1711.4.5 by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32
29
import posixpath
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
30
import re
1236 by Martin Pool
- fix up imports
31
import sha
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
32
import shutil
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
33
from shutil import copyfile
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
34
import stat
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
35
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
36
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
37
import string
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
38
import sys
39
import time
40
import types
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
41
import tempfile
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
42
import unicodedata
1 by mbp at sourcefrog
import from baz patch-364
43
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
44
import bzrlib
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
45
from bzrlib.errors import (BzrError,
1185.65.29 by Robert Collins
Implement final review suggestions.
46
                           BzrBadParameterNotUnicode,
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
47
                           NoSuchFile,
48
                           PathNotChild,
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
49
                           IllegalPath,
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
50
                           )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
51
from bzrlib.symbol_versioning import (deprecated_function, 
52
        zero_nine)
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
53
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
54
1 by mbp at sourcefrog
import from baz patch-364
55
56
def make_readonly(filename):
57
    """Make a filename read-only."""
58
    mod = os.stat(filename).st_mode
59
    mod = mod & 0777555
60
    os.chmod(filename, mod)
61
62
63
def make_writable(filename):
64
    mod = os.stat(filename).st_mode
65
    mod = mod | 0200
66
    os.chmod(filename, mod)
67
68
1077 by Martin Pool
- avoid compiling REs at module load time
69
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
70
71
1 by mbp at sourcefrog
import from baz patch-364
72
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
73
    """Return a quoted filename filename
74
75
    This previously used backslash quoting, but that works poorly on
76
    Windows."""
77
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
78
    global _QUOTE_RE
79
    if _QUOTE_RE == None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
80
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
1077 by Martin Pool
- avoid compiling REs at module load time
81
        
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
82
    if _QUOTE_RE.search(f):
83
        return '"' + f + '"'
84
    else:
85
        return f
1 by mbp at sourcefrog
import from baz patch-364
86
87
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
88
_directory_kind = 'directory'
89
1732.1.10 by John Arbash Meinel
Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup
90
_formats = {
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
91
    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
92
    stat.S_IFCHR:'chardev',
93
    stat.S_IFBLK:'block',
94
    stat.S_IFREG:'file',
95
    stat.S_IFIFO:'fifo',
96
    stat.S_IFLNK:'symlink',
97
    stat.S_IFSOCK:'socket',
98
}
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
99
100
101
def file_kind_from_stat_mode(stat_mode, _formats=_formats, _unknown='unknown'):
102
    """Generate a file kind from a stat mode. This is used in walkdirs.
103
104
    Its performance is critical: Do not mutate without careful benchmarking.
105
    """
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
106
    try:
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
107
        return _formats[stat_mode & 0170000]
1732.1.12 by John Arbash Meinel
improve bzrlib.osutils.file_kind performance from 324ms => 275ms
108
    except KeyError:
1732.1.30 by John Arbash Meinel
More file_kind tweaks. Use keyword parameters to make everything a local variable.
109
        return _unknown
488 by Martin Pool
- new helper function kind_marker()
110
111
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
112
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.
113
    try:
114
        return _mapper(_lstat(f).st_mode)
115
    except OSError, e:
116
        if getattr(e, 'errno', None) == errno.ENOENT:
117
            raise bzrlib.errors.NoSuchFile(f)
118
        raise
119
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
120
488 by Martin Pool
- new helper function kind_marker()
121
def kind_marker(kind):
122
    if kind == 'file':
123
        return ''
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
124
    elif kind == _directory_kind:
488 by Martin Pool
- new helper function kind_marker()
125
        return '/'
126
    elif kind == 'symlink':
127
        return '@'
128
    else:
129
        raise BzrError('invalid file kind %r' % kind)
1 by mbp at sourcefrog
import from baz patch-364
130
1732.1.2 by John Arbash Meinel
just use os.path.lexists if it exists
131
lexists = getattr(os.path, 'lexists', None)
132
if lexists is None:
133
    def lexists(f):
134
        try:
135
            if hasattr(os, 'lstat'):
136
                os.lstat(f)
137
            else:
138
                os.stat(f)
139
            return True
140
        except OSError,e:
141
            if e.errno == errno.ENOENT:
142
                return False;
143
            else:
144
                raise BzrError("lstat/stat of (%r): %r" % (f, e))
145
1 by mbp at sourcefrog
import from baz patch-364
146
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
147
def fancy_rename(old, new, rename_func, unlink_func):
148
    """A fancy rename, when you don't have atomic rename.
149
    
150
    :param old: The old path, to rename from
151
    :param new: The new path, to rename to
152
    :param rename_func: The potentially non-atomic rename function
153
    :param unlink_func: A way to delete the target file if the full rename succeeds
154
    """
155
156
    # sftp rename doesn't allow overwriting, so play tricks:
157
    import random
158
    base = os.path.basename(new)
159
    dirname = os.path.dirname(new)
1553.5.22 by Martin Pool
Change fancy_rename to use rand_chars rather than reinvent it.
160
    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.
161
    tmp_name = pathjoin(dirname, tmp_name)
162
163
    # Rename the file out of the way, but keep track if it didn't exist
164
    # We don't want to grab just any exception
165
    # something like EACCES should prevent us from continuing
166
    # The downside is that the rename_func has to throw an exception
167
    # with an errno = ENOENT, or NoSuchFile
168
    file_existed = False
169
    try:
170
        rename_func(new, tmp_name)
171
    except (NoSuchFile,), e:
172
        pass
1532 by Robert Collins
Merge in John Meinels integration branch.
173
    except IOError, e:
174
        # RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
175
        # function raises an IOError with errno == None when a rename fails.
176
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
177
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
178
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
179
    except Exception, e:
180
        if (not hasattr(e, 'errno') 
181
            or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
182
            raise
183
    else:
184
        file_existed = True
185
186
    success = False
187
    try:
188
        # This may throw an exception, in which case success will
189
        # not be set.
190
        rename_func(old, new)
191
        success = True
192
    finally:
193
        if file_existed:
194
            # If the file used to exist, rename it back into place
195
            # otherwise just delete it from the tmp location
196
            if success:
197
                unlink_func(tmp_name)
198
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
199
                rename_func(tmp_name, new)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
200
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
201
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
202
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
203
# choke on a Unicode string containing a relative path if
204
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
205
# string.
206
_fs_enc = sys.getfilesystemencoding()
207
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
208
    # jam 20060426 rather than encoding to fsencoding
209
    # copy posixpath.abspath, but use os.getcwdu instead
210
    if not posixpath.isabs(path):
211
        path = posixpath.join(getcwd(), path)
212
    return posixpath.normpath(path)
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
213
214
215
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
216
    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
217
218
1711.5.2 by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this
219
def _win32_fixdrive(path):
220
    """Force drive letters to be consistent.
221
222
    win32 is inconsistent whether it returns lower or upper case
223
    and even if it was consistent the user might type the other
224
    so we force it to uppercase
225
    running python.exe under cmd.exe return capital C:\\
226
    running win32 python inside a cygwin shell returns lowercase c:\\
227
    """
228
    drive, path = _nt_splitdrive(path)
229
    return drive.upper() + path
230
231
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
232
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'
233
    # 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
234
    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
235
236
237
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'
238
    # 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
239
    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
240
241
242
def _win32_pathjoin(*args):
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
243
    return _nt_join(*args).replace('\\', '/')
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
244
245
246
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
247
    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
248
249
250
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
251
    return _win32_fixdrive(os.getcwdu().replace('\\', '/'))
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
252
253
254
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
255
    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
256
257
258
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.
259
    """We expect to be able to atomically replace 'new' with old.
260
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
261
    On win32, if new exists, it must be moved out of the way first,
262
    and then deleted. 
1711.7.6 by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming.
263
    """
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
264
    try:
265
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
266
    except OSError, e:
1711.7.26 by John Arbash Meinel
Linux raises EBUSY when renaming current directory
267
        if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY):
1711.7.17 by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure.
268
            # If we try to rename a non-existant file onto cwd, we get EPERM
269
            # instead of ENOENT, this will raise ENOENT if the old path
270
            # doesn't exist
271
            os.lstat(old)
272
        raise
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
273
274
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
275
# Default is to just use the python builtins, but these can be rebound on
276
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
277
abspath = _posix_abspath
278
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
279
pathjoin = os.path.join
280
normpath = os.path.normpath
281
getcwd = os.getcwdu
282
mkdtemp = tempfile.mkdtemp
283
rename = os.rename
284
dirname = os.path.dirname
285
basename = os.path.basename
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
286
rmtree = shutil.rmtree
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
287
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
288
MIN_ABS_PATHLENGTH = 1
289
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
290
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
291
if sys.platform == 'win32':
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
292
    abspath = _win32_abspath
293
    realpath = _win32_realpath
294
    pathjoin = _win32_pathjoin
295
    normpath = _win32_normpath
296
    getcwd = _win32_getcwd
297
    mkdtemp = _win32_mkdtemp
298
    rename = _win32_rename
299
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
300
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
301
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
302
    def _win32_delete_readonly(function, path, excinfo):
303
        """Error handler for shutil.rmtree function [for win32]
304
        Helps to remove files and dirs marked as read-only.
305
        """
306
        type_, value = excinfo[:2]
307
        if function in (os.remove, os.rmdir) \
308
            and type_ == OSError \
309
            and value.errno == errno.EACCES:
310
            bzrlib.osutils.make_writable(path)
311
            function(path)
312
        else:
313
            raise
314
315
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
316
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
317
        return shutil.rmtree(path, ignore_errors, onerror)
318
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
319
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.
320
def get_terminal_encoding():
321
    """Find the best encoding for printing to the screen.
322
323
    This attempts to check both sys.stdout and sys.stdin to see
324
    what encoding they are in, and if that fails it falls back to
325
    bzrlib.user_encoding.
326
    The problem is that on Windows, locale.getpreferredencoding()
327
    is not the same encoding as that used by the console:
328
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
329
330
    On my standard US Windows XP, the preferred encoding is
331
    cp1252, but the console is cp437
332
    """
333
    output_encoding = getattr(sys.stdout, 'encoding', None)
334
    if not output_encoding:
335
        input_encoding = getattr(sys.stdin, 'encoding', None)
336
        if not input_encoding:
337
            output_encoding = bzrlib.user_encoding
338
            mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding)
339
        else:
340
            output_encoding = input_encoding
341
            mutter('encoding stdout as sys.stdin encoding %r', output_encoding)
342
    else:
343
        mutter('encoding stdout as sys.stdout encoding %r', output_encoding)
344
    return output_encoding
345
346
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 \
347
def normalizepath(f):
348
    if hasattr(os.path, 'realpath'):
349
        F = realpath
350
    else:
351
        F = abspath
352
    [p,e] = os.path.split(f)
353
    if e == "" or e == "." or e == "..":
354
        return F(f)
355
    else:
356
        return pathjoin(F(p), e)
357
1 by mbp at sourcefrog
import from baz patch-364
358
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
359
def backup_file(fn):
360
    """Copy a file to a backup.
361
362
    Backups are named in GNU-style, with a ~ suffix.
363
364
    If the file is already a backup, it's not copied.
365
    """
366
    if fn[-1] == '~':
367
        return
368
    bfn = fn + '~'
369
1448 by Robert Collins
revert symlinks correctly
370
    if has_symlinks() and os.path.islink(fn):
371
        target = os.readlink(fn)
372
        os.symlink(target, bfn)
373
        return
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
374
    inf = file(fn, 'rb')
375
    try:
376
        content = inf.read()
377
    finally:
378
        inf.close()
379
    
380
    outf = file(bfn, 'wb')
381
    try:
382
        outf.write(content)
383
    finally:
384
        outf.close()
385
386
1 by mbp at sourcefrog
import from baz patch-364
387
def isdir(f):
388
    """True if f is an accessible directory."""
389
    try:
390
        return S_ISDIR(os.lstat(f)[ST_MODE])
391
    except OSError:
392
        return False
393
394
395
def isfile(f):
396
    """True if f is a regular file."""
397
    try:
398
        return S_ISREG(os.lstat(f)[ST_MODE])
399
    except OSError:
400
        return False
401
1092.2.6 by Robert Collins
symlink support updated to work
402
def islink(f):
403
    """True if f is a symlink."""
404
    try:
405
        return S_ISLNK(os.lstat(f)[ST_MODE])
406
    except OSError:
407
        return False
1 by mbp at sourcefrog
import from baz patch-364
408
485 by Martin Pool
- move commit code into its own module
409
def is_inside(dir, fname):
410
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
411
    
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
412
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
413
    that . and .. and repeated slashes are eliminated, and the separators
414
    are canonical for the platform.
415
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
416
    The empty string as a dir name is taken as top-of-tree and matches 
417
    everything.
418
    
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 \
419
    >>> is_inside('src', pathjoin('src', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
420
    True
421
    >>> is_inside('src', 'srccontrol')
422
    False
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 \
423
    >>> is_inside('src', pathjoin('src', 'a', 'a', 'a', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
424
    True
425
    >>> is_inside('foo.c', 'foo.c')
426
    True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
427
    >>> is_inside('foo.c', '')
428
    False
429
    >>> is_inside('', 'foo.c')
430
    True
485 by Martin Pool
- move commit code into its own module
431
    """
969 by Martin Pool
- Add less-sucky is_within_any
432
    # XXX: Most callers of this can actually do something smarter by 
433
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
434
    if dir == fname:
435
        return True
436
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
437
    if dir == '':
438
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
439
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
440
    if dir[-1] != '/':
441
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
442
972 by Martin Pool
- less dodgy is_inside function
443
    return fname.startswith(dir)
444
485 by Martin Pool
- move commit code into its own module
445
446
def is_inside_any(dir_list, fname):
447
    """True if fname is inside any of given dirs."""
448
    for dirname in dir_list:
449
        if is_inside(dirname, fname):
450
            return True
451
    else:
452
        return False
453
454
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
455
def is_inside_or_parent_of_any(dir_list, fname):
456
    """True if fname is a child or a parent of any of the given files."""
457
    for dirname in dir_list:
458
        if is_inside(dirname, fname) or is_inside(fname, dirname):
459
            return True
460
    else:
461
        return False
462
463
1 by mbp at sourcefrog
import from baz patch-364
464
def pumpfile(fromfile, tofile):
465
    """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.
466
    BUFSIZE = 32768
467
    while True:
468
        b = fromfile.read(BUFSIZE)
469
        if not b:
470
            break
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
471
        tofile.write(b)
1 by mbp at sourcefrog
import from baz patch-364
472
473
1185.67.7 by Aaron Bentley
Refactored a bit
474
def file_iterator(input_file, readsize=32768):
475
    while True:
476
        b = input_file.read(readsize)
477
        if len(b) == 0:
478
            break
479
        yield b
480
481
1 by mbp at sourcefrog
import from baz patch-364
482
def sha_file(f):
483
    if hasattr(f, 'tell'):
484
        assert f.tell() == 0
485
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
486
    BUFSIZE = 128<<10
487
    while True:
488
        b = f.read(BUFSIZE)
489
        if not b:
490
            break
491
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
492
    return s.hexdigest()
493
494
1235 by Martin Pool
- split sha_strings into osutils
495
496
def sha_strings(strings):
497
    """Return the sha-1 of concatenation of strings"""
498
    s = sha.new()
499
    map(s.update, strings)
500
    return s.hexdigest()
501
502
1 by mbp at sourcefrog
import from baz patch-364
503
def sha_string(f):
504
    s = sha.new()
505
    s.update(f)
506
    return s.hexdigest()
507
508
124 by mbp at sourcefrog
- check file text for past revisions is correct
509
def fingerprint_file(f):
510
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
511
    b = f.read()
512
    s.update(b)
513
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
514
    return {'size': size,
515
            'sha1': s.hexdigest()}
516
517
1 by mbp at sourcefrog
import from baz patch-364
518
def compare_files(a, b):
519
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
520
    BUFSIZE = 4096
521
    while True:
522
        ai = a.read(BUFSIZE)
523
        bi = b.read(BUFSIZE)
524
        if ai != bi:
525
            return False
526
        if ai == '':
527
            return True
1 by mbp at sourcefrog
import from baz patch-364
528
529
49 by mbp at sourcefrog
fix local-time-offset calculation
530
def local_time_offset(t=None):
531
    """Return offset of local zone from GMT, either at present or at time t."""
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
532
    # python2.3 localtime() can't take None
183 by mbp at sourcefrog
pychecker fixups
533
    if t == None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
534
        t = time.time()
535
        
49 by mbp at sourcefrog
fix local-time-offset calculation
536
    if time.localtime(t).tm_isdst and time.daylight:
8 by mbp at sourcefrog
store committer's timezone in revision and show
537
        return -time.altzone
538
    else:
539
        return -time.timezone
540
541
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
542
def format_date(t, offset=0, timezone='original', date_fmt=None, 
543
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
544
    ## TODO: Perhaps a global option to use either universal or local time?
545
    ## Or perhaps just let people set $TZ?
546
    assert isinstance(t, float)
547
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
548
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
549
        tt = time.gmtime(t)
550
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
551
    elif timezone == 'original':
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
552
        if offset == None:
553
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
554
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
555
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
556
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
557
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
558
    else:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
559
        raise BzrError("unsupported timezone format %r" % timezone,
560
                       ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
561
    if date_fmt is None:
562
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
563
    if show_offset:
564
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
565
    else:
566
        offset_str = ''
567
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
568
569
570
def compact_date(when):
571
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
572
    
573
574
575
def filesize(f):
576
    """Return size of given open file."""
577
    return os.fstat(f.fileno())[ST_SIZE]
578
1553.5.5 by Martin Pool
New utility routine rand_chars
579
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
580
# Define rand_bytes based on platform.
581
try:
582
    # Python 2.4 and later have os.urandom,
583
    # but it doesn't work on some arches
584
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
585
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
586
except (NotImplementedError, AttributeError):
587
    # If python doesn't have os.urandom, or it doesn't work,
588
    # then try to first pull random data from /dev/urandom
589
    if os.path.exists("/dev/urandom"):
590
        rand_bytes = file('/dev/urandom', 'rb').read
591
    # Otherwise, use this hack as a last resort
592
    else:
593
        # not well seeded, but better than nothing
594
        def rand_bytes(n):
595
            import random
596
            s = ''
597
            while n:
598
                s += chr(random.randint(0, 255))
599
                n -= 1
600
            return s
1 by mbp at sourcefrog
import from baz patch-364
601
1553.5.5 by Martin Pool
New utility routine rand_chars
602
603
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
604
def rand_chars(num):
605
    """Return a random string of num alphanumeric characters
606
    
607
    The result only contains lowercase chars because it may be used on 
608
    case-insensitive filesystems.
609
    """
610
    s = ''
611
    for raw_byte in rand_bytes(num):
612
        s += ALNUM[ord(raw_byte) % 36]
613
    return s
614
615
1 by mbp at sourcefrog
import from baz patch-364
616
## 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.
617
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
618
619
def splitpath(p):
620
    """Turn string into list of parts.
621
622
    >>> splitpath('a')
623
    ['a']
624
    >>> splitpath('a/b')
625
    ['a', 'b']
626
    >>> splitpath('a/./b')
627
    ['a', 'b']
628
    >>> splitpath('a/.b')
629
    ['a', '.b']
630
    >>> splitpath('a/../b')
184 by mbp at sourcefrog
pychecker fixups
631
    Traceback (most recent call last):
1 by mbp at sourcefrog
import from baz patch-364
632
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
633
    BzrError: sorry, '..' not allowed in path
1 by mbp at sourcefrog
import from baz patch-364
634
    """
635
    assert isinstance(p, types.StringTypes)
271 by Martin Pool
- Windows path fixes
636
637
    # split on either delimiter because people might use either on
638
    # Windows
639
    ps = re.split(r'[\\/]', p)
640
641
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
642
    for f in ps:
643
        if f == '..':
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
644
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
645
        elif (f == '.') or (f == ''):
646
            pass
647
        else:
648
            rps.append(f)
649
    return rps
1 by mbp at sourcefrog
import from baz patch-364
650
651
def joinpath(p):
652
    assert isinstance(p, list)
653
    for f in p:
183 by mbp at sourcefrog
pychecker fixups
654
        if (f == '..') or (f == None) or (f == ''):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
655
            raise 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 \
656
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
657
658
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
659
@deprecated_function(zero_nine)
1 by mbp at sourcefrog
import from baz patch-364
660
def appendpath(p1, p2):
661
    if p1 == '':
662
        return p2
663
    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 \
664
        return pathjoin(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
665
    
666
1231 by Martin Pool
- more progress on fetch on top of weaves
667
def split_lines(s):
668
    """Split s into lines, but without removing the newline characters."""
1666.1.6 by Robert Collins
Make knit the default format.
669
    lines = s.split('\n')
670
    result = [line + '\n' for line in lines[:-1]]
671
    if lines[-1]:
672
        result.append(lines[-1])
673
    return result
1391 by Robert Collins
merge from integration
674
675
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
676
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
677
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
678
1185.1.46 by Robert Collins
Aarons branch --basis patch
679
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
680
def link_or_copy(src, dest):
681
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
682
    if not hardlinks_good():
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
683
        copyfile(src, dest)
684
        return
685
    try:
686
        os.link(src, dest)
687
    except (OSError, IOError), e:
688
        if e.errno != errno.EXDEV:
689
            raise
690
        copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
691
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
692
def delete_any(full_path):
693
    """Delete a file or directory."""
694
    try:
695
        os.unlink(full_path)
696
    except OSError, e:
697
    # We may be renaming a dangling inventory id
698
        if e.errno not in (errno.EISDIR, errno.EACCES, errno.EPERM):
699
            raise
700
        os.rmdir(full_path)
701
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
702
703
def has_symlinks():
704
    if hasattr(os, 'symlink'):
705
        return True
706
    else:
707
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
708
        
709
710
def contains_whitespace(s):
711
    """True if there are any whitespace characters in s."""
712
    for ch in string.whitespace:
713
        if ch in s:
714
            return True
715
    else:
716
        return False
717
718
719
def contains_linebreaks(s):
720
    """True if there is any vertical whitespace in s."""
721
    for ch in '\f\n\r':
722
        if ch in s:
723
            return True
724
    else:
725
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
726
727
728
def relpath(base, path):
729
    """Return path relative to base, or raise exception.
730
731
    The path may be either an absolute path or a path relative to the
732
    current working directory.
733
734
    os.path.commonprefix (python2.4) has a bad bug that it works just
735
    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.
736
    avoids that problem.
737
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
738
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
739
    assert len(base) >= MIN_ABS_PATHLENGTH, ('Length of base must be equal or'
740
        ' exceed the platform minimum length (which is %d)' % 
741
        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
742
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
743
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
744
745
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
746
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
747
    while len(head) >= len(base):
748
        if head == base:
749
            break
750
        head, tail = os.path.split(head)
751
        if tail:
752
            s.insert(0, tail)
753
    else:
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
754
        raise PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
755
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
756
    if s:
757
        return pathjoin(*s)
758
    else:
759
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
760
761
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
762
def safe_unicode(unicode_or_utf8_string):
763
    """Coerce unicode_or_utf8_string into unicode.
764
765
    If it is unicode, it is returned.
766
    Otherwise it is decoded from utf-8. If a decoding error
767
    occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
768
    as a BzrBadParameter exception.
769
    """
770
    if isinstance(unicode_or_utf8_string, unicode):
771
        return unicode_or_utf8_string
772
    try:
773
        return unicode_or_utf8_string.decode('utf8')
774
    except UnicodeDecodeError:
1185.65.29 by Robert Collins
Implement final review suggestions.
775
        raise BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
776
777
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
778
_platform_normalizes_filenames = False
779
if sys.platform == 'darwin':
780
    _platform_normalizes_filenames = True
781
782
783
def normalizes_filenames():
784
    """Return True if this platform normalizes unicode filenames.
785
786
    Mac OSX does, Windows/Linux do not.
787
    """
788
    return _platform_normalizes_filenames
789
790
791
if _platform_normalizes_filenames:
792
    def unicode_filename(path):
793
        """Make sure 'path' is a properly normalized filename.
794
795
        On platforms where the system normalizes filenames (Mac OSX),
796
        you can access a file by any path which will normalize
797
        correctly.
798
        Internally, bzr only supports NFC/NFKC normalization, since
799
        that is the standard for XML documents.
800
        So we return an normalized path, and indicate this has been
801
        properly normalized.
802
803
        :return: (path, is_normalized) Return a path which can
804
                access the file, and whether or not this path is
805
                normalized.
806
        """
807
        return unicodedata.normalize('NFKC', path), True
808
else:
809
    def unicode_filename(path):
810
        """Make sure 'path' is a properly normalized filename.
811
812
        On platforms where the system does not normalize filenames 
813
        (Windows, Linux), you have to access a file by its exact path.
814
        Internally, bzr only supports NFC/NFKC normalization, since
815
        that is the standard for XML documents.
816
        So we return the original path, and indicate if this is
817
        properly normalized.
818
819
        :return: (path, is_normalized) Return a path which can
820
                access the file, and whether or not this path is
821
                normalized.
822
        """
823
        return path, unicodedata.normalize('NFKC', path) == path
824
825
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
826
def terminal_width():
827
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
828
    if sys.platform == 'win32':
829
        import bzrlib.win32console
830
        return bzrlib.win32console.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
831
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
832
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
833
        import struct, fcntl, termios
834
        s = struct.pack('HHHH', 0, 0, 0, 0)
835
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
836
        width = struct.unpack('HHHH', x)[1]
837
    except IOError:
838
        pass
839
    if width <= 0:
840
        try:
841
            width = int(os.environ['COLUMNS'])
842
        except:
843
            pass
844
    if width <= 0:
845
        width = 80
846
847
    return width
1534.7.25 by Aaron Bentley
Added set_executability
848
849
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
850
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
851
852
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
853
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
854
855
856
def check_legal_path(path):
857
    """Check whether the supplied path is legal.  
858
    This is only required on Windows, so we don't test on other platforms
859
    right now.
860
    """
861
    if sys.platform != "win32":
862
        return
863
    if _validWin32PathRE.match(path) is None:
864
        raise IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
865
866
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
867
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
868
    """Yield data about all the directories in a tree.
869
    
870
    This yields all the data about the contents of a directory at a time.
871
    After each directory has been yielded, if the caller has mutated the list
872
    to exclude some directories, they are then not descended into.
873
    
874
    The data yielded is of the form:
875
    [(relpath, basename, kind, lstat, path_from_top), ...]
876
1757.2.16 by Robert Collins
Review comments.
877
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
878
        allows one to walk a subtree but get paths that are relative to a tree
879
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
880
    :return: an iterator over the dirs.
881
    """
882
    lstat = os.lstat
883
    pending = []
884
    _directory = _directory_kind
885
    _listdir = listdir
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
886
    pending = [(prefix, "", _directory, None, top)]
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
887
    while pending:
888
        dirblock = []
889
        currentdir = pending.pop()
890
        # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
891
        top = currentdir[4]
892
        if currentdir[0]:
893
            relroot = currentdir[0] + '/'
894
        else:
895
            relroot = ""
896
        for name in sorted(_listdir(top)):
897
            abspath = top + '/' + name
898
            statvalue = lstat(abspath)
899
            dirblock.append ((relroot + name, name, file_kind_from_stat_mode(statvalue.st_mode), statvalue, abspath))
900
        yield dirblock
901
        # push the user specified dirs from dirblock
902
        for dir in reversed(dirblock):
903
            if dir[2] == _directory:
904
                pending.append(dir)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
905
906
907
def path_prefix_key(path):
908
    """Generate a prefix-order path key for path.
909
910
    This can be used to sort paths in the same way that walkdirs does.
911
    """
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.
912
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
913
914
915
def compare_paths_prefix_order(path_a, path_b):
916
    """Compare path_a and path_b to generate the same order walkdirs uses."""
917
    key_a = path_prefix_key(path_a)
918
    key_b = path_prefix_key(path_b)
919
    return cmp(key_a, key_b)