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