~bzr-pqm/bzr/bzr.dev

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
1185.1.46 by Robert Collins
Aarons branch --basis patch
19
from shutil import copyfile
1185.3.28 by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored.
20
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
21
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
1390 by Robert Collins
pair programming worx... merge integration and weave
22
from cStringIO import StringIO
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
23
import errno
24
import os
25
import re
1236 by Martin Pool
- fix up imports
26
import sha
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
27
import string
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
28
import sys
29
import time
30
import types
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
31
import tempfile
1 by mbp at sourcefrog
import from baz patch-364
32
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
33
import bzrlib
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
34
from bzrlib.errors import BzrError, PathNotChild, NoSuchFile
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
35
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
36
1 by mbp at sourcefrog
import from baz patch-364
37
38
def make_readonly(filename):
39
    """Make a filename read-only."""
40
    mod = os.stat(filename).st_mode
41
    mod = mod & 0777555
42
    os.chmod(filename, mod)
43
44
45
def make_writable(filename):
46
    mod = os.stat(filename).st_mode
47
    mod = mod | 0200
48
    os.chmod(filename, mod)
49
50
1077 by Martin Pool
- avoid compiling REs at module load time
51
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
52
53
1 by mbp at sourcefrog
import from baz patch-364
54
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
55
    """Return a quoted filename filename
56
57
    This previously used backslash quoting, but that works poorly on
58
    Windows."""
59
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
60
    global _QUOTE_RE
61
    if _QUOTE_RE == None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
62
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
1077 by Martin Pool
- avoid compiling REs at module load time
63
        
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
64
    if _QUOTE_RE.search(f):
65
        return '"' + f + '"'
66
    else:
67
        return f
1 by mbp at sourcefrog
import from baz patch-364
68
69
70
def file_kind(f):
71
    mode = os.lstat(f)[ST_MODE]
72
    if S_ISREG(mode):
73
        return 'file'
74
    elif S_ISDIR(mode):
75
        return 'directory'
20 by mbp at sourcefrog
don't abort on trees that happen to contain symlinks
76
    elif S_ISLNK(mode):
77
        return 'symlink'
1185.3.28 by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored.
78
    elif S_ISCHR(mode):
79
        return 'chardev'
80
    elif S_ISBLK(mode):
81
        return 'block'
82
    elif S_ISFIFO(mode):
83
        return 'fifo'
84
    elif S_ISSOCK(mode):
85
        return 'socket'
1 by mbp at sourcefrog
import from baz patch-364
86
    else:
1185.3.28 by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored.
87
        return 'unknown'
488 by Martin Pool
- new helper function kind_marker()
88
89
90
def kind_marker(kind):
91
    if kind == 'file':
92
        return ''
93
    elif kind == 'directory':
94
        return '/'
95
    elif kind == 'symlink':
96
        return '@'
97
    else:
98
        raise BzrError('invalid file kind %r' % kind)
1 by mbp at sourcefrog
import from baz patch-364
99
1092.2.6 by Robert Collins
symlink support updated to work
100
def lexists(f):
1185.31.33 by John Arbash Meinel
A couple more path.join statements needed changing.
101
    if hasattr(os.path, 'lexists'):
102
        return os.path.lexists(f)
1092.2.6 by Robert Collins
symlink support updated to work
103
    try:
104
        if hasattr(os, 'lstat'):
105
            os.lstat(f)
106
        else:
107
            os.stat(f)
108
        return True
109
    except OSError,e:
110
        if e.errno == errno.ENOENT:
111
            return False;
112
        else:
113
            raise BzrError("lstat/stat of (%r): %r" % (f, e))
1 by mbp at sourcefrog
import from baz patch-364
114
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
115
def fancy_rename(old, new, rename_func, unlink_func):
116
    """A fancy rename, when you don't have atomic rename.
117
    
118
    :param old: The old path, to rename from
119
    :param new: The new path, to rename to
120
    :param rename_func: The potentially non-atomic rename function
121
    :param unlink_func: A way to delete the target file if the full rename succeeds
122
    """
123
124
    # sftp rename doesn't allow overwriting, so play tricks:
125
    import random
126
    base = os.path.basename(new)
127
    dirname = os.path.dirname(new)
128
    tmp_name = u'tmp.%s.%.9f.%d.%d' % (base, time.time(), os.getpid(), random.randint(0, 0x7FFFFFFF))
129
    tmp_name = pathjoin(dirname, tmp_name)
130
131
    # Rename the file out of the way, but keep track if it didn't exist
132
    # We don't want to grab just any exception
133
    # something like EACCES should prevent us from continuing
134
    # The downside is that the rename_func has to throw an exception
135
    # with an errno = ENOENT, or NoSuchFile
136
    file_existed = False
137
    try:
138
        rename_func(new, tmp_name)
139
    except (NoSuchFile,), e:
140
        pass
1532 by Robert Collins
Merge in John Meinels integration branch.
141
    except IOError, e:
142
        # RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
143
        # function raises an IOError with errno == None when a rename fails.
144
        # This then gets caught here.
1185.50.37 by John Arbash Meinel
Fixed exception handling for fancy_rename
145
        if e.errno not in (None, errno.ENOENT, errno.ENOTDIR):
1532 by Robert Collins
Merge in John Meinels integration branch.
146
            raise
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
147
    except Exception, e:
148
        if (not hasattr(e, 'errno') 
149
            or e.errno not in (errno.ENOENT, errno.ENOTDIR)):
150
            raise
151
    else:
152
        file_existed = True
153
154
    success = False
155
    try:
156
        # This may throw an exception, in which case success will
157
        # not be set.
158
        rename_func(old, new)
159
        success = True
160
    finally:
161
        if file_existed:
162
            # If the file used to exist, rename it back into place
163
            # otherwise just delete it from the tmp location
164
            if success:
165
                unlink_func(tmp_name)
166
            else:
1185.31.49 by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS**
167
                rename_func(tmp_name, new)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
168
169
# Default is to just use the python builtins
170
abspath = os.path.abspath
171
realpath = os.path.realpath
172
pathjoin = os.path.join
173
normpath = os.path.normpath
174
getcwd = os.getcwdu
175
mkdtemp = tempfile.mkdtemp
176
rename = os.rename
177
dirname = os.path.dirname
178
basename = os.path.basename
179
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
180
if os.name == "posix":
181
    # In Python 2.4.2 and older, os.path.abspath and os.path.realpath
182
    # choke on a Unicode string containing a relative path if
183
    # os.getcwd() returns a non-sys.getdefaultencoding()-encoded
184
    # string.
185
    _fs_enc = sys.getfilesystemencoding()
186
    def abspath(path):
187
        return os.path.abspath(path.encode(_fs_enc)).decode(_fs_enc)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
188
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
189
    def realpath(path):
190
        return os.path.realpath(path.encode(_fs_enc)).decode(_fs_enc)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
191
192
if sys.platform == 'win32':
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
193
    # We need to use the Unicode-aware os.path.abspath and
194
    # os.path.realpath on Windows systems.
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 \
195
    def abspath(path):
196
        return os.path.abspath(path).replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
197
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 \
198
    def realpath(path):
199
        return os.path.realpath(path).replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
200
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 \
201
    def pathjoin(*args):
202
        return os.path.join(*args).replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
203
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
204
    def normpath(path):
205
        return os.path.normpath(path).replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
206
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
207
    def getcwd():
208
        return os.getcwdu().replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
209
1185.31.40 by John Arbash Meinel
Added osutils.mkdtemp()
210
    def mkdtemp(*args, **kwargs):
211
        return tempfile.mkdtemp(*args, **kwargs).replace('\\', '/')
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
212
213
    def rename(old, new):
214
        fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink)
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 \
215
1532 by Robert Collins
Merge in John Meinels integration branch.
216
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 \
217
def normalizepath(f):
218
    if hasattr(os.path, 'realpath'):
219
        F = realpath
220
    else:
221
        F = abspath
222
    [p,e] = os.path.split(f)
223
    if e == "" or e == "." or e == "..":
224
        return F(f)
225
    else:
226
        return pathjoin(F(p), e)
227
1 by mbp at sourcefrog
import from baz patch-364
228
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
229
def backup_file(fn):
230
    """Copy a file to a backup.
231
232
    Backups are named in GNU-style, with a ~ suffix.
233
234
    If the file is already a backup, it's not copied.
235
    """
236
    if fn[-1] == '~':
237
        return
238
    bfn = fn + '~'
239
1448 by Robert Collins
revert symlinks correctly
240
    if has_symlinks() and os.path.islink(fn):
241
        target = os.readlink(fn)
242
        os.symlink(target, bfn)
243
        return
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
244
    inf = file(fn, 'rb')
245
    try:
246
        content = inf.read()
247
    finally:
248
        inf.close()
249
    
250
    outf = file(bfn, 'wb')
251
    try:
252
        outf.write(content)
253
    finally:
254
        outf.close()
255
256
1 by mbp at sourcefrog
import from baz patch-364
257
def isdir(f):
258
    """True if f is an accessible directory."""
259
    try:
260
        return S_ISDIR(os.lstat(f)[ST_MODE])
261
    except OSError:
262
        return False
263
264
265
def isfile(f):
266
    """True if f is a regular file."""
267
    try:
268
        return S_ISREG(os.lstat(f)[ST_MODE])
269
    except OSError:
270
        return False
271
1092.2.6 by Robert Collins
symlink support updated to work
272
def islink(f):
273
    """True if f is a symlink."""
274
    try:
275
        return S_ISLNK(os.lstat(f)[ST_MODE])
276
    except OSError:
277
        return False
1 by mbp at sourcefrog
import from baz patch-364
278
485 by Martin Pool
- move commit code into its own module
279
def is_inside(dir, fname):
280
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
281
    
1185.31.38 by John Arbash Meinel
Changing os.path.normpath to osutils.normpath
282
    The parameters should typically be passed to osutils.normpath first, so
969 by Martin Pool
- Add less-sucky is_within_any
283
    that . and .. and repeated slashes are eliminated, and the separators
284
    are canonical for the platform.
285
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
286
    The empty string as a dir name is taken as top-of-tree and matches 
287
    everything.
288
    
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 \
289
    >>> is_inside('src', pathjoin('src', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
290
    True
291
    >>> is_inside('src', 'srccontrol')
292
    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 \
293
    >>> is_inside('src', pathjoin('src', 'a', 'a', 'a', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
294
    True
295
    >>> is_inside('foo.c', 'foo.c')
296
    True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
297
    >>> is_inside('foo.c', '')
298
    False
299
    >>> is_inside('', 'foo.c')
300
    True
485 by Martin Pool
- move commit code into its own module
301
    """
969 by Martin Pool
- Add less-sucky is_within_any
302
    # XXX: Most callers of this can actually do something smarter by 
303
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
304
    if dir == fname:
305
        return True
306
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
307
    if dir == '':
308
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
309
1185.31.34 by John Arbash Meinel
Removing instances of os.sep
310
    if dir[-1] != '/':
311
        dir += '/'
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
312
972 by Martin Pool
- less dodgy is_inside function
313
    return fname.startswith(dir)
314
485 by Martin Pool
- move commit code into its own module
315
316
def is_inside_any(dir_list, fname):
317
    """True if fname is inside any of given dirs."""
318
    for dirname in dir_list:
319
        if is_inside(dirname, fname):
320
            return True
321
    else:
322
        return False
323
324
1 by mbp at sourcefrog
import from baz patch-364
325
def pumpfile(fromfile, tofile):
326
    """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.
327
    BUFSIZE = 32768
328
    while True:
329
        b = fromfile.read(BUFSIZE)
330
        if not b:
331
            break
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
332
        tofile.write(b)
1 by mbp at sourcefrog
import from baz patch-364
333
334
335
def sha_file(f):
336
    if hasattr(f, 'tell'):
337
        assert f.tell() == 0
338
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
339
    BUFSIZE = 128<<10
340
    while True:
341
        b = f.read(BUFSIZE)
342
        if not b:
343
            break
344
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
345
    return s.hexdigest()
346
347
1235 by Martin Pool
- split sha_strings into osutils
348
349
def sha_strings(strings):
350
    """Return the sha-1 of concatenation of strings"""
351
    s = sha.new()
352
    map(s.update, strings)
353
    return s.hexdigest()
354
355
1 by mbp at sourcefrog
import from baz patch-364
356
def sha_string(f):
357
    s = sha.new()
358
    s.update(f)
359
    return s.hexdigest()
360
361
124 by mbp at sourcefrog
- check file text for past revisions is correct
362
def fingerprint_file(f):
363
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
364
    b = f.read()
365
    s.update(b)
366
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
367
    return {'size': size,
368
            'sha1': s.hexdigest()}
369
370
1 by mbp at sourcefrog
import from baz patch-364
371
def compare_files(a, b):
372
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
373
    BUFSIZE = 4096
374
    while True:
375
        ai = a.read(BUFSIZE)
376
        bi = b.read(BUFSIZE)
377
        if ai != bi:
378
            return False
379
        if ai == '':
380
            return True
1 by mbp at sourcefrog
import from baz patch-364
381
382
49 by mbp at sourcefrog
fix local-time-offset calculation
383
def local_time_offset(t=None):
384
    """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
385
    # python2.3 localtime() can't take None
183 by mbp at sourcefrog
pychecker fixups
386
    if t == None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
387
        t = time.time()
388
        
49 by mbp at sourcefrog
fix local-time-offset calculation
389
    if time.localtime(t).tm_isdst and time.daylight:
8 by mbp at sourcefrog
store committer's timezone in revision and show
390
        return -time.altzone
391
    else:
392
        return -time.timezone
393
394
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
395
def format_date(t, offset=0, timezone='original', date_fmt=None, 
396
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
397
    ## TODO: Perhaps a global option to use either universal or local time?
398
    ## Or perhaps just let people set $TZ?
399
    assert isinstance(t, float)
400
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
401
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
402
        tt = time.gmtime(t)
403
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
404
    elif timezone == 'original':
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
405
        if offset == None:
406
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
407
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
408
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
409
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
410
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
411
    else:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
412
        raise BzrError("unsupported timezone format %r" % timezone,
413
                       ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
414
    if date_fmt is None:
415
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
416
    if show_offset:
417
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
418
    else:
419
        offset_str = ''
420
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
421
422
423
def compact_date(when):
424
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
425
    
426
427
428
def filesize(f):
429
    """Return size of given open file."""
430
    return os.fstat(f.fileno())[ST_SIZE]
431
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
432
# Define rand_bytes based on platform.
433
try:
434
    # Python 2.4 and later have os.urandom,
435
    # but it doesn't work on some arches
436
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
437
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
438
except (NotImplementedError, AttributeError):
439
    # If python doesn't have os.urandom, or it doesn't work,
440
    # then try to first pull random data from /dev/urandom
441
    if os.path.exists("/dev/urandom"):
442
        rand_bytes = file('/dev/urandom', 'rb').read
443
    # Otherwise, use this hack as a last resort
444
    else:
445
        # not well seeded, but better than nothing
446
        def rand_bytes(n):
447
            import random
448
            s = ''
449
            while n:
450
                s += chr(random.randint(0, 255))
451
                n -= 1
452
            return s
1 by mbp at sourcefrog
import from baz patch-364
453
454
## TODO: We could later have path objects that remember their list
455
## decomposition (might be too tricksy though.)
456
457
def splitpath(p):
458
    """Turn string into list of parts.
459
460
    >>> splitpath('a')
461
    ['a']
462
    >>> splitpath('a/b')
463
    ['a', 'b']
464
    >>> splitpath('a/./b')
465
    ['a', 'b']
466
    >>> splitpath('a/.b')
467
    ['a', '.b']
468
    >>> splitpath('a/../b')
184 by mbp at sourcefrog
pychecker fixups
469
    Traceback (most recent call last):
1 by mbp at sourcefrog
import from baz patch-364
470
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
471
    BzrError: sorry, '..' not allowed in path
1 by mbp at sourcefrog
import from baz patch-364
472
    """
473
    assert isinstance(p, types.StringTypes)
271 by Martin Pool
- Windows path fixes
474
475
    # split on either delimiter because people might use either on
476
    # Windows
477
    ps = re.split(r'[\\/]', p)
478
479
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
480
    for f in ps:
481
        if f == '..':
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
482
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
483
        elif (f == '.') or (f == ''):
484
            pass
485
        else:
486
            rps.append(f)
487
    return rps
1 by mbp at sourcefrog
import from baz patch-364
488
489
def joinpath(p):
490
    assert isinstance(p, list)
491
    for f in p:
183 by mbp at sourcefrog
pychecker fixups
492
        if (f == '..') or (f == None) or (f == ''):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
493
            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 \
494
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
495
496
497
def appendpath(p1, p2):
498
    if p1 == '':
499
        return p2
500
    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 \
501
        return pathjoin(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
502
    
503
1231 by Martin Pool
- more progress on fetch on top of weaves
504
def split_lines(s):
505
    """Split s into lines, but without removing the newline characters."""
506
    return StringIO(s).readlines()
1391 by Robert Collins
merge from integration
507
508
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
509
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
510
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
511
1185.1.46 by Robert Collins
Aarons branch --basis patch
512
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
513
def link_or_copy(src, dest):
514
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
515
    if not hardlinks_good():
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
516
        copyfile(src, dest)
517
        return
518
    try:
519
        os.link(src, dest)
520
    except (OSError, IOError), e:
521
        if e.errno != errno.EXDEV:
522
            raise
523
        copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
524
525
526
def has_symlinks():
527
    if hasattr(os, 'symlink'):
528
        return True
529
    else:
530
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
531
        
532
533
def contains_whitespace(s):
534
    """True if there are any whitespace characters in s."""
535
    for ch in string.whitespace:
536
        if ch in s:
537
            return True
538
    else:
539
        return False
540
541
542
def contains_linebreaks(s):
543
    """True if there is any vertical whitespace in s."""
544
    for ch in '\f\n\r':
545
        if ch in s:
546
            return True
547
    else:
548
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
549
550
551
def relpath(base, path):
552
    """Return path relative to base, or raise exception.
553
554
    The path may be either an absolute path or a path relative to the
555
    current working directory.
556
557
    os.path.commonprefix (python2.4) has a bad bug that it works just
558
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
559
    avoids that problem."""
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
560
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
561
562
    s = []
563
    head = rp
564
    while len(head) >= len(base):
565
        if head == base:
566
            break
567
        head, tail = os.path.split(head)
568
        if tail:
569
            s.insert(0, tail)
570
    else:
571
        # XXX This should raise a NotChildPath exception, as its not tied
572
        # to branch anymore.
1185.31.41 by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil
573
        raise PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
574
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
575
    if s:
576
        return pathjoin(*s)
577
    else:
578
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
579
580
581
def terminal_width():
582
    """Return estimated terminal width."""
583
584
    # TODO: Do something smart on Windows?
585
586
    # TODO: Is there anything that gets a better update when the window
587
    # is resized while the program is running? We could use the Python termcap
588
    # library.
589
    try:
590
        return int(os.environ['COLUMNS'])
591
    except (IndexError, KeyError, ValueError):
592
        return 80