/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
1740.3.4 by Jelmer Vernooij
Move inventory to commit builder.
381
def is_inside_or_parent_of_any(dir_list, fname):
382
    """True if fname is a child or a parent of any of the given files."""
383
    for dirname in dir_list:
384
        if is_inside(dirname, fname) or is_inside(fname, dirname):
385
            return True
386
    else:
387
        return False
388
389
1 by mbp at sourcefrog
import from baz patch-364
390
def pumpfile(fromfile, tofile):
391
    """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.
392
    BUFSIZE = 32768
393
    while True:
394
        b = fromfile.read(BUFSIZE)
395
        if not b:
396
            break
1185.49.13 by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.
397
        tofile.write(b)
1 by mbp at sourcefrog
import from baz patch-364
398
399
1185.67.7 by Aaron Bentley
Refactored a bit
400
def file_iterator(input_file, readsize=32768):
401
    while True:
402
        b = input_file.read(readsize)
403
        if len(b) == 0:
404
            break
405
        yield b
406
407
1 by mbp at sourcefrog
import from baz patch-364
408
def sha_file(f):
409
    if hasattr(f, 'tell'):
410
        assert f.tell() == 0
411
    s = sha.new()
320 by Martin Pool
- Compute SHA-1 of files in chunks
412
    BUFSIZE = 128<<10
413
    while True:
414
        b = f.read(BUFSIZE)
415
        if not b:
416
            break
417
        s.update(b)
1 by mbp at sourcefrog
import from baz patch-364
418
    return s.hexdigest()
419
420
1235 by Martin Pool
- split sha_strings into osutils
421
422
def sha_strings(strings):
423
    """Return the sha-1 of concatenation of strings"""
424
    s = sha.new()
425
    map(s.update, strings)
426
    return s.hexdigest()
427
428
1 by mbp at sourcefrog
import from baz patch-364
429
def sha_string(f):
430
    s = sha.new()
431
    s.update(f)
432
    return s.hexdigest()
433
434
124 by mbp at sourcefrog
- check file text for past revisions is correct
435
def fingerprint_file(f):
436
    s = sha.new()
126 by mbp at sourcefrog
Use just one big read to fingerprint files
437
    b = f.read()
438
    s.update(b)
439
    size = len(b)
124 by mbp at sourcefrog
- check file text for past revisions is correct
440
    return {'size': size,
441
            'sha1': s.hexdigest()}
442
443
1 by mbp at sourcefrog
import from baz patch-364
444
def compare_files(a, b):
445
    """Returns true if equal in contents"""
74 by mbp at sourcefrog
compare_files: read in one page at a time rather than
446
    BUFSIZE = 4096
447
    while True:
448
        ai = a.read(BUFSIZE)
449
        bi = b.read(BUFSIZE)
450
        if ai != bi:
451
            return False
452
        if ai == '':
453
            return True
1 by mbp at sourcefrog
import from baz patch-364
454
455
49 by mbp at sourcefrog
fix local-time-offset calculation
456
def local_time_offset(t=None):
457
    """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
458
    # python2.3 localtime() can't take None
183 by mbp at sourcefrog
pychecker fixups
459
    if t == None:
73 by mbp at sourcefrog
fix time.localtime call for python 2.3
460
        t = time.time()
461
        
49 by mbp at sourcefrog
fix local-time-offset calculation
462
    if time.localtime(t).tm_isdst and time.daylight:
8 by mbp at sourcefrog
store committer's timezone in revision and show
463
        return -time.altzone
464
    else:
465
        return -time.timezone
466
467
    
1185.12.24 by Aaron Bentley
Made format_date more flexible
468
def format_date(t, offset=0, timezone='original', date_fmt=None, 
469
                show_offset=True):
1 by mbp at sourcefrog
import from baz patch-364
470
    ## TODO: Perhaps a global option to use either universal or local time?
471
    ## Or perhaps just let people set $TZ?
472
    assert isinstance(t, float)
473
    
8 by mbp at sourcefrog
store committer's timezone in revision and show
474
    if timezone == 'utc':
1 by mbp at sourcefrog
import from baz patch-364
475
        tt = time.gmtime(t)
476
        offset = 0
8 by mbp at sourcefrog
store committer's timezone in revision and show
477
    elif timezone == 'original':
23 by mbp at sourcefrog
format_date: handle revisions with no timezone offset
478
        if offset == None:
479
            offset = 0
16 by mbp at sourcefrog
fix inverted calculation for original timezone -> utc
480
        tt = time.gmtime(t + offset)
12 by mbp at sourcefrog
new --timezone option for bzr log
481
    elif timezone == 'local':
1 by mbp at sourcefrog
import from baz patch-364
482
        tt = time.localtime(t)
49 by mbp at sourcefrog
fix local-time-offset calculation
483
        offset = local_time_offset(t)
12 by mbp at sourcefrog
new --timezone option for bzr log
484
    else:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
485
        raise BzrError("unsupported timezone format %r" % timezone,
486
                       ['options are "utc", "original", "local"'])
1185.12.24 by Aaron Bentley
Made format_date more flexible
487
    if date_fmt is None:
488
        date_fmt = "%a %Y-%m-%d %H:%M:%S"
489
    if show_offset:
490
        offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)
491
    else:
492
        offset_str = ''
493
    return (time.strftime(date_fmt, tt) +  offset_str)
1 by mbp at sourcefrog
import from baz patch-364
494
495
496
def compact_date(when):
497
    return time.strftime('%Y%m%d%H%M%S', time.gmtime(when))
498
    
499
500
501
def filesize(f):
502
    """Return size of given open file."""
503
    return os.fstat(f.fileno())[ST_SIZE]
504
1553.5.5 by Martin Pool
New utility routine rand_chars
505
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
506
# Define rand_bytes based on platform.
507
try:
508
    # Python 2.4 and later have os.urandom,
509
    # but it doesn't work on some arches
510
    os.urandom(1)
1 by mbp at sourcefrog
import from baz patch-364
511
    rand_bytes = os.urandom
1185.1.7 by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix.
512
except (NotImplementedError, AttributeError):
513
    # If python doesn't have os.urandom, or it doesn't work,
514
    # then try to first pull random data from /dev/urandom
515
    if os.path.exists("/dev/urandom"):
516
        rand_bytes = file('/dev/urandom', 'rb').read
517
    # Otherwise, use this hack as a last resort
518
    else:
519
        # not well seeded, but better than nothing
520
        def rand_bytes(n):
521
            import random
522
            s = ''
523
            while n:
524
                s += chr(random.randint(0, 255))
525
                n -= 1
526
            return s
1 by mbp at sourcefrog
import from baz patch-364
527
1553.5.5 by Martin Pool
New utility routine rand_chars
528
529
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz'
530
def rand_chars(num):
531
    """Return a random string of num alphanumeric characters
532
    
533
    The result only contains lowercase chars because it may be used on 
534
    case-insensitive filesystems.
535
    """
536
    s = ''
537
    for raw_byte in rand_bytes(num):
538
        s += ALNUM[ord(raw_byte) % 36]
539
    return s
540
541
1 by mbp at sourcefrog
import from baz patch-364
542
## TODO: We could later have path objects that remember their list
543
## decomposition (might be too tricksy though.)
544
545
def splitpath(p):
546
    """Turn string into list of parts.
547
548
    >>> splitpath('a')
549
    ['a']
550
    >>> splitpath('a/b')
551
    ['a', 'b']
552
    >>> splitpath('a/./b')
553
    ['a', 'b']
554
    >>> splitpath('a/.b')
555
    ['a', '.b']
556
    >>> splitpath('a/../b')
184 by mbp at sourcefrog
pychecker fixups
557
    Traceback (most recent call last):
1 by mbp at sourcefrog
import from baz patch-364
558
    ...
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
559
    BzrError: sorry, '..' not allowed in path
1 by mbp at sourcefrog
import from baz patch-364
560
    """
561
    assert isinstance(p, types.StringTypes)
271 by Martin Pool
- Windows path fixes
562
563
    # split on either delimiter because people might use either on
564
    # Windows
565
    ps = re.split(r'[\\/]', p)
566
567
    rps = []
1 by mbp at sourcefrog
import from baz patch-364
568
    for f in ps:
569
        if f == '..':
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
570
            raise BzrError("sorry, %r not allowed in path" % f)
271 by Martin Pool
- Windows path fixes
571
        elif (f == '.') or (f == ''):
572
            pass
573
        else:
574
            rps.append(f)
575
    return rps
1 by mbp at sourcefrog
import from baz patch-364
576
577
def joinpath(p):
578
    assert isinstance(p, list)
579
    for f in p:
183 by mbp at sourcefrog
pychecker fixups
580
        if (f == '..') or (f == None) or (f == ''):
694 by Martin Pool
- weed out all remaining calls to bailout() and remove the function
581
            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 \
582
    return pathjoin(*p)
1 by mbp at sourcefrog
import from baz patch-364
583
584
1732.1.1 by John Arbash Meinel
deprecating appendpath, it does exactly what pathjoin does
585
@deprecated_function(zero_nine)
1 by mbp at sourcefrog
import from baz patch-364
586
def appendpath(p1, p2):
587
    if p1 == '':
588
        return p2
589
    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 \
590
        return pathjoin(p1, p2)
1 by mbp at sourcefrog
import from baz patch-364
591
    
592
1231 by Martin Pool
- more progress on fetch on top of weaves
593
def split_lines(s):
594
    """Split s into lines, but without removing the newline characters."""
1666.1.6 by Robert Collins
Make knit the default format.
595
    lines = s.split('\n')
596
    result = [line + '\n' for line in lines[:-1]]
597
    if lines[-1]:
598
        result.append(lines[-1])
599
    return result
1391 by Robert Collins
merge from integration
600
601
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
602
def hardlinks_good():
1185.10.5 by Aaron Bentley
Fixed hardlinks_good test
603
    return sys.platform not in ('win32', 'cygwin', 'darwin')
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
604
1185.1.46 by Robert Collins
Aarons branch --basis patch
605
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
606
def link_or_copy(src, dest):
607
    """Hardlink a file, or copy it if it can't be hardlinked."""
1185.10.4 by Aaron Bentley
Disabled hardlinks on cygwin, mac OS
608
    if not hardlinks_good():
1185.10.3 by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically
609
        copyfile(src, dest)
610
        return
611
    try:
612
        os.link(src, dest)
613
    except (OSError, IOError), e:
614
        if e.errno != errno.EXDEV:
615
            raise
616
        copyfile(src, dest)
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
617
1558.12.9 by Aaron Bentley
Handle resolving conflicts with directories properly
618
def delete_any(full_path):
619
    """Delete a file or directory."""
620
    try:
621
        os.unlink(full_path)
622
    except OSError, e:
623
    # We may be renaming a dangling inventory id
624
        if e.errno not in (errno.EISDIR, errno.EACCES, errno.EPERM):
625
            raise
626
        os.rmdir(full_path)
627
1399.1.4 by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py
628
629
def has_symlinks():
630
    if hasattr(os, 'symlink'):
631
        return True
632
    else:
633
        return False
1185.16.38 by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils
634
        
635
636
def contains_whitespace(s):
637
    """True if there are any whitespace characters in s."""
638
    for ch in string.whitespace:
639
        if ch in s:
640
            return True
641
    else:
642
        return False
643
644
645
def contains_linebreaks(s):
646
    """True if there is any vertical whitespace in s."""
647
    for ch in '\f\n\r':
648
        if ch in s:
649
            return True
650
    else:
651
        return False
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
652
653
654
def relpath(base, path):
655
    """Return path relative to base, or raise exception.
656
657
    The path may be either an absolute path or a path relative to the
658
    current working directory.
659
660
    os.path.commonprefix (python2.4) has a bad bug that it works just
661
    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.
662
    avoids that problem.
663
    """
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
664
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
665
    assert len(base) >= MIN_ABS_PATHLENGTH, ('Length of base must be equal or'
666
        ' exceed the platform minimum length (which is %d)' % 
667
        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
668
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
669
    rp = abspath(path)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
670
671
    s = []
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
672
    head = rp
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
673
    while len(head) >= len(base):
674
        if head == base:
675
            break
676
        head, tail = os.path.split(head)
677
        if tail:
678
            s.insert(0, tail)
679
    else:
1685.1.12 by John Arbash Meinel
Some more work to get LocalTransport to only support URLs
680
        raise PathNotChild(rp, base)
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
681
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
682
    if s:
683
        return pathjoin(*s)
684
    else:
685
        return ''
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
686
687
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
688
def safe_unicode(unicode_or_utf8_string):
689
    """Coerce unicode_or_utf8_string into unicode.
690
691
    If it is unicode, it is returned.
692
    Otherwise it is decoded from utf-8. If a decoding error
693
    occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
694
    as a BzrBadParameter exception.
695
    """
696
    if isinstance(unicode_or_utf8_string, unicode):
697
        return unicode_or_utf8_string
698
    try:
699
        return unicode_or_utf8_string.decode('utf8')
700
    except UnicodeDecodeError:
1185.65.29 by Robert Collins
Implement final review suggestions.
701
        raise BzrBadParameterNotUnicode(unicode_or_utf8_string)
1534.3.1 by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion
702
703
1185.85.75 by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths.
704
_platform_normalizes_filenames = False
705
if sys.platform == 'darwin':
706
    _platform_normalizes_filenames = True
707
708
709
def normalizes_filenames():
710
    """Return True if this platform normalizes unicode filenames.
711
712
    Mac OSX does, Windows/Linux do not.
713
    """
714
    return _platform_normalizes_filenames
715
716
717
if _platform_normalizes_filenames:
718
    def unicode_filename(path):
719
        """Make sure 'path' is a properly normalized filename.
720
721
        On platforms where the system normalizes filenames (Mac OSX),
722
        you can access a file by any path which will normalize
723
        correctly.
724
        Internally, bzr only supports NFC/NFKC normalization, since
725
        that is the standard for XML documents.
726
        So we return an normalized path, and indicate this has been
727
        properly normalized.
728
729
        :return: (path, is_normalized) Return a path which can
730
                access the file, and whether or not this path is
731
                normalized.
732
        """
733
        return unicodedata.normalize('NFKC', path), True
734
else:
735
    def unicode_filename(path):
736
        """Make sure 'path' is a properly normalized filename.
737
738
        On platforms where the system does not normalize filenames 
739
        (Windows, Linux), you have to access a file by its exact path.
740
        Internally, bzr only supports NFC/NFKC normalization, since
741
        that is the standard for XML documents.
742
        So we return the original path, and indicate if this is
743
        properly normalized.
744
745
        :return: (path, is_normalized) Return a path which can
746
                access the file, and whether or not this path is
747
                normalized.
748
        """
749
        return path, unicodedata.normalize('NFKC', path) == path
750
751
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
752
def terminal_width():
753
    """Return estimated terminal width."""
1704.2.3 by Martin Pool
(win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander)
754
    if sys.platform == 'win32':
755
        import bzrlib.win32console
756
        return bzrlib.win32console.get_console_size()[0]
1704.2.2 by Martin Pool
Detect terminal width using ioctl
757
    width = 0
1185.33.60 by Martin Pool
Use full terminal width for verbose test output.
758
    try:
1704.2.2 by Martin Pool
Detect terminal width using ioctl
759
        import struct, fcntl, termios
760
        s = struct.pack('HHHH', 0, 0, 0, 0)
761
        x = fcntl.ioctl(1, termios.TIOCGWINSZ, s)
762
        width = struct.unpack('HHHH', x)[1]
763
    except IOError:
764
        pass
765
    if width <= 0:
766
        try:
767
            width = int(os.environ['COLUMNS'])
768
        except:
769
            pass
770
    if width <= 0:
771
        width = 80
772
773
    return width
1534.7.25 by Aaron Bentley
Added set_executability
774
775
def supports_executable():
1534.7.160 by Aaron Bentley
Changed implementation of supports_executable
776
    return sys.platform != "win32"
1551.2.53 by abentley
Strip trailing slashes in a platform-sensible way
777
778
1551.2.56 by Aaron Bentley
Better illegal pathname check for Windows
779
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$')
780
781
782
def check_legal_path(path):
783
    """Check whether the supplied path is legal.  
784
    This is only required on Windows, so we don't test on other platforms
785
    right now.
786
    """
787
    if sys.platform != "win32":
788
        return
789
    if _validWin32PathRE.match(path) is None:
790
        raise IllegalPath(path)