/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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):
259
    fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
260
261
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
262
# Default is to just use the python builtins, but these can be rebound on
263
# particular platforms.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
264
abspath = _posix_abspath
265
realpath = _posix_realpath
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
266
pathjoin = os.path.join
267
normpath = os.path.normpath
268
getcwd = os.getcwdu
269
mkdtemp = tempfile.mkdtemp
270
rename = os.rename
271
dirname = os.path.dirname
272
basename = os.path.basename
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
273
rmtree = shutil.rmtree
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
274
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
275
MIN_ABS_PATHLENGTH = 1
276
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
277
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
278
if sys.platform == 'win32':
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
279
    abspath = _win32_abspath
280
    realpath = _win32_realpath
281
    pathjoin = _win32_pathjoin
282
    normpath = _win32_normpath
283
    getcwd = _win32_getcwd
284
    mkdtemp = _win32_mkdtemp
285
    rename = _win32_rename
286
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
287
    MIN_ABS_PATHLENGTH = 3
1532 by Robert Collins
Merge in John Meinels integration branch.
288
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
289
    def _win32_delete_readonly(function, path, excinfo):
290
        """Error handler for shutil.rmtree function [for win32]
291
        Helps to remove files and dirs marked as read-only.
292
        """
293
        type_, value = excinfo[:2]
294
        if function in (os.remove, os.rmdir) \
295
            and type_ == OSError \
296
            and value.errno == errno.EACCES:
297
            bzrlib.osutils.make_writable(path)
298
            function(path)
299
        else:
300
            raise
301
302
    def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly):
303
        """Replacer for shutil.rmtree: could remove readonly dirs/files"""
304
        return shutil.rmtree(path, ignore_errors, onerror)
305
1685.1.31 by John Arbash Meinel
Adding tests for the rest of the _win32 functions.
306
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.
307
def get_terminal_encoding():
308
    """Find the best encoding for printing to the screen.
309
310
    This attempts to check both sys.stdout and sys.stdin to see
311
    what encoding they are in, and if that fails it falls back to
312
    bzrlib.user_encoding.
313
    The problem is that on Windows, locale.getpreferredencoding()
314
    is not the same encoding as that used by the console:
315
    http://mail.python.org/pipermail/python-list/2003-May/162357.html
316
317
    On my standard US Windows XP, the preferred encoding is
318
    cp1252, but the console is cp437
319
    """
320
    output_encoding = getattr(sys.stdout, 'encoding', None)
321
    if not output_encoding:
322
        input_encoding = getattr(sys.stdin, 'encoding', None)
323
        if not input_encoding:
324
            output_encoding = bzrlib.user_encoding
325
            mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding)
326
        else:
327
            output_encoding = input_encoding
328
            mutter('encoding stdout as sys.stdin encoding %r', output_encoding)
329
    else:
330
        mutter('encoding stdout as sys.stdout encoding %r', output_encoding)
331
    return output_encoding
332
333
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 \
334
def normalizepath(f):
335
    if hasattr(os.path, 'realpath'):
336
        F = realpath
337
    else:
338
        F = abspath
339
    [p,e] = os.path.split(f)
340
    if e == "" or e == "." or e == "..":
341
        return F(f)
342
    else:
343
        return pathjoin(F(p), e)
344
1 by mbp at sourcefrog
import from baz patch-364
345
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
346
def backup_file(fn):
347
    """Copy a file to a backup.
348
349
    Backups are named in GNU-style, with a ~ suffix.
350
351
    If the file is already a backup, it's not copied.
352
    """
353
    if fn[-1] == '~':
354
        return
355
    bfn = fn + '~'
356
1448 by Robert Collins
revert symlinks correctly
357
    if has_symlinks() and os.path.islink(fn):
358
        target = os.readlink(fn)
359
        os.symlink(target, bfn)
360
        return
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
361
    inf = file(fn, 'rb')
362
    try:
363
        content = inf.read()
364
    finally:
365
        inf.close()
366
    
367
    outf = file(bfn, 'wb')
368
    try:
369
        outf.write(content)
370
    finally:
371
        outf.close()
372
373
1 by mbp at sourcefrog
import from baz patch-364
374
def isdir(f):
375
    """True if f is an accessible directory."""
376
    try:
377
        return S_ISDIR(os.lstat(f)[ST_MODE])
378
    except OSError:
379
        return False
380
381
382
def isfile(f):
383
    """True if f is a regular file."""
384
    try:
385
        return S_ISREG(os.lstat(f)[ST_MODE])
386
    except OSError:
387
        return False
388
1092.2.6 by Robert Collins
symlink support updated to work
389
def islink(f):
390
    """True if f is a symlink."""
391
    try:
392
        return S_ISLNK(os.lstat(f)[ST_MODE])
393
    except OSError:
394
        return False
1 by mbp at sourcefrog
import from baz patch-364
395
485 by Martin Pool
- move commit code into its own module
396
def is_inside(dir, fname):
397
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
398
    
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
399
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
400
    that . and .. and repeated slashes are eliminated, and the separators
401
    are canonical for the platform.
402
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
403
    The empty string as a dir name is taken as top-of-tree and matches 
404
    everything.
405
    
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 \
406
    >>> is_inside('src', pathjoin('src', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
407
    True
408
    >>> is_inside('src', 'srccontrol')
409
    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 \
410
    >>> is_inside('src', pathjoin('src', 'a', 'a', 'a', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
411
    True
412
    >>> is_inside('foo.c', 'foo.c')
413
    True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
414
    >>> is_inside('foo.c', '')
415
    False
416
    >>> is_inside('', 'foo.c')
417
    True
485 by Martin Pool
- move commit code into its own module
418
    """
969 by Martin Pool
- Add less-sucky is_within_any
419
    # XXX: Most callers of this can actually do something smarter by 
420
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
421
    if dir == fname:
422
        return True
423
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
424
    if dir == '':
425
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
426
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
427
    if dir[-1] != '/':
428
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
429
972 by Martin Pool
- less dodgy is_inside function
430
    return fname.startswith(dir)
431
485 by Martin Pool
- move commit code into its own module
432
433
def is_inside_any(dir_list, fname):
434
    """True if fname is inside any of given dirs."""
435
    for dirname in dir_list:
436
        if is_inside(dirname, fname):
437
            return True
438
    else:
439
        return False
440
441
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
442
def is_inside_or_parent_of_any(dir_list, fname):
443
    """True if fname is a child or a parent of any of the given files."""
444
    for dirname in dir_list:
445
        if is_inside(dirname, fname) or is_inside(fname, dirname):
446
            return True
447
    else:
448
        return False
449
450
1 by mbp at sourcefrog
import from baz patch-364
451
def pumpfile(fromfile, tofile):
452
    """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.
453
    BUFSIZE = 32768
454
    while True:
455
        b = fromfile.read(BUFSIZE)
456
        if not b:
457
            break
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
458
        tofile.write(b)
1 by mbp at sourcefrog
import from baz patch-364
459
460
1185.67.7 by Aaron Bentley
Refactored a bit
461
def file_iterator(input_file, readsize=32768):
462
    while True:
463
        b = input_file.read(readsize)
464
        if len(b) == 0:
465
            break
466
        yield b
467
468
1 by mbp at sourcefrog
import from baz patch-364
469
def sha_file(f):
470
    if hasattr(f, 'tell'):
471
        assert f.tell() == 0
472
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
473
    BUFSIZE = 128<<10
474
    while True:
475
        b = f.read(BUFSIZE)
476
        if not b:
477
            break
478
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
479
    return s.hexdigest()
480
481
1235 by Martin Pool
- split sha_strings into osutils
482
483
def sha_strings(strings):
484
    """Return the sha-1 of concatenation of strings"""
485
    s = sha.new()
486
    map(s.update, strings)
487
    return s.hexdigest()
488
489
1 by mbp at sourcefrog
import from baz patch-364
490
def sha_string(f):
491
    s = sha.new()
492
    s.update(f)
493
    return s.hexdigest()
494
495
124 by mbp at sourcefrog
- check file text for past revisions is correct
496
def fingerprint_file(f):
497
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
498
    b = f.read()
499
    s.update(b)
500
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
501
    return {'size': size,
502
            'sha1': s.hexdigest()}
503
504
1 by mbp at sourcefrog
import from baz patch-364
505
def compare_files(a, b):
506
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
507
    BUFSIZE = 4096
508
    while True:
509
        ai = a.read(BUFSIZE)
510
        bi = b.read(BUFSIZE)
511
        if ai != bi:
512
            return False
513
        if ai == '':
514
            return True
1 by mbp at sourcefrog
import from baz patch-364
515
516
49 by mbp at sourcefrog
fix local-time-offset calculation
517
def local_time_offset(t=None):
518
    """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
519
    # python2.3 localtime() can't take None
183 by mbp at sourcefrog
pychecker fixups
520
    if t == None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
521
        t = time.time()
522
        
49 by mbp at sourcefrog
fix local-time-offset calculation
523
    if time.localtime(t).tm_isdst and time.daylight:
8 by mbp at sourcefrog
store committer's timezone in revision and show
524
        return -time.altzone
525
    else:
526
        return -time.timezone
527
528
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
529
def format_date(t, offset=0, timezone='original', date_fmt=None, 
530
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
531
    ## TODO: Perhaps a global option to use either universal or local time?
532
    ## Or perhaps just let people set $TZ?
533
    assert isinstance(t, float)
534
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
535
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
536
        tt = time.gmtime(t)
537
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
538
    elif timezone == 'original':
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
539
        if offset == None:
540
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
541
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
542
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
543
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
544
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
545
    else:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
546
        raise BzrError("unsupported timezone format %r" % timezone,
547
                       ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
548
    if date_fmt is None:
549
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
550
    if show_offset:
551
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
552
    else:
553
        offset_str = ''
554
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
555
556
557
def compact_date(when):
558
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
559
    
560
561
562
def filesize(f):
563
    """Return size of given open file."""
564
    return os.fstat(f.fileno())[ST_SIZE]
565
1553.5.5 by Martin Pool
New utility routine rand_chars
566
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
567
# Define rand_bytes based on platform.
568
try:
569
    # Python 2.4 and later have os.urandom,
570
    # but it doesn't work on some arches
571
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
572
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
573
except (NotImplementedError, AttributeError):
574
    # If python doesn't have os.urandom, or it doesn't work,
575
    # then try to first pull random data from /dev/urandom
576
    if os.path.exists("/dev/urandom"):
577
        rand_bytes = file('/dev/urandom', 'rb').read
578
    # Otherwise, use this hack as a last resort
579
    else:
580
        # not well seeded, but better than nothing
581
        def rand_bytes(n):
582
            import random
583
            s = ''
584
            while n:
585
                s += chr(random.randint(0, 255))
586
                n -= 1
587
            return s
1 by mbp at sourcefrog
import from baz patch-364
588
1553.5.5 by Martin Pool
New utility routine rand_chars
589
590
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
591
def rand_chars(num):
592
    """Return a random string of num alphanumeric characters
593
    
594
    The result only contains lowercase chars because it may be used on 
595
    case-insensitive filesystems.
596
    """
597
    s = ''
598
    for raw_byte in rand_bytes(num):
599
        s += ALNUM[ord(raw_byte) % 36]
600
    return s
601
602
1 by mbp at sourcefrog
import from baz patch-364
603
## 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.
604
## decomposition (might be too tricksy though.)
1 by mbp at sourcefrog
import from baz patch-364
605
606
def splitpath(p):
607
    """Turn string into list of parts.
608
609
    >>> splitpath('a')
610
    ['a']
611
    >>> splitpath('a/b')
612
    ['a', 'b']
613
    >>> splitpath('a/./b')
614
    ['a', 'b']
615
    >>> splitpath('a/.b')
616
    ['a', '.b']
617
    >>> splitpath('a/../b')
184 by mbp at sourcefrog
pychecker fixups
618
    Traceback (most recent call last):
1 by mbp at sourcefrog
import from baz patch-364
619
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
620
    BzrError: sorry, '..' not allowed in path
1 by mbp at sourcefrog
import from baz patch-364
621
    """
622
    assert isinstance(p, types.StringTypes)
271 by Martin Pool
- Windows path fixes
623
624
    # split on either delimiter because people might use either on
625
    # Windows
626
    ps = re.split(r'[\\/]', p)
627
628
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
629
    for f in ps:
630
        if f == '..':
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
631
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
632
        elif (f == '.') or (f == ''):
633
            pass
634
        else:
635
            rps.append(f)
636
    return rps
1 by mbp at sourcefrog
import from baz patch-364
637
638
def joinpath(p):
639
    assert isinstance(p, list)
640
    for f in p:
183 by mbp at sourcefrog
pychecker fixups
641
        if (f == '..') or (f == None) or (f == ''):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
642
            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 \
643
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
644
645
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
646
@deprecated_function(zero_nine)
1 by mbp at sourcefrog
import from baz patch-364
647
def appendpath(p1, p2):
648
    if p1 == '':
649
        return p2
650
    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 \
651
        return pathjoin(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
652
    
653
1231 by Martin Pool
- more progress on fetch on top of weaves
654
def split_lines(s):
655
    """Split s into lines, but without removing the newline characters."""
1666.1.6 by Robert Collins
Make knit the default format.
656
    lines = s.split('\n')
657
    result = [line + '\n' for line in lines[:-1]]
658
    if lines[-1]:
659
        result.append(lines[-1])
660
    return result
1391 by Robert Collins
merge from integration
661
662
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
663
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
664
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
665
1185.1.46 by Robert Collins
Aarons branch --basis patch
666
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
667
def link_or_copy(src, dest):
668
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
669
    if not hardlinks_good():
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
670
        copyfile(src, dest)
671
        return
672
    try:
673
        os.link(src, dest)
674
    except (OSError, IOError), e:
675
        if e.errno != errno.EXDEV:
676
            raise
677
        copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
678
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
679
def delete_any(full_path):
680
    """Delete a file or directory."""
681
    try:
682
        os.unlink(full_path)
683
    except OSError, e:
684
    # We may be renaming a dangling inventory id
685
        if e.errno not in (errno.EISDIR, errno.EACCES, errno.EPERM):
686
            raise
687
        os.rmdir(full_path)
688
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
689
690
def has_symlinks():
691
    if hasattr(os, 'symlink'):
692
        return True
693
    else:
694
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
695
        
696
697
def contains_whitespace(s):
698
    """True if there are any whitespace characters in s."""
699
    for ch in string.whitespace:
700
        if ch in s:
701
            return True
702
    else:
703
        return False
704
705
706
def contains_linebreaks(s):
707
    """True if there is any vertical whitespace in s."""
708
    for ch in '\f\n\r':
709
        if ch in s:
710
            return True
711
    else:
712
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
713
714
715
def relpath(base, path):
716
    """Return path relative to base, or raise exception.
717
718
    The path may be either an absolute path or a path relative to the
719
    current working directory.
720
721
    os.path.commonprefix (python2.4) has a bad bug that it works just
722
    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.
723
    avoids that problem.
724
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
725
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
726
    assert len(base) >= MIN_ABS_PATHLENGTH, ('Length of base must be equal or'
727
        ' exceed the platform minimum length (which is %d)' % 
728
        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
729
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
730
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
731
732
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
733
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
734
    while len(head) >= len(base):
735
        if head == base:
736
            break
737
        head, tail = os.path.split(head)
738
        if tail:
739
            s.insert(0, tail)
740
    else:
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
741
        raise PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
742
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
743
    if s:
744
        return pathjoin(*s)
745
    else:
746
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
747
748
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
749
def safe_unicode(unicode_or_utf8_string):
750
    """Coerce unicode_or_utf8_string into unicode.
751
752
    If it is unicode, it is returned.
753
    Otherwise it is decoded from utf-8. If a decoding error
754
    occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
755
    as a BzrBadParameter exception.
756
    """
757
    if isinstance(unicode_or_utf8_string, unicode):
758
        return unicode_or_utf8_string
759
    try:
760
        return unicode_or_utf8_string.decode('utf8')
761
    except UnicodeDecodeError:
1185.65.29 by Robert Collins
Implement final review suggestions.
762
        raise BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
763
764
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
765
_platform_normalizes_filenames = False
766
if sys.platform == 'darwin':
767
    _platform_normalizes_filenames = True
768
769
770
def normalizes_filenames():
771
    """Return True if this platform normalizes unicode filenames.
772
773
    Mac OSX does, Windows/Linux do not.
774
    """
775
    return _platform_normalizes_filenames
776
777
778
if _platform_normalizes_filenames:
779
    def unicode_filename(path):
780
        """Make sure 'path' is a properly normalized filename.
781
782
        On platforms where the system normalizes filenames (Mac OSX),
783
        you can access a file by any path which will normalize
784
        correctly.
785
        Internally, bzr only supports NFC/NFKC normalization, since
786
        that is the standard for XML documents.
787
        So we return an normalized path, and indicate this has been
788
        properly normalized.
789
790
        :return: (path, is_normalized) Return a path which can
791
                access the file, and whether or not this path is
792
                normalized.
793
        """
794
        return unicodedata.normalize('NFKC', path), True
795
else:
796
    def unicode_filename(path):
797
        """Make sure 'path' is a properly normalized filename.
798
799
        On platforms where the system does not normalize filenames 
800
        (Windows, Linux), you have to access a file by its exact path.
801
        Internally, bzr only supports NFC/NFKC normalization, since
802
        that is the standard for XML documents.
803
        So we return the original path, and indicate if this is
804
        properly normalized.
805
806
        :return: (path, is_normalized) Return a path which can
807
                access the file, and whether or not this path is
808
                normalized.
809
        """
810
        return path, unicodedata.normalize('NFKC', path) == path
811
812
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
813
def terminal_width():
814
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
815
    if sys.platform == 'win32':
816
        import bzrlib.win32console
817
        return bzrlib.win32console.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
818
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
819
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
820
        import struct, fcntl, termios
821
        s = struct.pack('HHHH', 0, 0, 0, 0)
822
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
823
        width = struct.unpack('HHHH', x)[1]
824
    except IOError:
825
        pass
826
    if width <= 0:
827
        try:
828
            width = int(os.environ['COLUMNS'])
829
        except:
830
            pass
831
    if width <= 0:
832
        width = 80
833
834
    return width
1534.7.25 by Aaron Bentley
Added set_executability
835
836
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
837
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
838
839
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
840
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
841
842
843
def check_legal_path(path):
844
    """Check whether the supplied path is legal.  
845
    This is only required on Windows, so we don't test on other platforms
846
    right now.
847
    """
848
    if sys.platform != "win32":
849
        return
850
    if _validWin32PathRE.match(path) is None:
851
        raise IllegalPath(path)
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
852
853
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
854
def walkdirs(top, prefix=""):
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
855
    """Yield data about all the directories in a tree.
856
    
857
    This yields all the data about the contents of a directory at a time.
858
    After each directory has been yielded, if the caller has mutated the list
859
    to exclude some directories, they are then not descended into.
860
    
861
    The data yielded is of the form:
862
    [(relpath, basename, kind, lstat, path_from_top), ...]
863
1757.2.16 by Robert Collins
Review comments.
864
    :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
865
        allows one to walk a subtree but get paths that are relative to a tree
866
        rooted higher up.
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
867
    :return: an iterator over the dirs.
868
    """
869
    lstat = os.lstat
870
    pending = []
871
    _directory = _directory_kind
872
    _listdir = listdir
1757.2.8 by Robert Collins
Teach walkdirs to walk a subdir of a tree.
873
    pending = [(prefix, "", _directory, None, top)]
1753.1.1 by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine.
874
    while pending:
875
        dirblock = []
876
        currentdir = pending.pop()
877
        # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
878
        top = currentdir[4]
879
        if currentdir[0]:
880
            relroot = currentdir[0] + '/'
881
        else:
882
            relroot = ""
883
        for name in sorted(_listdir(top)):
884
            abspath = top + '/' + name
885
            statvalue = lstat(abspath)
886
            dirblock.append ((relroot + name, name, file_kind_from_stat_mode(statvalue.st_mode), statvalue, abspath))
887
        yield dirblock
888
        # push the user specified dirs from dirblock
889
        for dir in reversed(dirblock):
890
            if dir[2] == _directory:
891
                pending.append(dir)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
892
893
894
def path_prefix_key(path):
895
    """Generate a prefix-order path key for path.
896
897
    This can be used to sort paths in the same way that walkdirs does.
898
    """
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.
899
    return (dirname(path) , path)
1773.3.1 by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions.
900
901
902
def compare_paths_prefix_order(path_a, path_b):
903
    """Compare path_a and path_b to generate the same order walkdirs uses."""
904
    key_a = path_prefix_key(path_a)
905
    key_b = path_prefix_key(path_b)
906
    return cmp(key_a, key_b)