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