5594.1.1
by Vincent Ladeuil
Fix socketpair-based SSH transport leaking socket into other child processes |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
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 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
7 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# 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 |
12 |
#
|
1
by mbp at sourcefrog
import from baz patch-364 |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
6379.6.1
by Jelmer Vernooij
Import absolute_import in a few places. |
17 |
from __future__ import absolute_import |
18 |
||
5225.1.1
by Andrew Bennetts
Don't lazy_import errno in osutils; it's a builtin module, and that lazy_import is implicated in a FreeBSD builder failure. |
19 |
import errno |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
20 |
import os |
21 |
import re |
|
22 |
import stat |
|
23 |
import sys |
|
24 |
import time |
|
5051.2.1
by Benjamin Peterson
move codecs import out of lazy section since it is used on module import |
25 |
import codecs |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
26 |
|
27 |
from bzrlib.lazy_import import lazy_import |
|
28 |
lazy_import(globals(), """ |
|
2215.6.1
by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(), |
29 |
from datetime import datetime
|
5187.2.7
by Parth Malwankar
moved getuser_unicode to osutils. |
30 |
import getpass
|
6383.1.1
by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called |
31 |
import locale
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
32 |
import ntpath
|
1711.4.5
by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32 |
33 |
import posixpath
|
6336.2.1
by Martin Packman
Add is_environment_error() and switch trace to using it |
34 |
import select
|
5273.1.11
by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol. |
35 |
# We need to import both shutil and rmtree as we export the later on posix
|
36 |
# and need the former on windows
|
|
37 |
import shutil
|
|
5273.1.10
by Vincent Ladeuil
Fixed as per jam's review. |
38 |
from shutil import rmtree
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
39 |
import socket
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
40 |
import subprocess
|
5273.1.11
by Vincent Ladeuil
Really fix and better explain why we need both the module and the symbol. |
41 |
# We need to import both tempfile and mkdtemp as we export the later on posix
|
42 |
# and need the former on windows
|
|
43 |
import tempfile
|
|
44 |
from tempfile import mkdtemp
|
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
45 |
import unicodedata
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
46 |
|
47 |
from bzrlib import (
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
48 |
cache_utf8,
|
6059.4.2
by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config. |
49 |
config,
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
50 |
errors,
|
5011.3.16
by Andrew Bennetts
Merge lp:bzr. |
51 |
trace,
|
2245.4.6
by Alexander Belchenko
osutils.py: terminal_width() now use win32utils.get_console_size() |
52 |
win32utils,
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
53 |
)
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
54 |
from bzrlib.i18n import gettext
|
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
55 |
""") |
1
by mbp at sourcefrog
import from baz patch-364 |
56 |
|
5011.3.3
by Martin
Reintroduce EINTR handling only for socket object functions and general cleanup |
57 |
from bzrlib.symbol_versioning import ( |
6383.1.3
by Martin Packman
Deprecate public use_cache parameter in favour of test specific override |
58 |
DEPRECATED_PARAMETER, |
5011.3.3
by Martin
Reintroduce EINTR handling only for socket object functions and general cleanup |
59 |
deprecated_function, |
60 |
deprecated_in, |
|
6383.1.3
by Martin Packman
Deprecate public use_cache parameter in favour of test specific override |
61 |
deprecated_passed, |
62 |
warn as warn_deprecated, |
|
5011.3.3
by Martin
Reintroduce EINTR handling only for socket object functions and general cleanup |
63 |
)
|
64 |
||
5848.2.1
by John Arbash Meinel
Break compatibility with python <2.6. |
65 |
from hashlib import ( |
66 |
md5, |
|
67 |
sha1 as sha, |
|
68 |
)
|
|
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
69 |
|
3504.4.1
by John Arbash Meinel
Write an alternative 'walkdirs' implementation that uses win32 apis. |
70 |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
71 |
import bzrlib |
6352.3.2
by Martin Packman
Add mechanism for changing Py_FileSystemDefaultEncoding with ctypes |
72 |
from bzrlib import symbol_versioning, _fs_enc |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
73 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
74 |
|
4889.2.5
by John Arbash Meinel
Review feedback from Andrew. |
75 |
# Cross platform wall-clock time functionality with decent resolution.
|
76 |
# On Linux ``time.clock`` returns only CPU time. On Windows, ``time.time()``
|
|
77 |
# only has a resolution of ~15ms. Note that ``time.clock()`` is not
|
|
78 |
# synchronized with ``time.time()``, this is only meant to be used to find
|
|
79 |
# delta times by subtracting from another call to this function.
|
|
4889.2.1
by John Arbash Meinel
Make -Dhpss log debug information for the server process. |
80 |
timer_func = time.time |
81 |
if sys.platform == 'win32': |
|
82 |
timer_func = time.clock |
|
83 |
||
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
84 |
# On win32, O_BINARY is used to indicate the file should
|
85 |
# be opened in binary mode, rather than text mode.
|
|
86 |
# On other platforms, O_BINARY doesn't exist, because
|
|
87 |
# they always open in binary mode, so it is okay to
|
|
4634.140.12
by INADA Naoki
small clean up. |
88 |
# OR with 0 on those platforms.
|
89 |
# O_NOINHERIT and O_TEXT exists only on win32 too.
|
|
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
90 |
O_BINARY = getattr(os, 'O_BINARY', 0) |
4634.140.12
by INADA Naoki
small clean up. |
91 |
O_TEXT = getattr(os, 'O_TEXT', 0) |
4634.140.1
by INADA Naoki
Avoids child process inherits file handles on win32. by using os.fdopen and os.open with O_NOINHERIT instead of builtin open. |
92 |
O_NOINHERIT = getattr(os, 'O_NOINHERIT', 0) |
93 |
||
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
94 |
|
4355.2.2
by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel. |
95 |
def get_unicode_argv(): |
96 |
try: |
|
97 |
user_encoding = get_user_encoding() |
|
5274.4.8
by Jason Spashett
Reverse merge -r 5280..5279 |
98 |
return [a.decode(user_encoding) for a in sys.argv[1:]] |
4355.2.2
by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel. |
99 |
except UnicodeDecodeError: |
6138.3.8
by Jonathan Riddell
more error gettext()ing |
100 |
raise errors.BzrError(gettext("Parameter {0!r} encoding is unsupported by {1} " |
101 |
"application locale.").format(a, user_encoding)) |
|
4355.2.2
by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel. |
102 |
|
103 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
104 |
def make_readonly(filename): |
105 |
"""Make a filename read-only."""
|
|
2949.6.1
by Alexander Belchenko
windows python has os.lstat |
106 |
mod = os.lstat(filename).st_mode |
2568.1.1
by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable |
107 |
if not stat.S_ISLNK(mod): |
108 |
mod = mod & 0777555 |
|
6015.50.1
by Martin Pool
Use a chmod wrapper to cope with eperm from chmod |
109 |
chmod_if_possible(filename, mod) |
1
by mbp at sourcefrog
import from baz patch-364 |
110 |
|
111 |
||
112 |
def make_writable(filename): |
|
2949.6.1
by Alexander Belchenko
windows python has os.lstat |
113 |
mod = os.lstat(filename).st_mode |
2568.1.1
by John Arbash Meinel
(Elliot Murphy) Use os.lstat rather than os.stat for osutils.make_readonly/make_writeable |
114 |
if not stat.S_ISLNK(mod): |
115 |
mod = mod | 0200 |
|
6015.50.1
by Martin Pool
Use a chmod wrapper to cope with eperm from chmod |
116 |
chmod_if_possible(filename, mod) |
117 |
||
118 |
||
119 |
def chmod_if_possible(filename, mode): |
|
120 |
# Set file mode if that can be safely done.
|
|
121 |
# Sometimes even on unix the filesystem won't allow it - see
|
|
122 |
# https://bugs.launchpad.net/bzr/+bug/606537
|
|
123 |
try: |
|
124 |
# It is probably faster to just do the chmod, rather than
|
|
125 |
# doing a stat, and then trying to compare
|
|
126 |
os.chmod(filename, mode) |
|
127 |
except (IOError, OSError),e: |
|
6015.50.2
by Martin Pool
Also suppress EACCES from chmod |
128 |
# Permission/access denied seems to commonly happen on smbfs; there's
|
129 |
# probably no point warning about it.
|
|
6015.50.1
by Martin Pool
Use a chmod wrapper to cope with eperm from chmod |
130 |
# <https://bugs.launchpad.net/bzr/+bug/606537>
|
6015.50.2
by Martin Pool
Also suppress EACCES from chmod |
131 |
if getattr(e, 'errno') in (errno.EPERM, errno.EACCES): |
6015.50.3
by Martin Pool
More correct trace message when squelching chmod errors |
132 |
trace.mutter("ignore error on chmod of %r: %r" % ( |
133 |
filename, e)) |
|
6015.50.1
by Martin Pool
Use a chmod wrapper to cope with eperm from chmod |
134 |
return
|
135 |
raise
|
|
1
by mbp at sourcefrog
import from baz patch-364 |
136 |
|
137 |
||
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
138 |
def minimum_path_selection(paths): |
139 |
"""Return the smallset subset of paths which are outside paths.
|
|
140 |
||
2843.1.1
by Ian Clatworthy
Faster partial commits by walking less data (Robert Collins) |
141 |
:param paths: A container (and hence not None) of paths.
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
142 |
:return: A set of paths sufficient to include everything in paths via
|
4325.3.3
by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with |
143 |
is_inside, drawn from the paths parameter.
|
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
144 |
"""
|
4325.3.7
by Johan Walles
Style fixes for minimum_path_selection(). |
145 |
if len(paths) < 2: |
146 |
return set(paths) |
|
4325.3.3
by Johan Walles
Add unit test and fix for minimum_path_selection() vs directory names with |
147 |
|
148 |
def sort_key(path): |
|
149 |
return path.split('/') |
|
150 |
sorted_paths = sorted(list(paths), key=sort_key) |
|
151 |
||
4325.3.7
by Johan Walles
Style fixes for minimum_path_selection(). |
152 |
search_paths = [sorted_paths[0]] |
153 |
for path in sorted_paths[1:]: |
|
4325.3.2
by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection(). |
154 |
if not is_inside(search_paths[-1], path): |
155 |
# This path is unique, add it
|
|
156 |
search_paths.append(path) |
|
4325.3.7
by Johan Walles
Style fixes for minimum_path_selection(). |
157 |
|
4325.3.2
by Johan Walles
Use a linear algorithm for osutil.minimum_path_selection(). |
158 |
return set(search_paths) |
2825.7.1
by Robert Collins
* Partial commits are now approximately 40% faster by walking over the |
159 |
|
160 |
||
1077
by Martin Pool
- avoid compiling REs at module load time |
161 |
_QUOTE_RE = None |
969
by Martin Pool
- Add less-sucky is_within_any |
162 |
|
163 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
164 |
def quotefn(f): |
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
165 |
"""Return a quoted filename filename
|
166 |
||
167 |
This previously used backslash quoting, but that works poorly on
|
|
168 |
Windows."""
|
|
169 |
# TODO: I'm not really sure this is the best format either.x
|
|
1077
by Martin Pool
- avoid compiling REs at module load time |
170 |
global _QUOTE_RE |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
171 |
if _QUOTE_RE is None: |
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
172 |
_QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])') |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
173 |
|
779
by Martin Pool
- better quotefn for windows: use doublequotes for strings with |
174 |
if _QUOTE_RE.search(f): |
175 |
return '"' + f + '"' |
|
176 |
else: |
|
177 |
return f |
|
1
by mbp at sourcefrog
import from baz patch-364 |
178 |
|
179 |
||
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
180 |
_directory_kind = 'directory' |
181 |
||
1755.3.7
by John Arbash Meinel
Clean up and write tests for permissions. Now we use fstat which should be cheap, and lets us check the permissions and the file size |
182 |
def get_umask(): |
183 |
"""Return the current umask"""
|
|
184 |
# Assume that people aren't messing with the umask while running
|
|
185 |
# XXX: This is not thread safe, but there is no way to get the
|
|
186 |
# umask without setting it
|
|
187 |
umask = os.umask(0) |
|
188 |
os.umask(umask) |
|
189 |
return umask |
|
190 |
||
191 |
||
2324.2.1
by Dmitry Vasiliev
kind_marker() optimization |
192 |
_kind_marker_map = { |
193 |
"file": "", |
|
194 |
_directory_kind: "/", |
|
195 |
"symlink": "@", |
|
1551.10.30
by Aaron Bentley
Merge from bzr.dev |
196 |
'tree-reference': '+', |
2324.2.1
by Dmitry Vasiliev
kind_marker() optimization |
197 |
}
|
1551.10.30
by Aaron Bentley
Merge from bzr.dev |
198 |
|
199 |
||
488
by Martin Pool
- new helper function kind_marker() |
200 |
def kind_marker(kind): |
2324.2.1
by Dmitry Vasiliev
kind_marker() optimization |
201 |
try: |
202 |
return _kind_marker_map[kind] |
|
203 |
except KeyError: |
|
5024.1.2
by John Arbash Meinel
Switch so that all unknown files get an empty marker, rather than failing. |
204 |
# Slightly faster than using .get(, '') when the common case is that
|
205 |
# kind will be found
|
|
206 |
return '' |
|
1
by mbp at sourcefrog
import from baz patch-364 |
207 |
|
2324.2.1
by Dmitry Vasiliev
kind_marker() optimization |
208 |
|
1732.1.2
by John Arbash Meinel
just use os.path.lexists if it exists |
209 |
lexists = getattr(os.path, 'lexists', None) |
210 |
if lexists is None: |
|
211 |
def lexists(f): |
|
212 |
try: |
|
2324.2.2
by Dmitry Vasiliev
Fixed lexists() implementation |
213 |
stat = getattr(os, 'lstat', os.stat) |
214 |
stat(f) |
|
1732.1.2
by John Arbash Meinel
just use os.path.lexists if it exists |
215 |
return True |
2324.2.2
by Dmitry Vasiliev
Fixed lexists() implementation |
216 |
except OSError, e: |
1732.1.2
by John Arbash Meinel
just use os.path.lexists if it exists |
217 |
if e.errno == errno.ENOENT: |
218 |
return False; |
|
219 |
else: |
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
220 |
raise errors.BzrError(gettext("lstat/stat of ({0!r}): {1!r}").format(f, e)) |
1732.1.2
by John Arbash Meinel
just use os.path.lexists if it exists |
221 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
222 |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
223 |
def fancy_rename(old, new, rename_func, unlink_func): |
224 |
"""A fancy rename, when you don't have atomic rename.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
225 |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
226 |
:param old: The old path, to rename from
|
227 |
:param new: The new path, to rename to
|
|
228 |
:param rename_func: The potentially non-atomic rename function
|
|
4935.1.1
by Vincent Ladeuil
Support Unicode paths for ftp transport (encoded as utf8). |
229 |
:param unlink_func: A way to delete the target file if the full rename
|
230 |
succeeds
|
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
231 |
"""
|
232 |
# sftp rename doesn't allow overwriting, so play tricks:
|
|
233 |
base = os.path.basename(new) |
|
234 |
dirname = os.path.dirname(new) |
|
4935.1.3
by Vincent Ladeuil
Better fix for fancy_rename respecting callers file encoding. |
235 |
# callers use different encodings for the paths so the following MUST
|
236 |
# respect that. We rely on python upcasting to unicode if new is unicode
|
|
237 |
# and keeping a str if not.
|
|
238 |
tmp_name = 'tmp.%s.%.9f.%d.%s' % (base, time.time(), |
|
239 |
os.getpid(), rand_chars(10)) |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
240 |
tmp_name = pathjoin(dirname, tmp_name) |
241 |
||
242 |
# Rename the file out of the way, but keep track if it didn't exist
|
|
243 |
# We don't want to grab just any exception
|
|
244 |
# something like EACCES should prevent us from continuing
|
|
245 |
# The downside is that the rename_func has to throw an exception
|
|
246 |
# with an errno = ENOENT, or NoSuchFile
|
|
247 |
file_existed = False |
|
248 |
try: |
|
249 |
rename_func(new, tmp_name) |
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
250 |
except (errors.NoSuchFile,), e: |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
251 |
pass
|
1532
by Robert Collins
Merge in John Meinels integration branch. |
252 |
except IOError, e: |
253 |
# RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
|
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
254 |
# function raises an IOError with errno is None when a rename fails.
|
1532
by Robert Collins
Merge in John Meinels integration branch. |
255 |
# This then gets caught here.
|
1185.50.37
by John Arbash Meinel
Fixed exception handling for fancy_rename |
256 |
if e.errno not in (None, errno.ENOENT, errno.ENOTDIR): |
1532
by Robert Collins
Merge in John Meinels integration branch. |
257 |
raise
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
258 |
except Exception, e: |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
259 |
if (getattr(e, 'errno', None) is None |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
260 |
or e.errno not in (errno.ENOENT, errno.ENOTDIR)): |
261 |
raise
|
|
262 |
else: |
|
263 |
file_existed = True |
|
264 |
||
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
265 |
failure_exc = None |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
266 |
success = False |
267 |
try: |
|
2978.8.2
by Alexander Belchenko
teach fancy_rename to handle change case renames in possible case-insensitive filesystem |
268 |
try: |
269 |
# This may throw an exception, in which case success will
|
|
270 |
# not be set.
|
|
271 |
rename_func(old, new) |
|
272 |
success = True |
|
273 |
except (IOError, OSError), e: |
|
2978.8.3
by Alexander Belchenko
Aaron's review |
274 |
# source and target may be aliases of each other (e.g. on a
|
275 |
# case-insensitive filesystem), so we may have accidentally renamed
|
|
276 |
# source by when we tried to rename target
|
|
4789.17.1
by John Arbash Meinel
Change fancy_rename slightly. |
277 |
failure_exc = sys.exc_info() |
278 |
if (file_existed and e.errno in (None, errno.ENOENT) |
|
279 |
and old.lower() == new.lower()): |
|
280 |
# source and target are the same file on a case-insensitive
|
|
281 |
# filesystem, so we don't generate an exception
|
|
282 |
failure_exc = None |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
283 |
finally: |
284 |
if file_existed: |
|
285 |
# If the file used to exist, rename it back into place
|
|
286 |
# otherwise just delete it from the tmp location
|
|
287 |
if success: |
|
1551.15.4
by Aaron Bentley
Revert now-unnecessary changes |
288 |
unlink_func(tmp_name) |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
289 |
else: |
1185.31.49
by John Arbash Meinel
Some corrections using the new osutils.rename. **ALL TESTS PASS** |
290 |
rename_func(tmp_name, new) |
4789.17.2
by John Arbash Meinel
Also handle the case when source *and* target does not exist. |
291 |
if failure_exc is not None: |
5340.15.2
by John Arbash Meinel
supercede 2.4-613247-cleanup-tests |
292 |
try: |
293 |
raise failure_exc[0], failure_exc[1], failure_exc[2] |
|
294 |
finally: |
|
295 |
del failure_exc |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
296 |
|
1685.1.9
by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url |
297 |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
298 |
# In Python 2.4.2 and older, os.path.abspath and os.path.realpath
|
299 |
# choke on a Unicode string containing a relative path if
|
|
300 |
# os.getcwd() returns a non-sys.getdefaultencoding()-encoded
|
|
301 |
# string.
|
|
302 |
def _posix_abspath(path): |
|
1711.4.5
by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32 |
303 |
# jam 20060426 rather than encoding to fsencoding
|
304 |
# copy posixpath.abspath, but use os.getcwdu instead
|
|
305 |
if not posixpath.isabs(path): |
|
306 |
path = posixpath.join(getcwd(), path) |
|
6015.39.2
by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem, |
307 |
return _posix_normpath(path) |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
308 |
|
309 |
||
310 |
def _posix_realpath(path): |
|
1711.4.5
by John Arbash Meinel
the _posix_* routines should use posixpath not os.path, so tests pass on win32 |
311 |
return posixpath.realpath(path.encode(_fs_enc)).decode(_fs_enc) |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
312 |
|
313 |
||
6015.39.2
by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem, |
314 |
def _posix_normpath(path): |
315 |
path = posixpath.normpath(path) |
|
316 |
# Bug 861008: posixpath.normpath() returns a path normalized according to
|
|
317 |
# the POSIX standard, which stipulates (for compatibility reasons) that two
|
|
318 |
# leading slashes must not be simplified to one, and only if there are 3 or
|
|
319 |
# more should they be simplified as one. So we treat the leading 2 slashes
|
|
320 |
# as a special case here by simply removing the first slash, as we consider
|
|
321 |
# that breaking POSIX compatibility for this obscure feature is acceptable.
|
|
322 |
# This is not a paranoid precaution, as we notably get paths like this when
|
|
323 |
# the repo is hosted at the root of the filesystem, i.e. in "/".
|
|
324 |
if path.startswith('//'): |
|
325 |
path = path[1:] |
|
326 |
return path |
|
327 |
||
328 |
||
6362.2.1
by Martin Packman
Add path_from_environ function for getting unicode paths from envvars |
329 |
def _posix_path_from_environ(key): |
330 |
"""Get unicode path from `key` in environment or None if not present
|
|
331 |
||
332 |
Note that posix systems use arbitrary byte strings for filesystem objects,
|
|
333 |
so a path that raises BadFilenameEncoding here may still be accessible.
|
|
334 |
"""
|
|
335 |
val = os.environ.get(key, None) |
|
336 |
if val is None: |
|
337 |
return val |
|
338 |
try: |
|
339 |
return val.decode(_fs_enc) |
|
340 |
except UnicodeDecodeError: |
|
341 |
# GZ 2011-12-12:Ideally want to include `key` in the exception message
|
|
342 |
raise errors.BadFilenameEncoding(val, _fs_enc) |
|
343 |
||
344 |
||
6437.26.1
by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms |
345 |
def _posix_get_home_dir(): |
346 |
"""Get the home directory of the current user as a unicode path"""
|
|
347 |
path = posixpath.expanduser("~") |
|
348 |
try: |
|
349 |
return path.decode(_fs_enc) |
|
350 |
except UnicodeDecodeError: |
|
351 |
raise errors.BadFilenameEncoding(path, _fs_enc) |
|
352 |
||
353 |
||
6362.2.4
by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely |
354 |
def _posix_getuser_unicode(): |
355 |
"""Get username from environment or password database as unicode"""
|
|
356 |
name = getpass.getuser() |
|
357 |
user_encoding = get_user_encoding() |
|
358 |
try: |
|
359 |
return name.decode(user_encoding) |
|
360 |
except UnicodeDecodeError: |
|
361 |
raise errors.BzrError("Encoding of username %r is unsupported by %s " |
|
362 |
"application locale." % (name, user_encoding)) |
|
363 |
||
364 |
||
1711.5.2
by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this |
365 |
def _win32_fixdrive(path): |
366 |
"""Force drive letters to be consistent.
|
|
367 |
||
368 |
win32 is inconsistent whether it returns lower or upper case
|
|
369 |
and even if it was consistent the user might type the other
|
|
370 |
so we force it to uppercase
|
|
371 |
running python.exe under cmd.exe return capital C:\\
|
|
372 |
running win32 python inside a cygwin shell returns lowercase c:\\
|
|
373 |
"""
|
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
374 |
drive, path = ntpath.splitdrive(path) |
1711.5.2
by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this |
375 |
return drive.upper() + path |
376 |
||
377 |
||
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
378 |
def _win32_abspath(path): |
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
379 |
# Real ntpath.abspath doesn't have a problem with a unicode cwd
|
380 |
return _win32_fixdrive(ntpath.abspath(unicode(path)).replace('\\', '/')) |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
381 |
|
382 |
||
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
383 |
def _win98_abspath(path): |
384 |
"""Return the absolute version of a path.
|
|
385 |
Windows 98 safe implementation (python reimplementation
|
|
386 |
of Win32 API function GetFullPathNameW)
|
|
387 |
"""
|
|
388 |
# Corner cases:
|
|
389 |
# C:\path => C:/path
|
|
390 |
# C:/path => C:/path
|
|
391 |
# \\HOST\path => //HOST/path
|
|
392 |
# //HOST/path => //HOST/path
|
|
393 |
# path => C:/cwd/path
|
|
394 |
# /path => C:/path
|
|
395 |
path = unicode(path) |
|
396 |
# check for absolute path
|
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
397 |
drive = ntpath.splitdrive(path)[0] |
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
398 |
if drive == '' and path[:2] not in('//','\\\\'): |
399 |
cwd = os.getcwdu() |
|
400 |
# we cannot simply os.path.join cwd and path
|
|
401 |
# because os.path.join('C:','/path') produce '/path'
|
|
402 |
# and this is incorrect
|
|
403 |
if path[:1] in ('/','\\'): |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
404 |
cwd = ntpath.splitdrive(cwd)[0] |
2279.4.3
by Alexander Belchenko
win98_abspath: support for running in POSIX environment: cwd path has not drive letter |
405 |
path = path[1:] |
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
406 |
path = cwd + '\\' + path |
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
407 |
return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/')) |
2279.4.1
by Alexander Belchenko
Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe |
408 |
|
409 |
||
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
410 |
def _win32_realpath(path): |
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
411 |
# Real ntpath.realpath doesn't have a problem with a unicode cwd
|
412 |
return _win32_fixdrive(ntpath.realpath(unicode(path)).replace('\\', '/')) |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
413 |
|
414 |
||
415 |
def _win32_pathjoin(*args): |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
416 |
return ntpath.join(*args).replace('\\', '/') |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
417 |
|
418 |
||
419 |
def _win32_normpath(path): |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
420 |
return _win32_fixdrive(ntpath.normpath(unicode(path)).replace('\\', '/')) |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
421 |
|
422 |
||
423 |
def _win32_getcwd(): |
|
1711.5.2
by John Arbash Meinel
win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this |
424 |
return _win32_fixdrive(os.getcwdu().replace('\\', '/')) |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
425 |
|
426 |
||
427 |
def _win32_mkdtemp(*args, **kwargs): |
|
5331.3.1
by Martin
Avoid infinite recursion with _win32_mkdtemp by using module namespaced name |
428 |
return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/')) |
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
429 |
|
430 |
||
431 |
def _win32_rename(old, new): |
|
1711.7.6
by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming. |
432 |
"""We expect to be able to atomically replace 'new' with old.
|
433 |
||
1711.7.17
by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure. |
434 |
On win32, if new exists, it must be moved out of the way first,
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
435 |
and then deleted.
|
1711.7.6
by John Arbash Meinel
Change _win32_rename() so that it raises ENOENT *before* it tries any renaming. |
436 |
"""
|
1711.7.17
by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure. |
437 |
try: |
5186.2.11
by Martin Pool
_win32_rename no longer relies on _wrapped_rename |
438 |
fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink) |
1711.7.17
by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure. |
439 |
except OSError, e: |
1830.3.15
by John Arbash Meinel
On Mac we get EINVAL when renaming cwd |
440 |
if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL): |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
441 |
# If we try to rename a non-existant file onto cwd, we get
|
442 |
# EPERM or EACCES instead of ENOENT, this will raise ENOENT
|
|
1830.3.15
by John Arbash Meinel
On Mac we get EINVAL when renaming cwd |
443 |
# if the old path doesn't exist, sometimes we get EACCES
|
444 |
# On Linux, we seem to get EBUSY, on Mac we get EINVAL
|
|
1711.7.17
by John Arbash Meinel
Delay the extra syscall in _win32_rename until we get a failure. |
445 |
os.lstat(old) |
446 |
raise
|
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
447 |
|
448 |
||
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
449 |
def _mac_getcwd(): |
3201.1.1
by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC |
450 |
return unicodedata.normalize('NFC', os.getcwdu()) |
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
451 |
|
452 |
||
6468.6.1
by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename. |
453 |
def _rename_wrap_exception(rename_func): |
454 |
"""Adds extra information to any exceptions that come from rename().
|
|
455 |
||
456 |
The exception has an updated message and 'old_filename' and 'new_filename'
|
|
457 |
attributes.
|
|
458 |
"""
|
|
459 |
||
460 |
def _rename_wrapper(old, new): |
|
461 |
try: |
|
462 |
rename_func(old, new) |
|
463 |
except OSError, e: |
|
464 |
detailed_error = OSError(e.errno, e.strerror + |
|
465 |
" [occurred when renaming '%s' to '%s']" % |
|
466 |
(old, new)) |
|
467 |
detailed_error.old_filename = old |
|
468 |
detailed_error.new_filename = new |
|
469 |
raise detailed_error |
|
470 |
||
471 |
return _rename_wrapper |
|
472 |
||
473 |
# Default rename wraps os.rename()
|
|
474 |
rename = _rename_wrap_exception(os.rename) |
|
475 |
||
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
476 |
# Default is to just use the python builtins, but these can be rebound on
|
477 |
# particular platforms.
|
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
478 |
abspath = _posix_abspath |
479 |
realpath = _posix_realpath |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
480 |
pathjoin = os.path.join |
6015.39.2
by Florian Vichot
Fixed an infinite loop when creating a repo at the root of the filesystem, |
481 |
normpath = _posix_normpath |
6362.2.1
by Martin Packman
Add path_from_environ function for getting unicode paths from envvars |
482 |
path_from_environ = _posix_path_from_environ |
6437.26.1
by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms |
483 |
_get_home_dir = _posix_get_home_dir |
6362.2.4
by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely |
484 |
getuser_unicode = _posix_getuser_unicode |
5186.2.11
by Martin Pool
_win32_rename no longer relies on _wrapped_rename |
485 |
getcwd = os.getcwdu |
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
486 |
dirname = os.path.dirname |
487 |
basename = os.path.basename |
|
2215.4.2
by Alexander Belchenko
split and splitext now the part of osutils |
488 |
split = os.path.split |
489 |
splitext = os.path.splitext |
|
5273.1.10
by Vincent Ladeuil
Fixed as per jam's review. |
490 |
# These were already lazily imported into local scope
|
491 |
# mkdtemp = tempfile.mkdtemp
|
|
492 |
# rmtree = shutil.rmtree
|
|
5609.29.5
by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache. |
493 |
lstat = os.lstat |
494 |
fstat = os.fstat |
|
495 |
||
496 |
def wrap_stat(st): |
|
497 |
return st |
|
498 |
||
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
499 |
|
1551.2.53
by abentley
Strip trailing slashes in a platform-sensible way |
500 |
MIN_ABS_PATHLENGTH = 1 |
501 |
||
1685.1.9
by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url |
502 |
|
1185.31.47
by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it. |
503 |
if sys.platform == 'win32': |
3224.5.35
by Andrew Bennetts
More improvements suggested by John's review. |
504 |
if win32utils.winver == 'Windows 98': |
505 |
abspath = _win98_abspath |
|
506 |
else: |
|
507 |
abspath = _win32_abspath |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
508 |
realpath = _win32_realpath |
509 |
pathjoin = _win32_pathjoin |
|
510 |
normpath = _win32_normpath |
|
511 |
getcwd = _win32_getcwd |
|
512 |
mkdtemp = _win32_mkdtemp |
|
6468.6.1
by Ross Lagerwall
Change osutils.rename to extend any exception information given from os.rename. |
513 |
rename = _rename_wrap_exception(_win32_rename) |
5609.29.5
by John Arbash Meinel
Fix bug #740932. Transform should update the sha cache. |
514 |
try: |
515 |
from bzrlib import _walkdirs_win32 |
|
516 |
except ImportError: |
|
517 |
pass
|
|
518 |
else: |
|
519 |
lstat = _walkdirs_win32.lstat |
|
520 |
fstat = _walkdirs_win32.fstat |
|
521 |
wrap_stat = _walkdirs_win32.wrap_stat |
|
1685.1.20
by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work |
522 |
|
1551.2.53
by abentley
Strip trailing slashes in a platform-sensible way |
523 |
MIN_ABS_PATHLENGTH = 3 |
1532
by Robert Collins
Merge in John Meinels integration branch. |
524 |
|
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
525 |
def _win32_delete_readonly(function, path, excinfo): |
526 |
"""Error handler for shutil.rmtree function [for win32]
|
|
527 |
Helps to remove files and dirs marked as read-only.
|
|
528 |
"""
|
|
2116.5.1
by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5 |
529 |
exception = excinfo[1] |
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
530 |
if function in (os.remove, os.rmdir) \ |
2116.5.1
by Henri Wiechers
Fixes osutils.rmtree on Windows with Python 2.5 |
531 |
and isinstance(exception, OSError) \ |
532 |
and exception.errno == errno.EACCES: |
|
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
533 |
make_writable(path) |
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
534 |
function(path) |
535 |
else: |
|
536 |
raise
|
|
537 |
||
538 |
def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly): |
|
539 |
"""Replacer for shutil.rmtree: could remove readonly dirs/files"""
|
|
540 |
return shutil.rmtree(path, ignore_errors, onerror) |
|
4355.2.2
by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel. |
541 |
|
542 |
f = win32utils.get_unicode_argv # special function or None |
|
543 |
if f is not None: |
|
544 |
get_unicode_argv = f |
|
6362.2.1
by Martin Packman
Add path_from_environ function for getting unicode paths from envvars |
545 |
path_from_environ = win32utils.get_environ_unicode |
6437.26.1
by Martin Packman
Add and test osutils._get_home_dir for unicode access to home location across platforms |
546 |
_get_home_dir = win32utils.get_home_location |
6362.2.4
by Martin Packman
Use native functions for getting username avoiding bug 660174 entirely |
547 |
getuser_unicode = win32utils.get_user_name |
4355.2.2
by Alexander Belchenko
osutils.py: get_unicode_argv function (to obtain unicode command line arguments from sys.argv) moved to the beginning of module based on suggestions from review of John Meinel. |
548 |
|
1830.3.11
by John Arbash Meinel
Create a mac version of 'getcwd()' which normalizes the path. |
549 |
elif sys.platform == 'darwin': |
550 |
getcwd = _mac_getcwd |
|
1692.7.6
by Martin Pool
[patch] force deletion of trees containing readonly files (alexander) |
551 |
|
1685.1.31
by John Arbash Meinel
Adding tests for the rest of the _win32 functions. |
552 |
|
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
553 |
def get_terminal_encoding(trace=False): |
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
554 |
"""Find the best encoding for printing to the screen.
|
555 |
||
556 |
This attempts to check both sys.stdout and sys.stdin to see
|
|
557 |
what encoding they are in, and if that fails it falls back to
|
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
558 |
osutils.get_user_encoding().
|
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
559 |
The problem is that on Windows, locale.getpreferredencoding()
|
560 |
is not the same encoding as that used by the console:
|
|
561 |
http://mail.python.org/pipermail/python-list/2003-May/162357.html
|
|
562 |
||
563 |
On my standard US Windows XP, the preferred encoding is
|
|
564 |
cp1252, but the console is cp437
|
|
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
565 |
|
566 |
:param trace: If True trace the selected encoding via mutter().
|
|
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
567 |
"""
|
5523.2.3
by Parth Malwankar
message is now shown to the user but is not too scary. |
568 |
from bzrlib.trace import mutter |
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
569 |
output_encoding = getattr(sys.stdout, 'encoding', None) |
570 |
if not output_encoding: |
|
571 |
input_encoding = getattr(sys.stdin, 'encoding', None) |
|
572 |
if not input_encoding: |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
573 |
output_encoding = get_user_encoding() |
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
574 |
if trace: |
575 |
mutter('encoding stdout as osutils.get_user_encoding() %r', |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
576 |
output_encoding) |
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
577 |
else: |
578 |
output_encoding = input_encoding |
|
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
579 |
if trace: |
580 |
mutter('encoding stdout as sys.stdin encoding %r', |
|
581 |
output_encoding) |
|
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
582 |
else: |
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
583 |
if trace: |
584 |
mutter('encoding stdout as sys.stdout encoding %r', output_encoding) |
|
2127.4.1
by Alexander Belchenko
(jam, bialix) Workaround for cp0 console encoding on Windows |
585 |
if output_encoding == 'cp0': |
586 |
# invalid encoding (cp0 means 'no codepage' on Windows)
|
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
587 |
output_encoding = get_user_encoding() |
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
588 |
if trace: |
589 |
mutter('cp0 is invalid encoding.' |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
590 |
' encoding stdout as osutils.get_user_encoding() %r', |
591 |
output_encoding) |
|
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
592 |
# check encoding
|
593 |
try: |
|
594 |
codecs.lookup(output_encoding) |
|
595 |
except LookupError: |
|
596 |
sys.stderr.write('bzr: warning:' |
|
2192.1.9
by Alexander Belchenko
final fix suggested by John Meinel |
597 |
' unknown terminal encoding %s.\n' |
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
598 |
' Using encoding %s instead.\n' |
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
599 |
% (output_encoding, get_user_encoding()) |
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
600 |
)
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
601 |
output_encoding = get_user_encoding() |
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
602 |
|
1711.4.10
by John Arbash Meinel
Pull out sys.stdout.encoding handling into a separate function so it can be tested, and used elsewhere. |
603 |
return output_encoding |
604 |
||
605 |
||
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 \ |
606 |
def normalizepath(f): |
3287.18.2
by Matt McClure
Reverts to 3290. |
607 |
if getattr(os.path, 'realpath', None) is not None: |
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 \ |
608 |
F = realpath |
609 |
else: |
|
610 |
F = abspath |
|
611 |
[p,e] = os.path.split(f) |
|
612 |
if e == "" or e == "." or e == "..": |
|
613 |
return F(f) |
|
614 |
else: |
|
615 |
return pathjoin(F(p), e) |
|
616 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
617 |
|
618 |
def isdir(f): |
|
619 |
"""True if f is an accessible directory."""
|
|
620 |
try: |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
621 |
return stat.S_ISDIR(os.lstat(f)[stat.ST_MODE]) |
1
by mbp at sourcefrog
import from baz patch-364 |
622 |
except OSError: |
623 |
return False |
|
624 |
||
625 |
||
626 |
def isfile(f): |
|
627 |
"""True if f is a regular file."""
|
|
628 |
try: |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
629 |
return stat.S_ISREG(os.lstat(f)[stat.ST_MODE]) |
1
by mbp at sourcefrog
import from baz patch-364 |
630 |
except OSError: |
631 |
return False |
|
632 |
||
1092.2.6
by Robert Collins
symlink support updated to work |
633 |
def islink(f): |
634 |
"""True if f is a symlink."""
|
|
635 |
try: |
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
636 |
return stat.S_ISLNK(os.lstat(f)[stat.ST_MODE]) |
1092.2.6
by Robert Collins
symlink support updated to work |
637 |
except OSError: |
638 |
return False |
|
1
by mbp at sourcefrog
import from baz patch-364 |
639 |
|
485
by Martin Pool
- move commit code into its own module |
640 |
def is_inside(dir, fname): |
641 |
"""True if fname is inside dir.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
642 |
|
1185.31.38
by John Arbash Meinel
Changing os.path.normpath to osutils.normpath |
643 |
The parameters should typically be passed to osutils.normpath first, so
|
969
by Martin Pool
- Add less-sucky is_within_any |
644 |
that . and .. and repeated slashes are eliminated, and the separators
|
645 |
are canonical for the platform.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
646 |
|
647 |
The empty string as a dir name is taken as top-of-tree and matches
|
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
648 |
everything.
|
485
by Martin Pool
- move commit code into its own module |
649 |
"""
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
650 |
# XXX: Most callers of this can actually do something smarter by
|
969
by Martin Pool
- Add less-sucky is_within_any |
651 |
# looking at the inventory
|
972
by Martin Pool
- less dodgy is_inside function |
652 |
if dir == fname: |
653 |
return True |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
654 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
655 |
if dir == '': |
656 |
return True |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
657 |
|
1185.31.34
by John Arbash Meinel
Removing instances of os.sep |
658 |
if dir[-1] != '/': |
659 |
dir += '/' |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
660 |
|
972
by Martin Pool
- less dodgy is_inside function |
661 |
return fname.startswith(dir) |
662 |
||
485
by Martin Pool
- move commit code into its own module |
663 |
|
664 |
def is_inside_any(dir_list, fname): |
|
665 |
"""True if fname is inside any of given dirs."""
|
|
666 |
for dirname in dir_list: |
|
667 |
if is_inside(dirname, fname): |
|
668 |
return True |
|
2324.2.3
by Dmitry Vasiliev
Fixed is_inside_* methods implementation |
669 |
return False |
485
by Martin Pool
- move commit code into its own module |
670 |
|
671 |
||
1740.3.4
by Jelmer Vernooij
Move inventory to commit builder. |
672 |
def is_inside_or_parent_of_any(dir_list, fname): |
673 |
"""True if fname is a child or a parent of any of the given files."""
|
|
674 |
for dirname in dir_list: |
|
675 |
if is_inside(dirname, fname) or is_inside(fname, dirname): |
|
676 |
return True |
|
2324.2.3
by Dmitry Vasiliev
Fixed is_inside_* methods implementation |
677 |
return False |
1740.3.4
by Jelmer Vernooij
Move inventory to commit builder. |
678 |
|
679 |
||
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
680 |
def pumpfile(from_file, to_file, read_length=-1, buff_size=32768, |
681 |
report_activity=None, direction='read'): |
|
2745.5.2
by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes |
682 |
"""Copy contents of one file to another.
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
683 |
|
684 |
The read_length can either be -1 to read to end-of-file (EOF) or
|
|
685 |
it can specify the maximum number of bytes to read.
|
|
686 |
||
687 |
The buff_size represents the maximum size for each read operation
|
|
688 |
performed on from_file.
|
|
689 |
||
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
690 |
:param report_activity: Call this as bytes are read, see
|
691 |
Transport._report_activity
|
|
692 |
:param direction: Will be passed to report_activity
|
|
693 |
||
2745.5.2
by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes |
694 |
:return: The number of bytes copied.
|
695 |
"""
|
|
696 |
length = 0 |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
697 |
if read_length >= 0: |
698 |
# read specified number of bytes
|
|
699 |
||
700 |
while read_length > 0: |
|
701 |
num_bytes_to_read = min(read_length, buff_size) |
|
702 |
||
703 |
block = from_file.read(num_bytes_to_read) |
|
704 |
if not block: |
|
705 |
# EOF reached
|
|
706 |
break
|
|
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
707 |
if report_activity is not None: |
708 |
report_activity(len(block), direction) |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
709 |
to_file.write(block) |
710 |
||
711 |
actual_bytes_read = len(block) |
|
712 |
read_length -= actual_bytes_read |
|
713 |
length += actual_bytes_read |
|
714 |
else: |
|
715 |
# read to EOF
|
|
716 |
while True: |
|
717 |
block = from_file.read(buff_size) |
|
718 |
if not block: |
|
719 |
# EOF reached
|
|
720 |
break
|
|
3956.2.1
by John Arbash Meinel
Add report_activity to osutils.pumpfile |
721 |
if report_activity is not None: |
722 |
report_activity(len(block), direction) |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
723 |
to_file.write(block) |
724 |
length += len(block) |
|
2745.5.2
by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes |
725 |
return length |
1
by mbp at sourcefrog
import from baz patch-364 |
726 |
|
727 |
||
3635.1.2
by Robert Collins
Add osutils.pump_string_file helper function. |
728 |
def pump_string_file(bytes, file_handle, segment_size=None): |
729 |
"""Write bytes to file_handle in many smaller writes.
|
|
730 |
||
731 |
:param bytes: The string to write.
|
|
732 |
:param file_handle: The file to write to.
|
|
733 |
"""
|
|
734 |
# Write data in chunks rather than all at once, because very large
|
|
735 |
# writes fail on some platforms (e.g. Windows with SMB mounted
|
|
736 |
# drives).
|
|
737 |
if not segment_size: |
|
738 |
segment_size = 5242880 # 5MB |
|
739 |
segments = range(len(bytes) / segment_size + 1) |
|
740 |
write = file_handle.write |
|
741 |
for segment_index in segments: |
|
742 |
segment = buffer(bytes, segment_index * segment_size, segment_size) |
|
743 |
write(segment) |
|
744 |
||
745 |
||
1185.67.7
by Aaron Bentley
Refactored a bit |
746 |
def file_iterator(input_file, readsize=32768): |
747 |
while True: |
|
748 |
b = input_file.read(readsize) |
|
749 |
if len(b) == 0: |
|
750 |
break
|
|
751 |
yield b |
|
752 |
||
753 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
754 |
def sha_file(f): |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
755 |
"""Calculate the hexdigest of an open file.
|
756 |
||
757 |
The file cursor should be already at the start.
|
|
758 |
"""
|
|
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
759 |
s = sha() |
320
by Martin Pool
- Compute SHA-1 of files in chunks |
760 |
BUFSIZE = 128<<10 |
761 |
while True: |
|
762 |
b = f.read(BUFSIZE) |
|
763 |
if not b: |
|
764 |
break
|
|
765 |
s.update(b) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
766 |
return s.hexdigest() |
767 |
||
768 |
||
3368.2.49
by Ian Clatworthy
added osutils.size_sha_file() with tests |
769 |
def size_sha_file(f): |
770 |
"""Calculate the size and hexdigest of an open file.
|
|
771 |
||
772 |
The file cursor should be already at the start and
|
|
773 |
the caller is responsible for closing the file afterwards.
|
|
774 |
"""
|
|
775 |
size = 0 |
|
776 |
s = sha() |
|
777 |
BUFSIZE = 128<<10 |
|
778 |
while True: |
|
779 |
b = f.read(BUFSIZE) |
|
780 |
if not b: |
|
781 |
break
|
|
782 |
size += len(b) |
|
783 |
s.update(b) |
|
784 |
return size, s.hexdigest() |
|
785 |
||
786 |
||
2872.3.1
by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code |
787 |
def sha_file_by_name(fname): |
788 |
"""Calculate the SHA1 of a file by reading the full text"""
|
|
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
789 |
s = sha() |
4634.140.1
by INADA Naoki
Avoids child process inherits file handles on win32. by using os.fdopen and os.open with O_NOINHERIT instead of builtin open. |
790 |
f = os.open(fname, os.O_RDONLY | O_BINARY | O_NOINHERIT) |
2872.3.1
by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code |
791 |
try: |
2872.3.2
by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster |
792 |
while True: |
793 |
b = os.read(f, 1<<16) |
|
794 |
if not b: |
|
795 |
return s.hexdigest() |
|
796 |
s.update(b) |
|
2872.3.1
by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code |
797 |
finally: |
2872.3.2
by Martin Pool
Do sha_file_by_name using raw os files rather than file objects; makes this routine about 12osutils.py faster |
798 |
os.close(f) |
2872.3.1
by Martin Pool
Add -Dhashcache option; clean up dirstate sha1 code |
799 |
|
800 |
||
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
801 |
def sha_strings(strings, _factory=sha): |
1235
by Martin Pool
- split sha_strings into osutils |
802 |
"""Return the sha-1 of concatenation of strings"""
|
2825.2.1
by Robert Collins
Micro-tweaks to sha routines. |
803 |
s = _factory() |
1235
by Martin Pool
- split sha_strings into osutils |
804 |
map(s.update, strings) |
805 |
return s.hexdigest() |
|
806 |
||
807 |
||
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
808 |
def sha_string(f, _factory=sha): |
2825.2.1
by Robert Collins
Micro-tweaks to sha routines. |
809 |
return _factory(f).hexdigest() |
1
by mbp at sourcefrog
import from baz patch-364 |
810 |
|
811 |
||
124
by mbp at sourcefrog
- check file text for past revisions is correct |
812 |
def fingerprint_file(f): |
126
by mbp at sourcefrog
Use just one big read to fingerprint files |
813 |
b = f.read() |
2825.2.1
by Robert Collins
Micro-tweaks to sha routines. |
814 |
return {'size': len(b), |
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
815 |
'sha1': sha(b).hexdigest()} |
124
by mbp at sourcefrog
- check file text for past revisions is correct |
816 |
|
817 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
818 |
def compare_files(a, b): |
819 |
"""Returns true if equal in contents"""
|
|
74
by mbp at sourcefrog
compare_files: read in one page at a time rather than |
820 |
BUFSIZE = 4096 |
821 |
while True: |
|
822 |
ai = a.read(BUFSIZE) |
|
823 |
bi = b.read(BUFSIZE) |
|
824 |
if ai != bi: |
|
825 |
return False |
|
826 |
if ai == '': |
|
827 |
return True |
|
1
by mbp at sourcefrog
import from baz patch-364 |
828 |
|
829 |
||
49
by mbp at sourcefrog
fix local-time-offset calculation |
830 |
def local_time_offset(t=None): |
831 |
"""Return offset of local zone from GMT, either at present or at time t."""
|
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
832 |
if t is None: |
73
by mbp at sourcefrog
fix time.localtime call for python 2.3 |
833 |
t = time.time() |
2215.6.1
by James Henstridge
Don't rely on time.timezone and time.altzone in local_time_offset(), |
834 |
offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t) |
835 |
return offset.days * 86400 + offset.seconds |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
836 |
|
3512.3.1
by Martin von Gagern
Hand-selected minimalistic set of changes from my setlocale branch. |
837 |
weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] |
4379.4.1
by Ian Clatworthy
make log --long faster |
838 |
_default_format_by_weekday_num = [wd + " %Y-%m-%d %H:%M:%S" for wd in weekdays] |
839 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
840 |
|
2425.6.2
by Martin Pool
Make timestamps use existing format_date; document that function more |
841 |
def format_date(t, offset=0, timezone='original', date_fmt=None, |
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
842 |
show_offset=True): |
2425.6.2
by Martin Pool
Make timestamps use existing format_date; document that function more |
843 |
"""Return a formatted date string.
|
844 |
||
845 |
:param t: Seconds since the epoch.
|
|
846 |
:param offset: Timezone offset in seconds east of utc.
|
|
847 |
:param timezone: How to display the time: 'utc', 'original' for the
|
|
848 |
timezone specified by offset, or 'local' for the process's current
|
|
849 |
timezone.
|
|
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
850 |
:param date_fmt: strftime format.
|
851 |
:param show_offset: Whether to append the timezone.
|
|
852 |
"""
|
|
853 |
(date_fmt, tt, offset_str) = \ |
|
854 |
_format_date(t, offset, timezone, date_fmt, show_offset) |
|
855 |
date_fmt = date_fmt.replace('%a', weekdays[tt[6]]) |
|
856 |
date_str = time.strftime(date_fmt, tt) |
|
857 |
return date_str + offset_str |
|
858 |
||
4379.4.1
by Ian Clatworthy
make log --long faster |
859 |
|
860 |
# Cache of formatted offset strings
|
|
861 |
_offset_cache = {} |
|
862 |
||
863 |
||
4379.4.2
by Ian Clatworthy
add NEWS item and tests for new date formatting API |
864 |
def format_date_with_offset_in_original_timezone(t, offset=0, |
4379.4.1
by Ian Clatworthy
make log --long faster |
865 |
_cache=_offset_cache): |
866 |
"""Return a formatted date string in the original timezone.
|
|
867 |
||
868 |
This routine may be faster then format_date.
|
|
869 |
||
870 |
:param t: Seconds since the epoch.
|
|
871 |
:param offset: Timezone offset in seconds east of utc.
|
|
872 |
"""
|
|
873 |
if offset is None: |
|
874 |
offset = 0 |
|
875 |
tt = time.gmtime(t + offset) |
|
876 |
date_fmt = _default_format_by_weekday_num[tt[6]] |
|
877 |
date_str = time.strftime(date_fmt, tt) |
|
878 |
offset_str = _cache.get(offset, None) |
|
879 |
if offset_str is None: |
|
880 |
offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) |
|
881 |
_cache[offset] = offset_str |
|
882 |
return date_str + offset_str |
|
883 |
||
884 |
||
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
885 |
def format_local_date(t, offset=0, timezone='original', date_fmt=None, |
886 |
show_offset=True): |
|
887 |
"""Return an unicode date string formatted according to the current locale.
|
|
888 |
||
889 |
:param t: Seconds since the epoch.
|
|
890 |
:param offset: Timezone offset in seconds east of utc.
|
|
891 |
:param timezone: How to display the time: 'utc', 'original' for the
|
|
892 |
timezone specified by offset, or 'local' for the process's current
|
|
893 |
timezone.
|
|
894 |
:param date_fmt: strftime format.
|
|
895 |
:param show_offset: Whether to append the timezone.
|
|
896 |
"""
|
|
897 |
(date_fmt, tt, offset_str) = \ |
|
898 |
_format_date(t, offset, timezone, date_fmt, show_offset) |
|
899 |
date_str = time.strftime(date_fmt, tt) |
|
900 |
if not isinstance(date_str, unicode): |
|
4385.4.1
by Alexander Belchenko
removed all references to bzrlib.user_encoding |
901 |
date_str = date_str.decode(get_user_encoding(), 'replace') |
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
902 |
return date_str + offset_str |
903 |
||
4379.4.1
by Ian Clatworthy
make log --long faster |
904 |
|
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
905 |
def _format_date(t, offset, timezone, date_fmt, show_offset): |
8
by mbp at sourcefrog
store committer's timezone in revision and show |
906 |
if timezone == 'utc': |
1
by mbp at sourcefrog
import from baz patch-364 |
907 |
tt = time.gmtime(t) |
908 |
offset = 0 |
|
8
by mbp at sourcefrog
store committer's timezone in revision and show |
909 |
elif timezone == 'original': |
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
910 |
if offset is None: |
23
by mbp at sourcefrog
format_date: handle revisions with no timezone offset |
911 |
offset = 0 |
16
by mbp at sourcefrog
fix inverted calculation for original timezone -> utc |
912 |
tt = time.gmtime(t + offset) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
913 |
elif timezone == 'local': |
1
by mbp at sourcefrog
import from baz patch-364 |
914 |
tt = time.localtime(t) |
49
by mbp at sourcefrog
fix local-time-offset calculation |
915 |
offset = local_time_offset(t) |
12
by mbp at sourcefrog
new --timezone option for bzr log |
916 |
else: |
3144.1.1
by Lukáš Lalinský
Fixed error reporting of unsupported timezone format. |
917 |
raise errors.UnsupportedTimezoneFormat(timezone) |
1185.12.24
by Aaron Bentley
Made format_date more flexible |
918 |
if date_fmt is None: |
919 |
date_fmt = "%a %Y-%m-%d %H:%M:%S" |
|
920 |
if show_offset: |
|
921 |
offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) |
|
922 |
else: |
|
923 |
offset_str = '' |
|
3526.5.4
by Martin von Gagern
Use separate function format_local_date for local weekday formats in unicode. |
924 |
return (date_fmt, tt, offset_str) |
1
by mbp at sourcefrog
import from baz patch-364 |
925 |
|
926 |
||
927 |
def compact_date(when): |
|
928 |
return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
929 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
930 |
|
1957.1.4
by John Arbash Meinel
create a helper for formatting a time delta |
931 |
def format_delta(delta): |
932 |
"""Get a nice looking string for a time delta.
|
|
933 |
||
934 |
:param delta: The time difference in seconds, can be positive or negative.
|
|
935 |
positive indicates time in the past, negative indicates time in the
|
|
936 |
future. (usually time.time() - stored_time)
|
|
937 |
:return: String formatted to show approximate resolution
|
|
938 |
"""
|
|
939 |
delta = int(delta) |
|
940 |
if delta >= 0: |
|
941 |
direction = 'ago' |
|
942 |
else: |
|
943 |
direction = 'in the future' |
|
944 |
delta = -delta |
|
945 |
||
946 |
seconds = delta |
|
947 |
if seconds < 90: # print seconds up to 90 seconds |
|
948 |
if seconds == 1: |
|
949 |
return '%d second %s' % (seconds, direction,) |
|
950 |
else: |
|
951 |
return '%d seconds %s' % (seconds, direction) |
|
952 |
||
953 |
minutes = int(seconds / 60) |
|
954 |
seconds -= 60 * minutes |
|
955 |
if seconds == 1: |
|
956 |
plural_seconds = '' |
|
957 |
else: |
|
958 |
plural_seconds = 's' |
|
959 |
if minutes < 90: # print minutes, seconds up to 90 minutes |
|
960 |
if minutes == 1: |
|
961 |
return '%d minute, %d second%s %s' % ( |
|
962 |
minutes, seconds, plural_seconds, direction) |
|
963 |
else: |
|
964 |
return '%d minutes, %d second%s %s' % ( |
|
965 |
minutes, seconds, plural_seconds, direction) |
|
966 |
||
967 |
hours = int(minutes / 60) |
|
968 |
minutes -= 60 * hours |
|
969 |
if minutes == 1: |
|
970 |
plural_minutes = '' |
|
971 |
else: |
|
972 |
plural_minutes = 's' |
|
973 |
||
974 |
if hours == 1: |
|
975 |
return '%d hour, %d minute%s %s' % (hours, minutes, |
|
976 |
plural_minutes, direction) |
|
977 |
return '%d hours, %d minute%s %s' % (hours, minutes, |
|
978 |
plural_minutes, direction) |
|
1
by mbp at sourcefrog
import from baz patch-364 |
979 |
|
980 |
def filesize(f): |
|
981 |
"""Return size of given open file."""
|
|
5273.1.2
by Vincent Ladeuil
Cleanup imports in osutils.py. |
982 |
return os.fstat(f.fileno())[stat.ST_SIZE] |
1
by mbp at sourcefrog
import from baz patch-364 |
983 |
|
1553.5.5
by Martin Pool
New utility routine rand_chars |
984 |
|
6419.1.1
by Martin Packman
Simplify urandom alias osutils.rand_bytes based on present realities |
985 |
# Alias os.urandom to support platforms (which?) without /dev/urandom and
|
986 |
# override if it doesn't work. Avoid checking on windows where there is
|
|
987 |
# significant initialisation cost that can be avoided for some bzr calls.
|
|
988 |
||
989 |
rand_bytes = os.urandom |
|
990 |
||
991 |
if rand_bytes.__module__ != "nt": |
|
2067.1.1
by John Arbash Meinel
Catch an exception while opening /dev/urandom rather than using os.path.exists() |
992 |
try: |
6419.1.1
by Martin Packman
Simplify urandom alias osutils.rand_bytes based on present realities |
993 |
rand_bytes(1) |
994 |
except NotImplementedError: |
|
1185.1.7
by Robert Collins
Nathaniel McCallums patch for urandom friendliness on aix. |
995 |
# not well seeded, but better than nothing
|
996 |
def rand_bytes(n): |
|
997 |
import random |
|
998 |
s = '' |
|
999 |
while n: |
|
1000 |
s += chr(random.randint(0, 255)) |
|
1001 |
n -= 1 |
|
1002 |
return s |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1003 |
|
1553.5.5
by Martin Pool
New utility routine rand_chars |
1004 |
|
1005 |
ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz' |
|
1006 |
def rand_chars(num): |
|
1007 |
"""Return a random string of num alphanumeric characters
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1008 |
|
1009 |
The result only contains lowercase chars because it may be used on
|
|
1553.5.5
by Martin Pool
New utility routine rand_chars |
1010 |
case-insensitive filesystems.
|
1011 |
"""
|
|
1012 |
s = '' |
|
1013 |
for raw_byte in rand_bytes(num): |
|
1014 |
s += ALNUM[ord(raw_byte) % 36] |
|
1015 |
return s |
|
1016 |
||
1017 |
||
1
by mbp at sourcefrog
import from baz patch-364 |
1018 |
## TODO: We could later have path objects that remember their list
|
1759.2.2
by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron. |
1019 |
## decomposition (might be too tricksy though.)
|
1
by mbp at sourcefrog
import from baz patch-364 |
1020 |
|
1021 |
def splitpath(p): |
|
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
1022 |
"""Turn string into list of parts."""
|
271
by Martin Pool
- Windows path fixes |
1023 |
# split on either delimiter because people might use either on
|
1024 |
# Windows
|
|
1025 |
ps = re.split(r'[\\/]', p) |
|
1026 |
||
1027 |
rps = [] |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1028 |
for f in ps: |
1029 |
if f == '..': |
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
1030 |
raise errors.BzrError(gettext("sorry, %r not allowed in path") % f) |
271
by Martin Pool
- Windows path fixes |
1031 |
elif (f == '.') or (f == ''): |
1032 |
pass
|
|
1033 |
else: |
|
1034 |
rps.append(f) |
|
1035 |
return rps |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1036 |
|
3890.2.4
by John Arbash Meinel
Add a new function that can convert 'chunks' format to a 'lines' format. |
1037 |
|
1
by mbp at sourcefrog
import from baz patch-364 |
1038 |
def joinpath(p): |
1039 |
for f in p: |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1040 |
if (f == '..') or (f is None) or (f == ''): |
6138.3.8
by Jonathan Riddell
more error gettext()ing |
1041 |
raise errors.BzrError(gettext("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 \ |
1042 |
return pathjoin(*p) |
1
by mbp at sourcefrog
import from baz patch-364 |
1043 |
|
1044 |
||
4370.1.1
by Ian Clatworthy
add osutils.parent_directories() API |
1045 |
def parent_directories(filename): |
4371.1.1
by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy) |
1046 |
"""Return the list of parent directories, deepest first.
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1047 |
|
4371.1.1
by Ian Clatworthy
(igc) added osutils.parent_directories() (Ian Clatworthy) |
1048 |
For example, parent_directories("a/b/c") -> ["a/b", "a"].
|
1049 |
"""
|
|
4370.1.1
by Ian Clatworthy
add osutils.parent_directories() API |
1050 |
parents = [] |
1051 |
parts = splitpath(dirname(filename)) |
|
1052 |
while parts: |
|
1053 |
parents.append(joinpath(parts)) |
|
1054 |
parts.pop() |
|
1055 |
return parents |
|
1056 |
||
1057 |
||
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1058 |
_extension_load_failures = [] |
1059 |
||
1060 |
||
1061 |
def failed_to_load_extension(exception): |
|
4574.3.1
by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx |
1062 |
"""Handle failing to load a binary extension.
|
1063 |
||
1064 |
This should be called from the ImportError block guarding the attempt to
|
|
1065 |
import the native extension. If this function returns, the pure-Python
|
|
1066 |
implementation should be loaded instead::
|
|
1067 |
||
1068 |
>>> try:
|
|
1069 |
>>> import bzrlib._fictional_extension_pyx
|
|
1070 |
>>> except ImportError, e:
|
|
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1071 |
>>> bzrlib.osutils.failed_to_load_extension(e)
|
4574.3.1
by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx |
1072 |
>>> import bzrlib._fictional_extension_py
|
1073 |
"""
|
|
1074 |
# NB: This docstring is just an example, not a doctest, because doctest
|
|
1075 |
# currently can't cope with the use of lazy imports in this namespace --
|
|
1076 |
# mbp 20090729
|
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1077 |
|
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1078 |
# This currently doesn't report the failure at the time it occurs, because
|
1079 |
# they tend to happen very early in startup when we can't check config
|
|
1080 |
# files etc, and also we want to report all failures but not spam the user
|
|
1081 |
# with 10 warnings.
|
|
1082 |
exception_str = str(exception) |
|
1083 |
if exception_str not in _extension_load_failures: |
|
5523.2.3
by Parth Malwankar
message is now shown to the user but is not too scary. |
1084 |
trace.mutter("failed to load compiled extension: %s" % exception_str) |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1085 |
_extension_load_failures.append(exception_str) |
1086 |
||
1087 |
||
1088 |
def report_extension_load_failures(): |
|
1089 |
if not _extension_load_failures: |
|
1090 |
return
|
|
6059.4.2
by Vincent Ladeuil
Migrate ignore_missing_extensions to stack-based config. |
1091 |
if config.GlobalStack().get('ignore_missing_extensions'): |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1092 |
return
|
1093 |
# the warnings framework should by default show this only once
|
|
4695.4.1
by Martin Pool
Give a shorter/cleaner message for missing extensions |
1094 |
from bzrlib.trace import warning |
1095 |
warning( |
|
1096 |
"bzr: warning: some compiled extensions could not be loaded; "
|
|
1097 |
"see <https://answers.launchpad.net/bzr/+faq/703>") |
|
1098 |
# we no longer show the specific missing extensions here, because it makes
|
|
1099 |
# the message too long and scary - see
|
|
1100 |
# https://bugs.launchpad.net/bzr/+bug/430529
|
|
4574.3.1
by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx |
1101 |
|
1102 |
||
3890.2.7
by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write. |
1103 |
try: |
1104 |
from bzrlib._chunks_to_lines_pyx import chunks_to_lines |
|
4574.3.1
by Martin Pool
Give a warning when failing to load _chunks_to_lines_pyx |
1105 |
except ImportError, e: |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1106 |
failed_to_load_extension(e) |
3890.2.8
by John Arbash Meinel
Move everything into properly parameterized tests. |
1107 |
from bzrlib._chunks_to_lines_py import chunks_to_lines |
3890.2.7
by John Arbash Meinel
A Pyrex extension is about 5x faster than the fastest python code I could write. |
1108 |
|
1109 |
||
1231
by Martin Pool
- more progress on fetch on top of weaves |
1110 |
def split_lines(s): |
1111 |
"""Split s into lines, but without removing the newline characters."""
|
|
3890.2.18
by John Arbash Meinel
Implement osutils.split_lines() in terms of chunks_to_lines if possible. |
1112 |
# Trivially convert a fulltext into a 'chunked' representation, and let
|
1113 |
# chunks_to_lines do the heavy lifting.
|
|
1114 |
if isinstance(s, str): |
|
1115 |
# chunks_to_lines only supports 8-bit strings
|
|
1116 |
return chunks_to_lines([s]) |
|
1117 |
else: |
|
1118 |
return _split_lines(s) |
|
1119 |
||
1120 |
||
1121 |
def _split_lines(s): |
|
1122 |
"""Split s into lines, but without removing the newline characters.
|
|
1123 |
||
1124 |
This supports Unicode or plain string objects.
|
|
1125 |
"""
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
1126 |
lines = s.split('\n') |
1127 |
result = [line + '\n' for line in lines[:-1]] |
|
1128 |
if lines[-1]: |
|
1129 |
result.append(lines[-1]) |
|
1130 |
return result |
|
1391
by Robert Collins
merge from integration |
1131 |
|
1132 |
||
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
1133 |
def hardlinks_good(): |
1185.10.5
by Aaron Bentley
Fixed hardlinks_good test |
1134 |
return sys.platform not in ('win32', 'cygwin', 'darwin') |
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
1135 |
|
1185.1.46
by Robert Collins
Aarons branch --basis patch |
1136 |
|
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
1137 |
def link_or_copy(src, dest): |
1138 |
"""Hardlink a file, or copy it if it can't be hardlinked."""
|
|
1185.10.4
by Aaron Bentley
Disabled hardlinks on cygwin, mac OS |
1139 |
if not hardlinks_good(): |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
1140 |
shutil.copyfile(src, dest) |
1185.10.3
by Aaron Bentley
Made copy_multi_immutable create hardlinks opportunistically |
1141 |
return
|
1142 |
try: |
|
1143 |
os.link(src, dest) |
|
1144 |
except (OSError, IOError), e: |
|
1145 |
if e.errno != errno.EXDEV: |
|
1146 |
raise
|
|
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
1147 |
shutil.copyfile(src, dest) |
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
1148 |
|
2831.5.2
by Vincent Ladeuil
Review feedback. |
1149 |
|
1150 |
def delete_any(path): |
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1151 |
"""Delete a file, symlink or directory.
|
1152 |
||
4490.1.1
by Martin Pool
merge fix for forcing readonly deletion, and tweak |
1153 |
Will delete even if readonly.
|
1154 |
"""
|
|
4440.1.2
by Craig Hewetson
Fixes made after first code review. |
1155 |
try: |
4490.1.1
by Martin Pool
merge fix for forcing readonly deletion, and tweak |
1156 |
_delete_file_or_dir(path) |
4440.1.2
by Craig Hewetson
Fixes made after first code review. |
1157 |
except (OSError, IOError), e: |
1158 |
if e.errno in (errno.EPERM, errno.EACCES): |
|
4490.1.1
by Martin Pool
merge fix for forcing readonly deletion, and tweak |
1159 |
# make writable and try again
|
1160 |
try: |
|
4440.1.2
by Craig Hewetson
Fixes made after first code review. |
1161 |
make_writable(path) |
4490.1.1
by Martin Pool
merge fix for forcing readonly deletion, and tweak |
1162 |
except (OSError, IOError): |
4440.1.2
by Craig Hewetson
Fixes made after first code review. |
1163 |
pass
|
4490.1.1
by Martin Pool
merge fix for forcing readonly deletion, and tweak |
1164 |
_delete_file_or_dir(path) |
1165 |
else: |
|
1166 |
raise
|
|
1167 |
||
1168 |
||
1169 |
def _delete_file_or_dir(path): |
|
1170 |
# Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
|
|
1171 |
# Forgiveness than Permission (EAFP) because:
|
|
1172 |
# - root can damage a solaris file system by using unlink,
|
|
1173 |
# - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
|
|
1174 |
# EACCES, OSX: EPERM) when invoked on a directory.
|
|
2831.5.2
by Vincent Ladeuil
Review feedback. |
1175 |
if isdir(path): # Takes care of symlinks |
1176 |
os.rmdir(path) |
|
1177 |
else: |
|
1178 |
os.unlink(path) |
|
1558.12.9
by Aaron Bentley
Handle resolving conflicts with directories properly |
1179 |
|
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
1180 |
|
1181 |
def has_symlinks(): |
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
1182 |
if getattr(os, 'symlink', None) is not None: |
1399.1.4
by Robert Collins
move diff and symlink conditionals into inventory.py from diff.py |
1183 |
return True |
1184 |
else: |
|
1185 |
return False |
|
2831.5.2
by Vincent Ladeuil
Review feedback. |
1186 |
|
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
1187 |
|
3136.1.1
by Aaron Bentley
Add support for hardlinks to TreeTransform |
1188 |
def has_hardlinks(): |
1189 |
if getattr(os, 'link', None) is not None: |
|
1190 |
return True |
|
1191 |
else: |
|
1192 |
return False |
|
1193 |
||
1194 |
||
3287.18.14
by Matt McClure
Extracted a host_os_dereferences_symlinks method. |
1195 |
def host_os_dereferences_symlinks(): |
1196 |
return (has_symlinks() |
|
3287.18.19
by Matt McClure
Changed tested sys.platform value from 'windows' (mistaken) to 'win32' |
1197 |
and sys.platform not in ('cygwin', 'win32')) |
3287.18.14
by Matt McClure
Extracted a host_os_dereferences_symlinks method. |
1198 |
|
1199 |
||
4241.14.14
by Vincent Ladeuil
Test and implements osutils.readlink(). |
1200 |
def readlink(abspath): |
1201 |
"""Return a string representing the path to which the symbolic link points.
|
|
1202 |
||
1203 |
:param abspath: The link absolute unicode path.
|
|
1204 |
||
1205 |
This his guaranteed to return the symbolic link in unicode in all python
|
|
1206 |
versions.
|
|
1207 |
"""
|
|
1208 |
link = abspath.encode(_fs_enc) |
|
1209 |
target = os.readlink(link) |
|
1210 |
target = target.decode(_fs_enc) |
|
1211 |
return target |
|
1212 |
||
1213 |
||
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
1214 |
def contains_whitespace(s): |
1215 |
"""True if there are any whitespace characters in s."""
|
|
2249.2.1
by John Arbash Meinel
(John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales. |
1216 |
# string.whitespace can include '\xa0' in certain locales, because it is
|
1217 |
# considered "non-breaking-space" as part of ISO-8859-1. But it
|
|
1218 |
# 1) Isn't a breaking whitespace
|
|
1219 |
# 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
|
|
1220 |
# separators
|
|
1221 |
# 3) '\xa0' isn't unicode safe since it is >128.
|
|
2249.5.16
by John Arbash Meinel
[merge] bzr.dev 2283 |
1222 |
|
1223 |
# This should *not* be a unicode set of characters in case the source
|
|
1224 |
# string is not a Unicode string. We can auto-up-cast the characters since
|
|
1225 |
# they are ascii, but we don't want to auto-up-cast the string in case it
|
|
1226 |
# is utf-8
|
|
1227 |
for ch in ' \t\n\r\v\f': |
|
1185.16.38
by Martin Pool
- move contains_whitespace and contains_linebreaks to osutils |
1228 |
if ch in s: |
1229 |
return True |
|
1230 |
else: |
|
1231 |
return False |
|
1232 |
||
1233 |
||
1234 |
def contains_linebreaks(s): |
|
1235 |
"""True if there is any vertical whitespace in s."""
|
|
1236 |
for ch in '\f\n\r': |
|
1237 |
if ch in s: |
|
1238 |
return True |
|
1239 |
else: |
|
1240 |
return False |
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1241 |
|
1242 |
||
1243 |
def relpath(base, path): |
|
5193.2.1
by Alexander Belchenko
update docstring for osutils.relpath() function. |
1244 |
"""Return path relative to base, or raise PathNotChild exception.
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1245 |
|
1246 |
The path may be either an absolute path or a path relative to the
|
|
1247 |
current working directory.
|
|
1248 |
||
1249 |
os.path.commonprefix (python2.4) has a bad bug that it works just
|
|
1250 |
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. |
1251 |
avoids that problem.
|
5193.2.1
by Alexander Belchenko
update docstring for osutils.relpath() function. |
1252 |
|
5193.2.2
by Alexander Belchenko
update wording based on spiv's review. |
1253 |
NOTE: `base` should not have a trailing slash otherwise you'll get
|
1254 |
PathNotChild exceptions regardless of `path`.
|
|
1636.1.1
by Robert Collins
Fix calling relpath() and abspath() on transports at their root. |
1255 |
"""
|
1685.1.12
by John Arbash Meinel
Some more work to get LocalTransport to only support URLs |
1256 |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1257 |
if len(base) < MIN_ABS_PATHLENGTH: |
1258 |
# must have space for e.g. a drive letter
|
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
1259 |
raise ValueError(gettext('%r is too short to calculate a relative path') |
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
1260 |
% (base,)) |
1685.1.9
by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url |
1261 |
|
1685.1.12
by John Arbash Meinel
Some more work to get LocalTransport to only support URLs |
1262 |
rp = abspath(path) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1263 |
|
1264 |
s = [] |
|
1685.1.12
by John Arbash Meinel
Some more work to get LocalTransport to only support URLs |
1265 |
head = rp |
4555.2.1
by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop. |
1266 |
while True: |
1267 |
if len(head) <= len(base) and head != base: |
|
1268 |
raise errors.PathNotChild(rp, base) |
|
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1269 |
if head == base: |
1270 |
break
|
|
4555.2.1
by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop. |
1271 |
head, tail = split(head) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1272 |
if tail: |
4555.2.1
by John Arbash Meinel
Fix bug #394227, osutils.relpath() could get into an infinite loop. |
1273 |
s.append(tail) |
1457.1.2
by Robert Collins
move branch._relpath into osutils as relpath |
1274 |
|
1185.31.35
by John Arbash Meinel
Couple small fixes, all tests pass on cygwin. |
1275 |
if s: |
4555.2.3
by John Arbash Meinel
Fix a trivial bug that should have been caught earlier. :) |
1276 |
return pathjoin(*reversed(s)) |
1185.31.35
by John Arbash Meinel
Couple small fixes, all tests pass on cygwin. |
1277 |
else: |
1278 |
return '' |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
1279 |
|
1280 |
||
3794.5.29
by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath |
1281 |
def _cicp_canonical_relpath(base, path): |
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1282 |
"""Return the canonical path relative to base.
|
1283 |
||
1284 |
Like relpath, but on case-insensitive-case-preserving file-systems, this
|
|
3794.5.13
by Mark Hammond
Tweaks suggested by Martin |
1285 |
will return the relpath as stored on the file-system rather than in the
|
1286 |
case specified in the input string, for all existing portions of the path.
|
|
1287 |
||
3794.5.28
by Mark Hammond
Update comments. |
1288 |
This will cause O(N) behaviour if called for every path in a tree; if you
|
1289 |
have a number of paths to convert, you should use canonical_relpaths().
|
|
3794.5.31
by Mark Hammond
bulk of the simple review comments from igc. |
1290 |
"""
|
1291 |
# TODO: it should be possible to optimize this for Windows by using the
|
|
1292 |
# win32 API FindFiles function to look for the specified name - but using
|
|
1293 |
# os.listdir() still gives us the correct, platform agnostic semantics in
|
|
1294 |
# the short term.
|
|
3794.5.13
by Mark Hammond
Tweaks suggested by Martin |
1295 |
|
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1296 |
rel = relpath(base, path) |
1297 |
# '.' will have been turned into ''
|
|
1298 |
if not rel: |
|
1299 |
return rel |
|
1300 |
||
1301 |
abs_base = abspath(base) |
|
1302 |
current = abs_base |
|
1303 |
_listdir = os.listdir |
|
1304 |
||
1305 |
# use an explicit iterator so we can easily consume the rest on early exit.
|
|
3794.5.36
by Mark Hammond
test for, and fix problem with canonical_relpath when the tail does not exist. |
1306 |
bit_iter = iter(rel.split('/')) |
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1307 |
for bit in bit_iter: |
1308 |
lbit = bit.lower() |
|
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
1309 |
try: |
1310 |
next_entries = _listdir(current) |
|
4634.70.3
by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv. |
1311 |
except OSError: # enoent, eperm, etc |
1312 |
# We can't find this in the filesystem, so just append the
|
|
1313 |
# remaining bits.
|
|
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
1314 |
current = pathjoin(current, bit, *list(bit_iter)) |
1315 |
break
|
|
4634.70.3
by John Arbash Meinel
Clean up some terminology, catch a double _listdir request, thanks spiv. |
1316 |
for look in next_entries: |
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1317 |
if lbit == look.lower(): |
1318 |
current = pathjoin(current, look) |
|
1319 |
break
|
|
1320 |
else: |
|
1321 |
# got to the end, nothing matched, so we just return the
|
|
1322 |
# non-existing bits as they were specified (the filename may be
|
|
1323 |
# the target of a move, for example).
|
|
1324 |
current = pathjoin(current, bit, *list(bit_iter)) |
|
1325 |
break
|
|
4634.70.2
by John Arbash Meinel
Fix bug #322807, teach cicp_canonical_relpath how to handle |
1326 |
return current[len(abs_base):].lstrip('/') |
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1327 |
|
3794.5.13
by Mark Hammond
Tweaks suggested by Martin |
1328 |
# XXX - TODO - we need better detection/integration of case-insensitive
|
4241.9.5
by Vincent Ladeuil
Fix unicode related OSX failures. |
1329 |
# file-systems; Linux often sees FAT32 devices (or NFS-mounted OSX
|
1330 |
# filesystems), for example, so could probably benefit from the same basic
|
|
1331 |
# support there. For now though, only Windows and OSX get that support, and
|
|
1332 |
# they get it for *all* file-systems!
|
|
4241.9.2
by Vincent Ladeuil
Fix most of cicp related failures on OSX. |
1333 |
if sys.platform in ('win32', 'darwin'): |
3794.5.29
by Mark Hammond
cicp_canonical_relpath -> _cicp_canonical_relpath |
1334 |
canonical_relpath = _cicp_canonical_relpath |
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1335 |
else: |
1336 |
canonical_relpath = relpath |
|
1337 |
||
3794.5.15
by Mark Hammond
Add canonical_relpaths() as a placeholder for a future caching implementation. |
1338 |
def canonical_relpaths(base, paths): |
1339 |
"""Create an iterable to canonicalize a sequence of relative paths.
|
|
1340 |
||
1341 |
The intent is for this implementation to use a cache, vastly speeding
|
|
1342 |
up multiple transformations in the same directory.
|
|
1343 |
"""
|
|
1344 |
# but for now, we haven't optimized...
|
|
1345 |
return [canonical_relpath(base, p) for p in paths] |
|
3794.5.1
by Mark Hammond
Add canonical_relpath api function |
1346 |
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1347 |
|
1348 |
def decode_filename(filename): |
|
1349 |
"""Decode the filename using the filesystem encoding
|
|
1350 |
||
1351 |
If it is unicode, it is returned.
|
|
1352 |
Otherwise it is decoded from the the filesystem's encoding. If decoding
|
|
1353 |
fails, a errors.BadFilenameEncoding exception is raised.
|
|
1354 |
"""
|
|
5279.2.15
by Eric Moritz
used "type(filename) == unicode" per John A Meinel's suggestion. This will |
1355 |
if type(filename) is unicode: |
5279.2.4
by Eric Moritz
Added the filename_decode |
1356 |
return filename |
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1357 |
try: |
1358 |
return filename.decode(_fs_enc) |
|
1359 |
except UnicodeDecodeError: |
|
1360 |
raise errors.BadFilenameEncoding(filename, _fs_enc) |
|
1361 |
||
5279.2.4
by Eric Moritz
Added the filename_decode |
1362 |
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1363 |
def safe_unicode(unicode_or_utf8_string): |
1364 |
"""Coerce unicode_or_utf8_string into unicode.
|
|
1365 |
||
1366 |
If it is unicode, it is returned.
|
|
4204.2.1
by Matt Nordhoff
Fix a broken sentence in osutils.safe_unicode's docstring |
1367 |
Otherwise it is decoded from utf-8. If decoding fails, the exception is
|
1368 |
wrapped in a BzrBadParameterNotUnicode exception.
|
|
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1369 |
"""
|
1370 |
if isinstance(unicode_or_utf8_string, unicode): |
|
1371 |
return unicode_or_utf8_string |
|
1372 |
try: |
|
1373 |
return unicode_or_utf8_string.decode('utf8') |
|
1374 |
except UnicodeDecodeError: |
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
1375 |
raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string) |
1534.3.1
by Robert Collins
* bzrlib.osutils.safe_unicode now exists to provide parameter coercion |
1376 |
|
1377 |
||
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
1378 |
def safe_utf8(unicode_or_utf8_string): |
1379 |
"""Coerce unicode_or_utf8_string to a utf8 string.
|
|
1380 |
||
1381 |
If it is a str, it is returned.
|
|
1382 |
If it is Unicode, it is encoded into a utf-8 string.
|
|
1383 |
"""
|
|
1384 |
if isinstance(unicode_or_utf8_string, str): |
|
1385 |
# TODO: jam 20070209 This is overkill, and probably has an impact on
|
|
1386 |
# performance if we are dealing with lots of apis that want a
|
|
1387 |
# utf-8 revision id
|
|
1388 |
try: |
|
1389 |
# Make sure it is a valid utf-8 string
|
|
1390 |
unicode_or_utf8_string.decode('utf-8') |
|
1391 |
except UnicodeDecodeError: |
|
1392 |
raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string) |
|
1393 |
return unicode_or_utf8_string |
|
1394 |
return unicode_or_utf8_string.encode('utf-8') |
|
1395 |
||
1396 |
||
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1397 |
_revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.' |
1398 |
' Revision id generators should be creating utf8'
|
|
1399 |
' revision ids.') |
|
1400 |
||
1401 |
||
1402 |
def safe_revision_id(unicode_or_utf8_string, warn=True): |
|
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
1403 |
"""Revision ids should now be utf8, but at one point they were unicode.
|
1404 |
||
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1405 |
:param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
|
1406 |
utf8 or None).
|
|
1407 |
:param warn: Functions that are sanitizing user data can set warn=False
|
|
1408 |
:return: None or a utf8 revision id.
|
|
2249.5.8
by John Arbash Meinel
Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. |
1409 |
"""
|
2309.4.3
by John Arbash Meinel
(broken) change safe_*_id to emit a warning. |
1410 |
if (unicode_or_utf8_string is None |
1411 |
or unicode_or_utf8_string.__class__ == str): |
|
1412 |
return unicode_or_utf8_string |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1413 |
if warn: |
1414 |
symbol_versioning.warn(_revision_id_warning, DeprecationWarning, |
|
1415 |
stacklevel=2) |
|
2309.4.3
by John Arbash Meinel
(broken) change safe_*_id to emit a warning. |
1416 |
return cache_utf8.encode(unicode_or_utf8_string) |
1417 |
||
1418 |
||
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1419 |
_file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id' |
1420 |
' generators should be creating utf8 file ids.') |
|
1421 |
||
1422 |
||
1423 |
def safe_file_id(unicode_or_utf8_string, warn=True): |
|
2309.4.3
by John Arbash Meinel
(broken) change safe_*_id to emit a warning. |
1424 |
"""File ids should now be utf8, but at one point they were unicode.
|
1425 |
||
1426 |
This is the same as safe_utf8, except it uses the cached encode functions
|
|
1427 |
to save a little bit of performance.
|
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1428 |
|
1429 |
:param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
|
|
1430 |
utf8 or None).
|
|
1431 |
:param warn: Functions that are sanitizing user data can set warn=False
|
|
1432 |
:return: None or a utf8 file id.
|
|
2309.4.3
by John Arbash Meinel
(broken) change safe_*_id to emit a warning. |
1433 |
"""
|
1434 |
if (unicode_or_utf8_string is None |
|
1435 |
or unicode_or_utf8_string.__class__ == str): |
|
1436 |
return unicode_or_utf8_string |
|
2309.4.4
by John Arbash Meinel
Change what warnings are raised, and add tests that they are used. |
1437 |
if warn: |
1438 |
symbol_versioning.warn(_file_id_warning, DeprecationWarning, |
|
1439 |
stacklevel=2) |
|
2309.4.3
by John Arbash Meinel
(broken) change safe_*_id to emit a warning. |
1440 |
return cache_utf8.encode(unicode_or_utf8_string) |
2294.1.4
by John Arbash Meinel
Add safe_file_id as a helper in osutils. |
1441 |
|
1442 |
||
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
1443 |
_platform_normalizes_filenames = False |
1444 |
if sys.platform == 'darwin': |
|
1445 |
_platform_normalizes_filenames = True |
|
1446 |
||
1447 |
||
1448 |
def normalizes_filenames(): |
|
1449 |
"""Return True if this platform normalizes unicode filenames.
|
|
1450 |
||
5283.2.1
by Martin Pool
Additional platform name tweaks |
1451 |
Only Mac OSX.
|
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
1452 |
"""
|
1453 |
return _platform_normalizes_filenames |
|
1454 |
||
1455 |
||
1830.3.2
by John Arbash Meinel
normalized_filename is a much better name |
1456 |
def _accessible_normalized_filename(path): |
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1457 |
"""Get the unicode normalized path, and if you can access the file.
|
1458 |
||
1459 |
On platforms where the system normalizes filenames (Mac OSX),
|
|
1460 |
you can access a file by any path which will normalize correctly.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1461 |
On platforms where the system does not normalize filenames
|
5283.2.1
by Martin Pool
Additional platform name tweaks |
1462 |
(everything else), you have to access a file by its exact path.
|
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1463 |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1464 |
Internally, bzr only supports NFC normalization, since that is
|
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1465 |
the standard for XML documents.
|
1466 |
||
1467 |
So return the normalized path, and a flag indicating if the file
|
|
1468 |
can be accessed by that path.
|
|
1469 |
"""
|
|
1470 |
||
3201.1.1
by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC |
1471 |
return unicodedata.normalize('NFC', unicode(path)), True |
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1472 |
|
1473 |
||
1830.3.2
by John Arbash Meinel
normalized_filename is a much better name |
1474 |
def _inaccessible_normalized_filename(path): |
1475 |
__doc__ = _accessible_normalized_filename.__doc__ |
|
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1476 |
|
3201.1.1
by jameinel
Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC |
1477 |
normalized = unicodedata.normalize('NFC', unicode(path)) |
1830.3.1
by John Arbash Meinel
Change the return value of unicode_filename, and make it testable on all platforms |
1478 |
return normalized, normalized == path |
1479 |
||
1480 |
||
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
1481 |
if _platform_normalizes_filenames: |
1830.3.2
by John Arbash Meinel
normalized_filename is a much better name |
1482 |
normalized_filename = _accessible_normalized_filename |
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
1483 |
else: |
1830.3.2
by John Arbash Meinel
normalized_filename is a much better name |
1484 |
normalized_filename = _inaccessible_normalized_filename |
1185.85.75
by John Arbash Meinel
Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. |
1485 |
|
1486 |
||
4634.142.2
by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import. |
1487 |
def set_signal_handler(signum, handler, restart_syscall=True): |
4634.142.1
by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib. |
1488 |
"""A wrapper for signal.signal that also calls siginterrupt(signum, False)
|
1489 |
on platforms that support that.
|
|
4634.142.2
by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import. |
1490 |
|
1491 |
:param restart_syscall: if set, allow syscalls interrupted by a signal to
|
|
1492 |
automatically restart (by calling `signal.siginterrupt(signum,
|
|
1493 |
False)`). May be ignored if the feature is not available on this
|
|
1494 |
platform or Python version.
|
|
4634.142.1
by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib. |
1495 |
"""
|
5141.4.1
by Andrew Bennetts
Reset siginterrupt every time we handle a signal. |
1496 |
try: |
5169.2.2
by Vincent Ladeuil
Just rely on python to tell us what it supports. |
1497 |
import signal |
5141.4.1
by Andrew Bennetts
Reset siginterrupt every time we handle a signal. |
1498 |
siginterrupt = signal.siginterrupt |
5169.2.2
by Vincent Ladeuil
Just rely on python to tell us what it supports. |
1499 |
except ImportError: |
1500 |
# This python implementation doesn't provide signal support, hence no
|
|
1501 |
# handler exists
|
|
1502 |
return None |
|
5141.4.1
by Andrew Bennetts
Reset siginterrupt every time we handle a signal. |
1503 |
except AttributeError: |
1504 |
# siginterrupt doesn't exist on this platform, or for this version
|
|
1505 |
# of Python.
|
|
1506 |
siginterrupt = lambda signum, flag: None |
|
4634.142.2
by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import. |
1507 |
if restart_syscall: |
5141.4.1
by Andrew Bennetts
Reset siginterrupt every time we handle a signal. |
1508 |
def sig_handler(*args): |
1509 |
# Python resets the siginterrupt flag when a signal is
|
|
5141.4.3
by Andrew Bennetts
Link to Python bug in comment. |
1510 |
# received. <http://bugs.python.org/issue8354>
|
1511 |
# As a workaround for some cases, set it back the way we want it.
|
|
4634.142.2
by Andrew Bennetts
Make calling siginterrupt in set_signal_handler conditional on a restart_syscall param (default True), and add missing import. |
1512 |
siginterrupt(signum, False) |
5141.4.1
by Andrew Bennetts
Reset siginterrupt every time we handle a signal. |
1513 |
# Now run the handler function passed to set_signal_handler.
|
1514 |
handler(*args) |
|
1515 |
else: |
|
1516 |
sig_handler = handler |
|
1517 |
old_handler = signal.signal(signum, sig_handler) |
|
1518 |
if restart_syscall: |
|
1519 |
siginterrupt(signum, False) |
|
4634.142.1
by Andrew Bennetts
Add osutils.set_signal_handler to call signal.siginterrupt where possible, and use it in bzrlib. |
1520 |
return old_handler |
1521 |
||
1522 |
||
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
1523 |
default_terminal_width = 80 |
1524 |
"""The default terminal width for ttys.
|
|
1525 |
||
1526 |
This is defined so that higher levels can share a common fallback value when
|
|
1527 |
terminal_width() returns None.
|
|
1528 |
"""
|
|
1529 |
||
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1530 |
# Keep some state so that terminal_width can detect if _terminal_size has
|
1531 |
# returned a different size since the process started. See docstring and
|
|
1532 |
# comments of terminal_width for details.
|
|
1533 |
# _terminal_size_state has 3 possible values: no_data, unchanged, and changed.
|
|
1534 |
_terminal_size_state = 'no_data' |
|
1535 |
_first_terminal_size = None |
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
1536 |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
1537 |
def terminal_width(): |
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
1538 |
"""Return terminal width.
|
1539 |
||
1540 |
None is returned if the width can't established precisely.
|
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1541 |
|
1542 |
The rules are:
|
|
1543 |
- if BZR_COLUMNS is set, returns its value
|
|
1544 |
- if there is no controlling terminal, returns None
|
|
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1545 |
- query the OS, if the queried size has changed since the last query,
|
1546 |
return its value,
|
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1547 |
- if COLUMNS is set, returns its value,
|
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1548 |
- if the OS has a value (even though it's never changed), return its value.
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1549 |
|
1550 |
From there, we need to query the OS to get the size of the controlling
|
|
1551 |
terminal.
|
|
1552 |
||
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1553 |
On Unices we query the OS by:
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1554 |
- get termios.TIOCGWINSZ
|
1555 |
- if an error occurs or a negative value is obtained, returns None
|
|
1556 |
||
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1557 |
On Windows we query the OS by:
|
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1558 |
- win32utils.get_console_size() decides,
|
1559 |
- returns None on error (provided default value)
|
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
1560 |
"""
|
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1561 |
# Note to implementors: if changing the rules for determining the width,
|
1562 |
# make sure you've considered the behaviour in these cases:
|
|
1563 |
# - M-x shell in emacs, where $COLUMNS is set and TIOCGWINSZ returns 0,0.
|
|
1564 |
# - bzr log | less, in bash, where $COLUMNS not set and TIOCGWINSZ returns
|
|
1565 |
# 0,0.
|
|
1566 |
# - (add more interesting cases here, if you find any)
|
|
1567 |
# Some programs implement "Use $COLUMNS (if set) until SIGWINCH occurs",
|
|
1568 |
# but we don't want to register a signal handler because it is impossible
|
|
1569 |
# to do so without risking EINTR errors in Python <= 2.6.5 (see
|
|
1570 |
# <http://bugs.python.org/issue8354>). Instead we check TIOCGWINSZ every
|
|
1571 |
# time so we can notice if the reported size has changed, which should have
|
|
1572 |
# a similar effect.
|
|
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1573 |
|
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1574 |
# If BZR_COLUMNS is set, take it, user is always right
|
5582.7.1
by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0 |
1575 |
# Except if they specified 0 in which case, impose no limit here
|
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1576 |
try: |
5582.7.1
by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0 |
1577 |
width = int(os.environ['BZR_COLUMNS']) |
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1578 |
except (KeyError, ValueError): |
5582.7.1
by Neil Martinsen-Burrell
allow BZR_COLUMNS to be 0 |
1579 |
width = None |
1580 |
if width is not None: |
|
1581 |
if width > 0: |
|
1582 |
return width |
|
1583 |
else: |
|
1584 |
return None |
|
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1585 |
|
4747.3.3
by Vincent Ladeuil
More complete fix (previous one changed the focus). |
1586 |
isatty = getattr(sys.stdout, 'isatty', None) |
4797.54.1
by Andrew Bennetts
Remove the SIGWINCH signal handler. |
1587 |
if isatty is None or not isatty(): |
4747.3.7
by Vincent Ladeuil
Introduce BZR_COLUMNS since COLUMNS behaviour is too obscure. |
1588 |
# Don't guess, setting BZR_COLUMNS is the recommended way to override.
|
4747.3.6
by Vincent Ladeuil
terminal_width can now returns None. |
1589 |
return None |
4747.3.1
by Joke de Buhr
Prevent linebreaks in output if it's not connected to a tty. |
1590 |
|
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1591 |
# Query the OS
|
1592 |
width, height = os_size = _terminal_size(None, None) |
|
1593 |
global _first_terminal_size, _terminal_size_state |
|
1594 |
if _terminal_size_state == 'no_data': |
|
1595 |
_first_terminal_size = os_size |
|
1596 |
_terminal_size_state = 'unchanged' |
|
1597 |
elif (_terminal_size_state == 'unchanged' and |
|
1598 |
_first_terminal_size != os_size): |
|
1599 |
_terminal_size_state = 'changed' |
|
1600 |
||
1601 |
# If the OS claims to know how wide the terminal is, and this value has
|
|
1602 |
# ever changed, use that.
|
|
1603 |
if _terminal_size_state == 'changed': |
|
1604 |
if width is not None and width > 0: |
|
1605 |
return width |
|
4797.54.1
by Andrew Bennetts
Remove the SIGWINCH signal handler. |
1606 |
|
1607 |
# If COLUMNS is set, use it.
|
|
4747.4.3
by Vincent Ladeuil
Re-fix the priority order since there is a known valid case. |
1608 |
try: |
1609 |
return int(os.environ['COLUMNS']) |
|
1610 |
except (KeyError, ValueError): |
|
1611 |
pass
|
|
1612 |
||
4797.54.2
by Andrew Bennetts
Try to preserve the 'use COLUMNS until SIGWINCH' behaviour without using SIGWINCH, to keep the behaviour in 2.1 as stable as possible. |
1613 |
# Finally, use an unchanged size from the OS, if we have one.
|
1614 |
if _terminal_size_state == 'unchanged': |
|
1615 |
if width is not None and width > 0: |
|
1616 |
return width |
|
1617 |
||
1618 |
# The width could not be determined.
|
|
4797.54.1
by Andrew Bennetts
Remove the SIGWINCH signal handler. |
1619 |
return None |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1620 |
|
1621 |
||
1622 |
def _win32_terminal_size(width, height): |
|
1623 |
width, height = win32utils.get_console_size(defaultx=width, defaulty=height) |
|
1624 |
return width, height |
|
1625 |
||
1626 |
||
1627 |
def _ioctl_terminal_size(width, height): |
|
1185.33.60
by Martin Pool
Use full terminal width for verbose test output. |
1628 |
try: |
1704.2.2
by Martin Pool
Detect terminal width using ioctl |
1629 |
import struct, fcntl, termios |
1630 |
s = struct.pack('HHHH', 0, 0, 0, 0) |
|
1631 |
x = fcntl.ioctl(1, termios.TIOCGWINSZ, s) |
|
4747.4.6
by Vincent Ladeuil
Fix parameter order. |
1632 |
height, width = struct.unpack('HHHH', x)[0:2] |
4747.3.4
by Vincent Ladeuil
Add tests, introduce explicit default values, always respect COLUMNS. |
1633 |
except (IOError, AttributeError): |
4747.4.5
by Vincent Ladeuil
More robusts tests for osutils.terminal_width(). |
1634 |
pass
|
1635 |
return width, height |
|
1636 |
||
1637 |
_terminal_size = None |
|
1638 |
"""Returns the terminal size as (width, height).
|
|
1639 |
||
1640 |
:param width: Default value for width.
|
|
1641 |
:param height: Default value for height.
|
|
1642 |
||
1643 |
This is defined specifically for each OS and query the size of the controlling
|
|
1644 |
terminal. If any error occurs, the provided default values should be returned.
|
|
1645 |
"""
|
|
1646 |
if sys.platform == 'win32': |
|
1647 |
_terminal_size = _win32_terminal_size |
|
1648 |
else: |
|
1649 |
_terminal_size = _ioctl_terminal_size |
|
1534.7.25
by Aaron Bentley
Added set_executability |
1650 |
|
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1651 |
|
1534.7.25
by Aaron Bentley
Added set_executability |
1652 |
def supports_executable(): |
1534.7.160
by Aaron Bentley
Changed implementation of supports_executable |
1653 |
return sys.platform != "win32" |
1551.2.53
by abentley
Strip trailing slashes in a platform-sensible way |
1654 |
|
1655 |
||
1551.10.4
by Aaron Bentley
Update to skip on win32 |
1656 |
def supports_posix_readonly(): |
1657 |
"""Return True if 'readonly' has POSIX semantics, False otherwise.
|
|
1658 |
||
1659 |
Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
|
|
1660 |
directory controls creation/deletion, etc.
|
|
1661 |
||
1662 |
And under win32, readonly means that the directory itself cannot be
|
|
1663 |
deleted. The contents of a readonly directory can be changed, unlike POSIX
|
|
1664 |
where files in readonly directories cannot be added, deleted or renamed.
|
|
1665 |
"""
|
|
1666 |
return sys.platform != "win32" |
|
1667 |
||
1668 |
||
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1669 |
def set_or_unset_env(env_variable, value): |
1670 |
"""Modify the environment, setting or removing the env_variable.
|
|
1671 |
||
1672 |
:param env_variable: The environment variable in question
|
|
1673 |
:param value: The value to set the environment to. If None, then
|
|
1674 |
the variable will be removed.
|
|
1675 |
:return: The original value of the environment variable.
|
|
1676 |
"""
|
|
1677 |
orig_val = os.environ.get(env_variable) |
|
1678 |
if value is None: |
|
1679 |
if orig_val is not None: |
|
1680 |
del os.environ[env_variable] |
|
1681 |
else: |
|
1682 |
if isinstance(value, unicode): |
|
3224.5.4
by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding. |
1683 |
value = value.encode(get_user_encoding()) |
1963.1.5
by John Arbash Meinel
Create an osutils helper function for modifying the environment |
1684 |
os.environ[env_variable] = value |
1685 |
return orig_val |
|
1686 |
||
1687 |
||
1551.2.56
by Aaron Bentley
Better illegal pathname check for Windows |
1688 |
_validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$') |
1689 |
||
1690 |
||
1691 |
def check_legal_path(path): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1692 |
"""Check whether the supplied path is legal.
|
1551.2.56
by Aaron Bentley
Better illegal pathname check for Windows |
1693 |
This is only required on Windows, so we don't test on other platforms
|
1694 |
right now.
|
|
1695 |
"""
|
|
1696 |
if sys.platform != "win32": |
|
1697 |
return
|
|
1698 |
if _validWin32PathRE.match(path) is None: |
|
1996.3.25
by John Arbash Meinel
Make importing errors lazy for osutils |
1699 |
raise errors.IllegalPath(path) |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1700 |
|
1701 |
||
3596.2.2
by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it |
1702 |
_WIN32_ERROR_DIRECTORY = 267 # Similar to errno.ENOTDIR |
1703 |
||
1704 |
def _is_error_enotdir(e): |
|
1705 |
"""Check if this exception represents ENOTDIR.
|
|
1706 |
||
1707 |
Unfortunately, python is very inconsistent about the exception
|
|
1708 |
here. The cases are:
|
|
1709 |
1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
|
|
1710 |
2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
|
|
1711 |
which is the windows error code.
|
|
1712 |
3) Windows, Python2.5 uses errno == EINVAL and
|
|
1713 |
winerror == ERROR_DIRECTORY
|
|
1714 |
||
1715 |
:param e: An Exception object (expected to be OSError with an errno
|
|
1716 |
attribute, but we should be able to cope with anything)
|
|
1717 |
:return: True if this represents an ENOTDIR error. False otherwise.
|
|
1718 |
"""
|
|
1719 |
en = getattr(e, 'errno', None) |
|
1720 |
if (en == errno.ENOTDIR |
|
1721 |
or (sys.platform == 'win32' |
|
1722 |
and (en == _WIN32_ERROR_DIRECTORY |
|
1723 |
or (en == errno.EINVAL |
|
1724 |
and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY) |
|
1725 |
))):
|
|
1726 |
return True |
|
1727 |
return False |
|
1728 |
||
1729 |
||
1757.2.8
by Robert Collins
Teach walkdirs to walk a subdir of a tree. |
1730 |
def walkdirs(top, prefix=""): |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1731 |
"""Yield data about all the directories in a tree.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1732 |
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1733 |
This yields all the data about the contents of a directory at a time.
|
1734 |
After each directory has been yielded, if the caller has mutated the list
|
|
1735 |
to exclude some directories, they are then not descended into.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1736 |
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1737 |
The data yielded is of the form:
|
1897.1.2
by Robert Collins
cleanup osutils.walkdirs changes after review. |
1738 |
((directory-relpath, directory-path-from-top),
|
2694.4.1
by Alexander Belchenko
trivial fix for docstring of osutils.walkdirs() |
1739 |
[(relpath, basename, kind, lstat, path-from-top), ...]),
|
1897.1.2
by Robert Collins
cleanup osutils.walkdirs changes after review. |
1740 |
- directory-relpath is the relative path of the directory being returned
|
1741 |
with respect to top. prefix is prepended to this.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1742 |
- directory-path-from-root is the path including top for this directory.
|
1897.1.2
by Robert Collins
cleanup osutils.walkdirs changes after review. |
1743 |
It is suitable for use with os functions.
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1744 |
- relpath is the relative path within the subtree being walked.
|
1745 |
- basename is the basename of the path
|
|
1897.1.2
by Robert Collins
cleanup osutils.walkdirs changes after review. |
1746 |
- kind is the kind of the file now. If unknown then the file is not
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1747 |
present within the tree - but it may be recorded as versioned. See
|
1748 |
versioned_kind.
|
|
1749 |
- lstat is the stat data *if* the file was statted.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1750 |
- planned, not implemented:
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1751 |
path_from_tree_root is the path from the root of the tree.
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1752 |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1753 |
:param prefix: Prefix the relpaths that are yielded with 'prefix'. This
|
1757.2.16
by Robert Collins
Review comments. |
1754 |
allows one to walk a subtree but get paths that are relative to a tree
|
1755 |
rooted higher up.
|
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1756 |
:return: an iterator over the dirs.
|
1757 |
"""
|
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1758 |
#TODO there is a bit of a smell where the results of the directory-
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1759 |
# summary in this, and the path from the root, may not agree
|
1897.1.1
by Robert Collins
Add some useful summary data to osutils.walkdirs output. |
1760 |
# depending on top and prefix - i.e. ./foo and foo as a pair leads to
|
1761 |
# potentially confusing output. We should make this more robust - but
|
|
1897.1.2
by Robert Collins
cleanup osutils.walkdirs changes after review. |
1762 |
# not at a speed cost. RBC 20060731
|
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1763 |
_lstat = os.lstat |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1764 |
_directory = _directory_kind |
1996.3.14
by John Arbash Meinel
lazy_import osutils and sign_my_commits |
1765 |
_listdir = os.listdir |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1766 |
_kind_from_mode = file_kind_from_stat_mode |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1767 |
pending = [(safe_unicode(prefix), "", _directory, None, safe_unicode(top))] |
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1768 |
while pending: |
1769 |
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
|
|
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1770 |
relroot, _, _, _, top = pending.pop() |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1771 |
if relroot: |
1772 |
relprefix = relroot + u'/' |
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1773 |
else: |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1774 |
relprefix = '' |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1775 |
top_slash = top + u'/' |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1776 |
|
1777 |
dirblock = [] |
|
1778 |
append = dirblock.append |
|
3585.2.4
by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not |
1779 |
try: |
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
1780 |
names = sorted(map(decode_filename, _listdir(top))) |
3596.2.2
by John Arbash Meinel
Factor out the common exception handling looking for ENOTDIR and use it |
1781 |
except OSError, e: |
1782 |
if not _is_error_enotdir(e): |
|
3585.2.4
by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not |
1783 |
raise
|
1784 |
else: |
|
1785 |
for name in names: |
|
1786 |
abspath = top_slash + name |
|
1787 |
statvalue = _lstat(abspath) |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1788 |
kind = _kind_from_mode(statvalue.st_mode) |
3585.2.4
by Robert Collins
* Deleting directories by hand before running ``bzr rm`` will not |
1789 |
append((relprefix + name, name, kind, statvalue, abspath)) |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1790 |
yield (relroot, top), dirblock |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1791 |
|
1753.1.1
by Robert Collins
(rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. |
1792 |
# push the user specified dirs from dirblock
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1793 |
pending.extend(d for d in reversed(dirblock) if d[2] == _directory) |
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
1794 |
|
1795 |
||
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1796 |
class DirReader(object): |
1797 |
"""An interface for reading directories."""
|
|
1798 |
||
1799 |
def top_prefix_to_starting_dir(self, top, prefix=""): |
|
1800 |
"""Converts top and prefix to a starting dir entry
|
|
1801 |
||
1802 |
:param top: A utf8 path
|
|
1803 |
:param prefix: An optional utf8 path to prefix output relative paths
|
|
1804 |
with.
|
|
1805 |
:return: A tuple starting with prefix, and ending with the native
|
|
1806 |
encoding of top.
|
|
1807 |
"""
|
|
1808 |
raise NotImplementedError(self.top_prefix_to_starting_dir) |
|
1809 |
||
1810 |
def read_dir(self, prefix, top): |
|
1811 |
"""Read a specific dir.
|
|
1812 |
||
1813 |
:param prefix: A utf8 prefix to be preprended to the path basenames.
|
|
1814 |
:param top: A natively encoded path to read.
|
|
3696.3.10
by Robert Collins
Review feedback. |
1815 |
:return: A list of the directories contents. Each item contains:
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1816 |
(utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
|
1817 |
"""
|
|
1818 |
raise NotImplementedError(self.read_dir) |
|
1819 |
||
1820 |
||
1821 |
_selected_dir_reader = None |
|
1822 |
||
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1823 |
|
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1824 |
def _walkdirs_utf8(top, prefix=""): |
1825 |
"""Yield data about all the directories in a tree.
|
|
1826 |
||
1827 |
This yields the same information as walkdirs() only each entry is yielded
|
|
1828 |
in utf-8. On platforms which have a filesystem encoding of utf8 the paths
|
|
1829 |
are returned as exact byte-strings.
|
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1830 |
|
1831 |
:return: yields a tuple of (dir_info, [file_info])
|
|
1832 |
dir_info is (utf8_relpath, path-from-top)
|
|
1833 |
file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
|
|
1834 |
if top is an absolute path, path-from-top is also an absolute path.
|
|
1835 |
path-from-top might be unicode or utf8, but it is the correct path to
|
|
1836 |
pass to os functions to affect the file in question. (such as os.lstat)
|
|
1837 |
"""
|
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1838 |
global _selected_dir_reader |
1839 |
if _selected_dir_reader is None: |
|
3224.5.17
by Andrew Bennetts
Avoid importing win32utils when sys.platform != win32 |
1840 |
if sys.platform == "win32" and win32utils.winver == 'Windows NT': |
3557.2.4
by John Arbash Meinel
Cleanup the tests a bit, and add a test that we downgrade if os.name isn't 'nt' |
1841 |
# Win98 doesn't have unicode apis like FindFirstFileW
|
1842 |
# TODO: We possibly could support Win98 by falling back to the
|
|
1843 |
# original FindFirstFile, and using TCHAR instead of WCHAR,
|
|
1844 |
# but that gets a bit tricky, and requires custom compiling
|
|
1845 |
# for win98 anyway.
|
|
3557.2.3
by John Arbash Meinel
Change the logic for selecting a real _walkdirs_utf8 implementation, |
1846 |
try: |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1847 |
from bzrlib._walkdirs_win32 import Win32ReadDir |
1848 |
_selected_dir_reader = Win32ReadDir() |
|
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1849 |
except ImportError: |
1850 |
pass
|
|
6352.3.4
by Martin Packman
Minor tweaks including normalising _fs_enc value |
1851 |
elif _fs_enc in ('utf-8', 'ascii'): |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1852 |
try: |
1853 |
from bzrlib._readdir_pyx import UTF8DirReader |
|
1854 |
_selected_dir_reader = UTF8DirReader() |
|
4574.3.6
by Martin Pool
More warnings when failing to load extensions |
1855 |
except ImportError, e: |
4574.3.8
by Martin Pool
Only mutter extension load errors when they occur, and record for later |
1856 |
failed_to_load_extension(e) |
4241.14.6
by Vincent Ladeuil
Start DirReader parametrized tests. |
1857 |
pass
|
1858 |
||
1859 |
if _selected_dir_reader is None: |
|
1860 |
# Fallback to the python version
|
|
1861 |
_selected_dir_reader = UnicodeDirReader() |
|
1862 |
||
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1863 |
# 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
|
1864 |
# But we don't actually uses 1-3 in pending, so set them to None
|
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1865 |
pending = [[_selected_dir_reader.top_prefix_to_starting_dir(top, prefix)]] |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1866 |
read_dir = _selected_dir_reader.read_dir |
1867 |
_directory = _directory_kind |
|
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1868 |
while pending: |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1869 |
relroot, _, _, _, top = pending[-1].pop() |
1870 |
if not pending[-1]: |
|
1871 |
pending.pop() |
|
1872 |
dirblock = sorted(read_dir(relroot, top)) |
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1873 |
yield (relroot, top), dirblock |
1874 |
# push the user specified dirs from dirblock
|
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1875 |
next = [d for d in reversed(dirblock) if d[2] == _directory] |
1876 |
if next: |
|
1877 |
pending.append(next) |
|
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1878 |
|
1879 |
||
1880 |
class UnicodeDirReader(DirReader): |
|
1881 |
"""A dir reader for non-utf8 file systems, which transcodes."""
|
|
1882 |
||
1883 |
__slots__ = ['_utf8_encode'] |
|
1884 |
||
1885 |
def __init__(self): |
|
1886 |
self._utf8_encode = codecs.getencoder('utf8') |
|
1887 |
||
1888 |
def top_prefix_to_starting_dir(self, top, prefix=""): |
|
1889 |
"""See DirReader.top_prefix_to_starting_dir."""
|
|
1890 |
return (safe_utf8(prefix), None, None, None, safe_unicode(top)) |
|
1891 |
||
1892 |
def read_dir(self, prefix, top): |
|
1893 |
"""Read a single directory from a non-utf8 file system.
|
|
1894 |
||
1895 |
top, and the abspath element in the output are unicode, all other paths
|
|
1896 |
are utf8. Local disk IO is done via unicode calls to listdir etc.
|
|
1897 |
||
1898 |
This is currently the fallback code path when the filesystem encoding is
|
|
1899 |
not UTF-8. It may be better to implement an alternative so that we can
|
|
1900 |
safely handle paths that are not properly decodable in the current
|
|
1901 |
encoding.
|
|
1902 |
||
1903 |
See DirReader.read_dir for details.
|
|
1904 |
"""
|
|
1905 |
_utf8_encode = self._utf8_encode |
|
1906 |
_lstat = os.lstat |
|
1907 |
_listdir = os.listdir |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1908 |
_kind_from_mode = file_kind_from_stat_mode |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1909 |
|
1910 |
if prefix: |
|
1911 |
relprefix = prefix + '/' |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1912 |
else: |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1913 |
relprefix = '' |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1914 |
top_slash = top + u'/' |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1915 |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1916 |
dirblock = [] |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1917 |
append = dirblock.append |
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1918 |
for name in sorted(_listdir(top)): |
3696.3.12
by Robert Collins
Fix PQM test failure. |
1919 |
try: |
1920 |
name_utf8 = _utf8_encode(name)[0] |
|
1921 |
except UnicodeDecodeError: |
|
1922 |
raise errors.BadFilenameEncoding( |
|
1923 |
_utf8_encode(relprefix)[0] + name, _fs_enc) |
|
2255.7.32
by John Arbash Meinel
Add tests that the walkdirs variants work on unicode paths. |
1924 |
abspath = top_slash + name |
1925 |
statvalue = _lstat(abspath) |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
1926 |
kind = _kind_from_mode(statvalue.st_mode) |
2255.7.33
by John Arbash Meinel
More inner loop tuning of walkdirs, can save as much as 5% |
1927 |
append((relprefix + name_utf8, name_utf8, kind, statvalue, abspath)) |
3696.3.1
by Robert Collins
Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. |
1928 |
return dirblock |
2255.7.27
by John Arbash Meinel
Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems |
1929 |
|
1930 |
||
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1931 |
def copy_tree(from_path, to_path, handlers={}): |
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1932 |
"""Copy all of the entries in from_path into to_path.
|
1933 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1934 |
:param from_path: The base directory to copy.
|
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1935 |
:param to_path: The target directory. If it does not exist, it will
|
1936 |
be created.
|
|
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1937 |
:param handlers: A dictionary of functions, which takes a source and
|
1938 |
destinations for files, directories, etc.
|
|
1939 |
It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
|
|
1940 |
'file', 'directory', and 'symlink' should always exist.
|
|
1941 |
If they are missing, they will be replaced with 'os.mkdir()',
|
|
1942 |
'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
|
|
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1943 |
"""
|
1944 |
# Now, just copy the existing cached tree to the new location
|
|
1945 |
# We use a cheap trick here.
|
|
1946 |
# Absolute paths are prefixed with the first parameter
|
|
1947 |
# relative paths are prefixed with the second.
|
|
1948 |
# So we can get both the source and target returned
|
|
1949 |
# without any extra work.
|
|
1950 |
||
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1951 |
def copy_dir(source, dest): |
1952 |
os.mkdir(dest) |
|
1953 |
||
1954 |
def copy_link(source, dest): |
|
1955 |
"""Copy the contents of a symlink"""
|
|
1956 |
link_to = os.readlink(source) |
|
1957 |
os.symlink(link_to, dest) |
|
1958 |
||
1959 |
real_handlers = {'file':shutil.copy2, |
|
1960 |
'symlink':copy_link, |
|
1961 |
'directory':copy_dir, |
|
1962 |
}
|
|
1963 |
real_handlers.update(handlers) |
|
1964 |
||
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1965 |
if not os.path.exists(to_path): |
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1966 |
real_handlers['directory'](from_path, to_path) |
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1967 |
|
1968 |
for dir_info, entries in walkdirs(from_path, prefix=to_path): |
|
1969 |
for relpath, name, kind, st, abspath in entries: |
|
1907.3.2
by John Arbash Meinel
Updated the copy_tree function to allow overriding functionality. |
1970 |
real_handlers[kind](abspath, relpath) |
1907.3.1
by John Arbash Meinel
create a copy_tree wrapper around walkdirs() |
1971 |
|
1972 |
||
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
1973 |
def copy_ownership_from_path(dst, src=None): |
5051.4.11
by Parth Malwankar
closed Martins review comments. |
1974 |
"""Copy usr/grp ownership from src file/dir to dst file/dir.
|
1975 |
||
1976 |
If src is None, the containing directory is used as source. If chown
|
|
1977 |
fails, the error is ignored and a warning is printed.
|
|
1978 |
"""
|
|
5074.4.6
by John Arbash Meinel
Unbreak bzr on windows. |
1979 |
chown = getattr(os, 'chown', None) |
1980 |
if chown is None: |
|
1981 |
return
|
|
5051.4.9
by Parth Malwankar
removed parent_dir. |
1982 |
|
1983 |
if src == None: |
|
1984 |
src = os.path.dirname(dst) |
|
1985 |
if src == '': |
|
1986 |
src = '.' |
|
1987 |
||
4634.143.4
by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally |
1988 |
try: |
4634.143.1
by Parth Malwankar
default .bazaar, .bzr.log and .bazaar/bazaar.conf retain |
1989 |
s = os.stat(src) |
5074.4.6
by John Arbash Meinel
Unbreak bzr on windows. |
1990 |
chown(dst, s.st_uid, s.st_gid) |
4634.143.4
by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally |
1991 |
except OSError, e: |
5523.2.3
by Parth Malwankar
message is now shown to the user but is not too scary. |
1992 |
trace.warning( |
1993 |
'Unable to copy ownership from "%s" to "%s". ' |
|
1994 |
'You may want to set it manually.', src, dst) |
|
1995 |
trace.log_exception_quietly() |
|
4634.143.4
by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally |
1996 |
|
1997 |
||
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
1998 |
def path_prefix_key(path): |
1999 |
"""Generate a prefix-order path key for path.
|
|
2000 |
||
2001 |
This can be used to sort paths in the same way that walkdirs does.
|
|
2002 |
"""
|
|
1773.3.2
by Robert Collins
New corner case from John Meinel, showing up the need to check the directory lexographically outside of a single tree's root. Fixed. |
2003 |
return (dirname(path) , path) |
1773.3.1
by Robert Collins
Add path_prefix_key and compare_paths_prefix_order utility functions. |
2004 |
|
2005 |
||
2006 |
def compare_paths_prefix_order(path_a, path_b): |
|
2007 |
"""Compare path_a and path_b to generate the same order walkdirs uses."""
|
|
2008 |
key_a = path_prefix_key(path_a) |
|
2009 |
key_b = path_prefix_key(path_b) |
|
2010 |
return cmp(key_a, key_b) |
|
1955.2.2
by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py |
2011 |
|
2012 |
||
2013 |
_cached_user_encoding = None |
|
2014 |
||
2015 |
||
6383.1.3
by Martin Packman
Deprecate public use_cache parameter in favour of test specific override |
2016 |
def get_user_encoding(use_cache=DEPRECATED_PARAMETER): |
1955.2.2
by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py |
2017 |
"""Find out what the preferred user encoding is.
|
2018 |
||
2019 |
This is generally the encoding that is used for command line parameters
|
|
2020 |
and file contents. This may be different from the terminal encoding
|
|
2021 |
or the filesystem encoding.
|
|
2022 |
||
2023 |
:return: A string defining the preferred user encoding
|
|
2024 |
"""
|
|
2025 |
global _cached_user_encoding |
|
6383.1.3
by Martin Packman
Deprecate public use_cache parameter in favour of test specific override |
2026 |
if deprecated_passed(use_cache): |
2027 |
warn_deprecated("use_cache should only have been used for tests", |
|
2028 |
DeprecationWarning, stacklevel=2) |
|
2029 |
if _cached_user_encoding is not None: |
|
1955.2.2
by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py |
2030 |
return _cached_user_encoding |
2031 |
||
6383.1.1
by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called |
2032 |
if os.name == 'posix' and getattr(locale, 'CODESET', None) is not None: |
2033 |
# Use the existing locale settings and call nl_langinfo directly
|
|
2034 |
# rather than going through getpreferredencoding. This avoids
|
|
2035 |
# <http://bugs.python.org/issue6202> on OSX Python 2.6 and the
|
|
2036 |
# possibility of the setlocale call throwing an error.
|
|
2037 |
user_encoding = locale.nl_langinfo(locale.CODESET) |
|
1955.2.2
by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py |
2038 |
else: |
6383.1.1
by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called |
2039 |
# GZ 2011-12-19: On windows could call GetACP directly instead.
|
6383.1.4
by Martin Packman
Simplify tests a little and make it clear setlocale is not being used |
2040 |
user_encoding = locale.getpreferredencoding(False) |
1955.2.2
by John Arbash Meinel
Change the name of the test classes (test_lang => test_locale), move the function into osutils.py |
2041 |
|
6383.1.1
by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called |
2042 |
try: |
2043 |
user_encoding = codecs.lookup(user_encoding).name |
|
2044 |
except LookupError: |
|
2045 |
if user_encoding not in ("", "cp0"): |
|
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
2046 |
sys.stderr.write('bzr: warning:' |
2047 |
' unknown encoding %s.' |
|
2048 |
' Continuing with ascii encoding.\n' |
|
2192.1.3
by Alexander Belchenko
Tests for osutils.get_user_encoding |
2049 |
% user_encoding |
2192.1.1
by Alexander Belchenko
Before actually using encoding need to check that Python has corresponding codec |
2050 |
)
|
6383.1.1
by Martin Packman
Simplify get_user_encoding by avoiding locale hacks and assuming setlocale has been called |
2051 |
user_encoding = 'ascii' |
2052 |
else: |
|
2053 |
# Get 'ascii' when setlocale has not been called or LANG=C or unset.
|
|
2054 |
if user_encoding == 'ascii': |
|
2055 |
if sys.platform == 'darwin': |
|
2056 |
# OSX is special-cased in Python to have a UTF-8 filesystem
|
|
2057 |
# encoding and previously had LANG set here if not present.
|
|
2058 |
user_encoding = 'utf-8' |
|
2059 |
# GZ 2011-12-19: Maybe UTF-8 should be the default in this case
|
|
2060 |
# for some other posix platforms as well.
|
|
2192.1.3
by Alexander Belchenko
Tests for osutils.get_user_encoding |
2061 |
|
6383.1.3
by Martin Packman
Deprecate public use_cache parameter in favour of test specific override |
2062 |
_cached_user_encoding = user_encoding |
2192.1.3
by Alexander Belchenko
Tests for osutils.get_user_encoding |
2063 |
return user_encoding |
2091.1.1
by Martin Pool
Avoid MSG_WAITALL as it doesn't work on Windows |
2064 |
|
2065 |
||
4797.57.10
by Alexander Belchenko
path_encoding selection logic extracted as helper function |
2066 |
def get_diff_header_encoding(): |
5258.1.5
by Alexander Belchenko
tweak requested by Martin Pool: use terminal encoding for diff headers on all platforms |
2067 |
return get_terminal_encoding() |
4797.57.10
by Alexander Belchenko
path_encoding selection logic extracted as helper function |
2068 |
|
2069 |
||
3626.1.1
by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent |
2070 |
def get_host_name(): |
3626.1.4
by John Arbash Meinel
Document the difference in get_host_name, per Robert's request. |
2071 |
"""Return the current unicode host name.
|
2072 |
||
2073 |
This is meant to be used in place of socket.gethostname() because that
|
|
2074 |
behaves inconsistently on different platforms.
|
|
2075 |
"""
|
|
3626.1.1
by Mark Hammond
Add osutils.get_host_name() to return a unicode hostname to prevent |
2076 |
if sys.platform == "win32": |
2077 |
return win32utils.get_host_name() |
|
2078 |
else: |
|
2079 |
import socket |
|
2080 |
return socket.gethostname().decode(get_user_encoding()) |
|
2081 |
||
2082 |
||
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2083 |
# We must not read/write any more than 64k at a time from/to a socket so we
|
2084 |
# don't risk "no buffer space available" errors on some platforms. Windows in
|
|
2085 |
# particular is likely to throw WSAECONNABORTED or WSAENOBUFS if given too much
|
|
2086 |
# data at once.
|
|
2087 |
MAX_SOCKET_CHUNK = 64 * 1024 |
|
2088 |
||
6437.74.2
by John Arbash Meinel
Push the change down into osutils.send_all. Needs tests at that level. |
2089 |
_end_of_stream_errors = [errno.ECONNRESET, errno.EPIPE, errno.EINVAL] |
5599.3.1
by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET. |
2090 |
for _eno in ['WSAECONNRESET', 'WSAECONNABORTED']: |
2091 |
_eno = getattr(errno, _eno, None) |
|
2092 |
if _eno is not None: |
|
2093 |
_end_of_stream_errors.append(_eno) |
|
2094 |
del _eno |
|
2095 |
||
2096 |
||
5011.3.12
by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional. |
2097 |
def read_bytes_from_socket(sock, report_activity=None, |
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2098 |
max_read_size=MAX_SOCKET_CHUNK): |
2099 |
"""Read up to max_read_size of bytes from sock and notify of progress.
|
|
2100 |
||
2101 |
Translates "Connection reset by peer" into file-like EOF (return an
|
|
2102 |
empty string rather than raise an error), and repeats the recv if
|
|
2103 |
interrupted by a signal.
|
|
2104 |
"""
|
|
2105 |
while 1: |
|
2106 |
try: |
|
2107 |
bytes = sock.recv(max_read_size) |
|
2108 |
except socket.error, e: |
|
2109 |
eno = e.args[0] |
|
5599.3.1
by John Arbash Meinel
Consider WSAECONNABORTED to be an end-of-stream as well as WSAECONNRESET. |
2110 |
if eno in _end_of_stream_errors: |
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2111 |
# The connection was closed by the other side. Callers expect
|
2112 |
# an empty string to signal end-of-stream.
|
|
2113 |
return "" |
|
2114 |
elif eno == errno.EINTR: |
|
2115 |
# Retry the interrupted recv.
|
|
2116 |
continue
|
|
2117 |
raise
|
|
2118 |
else: |
|
5011.3.12
by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional. |
2119 |
if report_activity is not None: |
2120 |
report_activity(len(bytes), 'read') |
|
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2121 |
return bytes |
2122 |
||
2123 |
||
2124 |
def recv_all(socket, count): |
|
2125 |
"""Receive an exact number of bytes.
|
|
2126 |
||
2127 |
Regular Socket.recv() may return less than the requested number of bytes,
|
|
2128 |
depending on what's in the OS buffer. MSG_WAITALL is not available
|
|
2129 |
on all platforms, but this should work everywhere. This will return
|
|
2130 |
less than the requested amount if the remote end closes.
|
|
2131 |
||
2132 |
This isn't optimized and is intended mostly for use in testing.
|
|
2133 |
"""
|
|
2134 |
b = '' |
|
2135 |
while len(b) < count: |
|
5011.3.12
by Andrew Bennetts
Make report_activity param of read_bytes_from_socket optional. |
2136 |
new = read_bytes_from_socket(socket, None, count - len(b)) |
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2137 |
if new == '': |
2138 |
break # eof |
|
2139 |
b += new |
|
2140 |
return b |
|
2141 |
||
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2142 |
|
2143 |
def send_all(sock, bytes, report_activity=None): |
|
2144 |
"""Send all bytes on a socket.
|
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
2145 |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2146 |
Breaks large blocks in smaller chunks to avoid buffering limitations on
|
2147 |
some platforms, and catches EINTR which may be thrown if the send is
|
|
2148 |
interrupted by a signal.
|
|
2149 |
||
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2150 |
This is preferred to socket.sendall(), because it avoids portability bugs
|
2151 |
and provides activity reporting.
|
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
2152 |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2153 |
:param report_activity: Call this as bytes are read, see
|
2154 |
Transport._report_activity
|
|
2155 |
"""
|
|
2156 |
sent_total = 0 |
|
2157 |
byte_count = len(bytes) |
|
2158 |
while sent_total < byte_count: |
|
2159 |
try: |
|
5011.3.11
by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept. |
2160 |
sent = sock.send(buffer(bytes, sent_total, MAX_SOCKET_CHUNK)) |
6437.74.2
by John Arbash Meinel
Push the change down into osutils.send_all. Needs tests at that level. |
2161 |
except (socket.error, IOError), e: |
2162 |
if e.args[0] in _end_of_stream_errors: |
|
2163 |
raise errors.ConnectionReset( |
|
2164 |
"Error trying to write to socket", e) |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2165 |
if e.args[0] != errno.EINTR: |
2166 |
raise
|
|
2167 |
else: |
|
6437.73.1
by John Arbash Meinel
Fix bug #1047309. Treat a series of no-bytes-sent as a ECONNRESET failure. |
2168 |
if sent == 0: |
6437.73.2
by John Arbash Meinel
simplify the fix. Sending 0 bytes seems to always indicate that we have a closed connection. |
2169 |
raise errors.ConnectionReset('Sending to %s returned 0 bytes' |
2170 |
% (sock,)) |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2171 |
sent_total += sent |
6437.73.1
by John Arbash Meinel
Fix bug #1047309. Treat a series of no-bytes-sent as a ECONNRESET failure. |
2172 |
if report_activity is not None: |
2173 |
report_activity(sent, 'write') |
|
3118.2.1
by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall. |
2174 |
|
5247.5.14
by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/ |
2175 |
|
5247.5.29
by Vincent Ladeuil
Fixed as per jam's review. |
2176 |
def connect_socket(address): |
2177 |
# Slight variation of the socket.create_connection() function (provided by
|
|
2178 |
# python-2.6) that can fail if getaddrinfo returns an empty list. We also
|
|
2179 |
# provide it for previous python versions. Also, we don't use the timeout
|
|
2180 |
# parameter (provided by the python implementation) so we don't implement
|
|
2181 |
# it either).
|
|
5247.5.14
by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/ |
2182 |
err = socket.error('getaddrinfo returns an empty list') |
2183 |
host, port = address |
|
2184 |
for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM): |
|
2185 |
af, socktype, proto, canonname, sa = res |
|
2186 |
sock = None |
|
2187 |
try: |
|
2188 |
sock = socket.socket(af, socktype, proto) |
|
2189 |
sock.connect(sa) |
|
2190 |
return sock |
|
2191 |
||
5247.5.15
by Vincent Ladeuil
Hopefully, the right fix this time. |
2192 |
except socket.error, err: |
5247.5.14
by Vincent Ladeuil
Fix the helper again, the python one is bogus :-/ |
2193 |
# 'err' is now the most recent error
|
2194 |
if sock is not None: |
|
2195 |
sock.close() |
|
2196 |
raise err |
|
5247.3.7
by Vincent Ladeuil
Provide connect_socket (socket.create_connection) for pythons older than 2.6. |
2197 |
|
3118.2.1
by Andrew Bennetts
(andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall. |
2198 |
|
2091.3.7
by Aaron Bentley
Rename real_parent to dereferenced_path |
2199 |
def dereference_path(path): |
2200 |
"""Determine the real path to a file.
|
|
2201 |
||
2202 |
All parent elements are dereferenced. But the file itself is not
|
|
2203 |
dereferenced.
|
|
2204 |
:param path: The original path. May be absolute or relative.
|
|
2205 |
:return: the real path *to* the file
|
|
2206 |
"""
|
|
2091.3.5
by Aaron Bentley
Move realpath functionality into osutils |
2207 |
parent, base = os.path.split(path) |
2208 |
# The pathjoin for '.' is a workaround for Python bug #1213894.
|
|
2209 |
# (initial path components aren't dereferenced)
|
|
2210 |
return pathjoin(realpath(pathjoin('.', parent)), base) |
|
2681.3.4
by Lukáš Lalinsky
- Rename 'windows' to 'mapi' |
2211 |
|
2212 |
||
2213 |
def supports_mapi(): |
|
2214 |
"""Return True if we can use MAPI to launch a mail client."""
|
|
2215 |
return sys.platform == "win32" |
|
3089.3.8
by Ian Clatworthy
move resource loading into a reusable function |
2216 |
|
2217 |
||
2218 |
def resource_string(package, resource_name): |
|
2219 |
"""Load a resource from a package and return it as a string.
|
|
2220 |
||
2221 |
Note: Only packages that start with bzrlib are currently supported.
|
|
2222 |
||
2223 |
This is designed to be a lightweight implementation of resource
|
|
2224 |
loading in a way which is API compatible with the same API from
|
|
2225 |
pkg_resources. See
|
|
2226 |
http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
|
|
2227 |
If and when pkg_resources becomes a standard library, this routine
|
|
2228 |
can delegate to it.
|
|
2229 |
"""
|
|
2230 |
# Check package name is within bzrlib
|
|
2231 |
if package == "bzrlib": |
|
2232 |
resource_relpath = resource_name |
|
2233 |
elif package.startswith("bzrlib."): |
|
2234 |
package = package[len("bzrlib."):].replace('.', os.sep) |
|
2235 |
resource_relpath = pathjoin(package, resource_name) |
|
2236 |
else: |
|
2237 |
raise errors.BzrError('resource package %s not in bzrlib' % package) |
|
2238 |
||
2239 |
# Map the resource to a file and read its contents
|
|
2240 |
base = dirname(bzrlib.__file__) |
|
2241 |
if getattr(sys, 'frozen', None): # bzr.exe |
|
2242 |
base = abspath(pathjoin(base, '..', '..')) |
|
4708.2.2
by Martin
Workingtree changes sitting around since November, more explict closing of files in bzrlib |
2243 |
f = file(pathjoin(base, resource_relpath), "rU") |
2244 |
try: |
|
2245 |
return f.read() |
|
2246 |
finally: |
|
2247 |
f.close() |
|
1739.2.7
by Robert Collins
Update readdir pyrex source files and usage in line with current practice. |
2248 |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
2249 |
def file_kind_from_stat_mode_thunk(mode): |
2250 |
global file_kind_from_stat_mode |
|
2251 |
if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk: |
|
2252 |
try: |
|
2253 |
from bzrlib._readdir_pyx import UTF8DirReader |
|
2254 |
file_kind_from_stat_mode = UTF8DirReader().kind_from_mode |
|
4574.3.6
by Martin Pool
More warnings when failing to load extensions |
2255 |
except ImportError, e: |
4694.2.1
by John Arbash Meinel
Fix bug #430645, don't issue a warning when failing to import _readdir_pyx the second time. |
2256 |
# This is one time where we won't warn that an extension failed to
|
2257 |
# load. The extension is never available on Windows anyway.
|
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
2258 |
from bzrlib._readdir_py import ( |
3696.4.8
by Robert Collins
Fix up inter_changes with dirstate both C and python. |
2259 |
_kind_from_mode as file_kind_from_stat_mode |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
2260 |
)
|
2261 |
return file_kind_from_stat_mode(mode) |
|
2262 |
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk |
|
2263 |
||
6046.2.6
by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results. |
2264 |
def file_stat(f, _lstat=os.lstat): |
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
2265 |
try: |
6046.2.6
by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results. |
2266 |
# XXX cache?
|
2267 |
return _lstat(f) |
|
3696.3.5
by Robert Collins
Streamline _walkdirs_utf8 for utf8 file systems, reducing time to traverse a mozilla tree from 1s to .6 seconds. (Robert Collins) |
2268 |
except OSError, e: |
2269 |
if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR): |
|
2270 |
raise errors.NoSuchFile(f) |
|
2271 |
raise
|
|
2272 |
||
6046.2.6
by Shannon Weyrick
Add file_stat, and make file_kind use it. file_stat can potentially cache results. |
2273 |
def file_kind(f, _lstat=os.lstat): |
2274 |
stat_value = file_stat(f, _lstat) |
|
2275 |
return file_kind_from_stat_mode(stat_value.st_mode) |
|
3923.3.1
by Andrew Bennetts
Quick attempt at adding some EINTR-proofing to smart protocol code. |
2276 |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2277 |
def until_no_eintr(f, *a, **kw): |
2278 |
"""Run f(*a, **kw), retrying if an EINTR error occurs.
|
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
2279 |
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2280 |
WARNING: you must be certain that it is safe to retry the call repeatedly
|
2281 |
if EINTR does occur. This is typically only true for low-level operations
|
|
2282 |
like os.read. If in any doubt, don't use this.
|
|
5011.3.5
by Andrew Bennetts
Expand until_no_eintr's docstring more with some explanation for why it is not a complete solution. |
2283 |
|
2284 |
Keep in mind that this is not a complete solution to EINTR. There is
|
|
2285 |
probably code in the Python standard library and other dependencies that
|
|
2286 |
may encounter EINTR if a signal arrives (and there is signal handler for
|
|
2287 |
that signal). So this function can reduce the impact for IO that bzrlib
|
|
2288 |
directly controls, but it is not a complete solution.
|
|
5011.3.4
by Andrew Bennetts
Reinstate osutils.until_no_eintr and .send_all, reapply until_no_eintr in SmartSimplePipesClientMedium.read_bytes. |
2289 |
"""
|
2290 |
# Borrowed from Twisted's twisted.python.util.untilConcludes function.
|
|
2291 |
while True: |
|
2292 |
try: |
|
2293 |
return f(*a, **kw) |
|
2294 |
except (IOError, OSError), e: |
|
2295 |
if e.errno == errno.EINTR: |
|
2296 |
continue
|
|
2297 |
raise
|
|
2298 |
||
2299 |
||
5326.2.6
by Parth Malwankar
deprecate re_compile_checked rather than remove it. |
2300 |
@deprecated_function(deprecated_in((2, 2, 0))) |
2301 |
def re_compile_checked(re_string, flags=0, where=""): |
|
2302 |
"""Return a compiled re, or raise a sensible error.
|
|
2303 |
||
2304 |
This should only be used when compiling user-supplied REs.
|
|
2305 |
||
2306 |
:param re_string: Text form of regular expression.
|
|
2307 |
:param flags: eg re.IGNORECASE
|
|
2308 |
:param where: Message explaining to the user the context where
|
|
2309 |
it occurred, eg 'log search filter'.
|
|
2310 |
"""
|
|
2311 |
# from https://bugs.launchpad.net/bzr/+bug/251352
|
|
2312 |
try: |
|
2313 |
re_obj = re.compile(re_string, flags) |
|
2314 |
re_obj.search("") |
|
2315 |
return re_obj |
|
2316 |
except errors.InvalidPattern, e: |
|
2317 |
if where: |
|
2318 |
where = ' in ' + where |
|
2319 |
# despite the name 'error' is a type
|
|
2320 |
raise errors.BzrCommandError('Invalid regular expression%s: %s' |
|
5339.1.1
by Parth Malwankar
fixes errors.InvalidPattern to work on Python2.5 |
2321 |
% (where, e.msg)) |
5326.2.6
by Parth Malwankar
deprecate re_compile_checked rather than remove it. |
2322 |
|
2323 |
||
0.16.79
by Aaron Bentley
Remove dependencies on bzrtools |
2324 |
if sys.platform == "win32": |
2325 |
def getchar(): |
|
6379.1.1
by Jelmer Vernooij
Avoid importing tty and termios if we don't have to. |
2326 |
import msvcrt |
0.16.79
by Aaron Bentley
Remove dependencies on bzrtools |
2327 |
return msvcrt.getch() |
2328 |
else: |
|
2329 |
def getchar(): |
|
6379.1.1
by Jelmer Vernooij
Avoid importing tty and termios if we don't have to. |
2330 |
import tty |
2331 |
import termios |
|
0.16.79
by Aaron Bentley
Remove dependencies on bzrtools |
2332 |
fd = sys.stdin.fileno() |
2333 |
settings = termios.tcgetattr(fd) |
|
2334 |
try: |
|
2335 |
tty.setraw(fd) |
|
2336 |
ch = sys.stdin.read(1) |
|
2337 |
finally: |
|
2338 |
termios.tcsetattr(fd, termios.TCSADRAIN, settings) |
|
2339 |
return ch |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2340 |
|
6057.1.1
by Martin Pool
Python can now report a platform of 'linux3' on kernel 3, but it's basically the same |
2341 |
if sys.platform.startswith('linux'): |
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2342 |
def _local_concurrency(): |
5677.1.2
by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD. |
2343 |
try: |
2344 |
return os.sysconf('SC_NPROCESSORS_ONLN') |
|
2345 |
except (ValueError, OSError, AttributeError): |
|
2346 |
return None |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2347 |
elif sys.platform == 'darwin': |
2348 |
def _local_concurrency(): |
|
2349 |
return subprocess.Popen(['sysctl', '-n', 'hw.availcpu'], |
|
2350 |
stdout=subprocess.PIPE).communicate()[0] |
|
5677.1.2
by Jelmer Vernooij
Use os.sysconf to get the number of CPUs on Linux. Use sysctl to get the number of CPUs on all *BSDs, not just FreeBSD. |
2351 |
elif "bsd" in sys.platform: |
4413.1.1
by Matthew Fuller
Catch the number of cores on FreeBSD too. |
2352 |
def _local_concurrency(): |
2353 |
return subprocess.Popen(['sysctl', '-n', 'hw.ncpu'], |
|
2354 |
stdout=subprocess.PIPE).communicate()[0] |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2355 |
elif sys.platform == 'sunos5': |
2356 |
def _local_concurrency(): |
|
2357 |
return subprocess.Popen(['psrinfo', '-p',], |
|
2358 |
stdout=subprocess.PIPE).communicate()[0] |
|
2359 |
elif sys.platform == "win32": |
|
2360 |
def _local_concurrency(): |
|
4398.4.4
by Vincent Ladeuil
Fixed as per John's review. |
2361 |
# This appears to return the number of cores.
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2362 |
return os.environ.get('NUMBER_OF_PROCESSORS') |
2363 |
else: |
|
2364 |
def _local_concurrency(): |
|
2365 |
# Who knows ?
|
|
2366 |
return None |
|
2367 |
||
2368 |
||
4398.4.4
by Vincent Ladeuil
Fixed as per John's review. |
2369 |
_cached_local_concurrency = None |
2370 |
||
2371 |
def local_concurrency(use_cache=True): |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2372 |
"""Return how many processes can be run concurrently.
|
2373 |
||
2374 |
Rely on platform specific implementations and default to 1 (one) if
|
|
2375 |
anything goes wrong.
|
|
2376 |
"""
|
|
4398.4.4
by Vincent Ladeuil
Fixed as per John's review. |
2377 |
global _cached_local_concurrency |
4766.3.4
by Matt Nordhoff
Change the environment variable to a global option. |
2378 |
|
4398.4.4
by Vincent Ladeuil
Fixed as per John's review. |
2379 |
if _cached_local_concurrency is not None and use_cache: |
2380 |
return _cached_local_concurrency |
|
2381 |
||
4766.3.7
by Vincent Ladeuil
Mix BZR_CONCURRENCY and --concurrency so both are available. |
2382 |
concurrency = os.environ.get('BZR_CONCURRENCY', None) |
2383 |
if concurrency is None: |
|
2384 |
try: |
|
5677.1.3
by Jelmer Vernooij
Use try/import rather than checking python version strings. |
2385 |
import multiprocessing |
6241.1.2
by Jelmer Vernooij
Simplify try/finally. |
2386 |
concurrency = multiprocessing.cpu_count() |
2387 |
except (ImportError, NotImplementedError): |
|
5677.1.3
by Jelmer Vernooij
Use try/import rather than checking python version strings. |
2388 |
# multiprocessing is only available on Python >= 2.6
|
6241.1.2
by Jelmer Vernooij
Simplify try/finally. |
2389 |
# and multiprocessing.cpu_count() isn't implemented on all
|
2390 |
# platforms
|
|
5677.1.3
by Jelmer Vernooij
Use try/import rather than checking python version strings. |
2391 |
try: |
2392 |
concurrency = _local_concurrency() |
|
2393 |
except (OSError, IOError): |
|
2394 |
pass
|
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2395 |
try: |
2396 |
concurrency = int(concurrency) |
|
2397 |
except (TypeError, ValueError): |
|
2398 |
concurrency = 1 |
|
4398.4.4
by Vincent Ladeuil
Fixed as per John's review. |
2399 |
if use_cache: |
2400 |
_cached_concurrency = concurrency |
|
4398.4.3
by Vincent Ladeuil
Detect # cores on win32 and Solaris too. |
2401 |
return concurrency |
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
2402 |
|
2403 |
||
4794.1.15
by Robert Collins
Review feedback. |
2404 |
class UnicodeOrBytesToBytesWriter(codecs.StreamWriter): |
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
2405 |
"""A stream writer that doesn't decode str arguments."""
|
2406 |
||
4794.1.21
by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup. |
2407 |
def __init__(self, encode, stream, errors='strict'): |
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
2408 |
codecs.StreamWriter.__init__(self, stream, errors) |
4794.1.21
by Robert Collins
Python 2.4 doesn't use CodecInfo, so do a type check on the result of codecs.lookup. |
2409 |
self.encode = encode |
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
2410 |
|
2411 |
def write(self, object): |
|
4794.1.15
by Robert Collins
Review feedback. |
2412 |
if type(object) is str: |
4794.1.12
by Robert Collins
Create a StreamWriter helper that doesn't trigger implicit decode('ascii') on write(a_str). |
2413 |
self.stream.write(object) |
2414 |
else: |
|
2415 |
data, _ = self.encode(object, self.errors) |
|
2416 |
self.stream.write(data) |
|
4797.2.27
by Vincent Ladeuil
Merge 2.0 into 2.1 including fix for #524560 |
2417 |
|
4634.140.4
by INADA Naoki
Fix easy miss in previous commit. |
2418 |
if sys.platform == 'win32': |
4634.140.10
by INADA Naoki
Change name from osutils.open to osutils.open_file |
2419 |
def open_file(filename, mode='r', bufsize=-1): |
4634.140.13
by Vincent Ladeuil
Fix some typos and add a NEWS entry. |
2420 |
"""This function is used to override the ``open`` builtin.
|
5279.2.7
by Eric Moritz
1. deleted trailing whitespace |
2421 |
|
4634.140.13
by Vincent Ladeuil
Fix some typos and add a NEWS entry. |
2422 |
But it uses O_NOINHERIT flag so the file handle is not inherited by
|
2423 |
child processes. Deleting or renaming a closed file opened with this
|
|
2424 |
function is not blocking child processes.
|
|
4634.140.6
by INADA Naoki
Add comment to osutils.open() |
2425 |
"""
|
4634.140.9
by INADA Naoki
Revert to previous implementation using os.fdopen(os.open()) |
2426 |
writing = 'w' in mode |
2427 |
appending = 'a' in mode |
|
2428 |
updating = '+' in mode |
|
2429 |
binary = 'b' in mode |
|
2430 |
||
4634.140.12
by INADA Naoki
small clean up. |
2431 |
flags = O_NOINHERIT |
4634.140.9
by INADA Naoki
Revert to previous implementation using os.fdopen(os.open()) |
2432 |
# see http://msdn.microsoft.com/en-us/library/yeby3zcb%28VS.71%29.aspx
|
2433 |
# for flags for each modes.
|
|
2434 |
if binary: |
|
4634.140.12
by INADA Naoki
small clean up. |
2435 |
flags |= O_BINARY |
4634.140.9
by INADA Naoki
Revert to previous implementation using os.fdopen(os.open()) |
2436 |
else: |
4634.140.12
by INADA Naoki
small clean up. |
2437 |
flags |= O_TEXT |
4634.140.9
by INADA Naoki
Revert to previous implementation using os.fdopen(os.open()) |
2438 |
|
2439 |
if writing: |
|
2440 |
if updating: |
|
2441 |
flags |= os.O_RDWR |
|
2442 |
else: |
|
2443 |
flags |= os.O_WRONLY |
|
2444 |
flags |= os.O_CREAT | os.O_TRUNC |
|
2445 |
elif appending: |
|
2446 |
if updating: |
|
2447 |
flags |= os.O_RDWR |
|
2448 |
else: |
|
2449 |
flags |= os.O_WRONLY |
|
2450 |
flags |= os.O_CREAT | os.O_APPEND |
|
2451 |
else: #reading |
|
2452 |
if updating: |
|
2453 |
flags |= os.O_RDWR |
|
2454 |
else: |
|
2455 |
flags |= os.O_RDONLY |
|
2456 |
||
2457 |
return os.fdopen(os.open(filename, flags), mode, bufsize) |
|
4634.140.2
by INADA Naoki
Add osutils.open() that uses O_NOINHERIT on Win32. |
2458 |
else: |
4634.140.10
by INADA Naoki
Change name from osutils.open to osutils.open_file |
2459 |
open_file = open |
5187.2.7
by Parth Malwankar
moved getuser_unicode to osutils. |
2460 |
|
2461 |
||
5409.5.3
by Vincent Ladeuil
Implement osutils.available_backup_name. |
2462 |
def available_backup_name(base, exists): |
2463 |
"""Find a non-existing backup file name.
|
|
2464 |
||
5409.5.6
by Vincent Ladeuil
Add NEWS entry, tweak osutils.available_backup_name docstring. |
2465 |
This will *not* create anything, this only return a 'free' entry. This
|
2466 |
should be used for checking names in a directory below a locked
|
|
5409.5.8
by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged |
2467 |
tree/branch/repo to avoid race conditions. This is LBYL (Look Before You
|
2468 |
Leap) and generally discouraged.
|
|
5409.5.3
by Vincent Ladeuil
Implement osutils.available_backup_name. |
2469 |
|
2470 |
:param base: The base name.
|
|
5409.5.8
by Vincent Ladeuil
Be more explicit about race conditions and LBYL being discouraged |
2471 |
|
2472 |
:param exists: A callable returning True if the path parameter exists.
|
|
5409.5.3
by Vincent Ladeuil
Implement osutils.available_backup_name. |
2473 |
"""
|
2474 |
counter = 1 |
|
2475 |
name = "%s.~%d~" % (base, counter) |
|
2476 |
while exists(name): |
|
2477 |
counter += 1 |
|
5409.1.7
by Vincent Ladeuil
First orphaning implementation (some tests lacking). |
2478 |
name = "%s.~%d~" % (base, counter) |
5409.5.3
by Vincent Ladeuil
Implement osutils.available_backup_name. |
2479 |
return name |
5321.1.79
by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature. |
2480 |
|
2481 |
||
5582.6.1
by Max Bowsher
Fix socketpair-based SSH transport leaking socket into other child processes. |
2482 |
def set_fd_cloexec(fd): |
2483 |
"""Set a Unix file descriptor's FD_CLOEXEC flag. Do nothing if platform
|
|
2484 |
support for this is not available.
|
|
2485 |
"""
|
|
2486 |
try: |
|
2487 |
import fcntl |
|
2488 |
old = fcntl.fcntl(fd, fcntl.F_GETFD) |
|
2489 |
fcntl.fcntl(fd, fcntl.F_SETFD, old | fcntl.FD_CLOEXEC) |
|
2490 |
except (ImportError, AttributeError): |
|
2491 |
# Either the fcntl module or specific constants are not present
|
|
2492 |
pass
|
|
5321.1.114
by Gordon Tyler
Merged from bzr.dev. |
2493 |
|
2494 |
||
5321.1.80
by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful. |
2495 |
def find_executable_on_path(name): |
2496 |
"""Finds an executable on the PATH.
|
|
5321.1.79
by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature. |
2497 |
|
2498 |
On Windows, this will try to append each extension in the PATHEXT
|
|
2499 |
environment variable to the name, if it cannot be found with the name
|
|
2500 |
as given.
|
|
2501 |
|
|
2502 |
:param name: The base name of the executable.
|
|
5321.1.80
by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful. |
2503 |
:return: The path to the executable found or None.
|
5321.1.79
by Gordon Tyler
Added is_executable_on_path to osutils based on _probe from ExecutableFeature. |
2504 |
"""
|
5321.1.105
by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32. |
2505 |
if sys.platform == 'win32': |
2506 |
exts = os.environ.get('PATHEXT', '').split(os.pathsep) |
|
5321.1.106
by Gordon Tyler
Fixed find_executable_on_path to properly test for executable-ness on win32 and not split the PATH for each extension in PATHEXT. |
2507 |
exts = [ext.lower() for ext in exts] |
2508 |
base, ext = os.path.splitext(name) |
|
2509 |
if ext != '': |
|
2510 |
if ext.lower() not in exts: |
|
2511 |
return None |
|
2512 |
name = base |
|
2513 |
exts = [ext] |
|
5321.1.105
by Gordon Tyler
Fixed find_executable_on_path to only check PATHEXT on win32. |
2514 |
else: |
2515 |
exts = [''] |
|
6437.44.1
by Gordon Tyler
Backport of fix for bug 939605 to bzr 2.5 series. |
2516 |
path = os.environ.get('PATH') |
2517 |
if path is not None: |
|
2518 |
path = path.split(os.pathsep) |
|
2519 |
for ext in exts: |
|
2520 |
for d in path: |
|
2521 |
f = os.path.join(d, name) + ext |
|
2522 |
if os.access(f, os.X_OK): |
|
2523 |
return f |
|
2524 |
if sys.platform == 'win32': |
|
2525 |
app_path = win32utils.get_app_path(name) |
|
2526 |
if app_path != name: |
|
2527 |
return app_path |
|
5321.1.80
by Gordon Tyler
Changed is_executable_on_path to find_executable_on_path to make it more useful. |
2528 |
return None |
5425.5.2
by Martin
Split pid deadness detection code out into osutils |
2529 |
|
2530 |
||
2531 |
def _posix_is_local_pid_dead(pid): |
|
5425.5.4
by Martin
Get docstring of _posix_is_local_pid_dead the right way round |
2532 |
"""True if pid doesn't correspond to live process on this machine"""
|
5425.5.2
by Martin
Split pid deadness detection code out into osutils |
2533 |
try: |
2534 |
# Special meaning of unix kill: just check if it's there.
|
|
2535 |
os.kill(pid, 0) |
|
2536 |
except OSError, e: |
|
2537 |
if e.errno == errno.ESRCH: |
|
2538 |
# On this machine, and really not found: as sure as we can be
|
|
2539 |
# that it's dead.
|
|
2540 |
return True |
|
2541 |
elif e.errno == errno.EPERM: |
|
2542 |
# exists, though not ours
|
|
2543 |
return False |
|
2544 |
else: |
|
5425.4.20
by Martin Pool
Suppress failures from os.kill when just using it to check for process liveness |
2545 |
mutter("os.kill(%d, 0) failed: %s" % (pid, e)) |
2546 |
# Don't really know.
|
|
2547 |
return False |
|
5425.5.2
by Martin
Split pid deadness detection code out into osutils |
2548 |
else: |
2549 |
# Exists and our process: not dead.
|
|
2550 |
return False |
|
2551 |
||
5425.5.5
by Martin
Quick implementation of dead process detection on win32 |
2552 |
if sys.platform == "win32": |
2553 |
is_local_pid_dead = win32utils.is_local_pid_dead |
|
2554 |
else: |
|
2555 |
is_local_pid_dead = _posix_is_local_pid_dead |
|
6006.4.8
by Martin Pool
Use fsync when fdatasync is not available |
2556 |
|
6015.60.4
by John Arbash Meinel
Found it called EOPNOTSUPP on a platform, include that spelling as well. |
2557 |
_maybe_ignored = ['EAGAIN', 'EINTR', 'ENOTSUP', 'EOPNOTSUPP', 'EACCES'] |
2558 |
_fdatasync_ignored = [getattr(errno, name) for name in _maybe_ignored |
|
6015.60.3
by John Arbash Meinel
only squelch known errors per vila. |
2559 |
if getattr(errno, name, None) is not None] |
6006.4.8
by Martin Pool
Use fsync when fdatasync is not available |
2560 |
|
6015.60.4
by John Arbash Meinel
Found it called EOPNOTSUPP on a platform, include that spelling as well. |
2561 |
|
6006.4.8
by Martin Pool
Use fsync when fdatasync is not available |
2562 |
def fdatasync(fileno): |
2563 |
"""Flush file contents to disk if possible.
|
|
2564 |
|
|
2565 |
:param fileno: Integer OS file handle.
|
|
2566 |
:raises TransportNotPossible: If flushing to disk is not possible.
|
|
2567 |
"""
|
|
2568 |
fn = getattr(os, 'fdatasync', getattr(os, 'fsync', None)) |
|
2569 |
if fn is not None: |
|
6015.60.2
by John Arbash Meinel
Fix bug #1075108. |
2570 |
try: |
2571 |
fn(fileno) |
|
2572 |
except IOError, e: |
|
2573 |
# See bug #1075108, on some platforms fdatasync exists, but can
|
|
2574 |
# raise ENOTSUP. However, we are calling fdatasync to be helpful
|
|
2575 |
# and reduce the chance of corruption-on-powerloss situations. It
|
|
2576 |
# is not a mandatory call, so it is ok to suppress failures.
|
|
2577 |
trace.mutter("ignoring error calling fdatasync: %s" % (e,)) |
|
6015.60.3
by John Arbash Meinel
only squelch known errors per vila. |
2578 |
if getattr(e, 'errno', None) not in _fdatasync_ignored: |
2579 |
raise
|
|
6336.2.1
by Martin Packman
Add is_environment_error() and switch trace to using it |
2580 |
|
2581 |
||
6015.51.1
by Martin Pool
Tolerate empty limbo and pending-deletion directories |
2582 |
def ensure_empty_directory_exists(path, exception_class): |
2583 |
"""Make sure a local directory exists and is empty.
|
|
2584 |
|
|
2585 |
If it does not exist, it is created. If it exists and is not empty, an
|
|
2586 |
instance of exception_class is raised.
|
|
2587 |
"""
|
|
2588 |
try: |
|
2589 |
os.mkdir(path) |
|
2590 |
except OSError, e: |
|
2591 |
if e.errno != errno.EEXIST: |
|
2592 |
raise
|
|
2593 |
if os.listdir(path) != []: |
|
2594 |
raise exception_class(path) |
|
6344.1.1
by Martin Packman
Merge 2.4 into bzr.dev |
2595 |
|
2596 |
||
6336.2.1
by Martin Packman
Add is_environment_error() and switch trace to using it |
2597 |
def is_environment_error(evalue): |
2598 |
"""True if exception instance is due to a process environment issue
|
|
2599 |
||
2600 |
This includes OSError and IOError, but also other errors that come from
|
|
2601 |
the operating system or core libraries but are not subclasses of those.
|
|
2602 |
"""
|
|
2603 |
if isinstance(evalue, (EnvironmentError, select.error)): |
|
2604 |
return True |
|
2605 |
if sys.platform == "win32" and win32utils._is_pywintypes_error(evalue): |
|
2606 |
return True |
|
2607 |
return False |