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