1
by mbp at sourcefrog
import from baz patch-364 |
1 |
# Bazaar-NG -- distributed version control
|
2 |
||
3 |
# Copyright (C) 2005 by Canonical Ltd
|
|
4 |
||
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.
|
|
9 |
||
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.
|
|
14 |
||
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 |
||
444
by Martin Pool
- cope on platforms with no urandom feature |
19 |
import os, types, re, time, errno, sys |
20
by mbp at sourcefrog
don't abort on trees that happen to contain symlinks |
20 |
from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE |
1
by mbp at sourcefrog
import from baz patch-364 |
21 |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
22 |
from bzrlib.errors import BzrError |
23 |
from bzrlib.trace import mutter |
|
251
by mbp at sourcefrog
- factor out locale.getpreferredencoding() |
24 |
import bzrlib |
1
by mbp at sourcefrog
import from baz patch-364 |
25 |
|
26 |
def make_readonly(filename): |
|
27 |
"""Make a filename read-only."""
|
|
28 |
# TODO: probably needs to be fixed for windows
|
|
29 |
mod = os.stat(filename).st_mode |
|
30 |
mod = mod & 0777555 |
|
31 |
os.chmod(filename, mod) |
|
32 |
||
33 |
||
34 |
def make_writable(filename): |
|
35 |
mod = os.stat(filename).st_mode |
|
36 |
mod = mod | 0200 |
|
37 |
os.chmod(filename, mod) |
|
38 |
||
39 |
||
1077
by Martin Pool
- avoid compiling REs at module load time |
40 |
_QUOTE_RE = None |
969
by Martin Pool
- Add less-sucky is_within_any |
41 |
|
42 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
43 |
def quotefn(f): |
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
44 |
"""Return a quoted filename filename
|
45 |
||
46 |
This previously used backslash quoting, but that works poorly on
|
|
47 |
Windows."""
|
|
48 |
# TODO: I'm not really sure this is the best format either.x
|
|
1077
by Martin Pool
- avoid compiling REs at module load time |
49 |
global _QUOTE_RE |
50 |
if _QUOTE_RE == None: |
|
51 |
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/_~-])') |
|
52 |
||
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
53 |
if _QUOTE_RE.search(f): |
54 |
return '"' + f + '"' |
|
55 |
else: |
|
56 |
return f |
|
1
by mbp at sourcefrog
import from baz patch-364 |
57 |
|
58 |
||
59 |
def file_kind(f): |
|
60 |
mode = os.lstat(f)[ST_MODE] |
|
61 |
if S_ISREG(mode): |
|
62 |
return 'file' |
|
63 |
elif S_ISDIR(mode): |
|
64 |
return 'directory' |
|
20
by mbp at sourcefrog
don't abort on trees that happen to contain symlinks |
65 |
elif S_ISLNK(mode): |
66 |
return 'symlink' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
67 |
else: |
488
by Martin Pool
- new helper function kind_marker() |
68 |
raise BzrError("can't handle file kind with mode %o of %r" % (mode, f)) |
69 |
||
70 |
||
71 |
def kind_marker(kind): |
|
72 |
if kind == 'file': |
|
73 |
return '' |
|
74 |
elif kind == 'directory': |
|
75 |
return '/' |
|
76 |
elif kind == 'symlink': |
|
77 |
return '@' |
|
78 |
else: |
|
79 |
raise BzrError('invalid file kind %r' % kind) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
80 |
|
81 |
||
82 |
||
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
83 |
def backup_file(fn): |
84 |
"""Copy a file to a backup.
|
|
85 |
||
86 |
Backups are named in GNU-style, with a ~ suffix.
|
|
87 |
||
88 |
If the file is already a backup, it's not copied.
|
|
89 |
"""
|
|
90 |
import os |
|
91 |
if fn[-1] == '~': |
|
92 |
return
|
|
93 |
bfn = fn + '~' |
|
94 |
||
95 |
inf = file(fn, 'rb') |
|
96 |
try: |
|
97 |
content = inf.read() |
|
98 |
finally: |
|
99 |
inf.close() |
|
100 |
||
101 |
outf = file(bfn, 'wb') |
|
102 |
try: |
|
103 |
outf.write(content) |
|
104 |
finally: |
|
105 |
outf.close() |
|
106 |
||
909
by Martin Pool
- merge John's code to give the tree root an explicit file id |
107 |
def rename(path_from, path_to): |
108 |
"""Basically the same as os.rename() just special for win32"""
|
|
109 |
if sys.platform == 'win32': |
|
110 |
try: |
|
111 |
os.remove(path_to) |
|
112 |
except OSError, e: |
|
113 |
if e.errno != e.ENOENT: |
|
114 |
raise
|
|
115 |
os.rename(path_from, path_to) |
|
116 |
||
117 |
||
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
118 |
|
119 |
||
120 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
121 |
def isdir(f): |
122 |
"""True if f is an accessible directory."""
|
|
123 |
try: |
|
124 |
return S_ISDIR(os.lstat(f)[ST_MODE]) |
|
125 |
except OSError: |
|
126 |
return False |
|
127 |
||
128 |
||
129 |
||
130 |
def isfile(f): |
|
131 |
"""True if f is a regular file."""
|
|
132 |
try: |
|
133 |
return S_ISREG(os.lstat(f)[ST_MODE]) |
|
134 |
except OSError: |
|
135 |
return False |
|
136 |
||
137 |
||
485
by Martin Pool
- move commit code into its own module |
138 |
def is_inside(dir, fname): |
139 |
"""True if fname is inside dir.
|
|
969
by Martin Pool
- Add less-sucky is_within_any |
140 |
|
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.
|
|
144 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
145 |
The empty string as a dir name is taken as top-of-tree and matches
|
146 |
everything.
|
|
147 |
|
|
969
by Martin Pool
- Add less-sucky is_within_any |
148 |
>>> is_inside('src', 'src/foo.c')
|
149 |
True
|
|
150 |
>>> is_inside('src', 'srccontrol')
|
|
151 |
False
|
|
152 |
>>> is_inside('src', 'src/a/a/a/foo.c')
|
|
153 |
True
|
|
154 |
>>> is_inside('foo.c', 'foo.c')
|
|
155 |
True
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
156 |
>>> is_inside('foo.c', '')
|
157 |
False
|
|
158 |
>>> is_inside('', 'foo.c')
|
|
159 |
True
|
|
485
by Martin Pool
- move commit code into its own module |
160 |
"""
|
969
by Martin Pool
- Add less-sucky is_within_any |
161 |
# XXX: Most callers of this can actually do something smarter by
|
162 |
# looking at the inventory
|
|
972
by Martin Pool
- less dodgy is_inside function |
163 |
if dir == fname: |
164 |
return True |
|
165 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
166 |
if dir == '': |
167 |
return True |
|
168 |
||
972
by Martin Pool
- less dodgy is_inside function |
169 |
if dir[-1] != os.sep: |
170 |
dir += os.sep |
|
171 |
||
172 |
return fname.startswith(dir) |
|
173 |
||
485
by Martin Pool
- move commit code into its own module |
174 |
|
175 |
def is_inside_any(dir_list, fname): |
|
176 |
"""True if fname is inside any of given dirs."""
|
|
177 |
for dirname in dir_list: |
|
178 |
if is_inside(dirname, fname): |
|
179 |
return True |
|
180 |
else: |
|
181 |
return False |
|
182 |
||
183 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
184 |
def pumpfile(fromfile, tofile): |
185 |
"""Copy contents of one file to another."""
|
|
186 |
tofile.write(fromfile.read()) |
|
187 |
||
188 |
||
189 |
def uuid(): |
|
190 |
"""Return a new UUID"""
|
|
63
by mbp at sourcefrog
fix up uuid command |
191 |
try: |
319
by Martin Pool
- remove trivial chomp() function |
192 |
return file('/proc/sys/kernel/random/uuid').readline().rstrip('\n') |
63
by mbp at sourcefrog
fix up uuid command |
193 |
except IOError: |
194 |
return chomp(os.popen('uuidgen').readline()) |
|
195 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
196 |
|
197 |
def sha_file(f): |
|
198 |
import sha |
|
199 |
if hasattr(f, 'tell'): |
|
200 |
assert f.tell() == 0 |
|
201 |
s = sha.new() |
|
320
by Martin Pool
- Compute SHA-1 of files in chunks |
202 |
BUFSIZE = 128<<10 |
203 |
while True: |
|
204 |
b = f.read(BUFSIZE) |
|
205 |
if not b: |
|
206 |
break
|
|
207 |
s.update(b) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
208 |
return s.hexdigest() |
209 |
||
210 |
||
211 |
def sha_string(f): |
|
212 |
import sha |
|
213 |
s = sha.new() |
|
214 |
s.update(f) |
|
215 |
return s.hexdigest() |
|
216 |
||
217 |
||
218 |
||
124
by mbp at sourcefrog
- check file text for past revisions is correct |
219 |
def fingerprint_file(f): |
220 |
import sha |
|
221 |
s = sha.new() |
|
126
by mbp at sourcefrog
Use just one big read to fingerprint files |
222 |
b = f.read() |
223 |
s.update(b) |
|
224 |
size = len(b) |
|
124
by mbp at sourcefrog
- check file text for past revisions is correct |
225 |
return {'size': size, |
226 |
'sha1': s.hexdigest()} |
|
227 |
||
228 |
||
258
by Martin Pool
- Take email from ~/.bzr.conf/email |
229 |
def config_dir(): |
230 |
"""Return per-user configuration directory.
|
|
231 |
||
232 |
By default this is ~/.bzr.conf/
|
|
233 |
|
|
234 |
TODO: Global option --config-dir to override this.
|
|
235 |
"""
|
|
236 |
return os.path.expanduser("~/.bzr.conf") |
|
237 |
||
238 |
||
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
239 |
def _auto_user_id(): |
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
240 |
"""Calculate automatic user identification.
|
241 |
||
242 |
Returns (realname, email).
|
|
243 |
||
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
244 |
Only used when none is set in the environment or the id file.
|
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
245 |
|
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
246 |
This previously used the FQDN as the default domain, but that can
|
247 |
be very slow on machines where DNS is broken. So now we simply
|
|
248 |
use the hostname.
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
249 |
"""
|
251
by mbp at sourcefrog
- factor out locale.getpreferredencoding() |
250 |
import socket |
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
251 |
|
252 |
# XXX: Any good way to get real user name on win32?
|
|
253 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
254 |
try: |
255 |
import pwd |
|
256 |
uid = os.getuid() |
|
257 |
w = pwd.getpwuid(uid) |
|
251
by mbp at sourcefrog
- factor out locale.getpreferredencoding() |
258 |
gecos = w.pw_gecos.decode(bzrlib.user_encoding) |
259 |
username = w.pw_name.decode(bzrlib.user_encoding) |
|
25
by Martin Pool
cope when gecos field doesn't have a comma |
260 |
comma = gecos.find(',') |
261 |
if comma == -1: |
|
262 |
realname = gecos |
|
263 |
else: |
|
264 |
realname = gecos[:comma] |
|
256
by Martin Pool
- More handling of auto-username case |
265 |
if not realname: |
266 |
realname = username |
|
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
267 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
268 |
except ImportError: |
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
269 |
import getpass |
256
by Martin Pool
- More handling of auto-username case |
270 |
realname = username = getpass.getuser().decode(bzrlib.user_encoding) |
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
271 |
|
256
by Martin Pool
- More handling of auto-username case |
272 |
return realname, (username + '@' + socket.gethostname()) |
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
273 |
|
274 |
||
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
275 |
def _get_user_id(branch): |
258
by Martin Pool
- Take email from ~/.bzr.conf/email |
276 |
"""Return the full user id from a file or environment variable.
|
277 |
||
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
278 |
e.g. "John Hacker <jhacker@foo.org>"
|
279 |
||
280 |
branch
|
|
281 |
A branch to use for a per-branch configuration, or None.
|
|
282 |
||
283 |
The following are searched in order:
|
|
284 |
||
285 |
1. $BZREMAIL
|
|
286 |
2. .bzr/email for this branch.
|
|
287 |
3. ~/.bzr.conf/email
|
|
288 |
4. $EMAIL
|
|
289 |
"""
|
|
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
290 |
v = os.environ.get('BZREMAIL') |
291 |
if v: |
|
292 |
return v.decode(bzrlib.user_encoding) |
|
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
293 |
|
294 |
if branch: |
|
295 |
try: |
|
296 |
return (branch.controlfile("email", "r") |
|
297 |
.read() |
|
298 |
.decode(bzrlib.user_encoding) |
|
299 |
.rstrip("\r\n")) |
|
300 |
except IOError, e: |
|
301 |
if e.errno != errno.ENOENT: |
|
302 |
raise
|
|
303 |
except BzrError, e: |
|
304 |
pass
|
|
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
305 |
|
306 |
try: |
|
258
by Martin Pool
- Take email from ~/.bzr.conf/email |
307 |
return (open(os.path.join(config_dir(), "email")) |
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
308 |
.read() |
309 |
.decode(bzrlib.user_encoding) |
|
310 |
.rstrip("\r\n")) |
|
256
by Martin Pool
- More handling of auto-username case |
311 |
except IOError, e: |
312 |
if e.errno != errno.ENOENT: |
|
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
313 |
raise e |
314 |
||
315 |
v = os.environ.get('EMAIL') |
|
316 |
if v: |
|
317 |
return v.decode(bzrlib.user_encoding) |
|
318 |
else: |
|
319 |
return None |
|
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
320 |
|
321 |
||
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
322 |
def username(branch): |
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
323 |
"""Return email-style username.
|
324 |
||
325 |
Something similar to 'Martin Pool <mbp@sourcefrog.net>'
|
|
326 |
||
254
by Martin Pool
- Doc cleanups from Magnus Therning |
327 |
TODO: Check it's reasonably well-formed.
|
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
328 |
"""
|
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
329 |
v = _get_user_id(branch) |
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
330 |
if v: |
331 |
return v |
|
332 |
||
333 |
name, email = _auto_user_id() |
|
246
by mbp at sourcefrog
- unicode decoding in getting email and userid strings |
334 |
if name: |
335 |
return '%s <%s>' % (name, email) |
|
336 |
else: |
|
337 |
return email |
|
1
by mbp at sourcefrog
import from baz patch-364 |
338 |
|
339 |
||
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
340 |
def user_email(branch): |
1
by mbp at sourcefrog
import from baz patch-364 |
341 |
"""Return just the email component of a username."""
|
1074
by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can |
342 |
e = _get_user_id(branch) |
1
by mbp at sourcefrog
import from baz patch-364 |
343 |
if e: |
1077
by Martin Pool
- avoid compiling REs at module load time |
344 |
m = re.search(r'[\w+.-]+@[\w+.-]+', e) |
1
by mbp at sourcefrog
import from baz patch-364 |
345 |
if not m: |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
346 |
raise BzrError("%r doesn't seem to contain a reasonable email address" % e) |
1
by mbp at sourcefrog
import from baz patch-364 |
347 |
return m.group(0) |
348 |
||
252
by Martin Pool
- Don't use host fqdn for default user name, because DNS tends |
349 |
return _auto_user_id()[1] |
1
by mbp at sourcefrog
import from baz patch-364 |
350 |
|
351 |
||
352 |
||
353 |
def compare_files(a, b): |
|
354 |
"""Returns true if equal in contents"""
|
|
74
by mbp at sourcefrog
compare_files: read in one page at a time rather than |
355 |
BUFSIZE = 4096 |
356 |
while True: |
|
357 |
ai = a.read(BUFSIZE) |
|
358 |
bi = b.read(BUFSIZE) |
|
359 |
if ai != bi: |
|
360 |
return False |
|
361 |
if ai == '': |
|
362 |
return True |
|
1
by mbp at sourcefrog
import from baz patch-364 |
363 |
|
364 |
||
365 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
366 |
def local_time_offset(t=None): |
367 |
"""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 |
368 |
# python2.3 localtime() can't take None
|
183
by mbp at sourcefrog
pychecker fixups |
369 |
if t == None: |
73
by mbp at sourcefrog
fix time.localtime call for python 2.3 |
370 |
t = time.time() |
371 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
372 |
if time.localtime(t).tm_isdst and time.daylight: |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
373 |
return -time.altzone |
374 |
else: |
|
375 |
return -time.timezone |
|
376 |
||
377 |
||
378 |
def format_date(t, offset=0, timezone='original'): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
379 |
## TODO: Perhaps a global option to use either universal or local time?
|
380 |
## Or perhaps just let people set $TZ?
|
|
381 |
assert isinstance(t, float) |
|
382 |
||
8
by mbp at sourcefrog
store committer's timezone in revision and show |
383 |
if timezone == 'utc': |
1
by mbp at sourcefrog
import from baz patch-364 |
384 |
tt = time.gmtime(t) |
385 |
offset = 0 |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
386 |
elif timezone == 'original': |
23
by mbp at sourcefrog
format_date: handle revisions with no timezone offset |
387 |
if offset == None: |
388 |
offset = 0 |
|
16
by mbp at sourcefrog
fix inverted calculation for original timezone -> utc |
389 |
tt = time.gmtime(t + offset) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
390 |
elif timezone == 'local': |
1
by mbp at sourcefrog
import from baz patch-364 |
391 |
tt = time.localtime(t) |
49
by mbp at sourcefrog
fix local-time-offset calculation |
392 |
offset = local_time_offset(t) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
393 |
else: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
394 |
raise BzrError("unsupported timezone format %r" % timezone, |
395 |
['options are "utc", "original", "local"']) |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
396 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
397 |
return (time.strftime("%a %Y-%m-%d %H:%M:%S", tt) |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
398 |
+ ' %+03d%02d' % (offset / 3600, (offset / 60) % 60)) |
1
by mbp at sourcefrog
import from baz patch-364 |
399 |
|
400 |
||
401 |
def compact_date(when): |
|
402 |
return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) |
|
403 |
||
404 |
||
405 |
||
406 |
def filesize(f): |
|
407 |
"""Return size of given open file."""
|
|
408 |
return os.fstat(f.fileno())[ST_SIZE] |
|
409 |
||
410 |
||
411 |
if hasattr(os, 'urandom'): # python 2.4 and later |
|
412 |
rand_bytes = os.urandom |
|
444
by Martin Pool
- cope on platforms with no urandom feature |
413 |
elif sys.platform == 'linux2': |
414 |
rand_bytes = file('/dev/urandom', 'rb').read |
|
1
by mbp at sourcefrog
import from baz patch-364 |
415 |
else: |
444
by Martin Pool
- cope on platforms with no urandom feature |
416 |
# not well seeded, but better than nothing
|
417 |
def rand_bytes(n): |
|
418 |
import random |
|
419 |
s = '' |
|
420 |
while n: |
|
421 |
s += chr(random.randint(0, 255)) |
|
422 |
n -= 1 |
|
423 |
return s |
|
1
by mbp at sourcefrog
import from baz patch-364 |
424 |
|
425 |
||
426 |
## TODO: We could later have path objects that remember their list
|
|
427 |
## decomposition (might be too tricksy though.)
|
|
428 |
||
429 |
def splitpath(p): |
|
430 |
"""Turn string into list of parts.
|
|
431 |
||
432 |
>>> splitpath('a')
|
|
433 |
['a']
|
|
434 |
>>> splitpath('a/b')
|
|
435 |
['a', 'b']
|
|
436 |
>>> splitpath('a/./b')
|
|
437 |
['a', 'b']
|
|
438 |
>>> splitpath('a/.b')
|
|
439 |
['a', '.b']
|
|
440 |
>>> splitpath('a/../b')
|
|
184
by mbp at sourcefrog
pychecker fixups |
441 |
Traceback (most recent call last):
|
1
by mbp at sourcefrog
import from baz patch-364 |
442 |
...
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
443 |
BzrError: sorry, '..' not allowed in path
|
1
by mbp at sourcefrog
import from baz patch-364 |
444 |
"""
|
445 |
assert isinstance(p, types.StringTypes) |
|
271
by Martin Pool
- Windows path fixes |
446 |
|
447 |
# split on either delimiter because people might use either on
|
|
448 |
# Windows
|
|
449 |
ps = re.split(r'[\\/]', p) |
|
450 |
||
451 |
rps = [] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
452 |
for f in ps: |
453 |
if f == '..': |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
454 |
raise BzrError("sorry, %r not allowed in path" % f) |
271
by Martin Pool
- Windows path fixes |
455 |
elif (f == '.') or (f == ''): |
456 |
pass
|
|
457 |
else: |
|
458 |
rps.append(f) |
|
459 |
return rps |
|
1
by mbp at sourcefrog
import from baz patch-364 |
460 |
|
461 |
def joinpath(p): |
|
462 |
assert isinstance(p, list) |
|
463 |
for f in p: |
|
183
by mbp at sourcefrog
pychecker fixups |
464 |
if (f == '..') or (f == None) or (f == ''): |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
465 |
raise BzrError("sorry, %r not allowed in path" % f) |
271
by Martin Pool
- Windows path fixes |
466 |
return os.path.join(*p) |
1
by mbp at sourcefrog
import from baz patch-364 |
467 |
|
468 |
||
469 |
def appendpath(p1, p2): |
|
470 |
if p1 == '': |
|
471 |
return p2 |
|
472 |
else: |
|
271
by Martin Pool
- Windows path fixes |
473 |
return os.path.join(p1, p2) |
1
by mbp at sourcefrog
import from baz patch-364 |
474 |
|
475 |
||
476 |
def extern_command(cmd, ignore_errors = False): |
|
477 |
mutter('external command: %s' % `cmd`) |
|
478 |
if os.system(cmd): |
|
479 |
if not ignore_errors: |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
480 |
raise BzrError('command failed') |
1
by mbp at sourcefrog
import from baz patch-364 |
481 |
|
763
by Martin Pool
- Patch from Torsten Marek to take commit messages through an |
482 |
|
483 |
def _read_config_value(name): |
|
484 |
"""Read a config value from the file ~/.bzr.conf/<name>
|
|
485 |
Return None if the file does not exist"""
|
|
486 |
try: |
|
487 |
f = file(os.path.join(config_dir(), name), "r") |
|
488 |
return f.read().decode(bzrlib.user_encoding).rstrip("\r\n") |
|
489 |
except IOError, e: |
|
490 |
if e.errno == errno.ENOENT: |
|
491 |
return None |
|
492 |
raise
|
|
493 |
||
494 |
||
495 |
def _get_editor(): |
|
496 |
"""Return a sequence of possible editor binaries for the current platform"""
|
|
497 |
e = _read_config_value("editor") |
|
498 |
if e is not None: |
|
499 |
yield e |
|
500 |
||
501 |
if os.name == "windows": |
|
502 |
yield "notepad.exe" |
|
503 |
elif os.name == "posix": |
|
504 |
try: |
|
505 |
yield os.environ["EDITOR"] |
|
506 |
except KeyError: |
|
507 |
yield "/usr/bin/vi" |
|
508 |
||
509 |
||
510 |
def _run_editor(filename): |
|
511 |
"""Try to execute an editor to edit the commit message. Returns True on success,
|
|
512 |
False on failure"""
|
|
513 |
for e in _get_editor(): |
|
514 |
x = os.spawnvp(os.P_WAIT, e, (e, filename)) |
|
515 |
if x == 0: |
|
516 |
return True |
|
517 |
elif x == 127: |
|
518 |
continue
|
|
519 |
else: |
|
520 |
break
|
|
521 |
raise BzrError("Could not start any editor. Please specify $EDITOR or use ~/.bzr.conf/editor") |
|
522 |
return False |
|
523 |
||
524 |
||
525 |
def get_text_message(infotext, ignoreline = "default"): |
|
526 |
import tempfile |
|
527 |
||
528 |
if ignoreline == "default": |
|
529 |
ignoreline = "-- This line and the following will be ignored --" |
|
530 |
||
531 |
try: |
|
532 |
tmp_fileno, msgfilename = tempfile.mkstemp() |
|
533 |
msgfile = os.close(tmp_fileno) |
|
534 |
if infotext is not None and infotext != "": |
|
535 |
hasinfo = True |
|
536 |
msgfile = file(msgfilename, "w") |
|
537 |
msgfile.write("\n\n%s\n\n%s" % (ignoreline, infotext)) |
|
538 |
msgfile.close() |
|
539 |
else: |
|
540 |
hasinfo = False |
|
541 |
||
542 |
if not _run_editor(msgfilename): |
|
543 |
return None |
|
544 |
||
545 |
started = False |
|
546 |
msg = [] |
|
547 |
lastline, nlines = 0, 0 |
|
548 |
for line in file(msgfilename, "r"): |
|
549 |
stripped_line = line.strip() |
|
550 |
# strip empty line before the log message starts
|
|
551 |
if not started: |
|
552 |
if stripped_line != "": |
|
553 |
started = True |
|
554 |
else: |
|
555 |
continue
|
|
556 |
# check for the ignore line only if there
|
|
557 |
# is additional information at the end
|
|
558 |
if hasinfo and stripped_line == ignoreline: |
|
559 |
break
|
|
560 |
nlines += 1 |
|
561 |
# keep track of the last line that had some content
|
|
562 |
if stripped_line != "": |
|
563 |
lastline = nlines |
|
564 |
msg.append(line) |
|
565 |
||
566 |
if len(msg) == 0: |
|
567 |
return None |
|
568 |
# delete empty lines at the end
|
|
569 |
del msg[lastline:] |
|
570 |
# add a newline at the end, if needed
|
|
571 |
if not msg[-1].endswith("\n"): |
|
572 |
return "%s%s" % ("".join(msg), "\n") |
|
573 |
else: |
|
574 |
return "".join(msg) |
|
575 |
finally: |
|
576 |
# delete the msg file in any case
|
|
577 |
try: os.unlink(msgfilename) |
|
578 |
except IOError: pass |