/brz/remove-bazaar

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