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 |
1
by mbp at sourcefrog
import from baz patch-364 |
32 |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
33 |
import bzrlib |
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
34 |
from bzrlib.errors import (BzrError, |
35 |
BzrBadParameter, |
|
36 |
NoSuchFile, |
|
37 |
PathNotChild, |
|
38 |
)
|
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
39 |
from bzrlib.trace import mutter |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
40 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
41 |
|
42 |
def make_readonly(filename): |
|
43 |
"""Make a filename read-only."""
|
|
44 |
mod = os.stat(filename).st_mode |
|
45 |
mod = mod & 0777555 |
|
46 |
os.chmod(filename, mod) |
|
47 |
||
48 |
||
49 |
def make_writable(filename): |
|
50 |
mod = os.stat(filename).st_mode |
|
51 |
mod = mod | 0200 |
|
52 |
os.chmod(filename, mod) |
|
53 |
||
54 |
||
1077
by Martin Pool
- avoid compiling REs at module load time |
55 |
_QUOTE_RE = None |
969
by Martin Pool
- Add less-sucky is_within_any |
56 |
|
57 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
58 |
def quotefn(f): |
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
59 |
"""Return a quoted filename filename
|
60 |
||
61 |
This previously used backslash quoting, but that works poorly on
|
|
62 |
Windows."""
|
|
63 |
# TODO: I'm not really sure this is the best format either.x
|
|
1077
by Martin Pool
- avoid compiling REs at module load time |
64 |
global _QUOTE_RE |
65 |
if _QUOTE_RE == None: |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
66 |
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])') |
1077
by Martin Pool
- avoid compiling REs at module load time |
67 |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
68 |
if _QUOTE_RE.search(f): |
69 |
return '"' + f + '"' |
|
70 |
else: |
|
71 |
return f |
|
1
by mbp at sourcefrog
import from baz patch-364 |
72 |
|
73 |
||
74 |
def file_kind(f): |
|
75 |
mode = os.lstat(f)[ST_MODE] |
|
76 |
if S_ISREG(mode): |
|
77 |
return 'file' |
|
78 |
elif S_ISDIR(mode): |
|
79 |
return 'directory' |
|
20
by mbp at sourcefrog
don't abort on trees that happen to contain symlinks |
80 |
elif S_ISLNK(mode): |
81 |
return 'symlink' |
|
1185.3.28
by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored. |
82 |
elif S_ISCHR(mode): |
83 |
return 'chardev' |
|
84 |
elif S_ISBLK(mode): |
|
85 |
return 'block' |
|
86 |
elif S_ISFIFO(mode): |
|
87 |
return 'fifo' |
|
88 |
elif S_ISSOCK(mode): |
|
89 |
return 'socket' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
90 |
else: |
1185.3.28
by John Arbash Meinel
Adding knowledge about fifo/block/etc, they will be unknown/ignored. |
91 |
return 'unknown' |
488
by Martin Pool
- new helper function kind_marker() |
92 |
|
93 |
||
94 |
def kind_marker(kind): |
|
95 |
if kind == 'file': |
|
96 |
return '' |
|
97 |
elif kind == 'directory': |
|
98 |
return '/' |
|
99 |
elif kind == 'symlink': |
|
100 |
return '@' |
|
101 |
else: |
|
102 |
raise BzrError('invalid file kind %r' % kind) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
103 |
|
1092.2.6
by Robert Collins
symlink support updated to work |
104 |
def lexists(f): |
1185.31.33
by John Arbash Meinel
A couple more path.join statements needed changing. |
105 |
if hasattr(os.path, 'lexists'): |
106 |
return os.path.lexists(f) |
|
1092.2.6
by Robert Collins
symlink support updated to work |
107 |
try: |
108 |
if hasattr(os, 'lstat'): |
|
109 |
os.lstat(f) |
|
110 |
else: |
|
111 |
os.stat(f) |
|
112 |
return True |
|
113 |
except OSError,e: |
|
114 |
if e.errno == errno.ENOENT: |
|
115 |
return False; |
|
116 |
else: |
|
117 |
raise BzrError("lstat/stat of (%r): %r" % (f, e)) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
118 |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
119 |
def fancy_rename(old, new, rename_func, unlink_func): |
120 |
"""A fancy rename, when you don't have atomic rename.
|
|
121 |
|
|
122 |
:param old: The old path, to rename from
|
|
123 |
:param new: The new path, to rename to
|
|
124 |
:param rename_func: The potentially non-atomic rename function
|
|
125 |
:param unlink_func: A way to delete the target file if the full rename succeeds
|
|
126 |
"""
|
|
127 |
||
128 |
# sftp rename doesn't allow overwriting, so play tricks:
|
|
129 |
import random |
|
130 |
base = os.path.basename(new) |
|
131 |
dirname = os.path.dirname(new) |
|
132 |
tmp_name = u'tmp.%s.%.9f.%d.%d' % (base, time.time(), os.getpid(), random.randint(0, 0x7FFFFFFF)) |
|
133 |
tmp_name = pathjoin(dirname, tmp_name) |
|
134 |
||
135 |
# Rename the file out of the way, but keep track if it didn't exist
|
|
136 |
# We don't want to grab just any exception
|
|
137 |
# something like EACCES should prevent us from continuing
|
|
138 |
# The downside is that the rename_func has to throw an exception
|
|
139 |
# with an errno = ENOENT, or NoSuchFile
|
|
140 |
file_existed = False |
|
141 |
try: |
|
142 |
rename_func(new, tmp_name) |
|
143 |
except (NoSuchFile,), e: |
|
144 |
pass
|
|
1532
by Robert Collins
Merge in John Meinels integration branch. |
145 |
except IOError, e: |
146 |
# RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
|
|
147 |
# function raises an IOError with errno == None when a rename fails.
|
|
148 |
# This then gets caught here.
|
|
1185.50.37
by John Arbash Meinel
Fixed exception handling for fancy_rename |
149 |
if e.errno not in (None, errno.ENOENT, errno.ENOTDIR): |
1532
by Robert Collins
Merge in John Meinels integration branch. |
150 |
raise
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
151 |
except Exception, e: |
152 |
if (not hasattr(e, 'errno') |
|
153 |
or e.errno not in (errno.ENOENT, errno.ENOTDIR)): |
|
154 |
raise
|
|
155 |
else: |
|
156 |
file_existed = True |
|
157 |
||
158 |
success = False |
|
159 |
try: |
|
160 |
# This may throw an exception, in which case success will
|
|
161 |
# not be set.
|
|
162 |
rename_func(old, new) |
|
163 |
success = True |
|
164 |
finally: |
|
165 |
if file_existed: |
|
166 |
# If the file used to exist, rename it back into place
|
|
167 |
# otherwise just delete it from the tmp location
|
|
168 |
if success: |
|
169 |
unlink_func(tmp_name) |
|
170 |
else: |
|
1185.31.49
by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS** |
171 |
rename_func(tmp_name, new) |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
172 |
|
173 |
# Default is to just use the python builtins
|
|
174 |
abspath = os.path.abspath |
|
175 |
realpath = os.path.realpath |
|
176 |
pathjoin = os.path.join |
|
177 |
normpath = os.path.normpath |
|
178 |
getcwd = os.getcwdu |
|
179 |
mkdtemp = tempfile.mkdtemp |
|
180 |
rename = os.rename |
|
181 |
dirname = os.path.dirname |
|
182 |
basename = os.path.basename |
|
183 |
||
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
184 |
if os.name == "posix": |
185 |
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
|
|
186 |
# choke on a Unicode string containing a relative path if
|
|
187 |
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
|
|
188 |
# string.
|
|
189 |
_fs_enc = sys.getfilesystemencoding() |
|
190 |
def abspath(path): |
|
191 |
return os.path.abspath(path.encode(_fs_enc)).decode(_fs_enc) |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
192 |
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
193 |
def realpath(path): |
194 |
return os.path.realpath(path.encode(_fs_enc)).decode(_fs_enc) |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
195 |
|
196 |
if sys.platform == 'win32': |
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
197 |
# We need to use the Unicode-aware os.path.abspath and
|
198 |
# os.path.realpath on Windows systems.
|
|
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 \ |
199 |
def abspath(path): |
200 |
return os.path.abspath(path).replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
201 |
|
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 \ |
202 |
def realpath(path): |
203 |
return os.path.realpath(path).replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
204 |
|
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 \ |
205 |
def pathjoin(*args): |
206 |
return os.path.join(*args).replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
207 |
|
1185.31.38
by John Arbash Meinel
Changing os.path.normpath to osutils.normpath |
208 |
def normpath(path): |
209 |
return os.path.normpath(path).replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
210 |
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
211 |
def getcwd(): |
212 |
return os.getcwdu().replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
213 |
|
1185.31.40
by John Arbash Meinel
Added osutils.mkdtemp() |
214 |
def mkdtemp(*args, **kwargs): |
215 |
return tempfile.mkdtemp(*args, **kwargs).replace('\\', '/') |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
216 |
|
217 |
def rename(old, new): |
|
218 |
fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink) |
|
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 \ |
219 |
|
1532
by Robert Collins
Merge in John Meinels integration branch. |
220 |
|
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 \ |
221 |
def normalizepath(f): |
222 |
if hasattr(os.path, 'realpath'): |
|
223 |
F = realpath |
|
224 |
else: |
|
225 |
F = abspath |
|
226 |
[p,e] = os.path.split(f) |
|
227 |
if e == "" or e == "." or e == "..": |
|
228 |
return F(f) |
|
229 |
else: |
|
230 |
return pathjoin(F(p), e) |
|
231 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
232 |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
233 |
def backup_file(fn): |
234 |
"""Copy a file to a backup.
|
|
235 |
||
236 |
Backups are named in GNU-style, with a ~ suffix.
|
|
237 |
||
238 |
If the file is already a backup, it's not copied.
|
|
239 |
"""
|
|
240 |
if fn[-1] == '~': |
|
241 |
return
|
|
242 |
bfn = fn + '~' |
|
243 |
||
1448
by Robert Collins
revert symlinks correctly |
244 |
if has_symlinks() and os.path.islink(fn): |
245 |
target = os.readlink(fn) |
|
246 |
os.symlink(target, bfn) |
|
247 |
return
|
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
248 |
inf = file(fn, 'rb') |
249 |
try: |
|
250 |
content = inf.read() |
|
251 |
finally: |
|
252 |
inf.close() |
|
253 |
||
254 |
outf = file(bfn, 'wb') |
|
255 |
try: |
|
256 |
outf.write(content) |
|
257 |
finally: |
|
258 |
outf.close() |
|
259 |
||
260 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
261 |
def isdir(f): |
262 |
"""True if f is an accessible directory."""
|
|
263 |
try: |
|
264 |
return S_ISDIR(os.lstat(f)[ST_MODE]) |
|
265 |
except OSError: |
|
266 |
return False |
|
267 |
||
268 |
||
269 |
def isfile(f): |
|
270 |
"""True if f is a regular file."""
|
|
271 |
try: |
|
272 |
return S_ISREG(os.lstat(f)[ST_MODE]) |
|
273 |
except OSError: |
|
274 |
return False |
|
275 |
||
1092.2.6
by Robert Collins
symlink support updated to work |
276 |
def islink(f): |
277 |
"""True if f is a symlink."""
|
|
278 |
try: |
|
279 |
return S_ISLNK(os.lstat(f)[ST_MODE]) |
|
280 |
except OSError: |
|
281 |
return False |
|
1
by mbp at sourcefrog
import from baz patch-364 |
282 |
|
485
by Martin Pool
- move commit code into its own module |
283 |
def is_inside(dir, fname): |
284 |
"""True if fname is inside dir.
|
|
969
by Martin Pool
- Add less-sucky is_within_any |
285 |
|
1185.31.38
by John Arbash Meinel
Changing os.path.normpath to osutils.normpath |
286 |
The parameters should typically be passed to osutils.normpath first, so
|
969
by Martin Pool
- Add less-sucky is_within_any |
287 |
that . and .. and repeated slashes are eliminated, and the separators
|
288 |
are canonical for the platform.
|
|
289 |
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
290 |
The empty string as a dir name is taken as top-of-tree and matches
|
291 |
everything.
|
|
292 |
|
|
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 \ |
293 |
>>> is_inside('src', pathjoin('src', 'foo.c'))
|
969
by Martin Pool
- Add less-sucky is_within_any |
294 |
True
|
295 |
>>> is_inside('src', 'srccontrol')
|
|
296 |
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 \ |
297 |
>>> is_inside('src', pathjoin('src', 'a', 'a', 'a', 'foo.c'))
|
969
by Martin Pool
- Add less-sucky is_within_any |
298 |
True
|
299 |
>>> is_inside('foo.c', 'foo.c')
|
|
300 |
True
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
301 |
>>> is_inside('foo.c', '')
|
302 |
False
|
|
303 |
>>> is_inside('', 'foo.c')
|
|
304 |
True
|
|
485
by Martin Pool
- move commit code into its own module |
305 |
"""
|
969
by Martin Pool
- Add less-sucky is_within_any |
306 |
# XXX: Most callers of this can actually do something smarter by
|
307 |
# looking at the inventory
|
|
972
by Martin Pool
- less dodgy is_inside function |
308 |
if dir == fname: |
309 |
return True |
|
310 |
||
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
311 |
if dir == '': |
312 |
return True |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
313 |
|
1185.31.34
by John Arbash Meinel
Removing instances of os.sep |
314 |
if dir[-1] != '/': |
315 |
dir += '/' |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
316 |
|
972
by Martin Pool
- less dodgy is_inside function |
317 |
return fname.startswith(dir) |
318 |
||
485
by Martin Pool
- move commit code into its own module |
319 |
|
320 |
def is_inside_any(dir_list, fname): |
|
321 |
"""True if fname is inside any of given dirs."""
|
|
322 |
for dirname in dir_list: |
|
323 |
if is_inside(dirname, fname): |
|
324 |
return True |
|
325 |
else: |
|
326 |
return False |
|
327 |
||
328 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
329 |
def pumpfile(fromfile, tofile): |
330 |
"""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. |
331 |
BUFSIZE = 32768 |
332 |
while True: |
|
333 |
b = fromfile.read(BUFSIZE) |
|
334 |
if not b: |
|
335 |
break
|
|
1185.49.13
by John Arbash Meinel
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass. |
336 |
tofile.write(b) |
1
by mbp at sourcefrog
import from baz patch-364 |
337 |
|
338 |
||
339 |
def sha_file(f): |
|
340 |
if hasattr(f, 'tell'): |
|
341 |
assert f.tell() == 0 |
|
342 |
s = sha.new() |
|
320
by Martin Pool
- Compute SHA-1 of files in chunks |
343 |
BUFSIZE = 128<<10 |
344 |
while True: |
|
345 |
b = f.read(BUFSIZE) |
|
346 |
if not b: |
|
347 |
break
|
|
348 |
s.update(b) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
349 |
return s.hexdigest() |
350 |
||
351 |
||
1235
by Martin Pool
- split sha_strings into osutils |
352 |
|
353 |
def sha_strings(strings): |
|
354 |
"""Return the sha-1 of concatenation of strings"""
|
|
355 |
s = sha.new() |
|
356 |
map(s.update, strings) |
|
357 |
return s.hexdigest() |
|
358 |
||
359 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
360 |
def sha_string(f): |
361 |
s = sha.new() |
|
362 |
s.update(f) |
|
363 |
return s.hexdigest() |
|
364 |
||
365 |
||
124
by mbp at sourcefrog
- check file text for past revisions is correct |
366 |
def fingerprint_file(f): |
367 |
s = sha.new() |
|
126
by mbp at sourcefrog
Use just one big read to fingerprint files |
368 |
b = f.read() |
369 |
s.update(b) |
|
370 |
size = len(b) |
|
124
by mbp at sourcefrog
- check file text for past revisions is correct |
371 |
return {'size': size, |
372 |
'sha1': s.hexdigest()} |
|
373 |
||
374 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
375 |
def compare_files(a, b): |
376 |
"""Returns true if equal in contents"""
|
|
74
by mbp at sourcefrog
compare_files: read in one page at a time rather than |
377 |
BUFSIZE = 4096 |
378 |
while True: |
|
379 |
ai = a.read(BUFSIZE) |
|
380 |
bi = b.read(BUFSIZE) |
|
381 |
if ai != bi: |
|
382 |
return False |
|
383 |
if ai == '': |
|
384 |
return True |
|
1
by mbp at sourcefrog
import from baz patch-364 |
385 |
|
386 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
387 |
def local_time_offset(t=None): |
388 |
"""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 |
389 |
# python2.3 localtime() can't take None
|
183
by mbp at sourcefrog
pychecker fixups |
390 |
if t == None: |
73
by mbp at sourcefrog
fix time.localtime call for python 2.3 |
391 |
t = time.time() |
392 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
393 |
if time.localtime(t).tm_isdst and time.daylight: |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
394 |
return -time.altzone |
395 |
else: |
|
396 |
return -time.timezone |
|
397 |
||
398 |
||
1185.12.24
by Aaron Bentley
Made format_date more flexible |
399 |
def format_date(t, offset=0, timezone='original', date_fmt=None, |
400 |
show_offset=True): |
|
1
by mbp at sourcefrog
import from baz patch-364 |
401 |
## TODO: Perhaps a global option to use either universal or local time?
|
402 |
## Or perhaps just let people set $TZ?
|
|
403 |
assert isinstance(t, float) |
|
404 |
||
8
by mbp at sourcefrog
store committer's timezone in revision and show |
405 |
if timezone == 'utc': |
1
by mbp at sourcefrog
import from baz patch-364 |
406 |
tt = time.gmtime(t) |
407 |
offset = 0 |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
408 |
elif timezone == 'original': |
23
by mbp at sourcefrog
format_date: handle revisions with no timezone offset |
409 |
if offset == None: |
410 |
offset = 0 |
|
16
by mbp at sourcefrog
fix inverted calculation for original timezone -> utc |
411 |
tt = time.gmtime(t + offset) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
412 |
elif timezone == 'local': |
1
by mbp at sourcefrog
import from baz patch-364 |
413 |
tt = time.localtime(t) |
49
by mbp at sourcefrog
fix local-time-offset calculation |
414 |
offset = local_time_offset(t) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
415 |
else: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
416 |
raise BzrError("unsupported timezone format %r" % timezone, |
417 |
['options are "utc", "original", "local"']) |
|
1185.12.24
by Aaron Bentley
Made format_date more flexible |
418 |
if date_fmt is None: |
419 |
date_fmt = "%a %Y-%m-%d %H:%M:%S" |
|
420 |
if show_offset: |
|
421 |
offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) |
|
422 |
else: |
|
423 |
offset_str = '' |
|
424 |
return (time.strftime(date_fmt, tt) + offset_str) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
425 |
|
426 |
||
427 |
def compact_date(when): |
|
428 |
return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) |
|
429 |
||
430 |
||
431 |
||
432 |
def filesize(f): |
|
433 |
"""Return size of given open file."""
|
|
434 |
return os.fstat(f.fileno())[ST_SIZE] |
|
435 |
||
1185.1.7
by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix. |
436 |
# Define rand_bytes based on platform.
|
437 |
try: |
|
438 |
# Python 2.4 and later have os.urandom,
|
|
439 |
# but it doesn't work on some arches
|
|
440 |
os.urandom(1) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
441 |
rand_bytes = os.urandom |
1185.1.7
by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix. |
442 |
except (NotImplementedError, AttributeError): |
443 |
# If python doesn't have os.urandom, or it doesn't work,
|
|
444 |
# then try to first pull random data from /dev/urandom
|
|
445 |
if os.path.exists("/dev/urandom"): |
|
446 |
rand_bytes = file('/dev/urandom', 'rb').read |
|
447 |
# Otherwise, use this hack as a last resort
|
|
448 |
else: |
|
449 |
# not well seeded, but better than nothing
|
|
450 |
def rand_bytes(n): |
|
451 |
import random |
|
452 |
s = '' |
|
453 |
while n: |
|
454 |
s += chr(random.randint(0, 255)) |
|
455 |
n -= 1 |
|
456 |
return s |
|
1
by mbp at sourcefrog
import from baz patch-364 |
457 |
|
458 |
## TODO: We could later have path objects that remember their list
|
|
459 |
## decomposition (might be too tricksy though.)
|
|
460 |
||
461 |
def splitpath(p): |
|
462 |
"""Turn string into list of parts.
|
|
463 |
||
464 |
>>> splitpath('a')
|
|
465 |
['a']
|
|
466 |
>>> splitpath('a/b')
|
|
467 |
['a', 'b']
|
|
468 |
>>> splitpath('a/./b')
|
|
469 |
['a', 'b']
|
|
470 |
>>> splitpath('a/.b')
|
|
471 |
['a', '.b']
|
|
472 |
>>> splitpath('a/../b')
|
|
184
by mbp at sourcefrog
pychecker fixups |
473 |
Traceback (most recent call last):
|
1
by mbp at sourcefrog
import from baz patch-364 |
474 |
...
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
475 |
BzrError: sorry, '..' not allowed in path
|
1
by mbp at sourcefrog
import from baz patch-364 |
476 |
"""
|
477 |
assert isinstance(p, types.StringTypes) |
|
271
by Martin Pool
- Windows path fixes |
478 |
|
479 |
# split on either delimiter because people might use either on
|
|
480 |
# Windows
|
|
481 |
ps = re.split(r'[\\/]', p) |
|
482 |
||
483 |
rps = [] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
484 |
for f in ps: |
485 |
if f == '..': |
|
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
486 |
raise BzrError("sorry, %r not allowed in path" % f) |
271
by Martin Pool
- Windows path fixes |
487 |
elif (f == '.') or (f == ''): |
488 |
pass
|
|
489 |
else: |
|
490 |
rps.append(f) |
|
491 |
return rps |
|
1
by mbp at sourcefrog
import from baz patch-364 |
492 |
|
493 |
def joinpath(p): |
|
494 |
assert isinstance(p, list) |
|
495 |
for f in p: |
|
183
by mbp at sourcefrog
pychecker fixups |
496 |
if (f == '..') or (f == None) or (f == ''): |
694
by Martin Pool
- weed out all remaining calls to bailout() and remove the function |
497 |
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 \ |
498 |
return pathjoin(*p) |
1
by mbp at sourcefrog
import from baz patch-364 |
499 |
|
500 |
||
501 |
def appendpath(p1, p2): |
|
502 |
if p1 == '': |
|
503 |
return p2 |
|
504 |
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 \ |
505 |
return pathjoin(p1, p2) |
1
by mbp at sourcefrog
import from baz patch-364 |
506 |
|
507 |
||
1231
by Martin Pool
- more progress on fetch on top of weaves |
508 |
def split_lines(s): |
509 |
"""Split s into lines, but without removing the newline characters."""
|
|
510 |
return StringIO(s).readlines() |
|
1391
by Robert Collins
merge from integration |
511 |
|
512 |
||
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
513 |
def hardlinks_good(): |
1185.10.5
by Aaron Bentley
Fixed hardlinks_good test |
514 |
return sys.platform not in ('win32', 'cygwin', 'darwin') |
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
515 |
|
1185.1.46
by Robert Collins
Aarons branch --basis patch |
516 |
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
517 |
def link_or_copy(src, dest): |
518 |
"""Hardlink a file, or copy it if it can't be hardlinked."""
|
|
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
519 |
if not hardlinks_good(): |
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
520 |
copyfile(src, dest) |
521 |
return
|
|
522 |
try: |
|
523 |
os.link(src, dest) |
|
524 |
except (OSError, IOError), e: |
|
525 |
if e.errno != errno.EXDEV: |
|
526 |
raise
|
|
527 |
copyfile(src, dest) |
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
528 |
|
529 |
||
530 |
def has_symlinks(): |
|
531 |
if hasattr(os, 'symlink'): |
|
532 |
return True |
|
533 |
else: |
|
534 |
return False |
|
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
535 |
|
536 |
||
537 |
def contains_whitespace(s): |
|
538 |
"""True if there are any whitespace characters in s."""
|
|
539 |
for ch in string.whitespace: |
|
540 |
if ch in s: |
|
541 |
return True |
|
542 |
else: |
|
543 |
return False |
|
544 |
||
545 |
||
546 |
def contains_linebreaks(s): |
|
547 |
"""True if there is any vertical whitespace in s."""
|
|
548 |
for ch in '\f\n\r': |
|
549 |
if ch in s: |
|
550 |
return True |
|
551 |
else: |
|
552 |
return False |
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
553 |
|
554 |
||
555 |
def relpath(base, path): |
|
556 |
"""Return path relative to base, or raise exception.
|
|
557 |
||
558 |
The path may be either an absolute path or a path relative to the
|
|
559 |
current working directory.
|
|
560 |
||
561 |
os.path.commonprefix (python2.4) has a bad bug that it works just
|
|
562 |
on string prefixes, assuming that '/u' is a prefix of '/u2'. This
|
|
563 |
avoids that problem."""
|
|
1185.16.70
by Martin Pool
- improved handling of non-ascii branch names and test |
564 |
rp = abspath(path) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
565 |
|
566 |
s = [] |
|
567 |
head = rp |
|
568 |
while len(head) >= len(base): |
|
569 |
if head == base: |
|
570 |
break
|
|
571 |
head, tail = os.path.split(head) |
|
572 |
if tail: |
|
573 |
s.insert(0, tail) |
|
574 |
else: |
|
575 |
# XXX This should raise a NotChildPath exception, as its not tied
|
|
576 |
# to branch anymore.
|
|
1185.31.41
by John Arbash Meinel
Creating a PathNotChild exception, and using relpath in HTTPTestUtil |
577 |
raise PathNotChild(rp, base) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
578 |
|
1185.31.35
by John Arbash Meinel
Couple small fixes, all tests pass on cygwin. |
579 |
if s: |
580 |
return pathjoin(*s) |
|
581 |
else: |
|
582 |
return '' |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
583 |
|
584 |
||
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
585 |
def safe_unicode(unicode_or_utf8_string): |
586 |
"""Coerce unicode_or_utf8_string into unicode.
|
|
587 |
||
588 |
If it is unicode, it is returned.
|
|
589 |
Otherwise it is decoded from utf-8. If a decoding error
|
|
590 |
occurs, it is wrapped as a If the decoding fails, the exception is wrapped
|
|
591 |
as a BzrBadParameter exception.
|
|
592 |
"""
|
|
593 |
if isinstance(unicode_or_utf8_string, unicode): |
|
594 |
return unicode_or_utf8_string |
|
595 |
try: |
|
596 |
return unicode_or_utf8_string.decode('utf8') |
|
597 |
except UnicodeDecodeError: |
|
598 |
raise BzrBadParameter(unicode_or_utf8_string) |
|
599 |
||
600 |
||
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
601 |
def terminal_width(): |
602 |
"""Return estimated terminal width."""
|
|
603 |
||
604 |
# TODO: Do something smart on Windows?
|
|
605 |
||
606 |
# TODO: Is there anything that gets a better update when the window
|
|
607 |
# is resized while the program is running? We could use the Python termcap
|
|
608 |
# library.
|
|
609 |
try: |
|
610 |
return int(os.environ['COLUMNS']) |
|
611 |
except (IndexError, KeyError, ValueError): |
|
612 |
return 80 |