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