~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
1 by mbp at sourcefrog
import from baz patch-364
31
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
32
import bzrlib
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
33
from bzrlib.errors import BzrError, NotBranchError
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
34
from bzrlib.trace import mutter
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
35
1 by mbp at sourcefrog
import from baz patch-364
36
37
def make_readonly(filename):
38
    """Make a filename read-only."""
39
    mod = os.stat(filename).st_mode
40
    mod = mod & 0777555
41
    os.chmod(filename, mod)
42
43
44
def make_writable(filename):
45
    mod = os.stat(filename).st_mode
46
    mod = mod | 0200
47
    os.chmod(filename, mod)
48
49
1077 by Martin Pool
- avoid compiling REs at module load time
50
_QUOTE_RE = None
969 by Martin Pool
- Add less-sucky is_within_any
51
52
1 by mbp at sourcefrog
import from baz patch-364
53
def quotefn(f):
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
54
    """Return a quoted filename filename
55
56
    This previously used backslash quoting, but that works poorly on
57
    Windows."""
58
    # TODO: I'm not really sure this is the best format either.x
1077 by Martin Pool
- avoid compiling REs at module load time
59
    global _QUOTE_RE
60
    if _QUOTE_RE == None:
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
61
        _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])')
1077 by Martin Pool
- avoid compiling REs at module load time
62
        
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
63
    if _QUOTE_RE.search(f):
64
        return '"' + f + '"'
65
    else:
66
        return f
1 by mbp at sourcefrog
import from baz patch-364
67
68
69
def file_kind(f):
70
    mode = os.lstat(f)[ST_MODE]
71
    if S_ISREG(mode):
72
        return 'file'
73
    elif S_ISDIR(mode):
74
        return 'directory'
20 by mbp at sourcefrog
don't abort on trees that happen to contain symlinks
75
    elif S_ISLNK(mode):
76
        return 'symlink'
1185.3.28 by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored.
77
    elif S_ISCHR(mode):
78
        return 'chardev'
79
    elif S_ISBLK(mode):
80
        return 'block'
81
    elif S_ISFIFO(mode):
82
        return 'fifo'
83
    elif S_ISSOCK(mode):
84
        return 'socket'
1 by mbp at sourcefrog
import from baz patch-364
85
    else:
1185.3.28 by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored.
86
        return 'unknown'
488 by Martin Pool
- new helper function kind_marker()
87
88
89
def kind_marker(kind):
90
    if kind == 'file':
91
        return ''
92
    elif kind == 'directory':
93
        return '/'
94
    elif kind == 'symlink':
95
        return '@'
96
    else:
97
        raise BzrError('invalid file kind %r' % kind)
1 by mbp at sourcefrog
import from baz patch-364
98
1092.2.6 by Robert Collins
symlink support updated to work
99
def lexists(f):
100
    try:
101
        if hasattr(os, 'lstat'):
102
            os.lstat(f)
103
        else:
104
            os.stat(f)
105
        return True
106
    except OSError,e:
107
        if e.errno == errno.ENOENT:
108
            return False;
109
        else:
110
            raise BzrError("lstat/stat of (%r): %r" % (f, e))
1 by mbp at sourcefrog
import from baz patch-364
111
1092.2.6 by Robert Collins
symlink support updated to work
112
def normalizepath(f):
113
    if hasattr(os.path, 'realpath'):
114
        F = os.path.realpath
115
    else:
116
        F = os.path.abspath
117
    [p,e] = os.path.split(f)
118
    if e == "" or e == "." or e == "..":
119
        return F(f)
120
    else:
121
        return os.path.join(F(p), e)
122
    
1 by mbp at sourcefrog
import from baz patch-364
123
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
124
def backup_file(fn):
125
    """Copy a file to a backup.
126
127
    Backups are named in GNU-style, with a ~ suffix.
128
129
    If the file is already a backup, it's not copied.
130
    """
131
    if fn[-1] == '~':
132
        return
133
    bfn = fn + '~'
134
1448 by Robert Collins
revert symlinks correctly
135
    if has_symlinks() and os.path.islink(fn):
136
        target = os.readlink(fn)
137
        os.symlink(target, bfn)
138
        return
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
139
    inf = file(fn, 'rb')
140
    try:
141
        content = inf.read()
142
    finally:
143
        inf.close()
144
    
145
    outf = file(bfn, 'wb')
146
    try:
147
        outf.write(content)
148
    finally:
149
        outf.close()
150
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
151
if os.name == 'nt':
152
    import shutil
153
    rename = shutil.move
154
else:
155
    rename = os.rename
779 by Martin Pool
- better quotefn for windows: use doublequotes for strings with
156
157
1 by mbp at sourcefrog
import from baz patch-364
158
def isdir(f):
159
    """True if f is an accessible directory."""
160
    try:
161
        return S_ISDIR(os.lstat(f)[ST_MODE])
162
    except OSError:
163
        return False
164
165
166
def isfile(f):
167
    """True if f is a regular file."""
168
    try:
169
        return S_ISREG(os.lstat(f)[ST_MODE])
170
    except OSError:
171
        return False
172
1092.2.6 by Robert Collins
symlink support updated to work
173
def islink(f):
174
    """True if f is a symlink."""
175
    try:
176
        return S_ISLNK(os.lstat(f)[ST_MODE])
177
    except OSError:
178
        return False
1 by mbp at sourcefrog
import from baz patch-364
179
485 by Martin Pool
- move commit code into its own module
180
def is_inside(dir, fname):
181
    """True if fname is inside dir.
969 by Martin Pool
- Add less-sucky is_within_any
182
    
183
    The parameters should typically be passed to os.path.normpath first, so
184
    that . and .. and repeated slashes are eliminated, and the separators
185
    are canonical for the platform.
186
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
187
    The empty string as a dir name is taken as top-of-tree and matches 
188
    everything.
189
    
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
190
    >>> is_inside('src', os.path.join('src', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
191
    True
192
    >>> is_inside('src', 'srccontrol')
193
    False
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
194
    >>> is_inside('src', os.path.join('src', 'a', 'a', 'a', 'foo.c'))
969 by Martin Pool
- Add less-sucky is_within_any
195
    True
196
    >>> is_inside('foo.c', 'foo.c')
197
    True
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
198
    >>> is_inside('foo.c', '')
199
    False
200
    >>> is_inside('', 'foo.c')
201
    True
485 by Martin Pool
- move commit code into its own module
202
    """
969 by Martin Pool
- Add less-sucky is_within_any
203
    # XXX: Most callers of this can actually do something smarter by 
204
    # looking at the inventory
972 by Martin Pool
- less dodgy is_inside function
205
    if dir == fname:
206
        return True
207
    
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
208
    if dir == '':
209
        return True
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
210
972 by Martin Pool
- less dodgy is_inside function
211
    if dir[-1] != os.sep:
212
        dir += os.sep
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
213
972 by Martin Pool
- less dodgy is_inside function
214
    return fname.startswith(dir)
215
485 by Martin Pool
- move commit code into its own module
216
217
def is_inside_any(dir_list, fname):
218
    """True if fname is inside any of given dirs."""
219
    for dirname in dir_list:
220
        if is_inside(dirname, fname):
221
            return True
222
    else:
223
        return False
224
225
1 by mbp at sourcefrog
import from baz patch-364
226
def pumpfile(fromfile, tofile):
227
    """Copy contents of one file to another."""
228
    tofile.write(fromfile.read())
229
230
231
def sha_file(f):
232
    if hasattr(f, 'tell'):
233
        assert f.tell() == 0
234
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
235
    BUFSIZE = 128<<10
236
    while True:
237
        b = f.read(BUFSIZE)
238
        if not b:
239
            break
240
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
241
    return s.hexdigest()
242
243
1235 by Martin Pool
- split sha_strings into osutils
244
245
def sha_strings(strings):
246
    """Return the sha-1 of concatenation of strings"""
247
    s = sha.new()
248
    map(s.update, strings)
249
    return s.hexdigest()
250
251
1 by mbp at sourcefrog
import from baz patch-364
252
def sha_string(f):
253
    s = sha.new()
254
    s.update(f)
255
    return s.hexdigest()
256
257
124 by mbp at sourcefrog
- check file text for past revisions is correct
258
def fingerprint_file(f):
259
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
260
    b = f.read()
261
    s.update(b)
262
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
263
    return {'size': size,
264
            'sha1': s.hexdigest()}
265
266
1 by mbp at sourcefrog
import from baz patch-364
267
def compare_files(a, b):
268
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
269
    BUFSIZE = 4096
270
    while True:
271
        ai = a.read(BUFSIZE)
272
        bi = b.read(BUFSIZE)
273
        if ai != bi:
274
            return False
275
        if ai == '':
276
            return True
1 by mbp at sourcefrog
import from baz patch-364
277
278
49 by mbp at sourcefrog
fix local-time-offset calculation
279
def local_time_offset(t=None):
280
    """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
281
    # python2.3 localtime() can't take None
183 by mbp at sourcefrog
pychecker fixups
282
    if t == None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
283
        t = time.time()
284
        
49 by mbp at sourcefrog
fix local-time-offset calculation
285
    if time.localtime(t).tm_isdst and time.daylight:
8 by mbp at sourcefrog
store committer's timezone in revision and show
286
        return -time.altzone
287
    else:
288
        return -time.timezone
289
290
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
291
def format_date(t, offset=0, timezone='original', date_fmt=None, 
292
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
293
    ## TODO: Perhaps a global option to use either universal or local time?
294
    ## Or perhaps just let people set $TZ?
295
    assert isinstance(t, float)
296
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
297
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
298
        tt = time.gmtime(t)
299
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
300
    elif timezone == 'original':
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
301
        if offset == None:
302
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
303
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
304
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
305
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
306
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
307
    else:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
308
        raise BzrError("unsupported timezone format %r" % timezone,
309
                       ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
310
    if date_fmt is None:
311
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
312
    if show_offset:
313
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
314
    else:
315
        offset_str = ''
316
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
317
318
319
def compact_date(when):
320
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
321
    
322
323
324
def filesize(f):
325
    """Return size of given open file."""
326
    return os.fstat(f.fileno())[ST_SIZE]
327
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
328
# Define rand_bytes based on platform.
329
try:
330
    # Python 2.4 and later have os.urandom,
331
    # but it doesn't work on some arches
332
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
333
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
334
except (NotImplementedError, AttributeError):
335
    # If python doesn't have os.urandom, or it doesn't work,
336
    # then try to first pull random data from /dev/urandom
337
    if os.path.exists("/dev/urandom"):
338
        rand_bytes = file('/dev/urandom', 'rb').read
339
    # Otherwise, use this hack as a last resort
340
    else:
341
        # not well seeded, but better than nothing
342
        def rand_bytes(n):
343
            import random
344
            s = ''
345
            while n:
346
                s += chr(random.randint(0, 255))
347
                n -= 1
348
            return s
1 by mbp at sourcefrog
import from baz patch-364
349
350
## TODO: We could later have path objects that remember their list
351
## decomposition (might be too tricksy though.)
352
353
def splitpath(p):
354
    """Turn string into list of parts.
355
356
    >>> splitpath('a')
357
    ['a']
358
    >>> splitpath('a/b')
359
    ['a', 'b']
360
    >>> splitpath('a/./b')
361
    ['a', 'b']
362
    >>> splitpath('a/.b')
363
    ['a', '.b']
364
    >>> splitpath('a/../b')
184 by mbp at sourcefrog
pychecker fixups
365
    Traceback (most recent call last):
1 by mbp at sourcefrog
import from baz patch-364
366
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
367
    BzrError: sorry, '..' not allowed in path
1 by mbp at sourcefrog
import from baz patch-364
368
    """
369
    assert isinstance(p, types.StringTypes)
271 by Martin Pool
- Windows path fixes
370
371
    # split on either delimiter because people might use either on
372
    # Windows
373
    ps = re.split(r'[\\/]', p)
374
375
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
376
    for f in ps:
377
        if f == '..':
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
378
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
379
        elif (f == '.') or (f == ''):
380
            pass
381
        else:
382
            rps.append(f)
383
    return rps
1 by mbp at sourcefrog
import from baz patch-364
384
385
def joinpath(p):
386
    assert isinstance(p, list)
387
    for f in p:
183 by mbp at sourcefrog
pychecker fixups
388
        if (f == '..') or (f == None) or (f == ''):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
389
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
390
    return os.path.join(*p)
1 by mbp at sourcefrog
import from baz patch-364
391
392
393
def appendpath(p1, p2):
394
    if p1 == '':
395
        return p2
396
    else:
271 by Martin Pool
- Windows path fixes
397
        return os.path.join(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
398
    
399
1231 by Martin Pool
- more progress on fetch on top of weaves
400
def split_lines(s):
401
    """Split s into lines, but without removing the newline characters."""
402
    return StringIO(s).readlines()
1391 by Robert Collins
merge from integration
403
404
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
405
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
406
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
407
1185.1.46 by Robert Collins
Aarons branch --basis patch
408
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
409
def link_or_copy(src, dest):
410
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
411
    if not hardlinks_good():
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
412
        copyfile(src, dest)
413
        return
414
    try:
415
        os.link(src, dest)
416
    except (OSError, IOError), e:
417
        if e.errno != errno.EXDEV:
418
            raise
419
        copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
420
421
422
def has_symlinks():
423
    if hasattr(os, 'symlink'):
424
        return True
425
    else:
426
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
427
        
428
429
def contains_whitespace(s):
430
    """True if there are any whitespace characters in s."""
431
    for ch in string.whitespace:
432
        if ch in s:
433
            return True
434
    else:
435
        return False
436
437
438
def contains_linebreaks(s):
439
    """True if there is any vertical whitespace in s."""
440
    for ch in '\f\n\r':
441
        if ch in s:
442
            return True
443
    else:
444
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
445
446
447
def relpath(base, path):
448
    """Return path relative to base, or raise exception.
449
450
    The path may be either an absolute path or a path relative to the
451
    current working directory.
452
453
    os.path.commonprefix (python2.4) has a bad bug that it works just
454
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
455
    avoids that problem."""
456
    rp = os.path.abspath(path)
457
458
    s = []
459
    head = rp
460
    while len(head) >= len(base):
461
        if head == base:
462
            break
463
        head, tail = os.path.split(head)
464
        if tail:
465
            s.insert(0, tail)
466
    else:
467
        # XXX This should raise a NotChildPath exception, as its not tied
468
        # to branch anymore.
469
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
470
471
    return os.sep.join(s)