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