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