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