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