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