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