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