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 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
31 |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
32 |
import bzrlib |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
33 |
from bzrlib.errors import BzrError, NotBranchError |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
34 |
from bzrlib.trace import mutter |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
35 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
36 |
|
37 |
def make_readonly(filename): |
|
38 |
"""Make a filename read-only."""
|
|
39 |
mod = os.stat(filename).st_mode |
|
40 |
mod = mod & 0777555 |
|
41 |
os.chmod(filename, mod) |
|
42 |
||
43 |
||
44 |
def make_writable(filename): |
|
45 |
mod = os.stat(filename).st_mode |
|
46 |
mod = mod | 0200 |
|
47 |
os.chmod(filename, mod) |
|
48 |
||
49 |
||
1077
by Martin Pool
- avoid compiling REs at module load time |
50 |
_QUOTE_RE = None |
969
by Martin Pool
- Add less-sucky is_within_any |
51 |
|
52 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
53 |
def quotefn(f): |
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
54 |
"""Return a quoted filename filename
|
55 |
||
56 |
This previously used backslash quoting, but that works poorly on
|
|
57 |
Windows."""
|
|
58 |
# TODO: I'm not really sure this is the best format either.x
|
|
1077
by Martin Pool
- avoid compiling REs at module load time |
59 |
global _QUOTE_RE |
60 |
if _QUOTE_RE == None: |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
61 |
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])') |
1077
by Martin Pool
- avoid compiling REs at module load time |
62 |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
63 |
if _QUOTE_RE.search(f): |
64 |
return '"' + f + '"' |
|
65 |
else: |
|
66 |
return f |
|
1
by mbp at sourcefrog
import from baz patch-364 |
67 |
|
68 |
||
69 |
def file_kind(f): |
|
70 |
mode = os.lstat(f)[ST_MODE] |
|
71 |
if S_ISREG(mode): |
|
72 |
return 'file' |
|
73 |
elif S_ISDIR(mode): |
|
74 |
return 'directory' |
|
20
by mbp at sourcefrog
don't abort on trees that happen to contain symlinks |
75 |
elif S_ISLNK(mode): |
76 |
return 'symlink' |
|
1185.3.28
by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored. |
77 |
elif S_ISCHR(mode): |
78 |
return 'chardev' |
|
79 |
elif S_ISBLK(mode): |
|
80 |
return 'block' |
|
81 |
elif S_ISFIFO(mode): |
|
82 |
return 'fifo' |
|
83 |
elif S_ISSOCK(mode): |
|
84 |
return 'socket' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
85 |
else: |
1185.3.28
by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored. |
86 |
return 'unknown' |
488
by Martin Pool
- new helper function kind_marker() |
87 |
|
88 |
||
89 |
def kind_marker(kind): |
|
90 |
if kind == 'file': |
|
91 |
return '' |
|
92 |
elif kind == 'directory': |
|
93 |
return '/' |
|
94 |
elif kind == 'symlink': |
|
95 |
return '@' |
|
96 |
else: |
|
97 |
raise BzrError('invalid file kind %r' % kind) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
98 |
|
1092.2.6
by Robert Collins
symlink support updated to work |
99 |
def lexists(f): |
100 |
try: |
|
101 |
if hasattr(os, 'lstat'): |
|
102 |
os.lstat(f) |
|
103 |
else: |
|
104 |
os.stat(f) |
|
105 |
return True |
|
106 |
except OSError,e: |
|
107 |
if e.errno == errno.ENOENT: |
|
108 |
return False; |
|
109 |
else: |
|
110 |
raise BzrError("lstat/stat of (%r): %r" % (f, e)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
111 |
|
1092.2.6
by Robert Collins
symlink support updated to work |
112 |
def normalizepath(f): |
113 |
if hasattr(os.path, 'realpath'): |
|
114 |
F = os.path.realpath |
|
115 |
else: |
|
116 |
F = os.path.abspath |
|
117 |
[p,e] = os.path.split(f) |
|
118 |
if e == "" or e == "." or e == "..": |
|
119 |
return F(f) |
|
120 |
else: |
|
121 |
return os.path.join(F(p), e) |
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
122 |
|
123 |
if os.name == "posix": |
|
124 |
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
|
|
125 |
# choke on a Unicode string containing a relative path if
|
|
126 |
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
|
|
127 |
# string.
|
|
128 |
_fs_enc = sys.getfilesystemencoding() |
|
129 |
def abspath(path): |
|
130 |
return os.path.abspath(path.encode(_fs_enc)).decode(_fs_enc) |
|
131 |
def realpath(path): |
|
132 |
return os.path.realpath(path.encode(_fs_enc)).decode(_fs_enc) |
|
133 |
else: |
|
134 |
# We need to use the Unicode-aware os.path.abspath and
|
|
135 |
# os.path.realpath on Windows systems.
|
|
136 |
abspath = os.path.abspath |
|
137 |
realpath = os.path.realpath |
|
1
by mbp at sourcefrog
import from baz patch-364 |
138 |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
139 |
def backup_file(fn): |
140 |
"""Copy a file to a backup.
|
|
141 |
||
142 |
Backups are named in GNU-style, with a ~ suffix.
|
|
143 |
||
144 |
If the file is already a backup, it's not copied.
|
|
145 |
"""
|
|
146 |
if fn[-1] == '~': |
|
147 |
return
|
|
148 |
bfn = fn + '~' |
|
149 |
||
1448
by Robert Collins
revert symlinks correctly |
150 |
if has_symlinks() and os.path.islink(fn): |
151 |
target = os.readlink(fn) |
|
152 |
os.symlink(target, bfn) |
|
153 |
return
|
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
154 |
inf = file(fn, 'rb') |
155 |
try: |
|
156 |
content = inf.read() |
|
157 |
finally: |
|
158 |
inf.close() |
|
159 |
||
160 |
outf = file(bfn, 'wb') |
|
161 |
try: |
|
162 |
outf.write(content) |
|
163 |
finally: |
|
164 |
outf.close() |
|
165 |
||
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
166 |
if os.name == 'nt': |
167 |
import shutil |
|
168 |
rename = shutil.move |
|
169 |
else: |
|
170 |
rename = os.rename |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
171 |
|
172 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
173 |
def isdir(f): |
174 |
"""True if f is an accessible directory."""
|
|
175 |
try: |
|
176 |
return S_ISDIR(os.lstat(f)[ST_MODE]) |
|
177 |
except OSError: |
|
178 |
return False |
|
179 |
||
180 |
||
181 |
def isfile(f): |
|
182 |
"""True if f is a regular file."""
|
|
183 |
try: |
|
184 |
return S_ISREG(os.lstat(f)[ST_MODE]) |
|
185 |
except OSError: |
|
186 |
return False |
|
187 |
||
1092.2.6
by Robert Collins
symlink support updated to work |
188 |
def islink(f): |
189 |
"""True if f is a symlink."""
|
|
190 |
try: |
|
191 |
return S_ISLNK(os.lstat(f)[ST_MODE]) |
|
192 |
except OSError: |
|
193 |
return False |
|
1
by mbp at sourcefrog
import from baz patch-364 |
194 |
|
485
by Martin Pool
- move commit code into its own module |
195 |
def is_inside(dir, fname): |
196 |
"""True if fname is inside dir.
|
|
969
by Martin Pool
- Add less-sucky is_within_any |
197 |
|
198 |
The parameters should typically be passed to os.path.normpath first, so
|
|
199 |
that . and .. and repeated slashes are eliminated, and the separators
|
|
200 |
are canonical for the platform.
|
|
201 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
202 |
The empty string as a dir name is taken as top-of-tree and matches
|
203 |
everything.
|
|
204 |
|
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
205 |
>>> is_inside('src', os.path.join('src', 'foo.c'))
|
969
by Martin Pool
- Add less-sucky is_within_any |
206 |
True
|
207 |
>>> is_inside('src', 'srccontrol')
|
|
208 |
False
|
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
209 |
>>> is_inside('src', os.path.join('src', 'a', 'a', 'a', 'foo.c'))
|
969
by Martin Pool
- Add less-sucky is_within_any |
210 |
True
|
211 |
>>> is_inside('foo.c', 'foo.c')
|
|
212 |
True
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
213 |
>>> is_inside('foo.c', '')
|
214 |
False
|
|
215 |
>>> is_inside('', 'foo.c')
|
|
216 |
True
|
|
485
by Martin Pool
- move commit code into its own module |
217 |
"""
|
969
by Martin Pool
- Add less-sucky is_within_any |
218 |
# XXX: Most callers of this can actually do something smarter by
|
219 |
# looking at the inventory
|
|
972
by Martin Pool
- less dodgy is_inside function |
220 |
if dir == fname: |
221 |
return True |
|
222 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
223 |
if dir == '': |
224 |
return True |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
225 |
|
972
by Martin Pool
- less dodgy is_inside function |
226 |
if dir[-1] != os.sep: |
227 |
dir += os.sep |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
228 |
|
972
by Martin Pool
- less dodgy is_inside function |
229 |
return fname.startswith(dir) |
230 |
||
485
by Martin Pool
- move commit code into its own module |
231 |
|
232 |
def is_inside_any(dir_list, fname): |
|
233 |
"""True if fname is inside any of given dirs."""
|
|
234 |
for dirname in dir_list: |
|
235 |
if is_inside(dirname, fname): |
|
236 |
return True |
|
237 |
else: |
|
238 |
return False |
|
239 |
||
240 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
241 |
def pumpfile(fromfile, tofile): |
242 |
"""Copy contents of one file to another."""
|
|
243 |
tofile.write(fromfile.read()) |
|
244 |
||
245 |
||
246 |
def sha_file(f): |
|
247 |
if hasattr(f, 'tell'): |
|
248 |
assert f.tell() == 0 |
|
249 |
s = sha.new() |
|
320
by Martin Pool
- Compute SHA-1 of files in chunks |
250 |
BUFSIZE = 128<<10 |
251 |
while True: |
|
252 |
b = f.read(BUFSIZE) |
|
253 |
if not b: |
|
254 |
break
|
|
255 |
s.update(b) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
256 |
return s.hexdigest() |
257 |
||
258 |
||
1235
by Martin Pool
- split sha_strings into osutils |
259 |
|
260 |
def sha_strings(strings): |
|
261 |
"""Return the sha-1 of concatenation of strings"""
|
|
262 |
s = sha.new() |
|
263 |
map(s.update, strings) |
|
264 |
return s.hexdigest() |
|
265 |
||
266 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
267 |
def sha_string(f): |
268 |
s = sha.new() |
|
269 |
s.update(f) |
|
270 |
return s.hexdigest() |
|
271 |
||
272 |
||
124
by mbp at sourcefrog
- check file text for past revisions is correct |
273 |
def fingerprint_file(f): |
274 |
s = sha.new() |
|
126
by mbp at sourcefrog
Use just one big read to fingerprint files |
275 |
b = f.read() |
276 |
s.update(b) |
|
277 |
size = len(b) |
|
124
by mbp at sourcefrog
- check file text for past revisions is correct |
278 |
return {'size': size, |
279 |
'sha1': s.hexdigest()} |
|
280 |
||
281 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
282 |
def compare_files(a, b): |
283 |
"""Returns true if equal in contents"""
|
|
74
by mbp at sourcefrog
compare_files: read in one page at a time rather than |
284 |
BUFSIZE = 4096 |
285 |
while True: |
|
286 |
ai = a.read(BUFSIZE) |
|
287 |
bi = b.read(BUFSIZE) |
|
288 |
if ai != bi: |
|
289 |
return False |
|
290 |
if ai == '': |
|
291 |
return True |
|
1
by mbp at sourcefrog
import from baz patch-364 |
292 |
|
293 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
294 |
def local_time_offset(t=None): |
295 |
"""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 |
296 |
# python2.3 localtime() can't take None
|
183
by mbp at sourcefrog
pychecker fixups |
297 |
if t == None: |
73
by mbp at sourcefrog
fix time.localtime call for python 2.3 |
298 |
t = time.time() |
299 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
300 |
if time.localtime(t).tm_isdst and time.daylight: |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
301 |
return -time.altzone |
302 |
else: |
|
303 |
return -time.timezone |
|
304 |
||
305 |
||
1185.12.24
by Aaron Bentley
Made format_date more flexible |
306 |
def format_date(t, offset=0, timezone='original', date_fmt=None, |
307 |
show_offset=True): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
308 |
## TODO: Perhaps a global option to use either universal or local time?
|
309 |
## Or perhaps just let people set $TZ?
|
|
310 |
assert isinstance(t, float) |
|
311 |
||
8
by mbp at sourcefrog
store committer's timezone in revision and show |
312 |
if timezone == 'utc': |
1
by mbp at sourcefrog
import from baz patch-364 |
313 |
tt = time.gmtime(t) |
314 |
offset = 0 |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
315 |
elif timezone == 'original': |
23
by mbp at sourcefrog
format_date: handle revisions with no timezone offset |
316 |
if offset == None: |
317 |
offset = 0 |
|
16
by mbp at sourcefrog
fix inverted calculation for original timezone -> utc |
318 |
tt = time.gmtime(t + offset) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
319 |
elif timezone == 'local': |
1
by mbp at sourcefrog
import from baz patch-364 |
320 |
tt = time.localtime(t) |
49
by mbp at sourcefrog
fix local-time-offset calculation |
321 |
offset = local_time_offset(t) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
322 |
else: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
323 |
raise BzrError("unsupported timezone format %r" % timezone, |
324 |
['options are "utc", "original", "local"']) |
|
1185.12.24
by Aaron Bentley
Made format_date more flexible |
325 |
if date_fmt is None: |
326 |
date_fmt = "%a %Y-%m-%d %H:%M:%S" |
|
327 |
if show_offset: |
|
328 |
offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) |
|
329 |
else: |
|
330 |
offset_str = '' |
|
331 |
return (time.strftime(date_fmt, tt) + offset_str) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
332 |
|
333 |
||
334 |
def compact_date(when): |
|
335 |
return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) |
|
336 |
||
337 |
||
338 |
||
339 |
def filesize(f): |
|
340 |
"""Return size of given open file."""
|
|
341 |
return os.fstat(f.fileno())[ST_SIZE] |
|
342 |
||
1185.1.7
by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix. |
343 |
# Define rand_bytes based on platform.
|
344 |
try: |
|
345 |
# Python 2.4 and later have os.urandom,
|
|
346 |
# but it doesn't work on some arches
|
|
347 |
os.urandom(1) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
348 |
rand_bytes = os.urandom |
1185.1.7
by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix. |
349 |
except (NotImplementedError, AttributeError): |
350 |
# If python doesn't have os.urandom, or it doesn't work,
|
|
351 |
# then try to first pull random data from /dev/urandom
|
|
352 |
if os.path.exists("/dev/urandom"): |
|
353 |
rand_bytes = file('/dev/urandom', 'rb').read |
|
354 |
# Otherwise, use this hack as a last resort
|
|
355 |
else: |
|
356 |
# not well seeded, but better than nothing
|
|
357 |
def rand_bytes(n): |
|
358 |
import random |
|
359 |
s = '' |
|
360 |
while n: |
|
361 |
s += chr(random.randint(0, 255)) |
|
362 |
n -= 1 |
|
363 |
return s |
|
1
by mbp at sourcefrog
import from baz patch-364 |
364 |
|
365 |
## TODO: We could later have path objects that remember their list
|
|
366 |
## decomposition (might be too tricksy though.)
|
|
367 |
||
368 |
def splitpath(p): |
|
369 |
"""Turn string into list of parts.
|
|
370 |
||
371 |
>>> splitpath('a')
|
|
372 |
['a']
|
|
373 |
>>> splitpath('a/b')
|
|
374 |
['a', 'b']
|
|
375 |
>>> splitpath('a/./b')
|
|
376 |
['a', 'b']
|
|
377 |
>>> splitpath('a/.b')
|
|
378 |
['a', '.b']
|
|
379 |
>>> splitpath('a/../b')
|
|
184
by mbp at sourcefrog
pychecker fixups |
380 |
Traceback (most recent call last):
|
1
by mbp at sourcefrog
import from baz patch-364 |
381 |
...
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
382 |
BzrError: sorry, '..' not allowed in path
|
1
by mbp at sourcefrog
import from baz patch-364 |
383 |
"""
|
384 |
assert isinstance(p, types.StringTypes) |
|
271
by Martin Pool
- Windows path fixes |
385 |
|
386 |
# split on either delimiter because people might use either on
|
|
387 |
# Windows
|
|
388 |
ps = re.split(r'[\\/]', p) |
|
389 |
||
390 |
rps = [] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
391 |
for f in ps: |
392 |
if f == '..': |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
393 |
raise BzrError("sorry, %r not allowed in path" % f) |
271
by Martin Pool
- Windows path fixes |
394 |
elif (f == '.') or (f == ''): |
395 |
pass
|
|
396 |
else: |
|
397 |
rps.append(f) |
|
398 |
return rps |
|
1
by mbp at sourcefrog
import from baz patch-364 |
399 |
|
400 |
def joinpath(p): |
|
401 |
assert isinstance(p, list) |
|
402 |
for f in p: |
|
183
by mbp at sourcefrog
pychecker fixups |
403 |
if (f == '..') or (f == None) or (f == ''): |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
404 |
raise BzrError("sorry, %r not allowed in path" % f) |
271
by Martin Pool
- Windows path fixes |
405 |
return os.path.join(*p) |
1
by mbp at sourcefrog
import from baz patch-364 |
406 |
|
407 |
||
408 |
def appendpath(p1, p2): |
|
409 |
if p1 == '': |
|
410 |
return p2 |
|
411 |
else: |
|
271
by Martin Pool
- Windows path fixes |
412 |
return os.path.join(p1, p2) |
1
by mbp at sourcefrog
import from baz patch-364 |
413 |
|
414 |
||
1231
by Martin Pool
- more progress on fetch on top of weaves |
415 |
def split_lines(s): |
416 |
"""Split s into lines, but without removing the newline characters."""
|
|
417 |
return StringIO(s).readlines() |
|
1391
by Robert Collins
merge from integration |
418 |
|
419 |
||
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
420 |
def hardlinks_good(): |
1185.10.5
by Aaron Bentley
Fixed hardlinks_good test |
421 |
return sys.platform not in ('win32', 'cygwin', 'darwin') |
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
422 |
|
1185.1.46
by Robert Collins
Aarons branch --basis patch |
423 |
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
424 |
def link_or_copy(src, dest): |
425 |
"""Hardlink a file, or copy it if it can't be hardlinked."""
|
|
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
426 |
if not hardlinks_good(): |
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
427 |
copyfile(src, dest) |
428 |
return
|
|
429 |
try: |
|
430 |
os.link(src, dest) |
|
431 |
except (OSError, IOError), e: |
|
432 |
if e.errno != errno.EXDEV: |
|
433 |
raise
|
|
434 |
copyfile(src, dest) |
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
435 |
|
436 |
||
437 |
def has_symlinks(): |
|
438 |
if hasattr(os, 'symlink'): |
|
439 |
return True |
|
440 |
else: |
|
441 |
return False |
|
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
442 |
|
443 |
||
444 |
def contains_whitespace(s): |
|
445 |
"""True if there are any whitespace characters in s."""
|
|
446 |
for ch in string.whitespace: |
|
447 |
if ch in s: |
|
448 |
return True |
|
449 |
else: |
|
450 |
return False |
|
451 |
||
452 |
||
453 |
def contains_linebreaks(s): |
|
454 |
"""True if there is any vertical whitespace in s."""
|
|
455 |
for ch in '\f\n\r': |
|
456 |
if ch in s: |
|
457 |
return True |
|
458 |
else: |
|
459 |
return False |
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
460 |
|
461 |
||
462 |
def relpath(base, path): |
|
463 |
"""Return path relative to base, or raise exception.
|
|
464 |
||
465 |
The path may be either an absolute path or a path relative to the
|
|
466 |
current working directory.
|
|
467 |
||
468 |
os.path.commonprefix (python2.4) has a bad bug that it works just
|
|
469 |
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
|
|
470 |
avoids that problem."""
|
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
471 |
rp = abspath(path) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
472 |
|
473 |
s = [] |
|
474 |
head = rp |
|
475 |
while len(head) >= len(base): |
|
476 |
if head == base: |
|
477 |
break
|
|
478 |
head, tail = os.path.split(head) |
|
479 |
if tail: |
|
480 |
s.insert(0, tail) |
|
481 |
else: |
|
482 |
# XXX This should raise a NotChildPath exception, as its not tied
|
|
483 |
# to branch anymore.
|
|
484 |
raise NotBranchError("path %r is not within branch %r" % (rp, base)) |
|
485 |
||
486 |
return os.sep.join(s) |