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