37
37
os.chmod(filename, mod)
40
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/_~-])')
44
42
"""Return a quoted filename filename
46
44
This previously used backslash quoting, but that works poorly on
48
46
# TODO: I'm not really sure this is the best format either.x
51
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/_~-])')
53
47
if _QUOTE_RE.search(f):
54
48
return '"' + f + '"'
138
132
def is_inside(dir, fname):
139
133
"""True if fname is inside dir.
141
The parameters should typically be passed to os.path.normpath first, so
142
that . and .. and repeated slashes are eliminated, and the separators
143
are canonical for the platform.
145
The empty string as a dir name is taken as top-of-tree and matches
148
>>> is_inside('src', 'src/foo.c')
150
>>> is_inside('src', 'srccontrol')
152
>>> is_inside('src', 'src/a/a/a/foo.c')
154
>>> is_inside('foo.c', 'foo.c')
156
>>> is_inside('foo.c', '')
158
>>> is_inside('', 'foo.c')
161
# XXX: Most callers of this can actually do something smarter by
162
# looking at the inventory
169
if dir[-1] != os.sep:
172
return fname.startswith(dir)
135
return os.path.commonprefix([dir, fname]) == dir
175
138
def is_inside_any(dir_list, fname):
176
139
"""True if fname is inside any of given dirs."""
140
# quick scan for perfect match
141
if fname in dir_list:
177
144
for dirname in dir_list:
178
145
if is_inside(dirname, fname):
272
239
return realname, (username + '@' + socket.gethostname())
275
def _get_user_id(branch):
276
243
"""Return the full user id from a file or environment variable.
278
e.g. "John Hacker <jhacker@foo.org>"
281
A branch to use for a per-branch configuration, or None.
283
The following are searched in order:
286
2. .bzr/email for this branch.
245
TODO: Allow taking this from a file in the branch directory too
246
for per-branch ids."""
290
247
v = os.environ.get('BZREMAIL')
292
249
return v.decode(bzrlib.user_encoding)
296
return (branch.controlfile("email", "r")
298
.decode(bzrlib.user_encoding)
301
if e.errno != errno.ENOENT:
307
252
return (open(os.path.join(config_dir(), "email"))
340
def user_email(branch):
285
_EMAIL_RE = re.compile(r'[\w+.-]+@[\w+.-]+')
341
287
"""Return just the email component of a username."""
342
e = _get_user_id(branch)
344
m = re.search(r'[\w+.-]+@[\w+.-]+', e)
290
m = _EMAIL_RE.search(e)
346
292
raise BzrError("%r doesn't seem to contain a reasonable email address" % e)
347
293
return m.group(0)
391
337
tt = time.localtime(t)
392
338
offset = local_time_offset(t)
394
raise BzrError("unsupported timezone format %r" % timezone,
395
['options are "utc", "original", "local"'])
340
raise BzrError("unsupported timezone format %r",
341
['options are "utc", "original", "local"'])
397
343
return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt)
398
344
+ ' %+03d%02d' % (offset / 3600, (offset / 60) % 60))
407
353
"""Return size of given open file."""
408
354
return os.fstat(f.fileno())[ST_SIZE]
410
# Define rand_bytes based on platform.
412
# Python 2.4 and later have os.urandom,
413
# but it doesn't work on some arches
357
if hasattr(os, 'urandom'): # python 2.4 and later
415
358
rand_bytes = os.urandom
416
except (NotImplementedError, AttributeError):
417
# If python doesn't have os.urandom, or it doesn't work,
418
# then try to first pull random data from /dev/urandom
419
if os.path.exists("/dev/urandom"):
420
rand_bytes = file('/dev/urandom', 'rb').read
421
# Otherwise, use this hack as a last resort
423
# not well seeded, but better than nothing
428
s += chr(random.randint(0, 255))
359
elif sys.platform == 'linux2':
360
rand_bytes = file('/dev/urandom', 'rb').read
362
# not well seeded, but better than nothing
367
s += chr(random.randint(0, 255))
432
372
## TODO: We could later have path objects that remember their list
433
373
## decomposition (might be too tricksy though.)
442
"""Return a sequence of possible editor binaries for the current platform"""
443
e = _read_config_value("editor")
447
if os.name == "windows":
449
elif os.name == "posix":
451
yield os.environ["EDITOR"]
456
def _run_editor(filename):
457
"""Try to execute an editor to edit the commit message. Returns True on success,
459
for e in _get_editor():
460
x = os.spawnvp(os.P_WAIT, e, (e, filename))
467
raise BzrError("Could not start any editor. Please specify $EDITOR or use ~/.bzr.conf/editor")
471
def get_text_message(infotext, ignoreline = "default"):
474
if ignoreline == "default":
475
ignoreline = "-- This line and the following will be ignored --"
478
tmp_fileno, msgfilename = tempfile.mkstemp()
479
msgfile = os.close(tmp_fileno)
480
if infotext is not None and infotext != "":
482
msgfile = file(msgfilename, "w")
483
msgfile.write("\n\n%s\n\n%s" % (ignoreline, infotext))
488
if not _run_editor(msgfilename):
493
lastline, nlines = 0, 0
494
for line in file(msgfilename, "r"):
495
stripped_line = line.strip()
496
# strip empty line before the log message starts
498
if stripped_line != "":
502
# check for the ignore line only if there
503
# is additional information at the end
504
if hasinfo and stripped_line == ignoreline:
507
# keep track of the last line that had some content
508
if stripped_line != "":
514
# delete empty lines at the end
516
# add a newline at the end, if needed
517
if not msg[-1].endswith("\n"):
518
return "%s%s" % ("".join(msg), "\n")
522
# delete the msg file in any case
523
try: os.unlink(msgfilename)
added
removed
bzrlib/osutils.py
