bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1 | # Copyright (C) 2005, 2006, 2007 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
 | |
| 15 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | |
| 16 | ||
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 17 | import os | 
| 18 | import re | |
| 19 | import stat | |
| 20 | from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE, | |
| 21 | S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK) | |
| 22 | import sys | |
| 23 | import time | |
| 24 | ||
| 25 | from bzrlib.lazy_import import lazy_import | |
| 26 | lazy_import(globals(), """ | |
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 27 | import codecs
 | 
| 2215.6.1
by James Henstridge Don't rely on time.timezone and time.altzone in local_time_offset(), | 28 | from datetime import datetime
 | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 29 | import errno
 | 
| 1711.4.5
by John Arbash Meinel the _posix_* routines should use posixpath not os.path, so tests pass on win32 | 30 | from ntpath import (abspath as _nt_abspath,
 | 
| 31 |                     join as _nt_join,
 | |
| 32 |                     normpath as _nt_normpath,
 | |
| 33 |                     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 | 34 |                     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 | 35 |                     )
 | 
| 36 | import posixpath
 | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 37 | import shutil
 | 
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 38 | from shutil import (
 | 
| 39 |     rmtree,
 | |
| 40 |     )
 | |
| 1185.31.40
by John Arbash Meinel Added osutils.mkdtemp() | 41 | import tempfile
 | 
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 42 | from tempfile import (
 | 
| 43 |     mkdtemp,
 | |
| 44 |     )
 | |
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 45 | import unicodedata
 | 
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 46 | |
| 47 | from bzrlib import (
 | |
| 2249.5.16
by John Arbash Meinel [merge] bzr.dev 2283 | 48 |     cache_utf8,
 | 
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 49 |     errors,
 | 
| 2245.4.6
by Alexander Belchenko osutils.py: terminal_width() now use win32utils.get_console_size() | 50 |     win32utils,
 | 
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 51 |     )
 | 
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 52 | """) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 53 | |
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 54 | # sha and md5 modules are deprecated in python2.6 but hashlib is available as
 | 
| 55 | # of 2.5
 | |
| 56 | if sys.version_info < (2, 5): | |
| 3734.5.2
by Vincent Ladeuil Martin's review feedback. | 57 | import md5 as _mod_md5 | 
| 58 | md5 = _mod_md5.new | |
| 59 | import sha as _mod_sha | |
| 60 | sha = _mod_sha.new | |
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 61 | else: | 
| 62 | from hashlib import ( | |
| 63 | md5, | |
| 64 | sha1 as sha, | |
| 65 |         )
 | |
| 66 | ||
| 3504.4.1
by John Arbash Meinel Write an alternative 'walkdirs' implementation that uses win32 apis. | 67 | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 68 | import bzrlib | 
| 2309.4.3
by John Arbash Meinel (broken) change safe_*_id to emit a warning. | 69 | from bzrlib import symbol_versioning | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 70 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 71 | |
| 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 | 72 | # On win32, O_BINARY is used to indicate the file should
 | 
| 73 | # be opened in binary mode, rather than text mode.
 | |
| 74 | # On other platforms, O_BINARY doesn't exist, because
 | |
| 75 | # they always open in binary mode, so it is okay to
 | |
| 76 | # OR with 0 on those platforms
 | |
| 77 | O_BINARY = getattr(os, 'O_BINARY', 0) | |
| 78 | ||
| 79 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 80 | def make_readonly(filename): | 
| 81 | """Make a filename read-only.""" | |
| 2949.6.1
by Alexander Belchenko windows python has os.lstat | 82 | 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 | 83 | if not stat.S_ISLNK(mod): | 
| 84 | mod = mod & 0777555 | |
| 85 | os.chmod(filename, mod) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 86 | |
| 87 | ||
| 88 | def make_writable(filename): | |
| 2949.6.1
by Alexander Belchenko windows python has os.lstat | 89 | 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 | 90 | if not stat.S_ISLNK(mod): | 
| 91 | mod = mod | 0200 | |
| 92 | os.chmod(filename, mod) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 93 | |
| 94 | ||
| 2825.7.1
by Robert Collins * Partial commits are now approximately 40% faster by walking over the | 95 | def minimum_path_selection(paths): | 
| 96 | """Return the smallset subset of paths which are outside paths. | |
| 97 | ||
| 2843.1.1
by Ian Clatworthy Faster partial commits by walking less data (Robert Collins) | 98 |     :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 | 99 |     :return: A set of paths sufficient to include everything in paths via
 | 
| 100 |         is_inside_any, drawn from the paths parameter.
 | |
| 101 |     """
 | |
| 102 | search_paths = set() | |
| 103 | paths = set(paths) | |
| 104 | for path in paths: | |
| 2843.1.1
by Ian Clatworthy Faster partial commits by walking less data (Robert Collins) | 105 | other_paths = paths.difference([path]) | 
| 2825.7.1
by Robert Collins * Partial commits are now approximately 40% faster by walking over the | 106 | if not is_inside_any(other_paths, path): | 
| 107 |             # this is a top level path, we must check it.
 | |
| 108 | search_paths.add(path) | |
| 109 | return search_paths | |
| 110 | ||
| 111 | ||
| 1077
by Martin Pool - avoid compiling REs at module load time | 112 | _QUOTE_RE = None | 
| 969
by Martin Pool - Add less-sucky is_within_any | 113 | |
| 114 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 115 | def quotefn(f): | 
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 116 | """Return a quoted filename filename | 
| 117 | ||
| 118 |     This previously used backslash quoting, but that works poorly on
 | |
| 119 |     Windows."""
 | |
| 120 |     # TODO: I'm not really sure this is the best format either.x
 | |
| 1077
by Martin Pool - avoid compiling REs at module load time | 121 | global _QUOTE_RE | 
| 1963.2.6
by Robey Pointer pychecker is on crack; go back to using 'is None'. | 122 | if _QUOTE_RE is None: | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 123 | _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])') | 
| 1077
by Martin Pool - avoid compiling REs at module load time | 124 | |
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 125 | if _QUOTE_RE.search(f): | 
| 126 | return '"' + f + '"' | |
| 127 | else: | |
| 128 | return f | |
| 1
by mbp at sourcefrog import from baz patch-364 | 129 | |
| 130 | ||
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 131 | _directory_kind = 'directory' | 
| 132 | ||
| 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 | 133 | def get_umask(): | 
| 134 | """Return the current umask""" | |
| 135 |     # Assume that people aren't messing with the umask while running
 | |
| 136 |     # XXX: This is not thread safe, but there is no way to get the
 | |
| 137 |     #      umask without setting it
 | |
| 138 | umask = os.umask(0) | |
| 139 | os.umask(umask) | |
| 140 | return umask | |
| 141 | ||
| 142 | ||
| 2324.2.1
by Dmitry Vasiliev kind_marker() optimization | 143 | _kind_marker_map = { | 
| 144 | "file": "", | |
| 145 | _directory_kind: "/", | |
| 146 | "symlink": "@", | |
| 1551.10.30
by Aaron Bentley Merge from bzr.dev | 147 | 'tree-reference': '+', | 
| 2324.2.1
by Dmitry Vasiliev kind_marker() optimization | 148 | }
 | 
| 1551.10.30
by Aaron Bentley Merge from bzr.dev | 149 | |
| 150 | ||
| 488
by Martin Pool - new helper function kind_marker() | 151 | def kind_marker(kind): | 
| 2324.2.1
by Dmitry Vasiliev kind_marker() optimization | 152 | try: | 
| 153 | return _kind_marker_map[kind] | |
| 154 | except KeyError: | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 155 | raise errors.BzrError('invalid file kind %r' % kind) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 156 | |
| 2324.2.1
by Dmitry Vasiliev kind_marker() optimization | 157 | |
| 1732.1.2
by John Arbash Meinel just use os.path.lexists if it exists | 158 | lexists = getattr(os.path, 'lexists', None) | 
| 159 | if lexists is None: | |
| 160 | def lexists(f): | |
| 161 | try: | |
| 2324.2.2
by Dmitry Vasiliev Fixed lexists() implementation | 162 | stat = getattr(os, 'lstat', os.stat) | 
| 163 | stat(f) | |
| 1732.1.2
by John Arbash Meinel just use os.path.lexists if it exists | 164 | return True | 
| 2324.2.2
by Dmitry Vasiliev Fixed lexists() implementation | 165 | except OSError, e: | 
| 1732.1.2
by John Arbash Meinel just use os.path.lexists if it exists | 166 | if e.errno == errno.ENOENT: | 
| 167 | return False; | |
| 168 | else: | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 169 | 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 | 170 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 171 | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 172 | def fancy_rename(old, new, rename_func, unlink_func): | 
| 173 | """A fancy rename, when you don't have atomic rename. | |
| 174 |     
 | |
| 175 |     :param old: The old path, to rename from
 | |
| 176 |     :param new: The new path, to rename to
 | |
| 177 |     :param rename_func: The potentially non-atomic rename function
 | |
| 178 |     :param unlink_func: A way to delete the target file if the full rename succeeds
 | |
| 179 |     """
 | |
| 180 | ||
| 181 |     # sftp rename doesn't allow overwriting, so play tricks:
 | |
| 182 | base = os.path.basename(new) | |
| 183 | dirname = os.path.dirname(new) | |
| 1553.5.22
by Martin Pool Change fancy_rename to use rand_chars rather than reinvent it. | 184 | tmp_name = u'tmp.%s.%.9f.%d.%s' % (base, time.time(), os.getpid(), rand_chars(10)) | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 185 | tmp_name = pathjoin(dirname, tmp_name) | 
| 186 | ||
| 187 |     # Rename the file out of the way, but keep track if it didn't exist
 | |
| 188 |     # We don't want to grab just any exception
 | |
| 189 |     # something like EACCES should prevent us from continuing
 | |
| 190 |     # The downside is that the rename_func has to throw an exception
 | |
| 191 |     # with an errno = ENOENT, or NoSuchFile
 | |
| 192 | file_existed = False | |
| 193 | try: | |
| 194 | rename_func(new, tmp_name) | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 195 | except (errors.NoSuchFile,), e: | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 196 |         pass
 | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 197 | except IOError, e: | 
| 198 |         # 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'. | 199 |         # function raises an IOError with errno is None when a rename fails.
 | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 200 |         # This then gets caught here.
 | 
| 1185.50.37
by John Arbash Meinel Fixed exception handling for fancy_rename | 201 | if e.errno not in (None, errno.ENOENT, errno.ENOTDIR): | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 202 |             raise
 | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 203 | except Exception, e: | 
| 1963.2.6
by Robey Pointer pychecker is on crack; go back to using 'is None'. | 204 | 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. | 205 | or e.errno not in (errno.ENOENT, errno.ENOTDIR)): | 
| 206 |             raise
 | |
| 207 | else: | |
| 208 | file_existed = True | |
| 209 | ||
| 210 | success = False | |
| 211 | try: | |
| 2978.8.2
by Alexander Belchenko teach fancy_rename to handle change case renames in possible case-insensitive filesystem | 212 | try: | 
| 213 |             # This may throw an exception, in which case success will
 | |
| 214 |             # not be set.
 | |
| 215 | rename_func(old, new) | |
| 216 | success = True | |
| 217 | except (IOError, OSError), e: | |
| 2978.8.3
by Alexander Belchenko Aaron's review | 218 |             # source and target may be aliases of each other (e.g. on a
 | 
| 219 |             # case-insensitive filesystem), so we may have accidentally renamed
 | |
| 220 |             # source by when we tried to rename target
 | |
| 2978.8.4
by Alexander Belchenko fancy_rename: lower() test removed. | 221 | if not (file_existed and e.errno in (None, errno.ENOENT)): | 
| 2978.8.2
by Alexander Belchenko teach fancy_rename to handle change case renames in possible case-insensitive filesystem | 222 |                 raise
 | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 223 | finally: | 
| 224 | if file_existed: | |
| 225 |             # If the file used to exist, rename it back into place
 | |
| 226 |             # otherwise just delete it from the tmp location
 | |
| 227 | if success: | |
| 1551.15.4
by Aaron Bentley Revert now-unnecessary changes | 228 | unlink_func(tmp_name) | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 229 | else: | 
| 1185.31.49
by John Arbash Meinel Some corrections using the new osutils.rename. **ALL TESTS PASS** | 230 | rename_func(tmp_name, new) | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 231 | |
| 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 | 232 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 233 | # In Python 2.4.2 and older, os.path.abspath and os.path.realpath
 | 
| 234 | # choke on a Unicode string containing a relative path if
 | |
| 235 | # os.getcwd() returns a non-sys.getdefaultencoding()-encoded
 | |
| 236 | # string.
 | |
| 2093.1.1
by John Arbash Meinel (Bart Teeuwisse) if sys.getfilesystemencoding() is None, use 'utf-8' | 237 | _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 | 238 | 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 | 239 |     # jam 20060426 rather than encoding to fsencoding
 | 
| 240 |     # copy posixpath.abspath, but use os.getcwdu instead
 | |
| 241 | if not posixpath.isabs(path): | |
| 242 | path = posixpath.join(getcwd(), path) | |
| 243 | return posixpath.normpath(path) | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 244 | |
| 245 | ||
| 246 | 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 | 247 | 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 | 248 | |
| 249 | ||
| 1711.5.2
by John Arbash Meinel win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this | 250 | def _win32_fixdrive(path): | 
| 251 | """Force drive letters to be consistent. | |
| 252 | ||
| 253 |     win32 is inconsistent whether it returns lower or upper case
 | |
| 254 |     and even if it was consistent the user might type the other
 | |
| 255 |     so we force it to uppercase
 | |
| 256 |     running python.exe under cmd.exe return capital C:\\
 | |
| 257 |     running win32 python inside a cygwin shell returns lowercase c:\\
 | |
| 258 |     """
 | |
| 259 | drive, path = _nt_splitdrive(path) | |
| 260 | return drive.upper() + path | |
| 261 | ||
| 262 | ||
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 263 | 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' | 264 |     # 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 | 265 | 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 | 266 | |
| 267 | ||
| 2279.4.1
by Alexander Belchenko Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe | 268 | def _win98_abspath(path): | 
| 269 | """Return the absolute version of a path. | |
| 270 |     Windows 98 safe implementation (python reimplementation
 | |
| 271 |     of Win32 API function GetFullPathNameW)
 | |
| 272 |     """
 | |
| 273 |     # Corner cases:
 | |
| 274 |     #   C:\path     => C:/path
 | |
| 275 |     #   C:/path     => C:/path
 | |
| 276 |     #   \\HOST\path => //HOST/path
 | |
| 277 |     #   //HOST/path => //HOST/path
 | |
| 278 |     #   path        => C:/cwd/path
 | |
| 279 |     #   /path       => C:/path
 | |
| 280 | path = unicode(path) | |
| 281 |     # check for absolute path
 | |
| 282 | drive = _nt_splitdrive(path)[0] | |
| 283 | if drive == '' and path[:2] not in('//','\\\\'): | |
| 284 | cwd = os.getcwdu() | |
| 285 |         # we cannot simply os.path.join cwd and path
 | |
| 286 |         # because os.path.join('C:','/path') produce '/path'
 | |
| 287 |         # and this is incorrect
 | |
| 288 | if path[:1] in ('/','\\'): | |
| 289 | 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 | 290 | path = path[1:] | 
| 2279.4.1
by Alexander Belchenko Reimplementation of ntpath.abspath in Python for Windows98: unicode safe, UNC path safe | 291 | path = cwd + '\\' + path | 
| 292 | return _win32_fixdrive(_nt_normpath(path).replace('\\', '/')) | |
| 293 | ||
| 294 | ||
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 295 | 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' | 296 |     # 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 | 297 | 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 | 298 | |
| 299 | ||
| 300 | def _win32_pathjoin(*args): | |
| 1685.1.31
by John Arbash Meinel Adding tests for the rest of the _win32 functions. | 301 | return _nt_join(*args).replace('\\', '/') | 
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 302 | |
| 303 | ||
| 304 | 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 | 305 | 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 | 306 | |
| 307 | ||
| 308 | 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 | 309 | return _win32_fixdrive(os.getcwdu().replace('\\', '/')) | 
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 310 | |
| 311 | ||
| 312 | 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 | 313 | 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 | 314 | |
| 315 | ||
| 316 | 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. | 317 | """We expect to be able to atomically replace 'new' with old. | 
| 318 | ||
| 1711.7.17
by John Arbash Meinel Delay the extra syscall in _win32_rename until we get a failure. | 319 |     On win32, if new exists, it must be moved out of the way first,
 | 
| 320 |     and then deleted. 
 | |
| 1711.7.6
by John Arbash Meinel Change _win32_rename() so that it raises ENOENT *before* it tries any renaming. | 321 |     """
 | 
| 1711.7.17
by John Arbash Meinel Delay the extra syscall in _win32_rename until we get a failure. | 322 | try: | 
| 323 | fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink) | |
| 324 | except OSError, e: | |
| 1830.3.15
by John Arbash Meinel On Mac we get EINVAL when renaming cwd | 325 | if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL): | 
| 326 |             # If we try to rename a non-existant file onto cwd, we get 
 | |
| 327 |             # EPERM or EACCES instead of ENOENT, this will raise ENOENT 
 | |
| 328 |             # if the old path doesn't exist, sometimes we get EACCES
 | |
| 329 |             # 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. | 330 | os.lstat(old) | 
| 331 |         raise
 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 332 | |
| 333 | ||
| 1830.3.11
by John Arbash Meinel Create a mac version of 'getcwd()' which normalizes the path. | 334 | 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 | 335 | return unicodedata.normalize('NFC', os.getcwdu()) | 
| 1830.3.11
by John Arbash Meinel Create a mac version of 'getcwd()' which normalizes the path. | 336 | |
| 337 | ||
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 338 | # Default is to just use the python builtins, but these can be rebound on
 | 
| 339 | # particular platforms.
 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 340 | abspath = _posix_abspath | 
| 341 | realpath = _posix_realpath | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 342 | pathjoin = os.path.join | 
| 343 | normpath = os.path.normpath | |
| 344 | getcwd = os.getcwdu | |
| 345 | rename = os.rename | |
| 346 | dirname = os.path.dirname | |
| 347 | basename = os.path.basename | |
| 2215.4.2
by Alexander Belchenko split and splitext now the part of osutils | 348 | split = os.path.split | 
| 349 | splitext = os.path.splitext | |
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 350 | # These were already imported into local scope
 | 
| 351 | # mkdtemp = tempfile.mkdtemp
 | |
| 352 | # rmtree = shutil.rmtree
 | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 353 | |
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 354 | MIN_ABS_PATHLENGTH = 1 | 
| 355 | ||
| 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 | 356 | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 357 | if sys.platform == 'win32': | 
| 3224.5.35
by Andrew Bennetts More improvements suggested by John's review. | 358 | if win32utils.winver == 'Windows 98': | 
| 359 | abspath = _win98_abspath | |
| 360 | else: | |
| 361 | abspath = _win32_abspath | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 362 | realpath = _win32_realpath | 
| 363 | pathjoin = _win32_pathjoin | |
| 364 | normpath = _win32_normpath | |
| 365 | getcwd = _win32_getcwd | |
| 366 | mkdtemp = _win32_mkdtemp | |
| 367 | rename = _win32_rename | |
| 368 | ||
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 369 | MIN_ABS_PATHLENGTH = 3 | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 370 | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 371 | def _win32_delete_readonly(function, path, excinfo): | 
| 372 | """Error handler for shutil.rmtree function [for win32] | |
| 373 |         Helps to remove files and dirs marked as read-only.
 | |
| 374 |         """
 | |
| 2116.5.1
by Henri Wiechers Fixes osutils.rmtree on Windows with Python 2.5 | 375 | exception = excinfo[1] | 
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 376 | if function in (os.remove, os.rmdir) \ | 
| 2116.5.1
by Henri Wiechers Fixes osutils.rmtree on Windows with Python 2.5 | 377 | and isinstance(exception, OSError) \ | 
| 378 | and exception.errno == errno.EACCES: | |
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 379 | make_writable(path) | 
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 380 | function(path) | 
| 381 | else: | |
| 382 |             raise
 | |
| 383 | ||
| 384 | def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly): | |
| 385 | """Replacer for shutil.rmtree: could remove readonly dirs/files""" | |
| 386 | return shutil.rmtree(path, ignore_errors, onerror) | |
| 1830.3.11
by John Arbash Meinel Create a mac version of 'getcwd()' which normalizes the path. | 387 | elif sys.platform == 'darwin': | 
| 388 | getcwd = _mac_getcwd | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 389 | |
| 1685.1.31
by John Arbash Meinel Adding tests for the rest of the _win32 functions. | 390 | |
| 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. | 391 | def get_terminal_encoding(): | 
| 392 | """Find the best encoding for printing to the screen. | |
| 393 | ||
| 394 |     This attempts to check both sys.stdout and sys.stdin to see
 | |
| 395 |     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. | 396 |     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. | 397 |     The problem is that on Windows, locale.getpreferredencoding()
 | 
| 398 |     is not the same encoding as that used by the console:
 | |
| 399 |     http://mail.python.org/pipermail/python-list/2003-May/162357.html
 | |
| 400 | ||
| 401 |     On my standard US Windows XP, the preferred encoding is
 | |
| 402 |     cp1252, but the console is cp437
 | |
| 403 |     """
 | |
| 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. | 404 | 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. | 405 | output_encoding = getattr(sys.stdout, 'encoding', None) | 
| 406 | if not output_encoding: | |
| 407 | input_encoding = getattr(sys.stdin, 'encoding', None) | |
| 408 | if not input_encoding: | |
| 3224.5.4
by Andrew Bennetts Fix test suite, mainly weeding out uses of bzrlib.user_encoding. | 409 | output_encoding = get_user_encoding() | 
| 410 | mutter('encoding stdout as osutils.get_user_encoding() %r', | |
| 411 | 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. | 412 | else: | 
| 413 | output_encoding = input_encoding | |
| 414 | mutter('encoding stdout as sys.stdin encoding %r', output_encoding) | |
| 415 | else: | |
| 416 | 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 | 417 | if output_encoding == 'cp0': | 
| 418 |         # 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. | 419 | output_encoding = get_user_encoding() | 
| 2127.4.1
by Alexander Belchenko (jam, bialix) Workaround for cp0 console encoding on Windows | 420 | mutter('cp0 is invalid encoding.' | 
| 3224.5.4
by Andrew Bennetts Fix test suite, mainly weeding out uses of bzrlib.user_encoding. | 421 | ' encoding stdout as osutils.get_user_encoding() %r', | 
| 422 | output_encoding) | |
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 423 |     # check encoding
 | 
| 424 | try: | |
| 425 | codecs.lookup(output_encoding) | |
| 426 | except LookupError: | |
| 427 | sys.stderr.write('bzr: warning:' | |
| 2192.1.9
by Alexander Belchenko final fix suggested by John Meinel | 428 | ' unknown terminal encoding %s.\n' | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 429 | ' Using encoding %s instead.\n' | 
| 3224.5.4
by Andrew Bennetts Fix test suite, mainly weeding out uses of bzrlib.user_encoding. | 430 | % (output_encoding, get_user_encoding()) | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 431 |                         )
 | 
| 3224.5.4
by Andrew Bennetts Fix test suite, mainly weeding out uses of bzrlib.user_encoding. | 432 | output_encoding = get_user_encoding() | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 433 | |
| 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. | 434 | return output_encoding | 
| 435 | ||
| 436 | ||
| 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 \ | 437 | def normalizepath(f): | 
| 3287.18.2
by Matt McClure Reverts to 3290. | 438 | 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 \ | 439 | F = realpath | 
| 440 | else: | |
| 441 | F = abspath | |
| 442 | [p,e] = os.path.split(f) | |
| 443 | if e == "" or e == "." or e == "..": | |
| 444 | return F(f) | |
| 445 | else: | |
| 446 | return pathjoin(F(p), e) | |
| 447 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 448 | |
| 449 | def isdir(f): | |
| 450 | """True if f is an accessible directory.""" | |
| 451 | try: | |
| 452 | return S_ISDIR(os.lstat(f)[ST_MODE]) | |
| 453 | except OSError: | |
| 454 | return False | |
| 455 | ||
| 456 | ||
| 457 | def isfile(f): | |
| 458 | """True if f is a regular file.""" | |
| 459 | try: | |
| 460 | return S_ISREG(os.lstat(f)[ST_MODE]) | |
| 461 | except OSError: | |
| 462 | return False | |
| 463 | ||
| 1092.2.6
by Robert Collins symlink support updated to work | 464 | def islink(f): | 
| 465 | """True if f is a symlink.""" | |
| 466 | try: | |
| 467 | return S_ISLNK(os.lstat(f)[ST_MODE]) | |
| 468 | except OSError: | |
| 469 | return False | |
| 1
by mbp at sourcefrog import from baz patch-364 | 470 | |
| 485
by Martin Pool - move commit code into its own module | 471 | def is_inside(dir, fname): | 
| 472 | """True if fname is inside dir. | |
| 969
by Martin Pool - Add less-sucky is_within_any | 473 |     
 | 
| 1185.31.38
by John Arbash Meinel Changing os.path.normpath to osutils.normpath | 474 |     The parameters should typically be passed to osutils.normpath first, so
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 475 |     that . and .. and repeated slashes are eliminated, and the separators
 | 
| 476 |     are canonical for the platform.
 | |
| 477 |     
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 478 |     The empty string as a dir name is taken as top-of-tree and matches 
 | 
| 479 |     everything.
 | |
| 485
by Martin Pool - move commit code into its own module | 480 |     """
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 481 |     # XXX: Most callers of this can actually do something smarter by 
 | 
| 482 |     # looking at the inventory
 | |
| 972
by Martin Pool - less dodgy is_inside function | 483 | if dir == fname: | 
| 484 | return True | |
| 485 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 486 | if dir == '': | 
| 487 | return True | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 488 | |
| 1185.31.34
by John Arbash Meinel Removing instances of os.sep | 489 | if dir[-1] != '/': | 
| 490 | dir += '/' | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 491 | |
| 972
by Martin Pool - less dodgy is_inside function | 492 | return fname.startswith(dir) | 
| 493 | ||
| 485
by Martin Pool - move commit code into its own module | 494 | |
| 495 | def is_inside_any(dir_list, fname): | |
| 496 | """True if fname is inside any of given dirs.""" | |
| 497 | for dirname in dir_list: | |
| 498 | if is_inside(dirname, fname): | |
| 499 | return True | |
| 2324.2.3
by Dmitry Vasiliev Fixed is_inside_* methods implementation | 500 | return False | 
| 485
by Martin Pool - move commit code into its own module | 501 | |
| 502 | ||
| 1740.3.4
by Jelmer Vernooij Move inventory to commit builder. | 503 | def is_inside_or_parent_of_any(dir_list, fname): | 
| 504 | """True if fname is a child or a parent of any of the given files.""" | |
| 505 | for dirname in dir_list: | |
| 506 | if is_inside(dirname, fname) or is_inside(fname, dirname): | |
| 507 | return True | |
| 2324.2.3
by Dmitry Vasiliev Fixed is_inside_* methods implementation | 508 | return False | 
| 1740.3.4
by Jelmer Vernooij Move inventory to commit builder. | 509 | |
| 510 | ||
| 3408.6.1
by Eric Holmberg Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while | 511 | def pumpfile(from_file, to_file, read_length=-1, buff_size=32768): | 
| 2745.5.2
by Robert Collins * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes | 512 | """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 | 513 | |
| 514 |     The read_length can either be -1 to read to end-of-file (EOF) or
 | |
| 515 |     it can specify the maximum number of bytes to read.
 | |
| 516 | ||
| 517 |     The buff_size represents the maximum size for each read operation
 | |
| 518 |     performed on from_file.
 | |
| 519 | ||
| 2745.5.2
by Robert Collins * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes | 520 |     :return: The number of bytes copied.
 | 
| 521 |     """
 | |
| 522 | length = 0 | |
| 3408.6.1
by Eric Holmberg Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while | 523 | if read_length >= 0: | 
| 524 |         # read specified number of bytes
 | |
| 525 | ||
| 526 | while read_length > 0: | |
| 527 | num_bytes_to_read = min(read_length, buff_size) | |
| 528 | ||
| 529 | block = from_file.read(num_bytes_to_read) | |
| 530 | if not block: | |
| 531 |                 # EOF reached
 | |
| 532 |                 break
 | |
| 533 | to_file.write(block) | |
| 534 | ||
| 535 | actual_bytes_read = len(block) | |
| 536 | read_length -= actual_bytes_read | |
| 537 | length += actual_bytes_read | |
| 538 | else: | |
| 539 |         # read to EOF
 | |
| 540 | while True: | |
| 541 | block = from_file.read(buff_size) | |
| 542 | if not block: | |
| 543 |                 # EOF reached
 | |
| 544 |                 break
 | |
| 545 | to_file.write(block) | |
| 546 | length += len(block) | |
| 2745.5.2
by Robert Collins * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes | 547 | return length | 
| 1
by mbp at sourcefrog import from baz patch-364 | 548 | |
| 549 | ||
| 3635.1.2
by Robert Collins Add osutils.pump_string_file helper function. | 550 | def pump_string_file(bytes, file_handle, segment_size=None): | 
| 551 | """Write bytes to file_handle in many smaller writes. | |
| 552 | ||
| 553 |     :param bytes: The string to write.
 | |
| 554 |     :param file_handle: The file to write to.
 | |
| 555 |     """
 | |
| 556 |     # Write data in chunks rather than all at once, because very large
 | |
| 557 |     # writes fail on some platforms (e.g. Windows with SMB  mounted
 | |
| 558 |     # drives).
 | |
| 559 | if not segment_size: | |
| 560 | segment_size = 5242880 # 5MB | |
| 561 | segments = range(len(bytes) / segment_size + 1) | |
| 562 | write = file_handle.write | |
| 563 | for segment_index in segments: | |
| 564 | segment = buffer(bytes, segment_index * segment_size, segment_size) | |
| 565 | write(segment) | |
| 566 | ||
| 567 | ||
| 1185.67.7
by Aaron Bentley Refactored a bit | 568 | def file_iterator(input_file, readsize=32768): | 
| 569 | while True: | |
| 570 | b = input_file.read(readsize) | |
| 571 | if len(b) == 0: | |
| 572 |             break
 | |
| 573 | yield b | |
| 574 | ||
| 575 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 576 | def sha_file(f): | 
| 3376.2.4
by Martin Pool Remove every assert statement from bzrlib! | 577 | """Calculate the hexdigest of an open file. | 
| 578 | ||
| 579 |     The file cursor should be already at the start.
 | |
| 580 |     """
 | |
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 581 | s = sha() | 
| 320
by Martin Pool - Compute SHA-1 of files in chunks | 582 | BUFSIZE = 128<<10 | 
| 583 | while True: | |
| 584 | b = f.read(BUFSIZE) | |
| 585 | if not b: | |
| 586 |             break
 | |
| 587 | s.update(b) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 588 | return s.hexdigest() | 
| 589 | ||
| 590 | ||
| 2872.3.1
by Martin Pool Add -Dhashcache option; clean up dirstate sha1 code | 591 | def sha_file_by_name(fname): | 
| 592 | """Calculate the SHA1 of a file by reading the full text""" | |
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 593 | s = sha() | 
| 2922.1.1
by John Arbash Meinel Fix bug #153493, use O_BINARY when reading files. | 594 | f = os.open(fname, os.O_RDONLY | O_BINARY) | 
| 2872.3.1
by Martin Pool Add -Dhashcache option; clean up dirstate sha1 code | 595 | 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 | 596 | while True: | 
| 597 | b = os.read(f, 1<<16) | |
| 598 | if not b: | |
| 599 | return s.hexdigest() | |
| 600 | s.update(b) | |
| 2872.3.1
by Martin Pool Add -Dhashcache option; clean up dirstate sha1 code | 601 | 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 | 602 | os.close(f) | 
| 2872.3.1
by Martin Pool Add -Dhashcache option; clean up dirstate sha1 code | 603 | |
| 604 | ||
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 605 | def sha_strings(strings, _factory=sha): | 
| 1235
by Martin Pool - split sha_strings into osutils | 606 | """Return the sha-1 of concatenation of strings""" | 
| 2825.2.1
by Robert Collins Micro-tweaks to sha routines. | 607 | s = _factory() | 
| 1235
by Martin Pool - split sha_strings into osutils | 608 | map(s.update, strings) | 
| 609 | return s.hexdigest() | |
| 610 | ||
| 611 | ||
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 612 | def sha_string(f, _factory=sha): | 
| 2825.2.1
by Robert Collins Micro-tweaks to sha routines. | 613 | return _factory(f).hexdigest() | 
| 1
by mbp at sourcefrog import from baz patch-364 | 614 | |
| 615 | ||
| 124
by mbp at sourcefrog - check file text for past revisions is correct | 616 | def fingerprint_file(f): | 
| 126
by mbp at sourcefrog Use just one big read to fingerprint files | 617 | b = f.read() | 
| 2825.2.1
by Robert Collins Micro-tweaks to sha routines. | 618 | return {'size': len(b), | 
| 3734.2.4
by Vincent Ladeuil Fix python2.6 deprecation warnings related to hashlib. | 619 | 'sha1': sha(b).hexdigest()} | 
| 124
by mbp at sourcefrog - check file text for past revisions is correct | 620 | |
| 621 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 622 | def compare_files(a, b): | 
| 623 | """Returns true if equal in contents""" | |
| 74
by mbp at sourcefrog compare_files: read in one page at a time rather than | 624 | BUFSIZE = 4096 | 
| 625 | while True: | |
| 626 | ai = a.read(BUFSIZE) | |
| 627 | bi = b.read(BUFSIZE) | |
| 628 | if ai != bi: | |
| 629 | return False | |
| 630 | if ai == '': | |
| 631 | return True | |
| 1
by mbp at sourcefrog import from baz patch-364 | 632 | |
| 633 | ||
| 49
by mbp at sourcefrog fix local-time-offset calculation | 634 | def local_time_offset(t=None): | 
| 635 | """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'. | 636 | if t is None: | 
| 73
by mbp at sourcefrog fix time.localtime call for python 2.3 | 637 | t = time.time() | 
| 2215.6.1
by James Henstridge Don't rely on time.timezone and time.altzone in local_time_offset(), | 638 | offset = datetime.fromtimestamp(t) - datetime.utcfromtimestamp(t) | 
| 639 | return offset.days * 86400 + offset.seconds | |
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 640 | |
| 3512.3.1
by Martin von Gagern Hand-selected minimalistic set of changes from my setlocale branch. | 641 | weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] | 
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 642 | |
| 2425.6.2
by Martin Pool Make timestamps use existing format_date; document that function more | 643 | 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. | 644 | show_offset=True): | 
| 2425.6.2
by Martin Pool Make timestamps use existing format_date; document that function more | 645 | """Return a formatted date string. | 
| 646 | ||
| 647 |     :param t: Seconds since the epoch.
 | |
| 648 |     :param offset: Timezone offset in seconds east of utc.
 | |
| 649 |     :param timezone: How to display the time: 'utc', 'original' for the
 | |
| 650 |          timezone specified by offset, or 'local' for the process's current
 | |
| 651 |          timezone.
 | |
| 3526.5.4
by Martin von Gagern Use separate function format_local_date for local weekday formats in unicode. | 652 |     :param date_fmt: strftime format.
 | 
| 653 |     :param show_offset: Whether to append the timezone.
 | |
| 654 |     """
 | |
| 655 | (date_fmt, tt, offset_str) = \ | |
| 656 | _format_date(t, offset, timezone, date_fmt, show_offset) | |
| 657 | date_fmt = date_fmt.replace('%a', weekdays[tt[6]]) | |
| 658 | date_str = time.strftime(date_fmt, tt) | |
| 659 | return date_str + offset_str | |
| 660 | ||
| 661 | def format_local_date(t, offset=0, timezone='original', date_fmt=None, | |
| 662 | show_offset=True): | |
| 663 | """Return an unicode date string formatted according to the current locale. | |
| 664 | ||
| 665 |     :param t: Seconds since the epoch.
 | |
| 666 |     :param offset: Timezone offset in seconds east of utc.
 | |
| 667 |     :param timezone: How to display the time: 'utc', 'original' for the
 | |
| 668 |          timezone specified by offset, or 'local' for the process's current
 | |
| 669 |          timezone.
 | |
| 670 |     :param date_fmt: strftime format.
 | |
| 671 |     :param show_offset: Whether to append the timezone.
 | |
| 672 |     """
 | |
| 673 | (date_fmt, tt, offset_str) = \ | |
| 674 | _format_date(t, offset, timezone, date_fmt, show_offset) | |
| 675 | date_str = time.strftime(date_fmt, tt) | |
| 676 | if not isinstance(date_str, unicode): | |
| 677 | date_str = date_str.decode(bzrlib.user_encoding, 'replace') | |
| 678 | return date_str + offset_str | |
| 679 | ||
| 680 | def _format_date(t, offset, timezone, date_fmt, show_offset): | |
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 681 | if timezone == 'utc': | 
| 1
by mbp at sourcefrog import from baz patch-364 | 682 | tt = time.gmtime(t) | 
| 683 | offset = 0 | |
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 684 | elif timezone == 'original': | 
| 1963.2.6
by Robey Pointer pychecker is on crack; go back to using 'is None'. | 685 | if offset is None: | 
| 23
by mbp at sourcefrog format_date: handle revisions with no timezone offset | 686 | offset = 0 | 
| 16
by mbp at sourcefrog fix inverted calculation for original timezone -> utc | 687 | tt = time.gmtime(t + offset) | 
| 12
by mbp at sourcefrog new --timezone option for bzr log | 688 | elif timezone == 'local': | 
| 1
by mbp at sourcefrog import from baz patch-364 | 689 | tt = time.localtime(t) | 
| 49
by mbp at sourcefrog fix local-time-offset calculation | 690 | offset = local_time_offset(t) | 
| 12
by mbp at sourcefrog new --timezone option for bzr log | 691 | else: | 
| 3144.1.1
by Lukáš Lalinský Fixed error reporting of unsupported timezone format. | 692 | raise errors.UnsupportedTimezoneFormat(timezone) | 
| 1185.12.24
by Aaron Bentley Made format_date more flexible | 693 | if date_fmt is None: | 
| 694 | date_fmt = "%a %Y-%m-%d %H:%M:%S" | |
| 695 | if show_offset: | |
| 696 | offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) | |
| 697 | else: | |
| 698 | offset_str = '' | |
| 3526.5.4
by Martin von Gagern Use separate function format_local_date for local weekday formats in unicode. | 699 | return (date_fmt, tt, offset_str) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 700 | |
| 701 | ||
| 702 | def compact_date(when): | |
| 703 | return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) | |
| 704 | ||
| 705 | ||
| 1957.1.4
by John Arbash Meinel create a helper for formatting a time delta | 706 | def format_delta(delta): | 
| 707 | """Get a nice looking string for a time delta. | |
| 708 | ||
| 709 |     :param delta: The time difference in seconds, can be positive or negative.
 | |
| 710 |         positive indicates time in the past, negative indicates time in the
 | |
| 711 |         future. (usually time.time() - stored_time)
 | |
| 712 |     :return: String formatted to show approximate resolution
 | |
| 713 |     """
 | |
| 714 | delta = int(delta) | |
| 715 | if delta >= 0: | |
| 716 | direction = 'ago' | |
| 717 | else: | |
| 718 | direction = 'in the future' | |
| 719 | delta = -delta | |
| 720 | ||
| 721 | seconds = delta | |
| 722 | if seconds < 90: # print seconds up to 90 seconds | |
| 723 | if seconds == 1: | |
| 724 | return '%d second %s' % (seconds, direction,) | |
| 725 | else: | |
| 726 | return '%d seconds %s' % (seconds, direction) | |
| 727 | ||
| 728 | minutes = int(seconds / 60) | |
| 729 | seconds -= 60 * minutes | |
| 730 | if seconds == 1: | |
| 731 | plural_seconds = '' | |
| 732 | else: | |
| 733 | plural_seconds = 's' | |
| 734 | if minutes < 90: # print minutes, seconds up to 90 minutes | |
| 735 | if minutes == 1: | |
| 736 | return '%d minute, %d second%s %s' % ( | |
| 737 | minutes, seconds, plural_seconds, direction) | |
| 738 | else: | |
| 739 | return '%d minutes, %d second%s %s' % ( | |
| 740 | minutes, seconds, plural_seconds, direction) | |
| 741 | ||
| 742 | hours = int(minutes / 60) | |
| 743 | minutes -= 60 * hours | |
| 744 | if minutes == 1: | |
| 745 | plural_minutes = '' | |
| 746 | else: | |
| 747 | plural_minutes = 's' | |
| 748 | ||
| 749 | if hours == 1: | |
| 750 | return '%d hour, %d minute%s %s' % (hours, minutes, | |
| 751 | plural_minutes, direction) | |
| 752 | return '%d hours, %d minute%s %s' % (hours, minutes, | |
| 753 | plural_minutes, direction) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 754 | |
| 755 | def filesize(f): | |
| 756 | """Return size of given open file.""" | |
| 757 | return os.fstat(f.fileno())[ST_SIZE] | |
| 758 | ||
| 1553.5.5
by Martin Pool New utility routine rand_chars | 759 | |
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 760 | # Define rand_bytes based on platform.
 | 
| 761 | try: | |
| 762 |     # Python 2.4 and later have os.urandom,
 | |
| 763 |     # but it doesn't work on some arches
 | |
| 764 | os.urandom(1) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 765 | rand_bytes = os.urandom | 
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 766 | except (NotImplementedError, AttributeError): | 
| 767 |     # If python doesn't have os.urandom, or it doesn't work,
 | |
| 768 |     # 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() | 769 | try: | 
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 770 | rand_bytes = file('/dev/urandom', 'rb').read | 
| 771 |     # 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() | 772 | except (IOError, OSError): | 
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 773 |         # not well seeded, but better than nothing
 | 
| 774 | def rand_bytes(n): | |
| 775 | import random | |
| 776 | s = '' | |
| 777 | while n: | |
| 778 | s += chr(random.randint(0, 255)) | |
| 779 | n -= 1 | |
| 780 | return s | |
| 1
by mbp at sourcefrog import from baz patch-364 | 781 | |
| 1553.5.5
by Martin Pool New utility routine rand_chars | 782 | |
| 783 | ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz' | |
| 784 | def rand_chars(num): | |
| 785 | """Return a random string of num alphanumeric characters | |
| 786 |     
 | |
| 787 |     The result only contains lowercase chars because it may be used on 
 | |
| 788 |     case-insensitive filesystems.
 | |
| 789 |     """
 | |
| 790 | s = '' | |
| 791 | for raw_byte in rand_bytes(num): | |
| 792 | s += ALNUM[ord(raw_byte) % 36] | |
| 793 | return s | |
| 794 | ||
| 795 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 796 | ## 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. | 797 | ## decomposition (might be too tricksy though.)
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 798 | |
| 799 | def splitpath(p): | |
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 800 | """Turn string into list of parts.""" | 
| 271
by Martin Pool - Windows path fixes | 801 |     # split on either delimiter because people might use either on
 | 
| 802 |     # Windows
 | |
| 803 | ps = re.split(r'[\\/]', p) | |
| 804 | ||
| 805 | rps = [] | |
| 1
by mbp at sourcefrog import from baz patch-364 | 806 | for f in ps: | 
| 807 | if f == '..': | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 808 | raise errors.BzrError("sorry, %r not allowed in path" % f) | 
| 271
by Martin Pool - Windows path fixes | 809 | elif (f == '.') or (f == ''): | 
| 810 |             pass
 | |
| 811 | else: | |
| 812 | rps.append(f) | |
| 813 | return rps | |
| 1
by mbp at sourcefrog import from baz patch-364 | 814 | |
| 3890.2.4
by John Arbash Meinel Add a new function that can convert 'chunks' format to a 'lines' format. | 815 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 816 | def joinpath(p): | 
| 817 | for f in p: | |
| 1963.2.6
by Robey Pointer pychecker is on crack; go back to using 'is None'. | 818 | if (f == '..') or (f is None) or (f == ''): | 
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 819 | 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 \ | 820 | return pathjoin(*p) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 821 | |
| 822 | ||
| 3890.2.7
by John Arbash Meinel A Pyrex extension is about 5x faster than the fastest python code I could write. | 823 | try: | 
| 824 | from bzrlib._chunks_to_lines_pyx import chunks_to_lines | |
| 825 | except ImportError: | |
| 3890.2.8
by John Arbash Meinel Move everything into properly parameterized tests. | 826 | 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. | 827 | |
| 828 | ||
| 1231
by Martin Pool - more progress on fetch on top of weaves | 829 | def split_lines(s): | 
| 830 | """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. | 831 |     # Trivially convert a fulltext into a 'chunked' representation, and let
 | 
| 832 |     # chunks_to_lines do the heavy lifting.
 | |
| 833 | if isinstance(s, str): | |
| 834 |         # chunks_to_lines only supports 8-bit strings
 | |
| 835 | return chunks_to_lines([s]) | |
| 836 | else: | |
| 837 | return _split_lines(s) | |
| 838 | ||
| 839 | ||
| 840 | def _split_lines(s): | |
| 841 | """Split s into lines, but without removing the newline characters. | |
| 842 | ||
| 843 |     This supports Unicode or plain string objects.
 | |
| 844 |     """
 | |
| 1666.1.6
by Robert Collins Make knit the default format. | 845 | lines = s.split('\n') | 
| 846 | result = [line + '\n' for line in lines[:-1]] | |
| 847 | if lines[-1]: | |
| 848 | result.append(lines[-1]) | |
| 849 | return result | |
| 1391
by Robert Collins merge from integration | 850 | |
| 851 | ||
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 852 | def hardlinks_good(): | 
| 1185.10.5
by Aaron Bentley Fixed hardlinks_good test | 853 | return sys.platform not in ('win32', 'cygwin', 'darwin') | 
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 854 | |
| 1185.1.46
by Robert Collins Aarons branch --basis patch | 855 | |
| 1185.10.3
by Aaron Bentley Made copy_multi_immutable create hardlinks opportunistically | 856 | def link_or_copy(src, dest): | 
| 857 | """Hardlink a file, or copy it if it can't be hardlinked.""" | |
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 858 | if not hardlinks_good(): | 
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 859 | shutil.copyfile(src, dest) | 
| 1185.10.3
by Aaron Bentley Made copy_multi_immutable create hardlinks opportunistically | 860 |         return
 | 
| 861 | try: | |
| 862 | os.link(src, dest) | |
| 863 | except (OSError, IOError), e: | |
| 864 | if e.errno != errno.EXDEV: | |
| 865 |             raise
 | |
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 866 | shutil.copyfile(src, dest) | 
| 1399.1.4
by Robert Collins move diff and symlink conditionals into inventory.py from diff.py | 867 | |
| 2831.5.2
by Vincent Ladeuil Review feedback. | 868 | |
| 869 | # Look Before You Leap (LBYL) is appropriate here instead of Easier to Ask for
 | |
| 870 | # Forgiveness than Permission (EAFP) because:
 | |
| 871 | # - root can damage a solaris file system by using unlink,
 | |
| 872 | # - unlink raises different exceptions on different OSes (linux: EISDIR, win32:
 | |
| 873 | #   EACCES, OSX: EPERM) when invoked on a directory.
 | |
| 874 | def delete_any(path): | |
| 1558.12.9
by Aaron Bentley Handle resolving conflicts with directories properly | 875 | """Delete a file or directory.""" | 
| 2831.5.2
by Vincent Ladeuil Review feedback. | 876 | if isdir(path): # Takes care of symlinks | 
| 877 | os.rmdir(path) | |
| 878 | else: | |
| 879 | os.unlink(path) | |
| 1558.12.9
by Aaron Bentley Handle resolving conflicts with directories properly | 880 | |
| 1399.1.4
by Robert Collins move diff and symlink conditionals into inventory.py from diff.py | 881 | |
| 882 | def has_symlinks(): | |
| 1963.2.6
by Robey Pointer pychecker is on crack; go back to using 'is None'. | 883 | 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 | 884 | return True | 
| 885 | else: | |
| 886 | return False | |
| 2831.5.2
by Vincent Ladeuil Review feedback. | 887 | |
| 1185.16.38
by Martin Pool - move contains_whitespace and contains_linebreaks to osutils | 888 | |
| 3136.1.1
by Aaron Bentley Add support for hardlinks to TreeTransform | 889 | def has_hardlinks(): | 
| 890 | if getattr(os, 'link', None) is not None: | |
| 891 | return True | |
| 892 | else: | |
| 893 | return False | |
| 894 | ||
| 895 | ||
| 3287.18.14
by Matt McClure Extracted a host_os_dereferences_symlinks method. | 896 | def host_os_dereferences_symlinks(): | 
| 897 | return (has_symlinks() | |
| 3287.18.19
by Matt McClure Changed tested sys.platform value from 'windows' (mistaken) to 'win32' | 898 | and sys.platform not in ('cygwin', 'win32')) | 
| 3287.18.14
by Matt McClure Extracted a host_os_dereferences_symlinks method. | 899 | |
| 900 | ||
| 1185.16.38
by Martin Pool - move contains_whitespace and contains_linebreaks to osutils | 901 | def contains_whitespace(s): | 
| 902 | """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. | 903 |     # string.whitespace can include '\xa0' in certain locales, because it is
 | 
| 904 |     # considered "non-breaking-space" as part of ISO-8859-1. But it
 | |
| 905 |     # 1) Isn't a breaking whitespace
 | |
| 906 |     # 2) Isn't one of ' \t\r\n' which are characters we sometimes use as
 | |
| 907 |     #    separators
 | |
| 908 |     # 3) '\xa0' isn't unicode safe since it is >128.
 | |
| 2249.5.16
by John Arbash Meinel [merge] bzr.dev 2283 | 909 | |
| 910 |     # This should *not* be a unicode set of characters in case the source
 | |
| 911 |     # string is not a Unicode string. We can auto-up-cast the characters since
 | |
| 912 |     # they are ascii, but we don't want to auto-up-cast the string in case it
 | |
| 913 |     # is utf-8
 | |
| 914 | for ch in ' \t\n\r\v\f': | |
| 1185.16.38
by Martin Pool - move contains_whitespace and contains_linebreaks to osutils | 915 | if ch in s: | 
| 916 | return True | |
| 917 | else: | |
| 918 | return False | |
| 919 | ||
| 920 | ||
| 921 | def contains_linebreaks(s): | |
| 922 | """True if there is any vertical whitespace in s.""" | |
| 923 | for ch in '\f\n\r': | |
| 924 | if ch in s: | |
| 925 | return True | |
| 926 | else: | |
| 927 | return False | |
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 928 | |
| 929 | ||
| 930 | def relpath(base, path): | |
| 931 | """Return path relative to base, or raise exception. | |
| 932 | ||
| 933 |     The path may be either an absolute path or a path relative to the
 | |
| 934 |     current working directory.
 | |
| 935 | ||
| 936 |     os.path.commonprefix (python2.4) has a bad bug that it works just
 | |
| 937 |     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. | 938 |     avoids that problem.
 | 
| 939 |     """
 | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 940 | |
| 3376.2.4
by Martin Pool Remove every assert statement from bzrlib! | 941 | if len(base) < MIN_ABS_PATHLENGTH: | 
| 942 |         # must have space for e.g. a drive letter
 | |
| 943 | raise ValueError('%r is too short to calculate a relative path' | |
| 944 | % (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 | 945 | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 946 | rp = abspath(path) | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 947 | |
| 948 | s = [] | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 949 | head = rp | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 950 | while len(head) >= len(base): | 
| 951 | if head == base: | |
| 952 |             break
 | |
| 953 | head, tail = os.path.split(head) | |
| 954 | if tail: | |
| 955 | s.insert(0, tail) | |
| 956 | else: | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 957 | raise errors.PathNotChild(rp, base) | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 958 | |
| 1185.31.35
by John Arbash Meinel Couple small fixes, all tests pass on cygwin. | 959 | if s: | 
| 960 | return pathjoin(*s) | |
| 961 | else: | |
| 962 | return '' | |
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 963 | |
| 964 | ||
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 965 | def safe_unicode(unicode_or_utf8_string): | 
| 966 | """Coerce unicode_or_utf8_string into unicode. | |
| 967 | ||
| 968 |     If it is unicode, it is returned.
 | |
| 969 |     Otherwise it is decoded from utf-8. If a decoding error
 | |
| 970 |     occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
 | |
| 971 |     as a BzrBadParameter exception.
 | |
| 972 |     """
 | |
| 973 | if isinstance(unicode_or_utf8_string, unicode): | |
| 974 | return unicode_or_utf8_string | |
| 975 | try: | |
| 976 | return unicode_or_utf8_string.decode('utf8') | |
| 977 | except UnicodeDecodeError: | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 978 | raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string) | 
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 979 | |
| 980 | ||
| 2249.5.8
by John Arbash Meinel Add osutils.safe_utf8 and safe_revision_id for the new revision_id work. | 981 | def safe_utf8(unicode_or_utf8_string): | 
| 982 | """Coerce unicode_or_utf8_string to a utf8 string. | |
| 983 | ||
| 984 |     If it is a str, it is returned.
 | |
| 985 |     If it is Unicode, it is encoded into a utf-8 string.
 | |
| 986 |     """
 | |
| 987 | if isinstance(unicode_or_utf8_string, str): | |
| 988 |         # TODO: jam 20070209 This is overkill, and probably has an impact on
 | |
| 989 |         #       performance if we are dealing with lots of apis that want a
 | |
| 990 |         #       utf-8 revision id
 | |
| 991 | try: | |
| 992 |             # Make sure it is a valid utf-8 string
 | |
| 993 | unicode_or_utf8_string.decode('utf-8') | |
| 994 | except UnicodeDecodeError: | |
| 995 | raise errors.BzrBadParameterNotUnicode(unicode_or_utf8_string) | |
| 996 | return unicode_or_utf8_string | |
| 997 | return unicode_or_utf8_string.encode('utf-8') | |
| 998 | ||
| 999 | ||
| 2309.4.4
by John Arbash Meinel Change what warnings are raised, and add tests that they are used. | 1000 | _revision_id_warning = ('Unicode revision ids were deprecated in bzr 0.15.' | 
| 1001 |                         ' Revision id generators should be creating utf8'
 | |
| 1002 | ' revision ids.') | |
| 1003 | ||
| 1004 | ||
| 1005 | 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. | 1006 | """Revision ids should now be utf8, but at one point they were unicode. | 
| 1007 | ||
| 2309.4.4
by John Arbash Meinel Change what warnings are raised, and add tests that they are used. | 1008 |     :param unicode_or_utf8_string: A possibly Unicode revision_id. (can also be
 | 
| 1009 |         utf8 or None).
 | |
| 1010 |     :param warn: Functions that are sanitizing user data can set warn=False
 | |
| 1011 |     :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. | 1012 |     """
 | 
| 2309.4.3
by John Arbash Meinel (broken) change safe_*_id to emit a warning. | 1013 | if (unicode_or_utf8_string is None | 
| 1014 | or unicode_or_utf8_string.__class__ == str): | |
| 1015 | return unicode_or_utf8_string | |
| 2309.4.4
by John Arbash Meinel Change what warnings are raised, and add tests that they are used. | 1016 | if warn: | 
| 1017 | symbol_versioning.warn(_revision_id_warning, DeprecationWarning, | |
| 1018 | stacklevel=2) | |
| 2309.4.3
by John Arbash Meinel (broken) change safe_*_id to emit a warning. | 1019 | return cache_utf8.encode(unicode_or_utf8_string) | 
| 1020 | ||
| 1021 | ||
| 2309.4.4
by John Arbash Meinel Change what warnings are raised, and add tests that they are used. | 1022 | _file_id_warning = ('Unicode file ids were deprecated in bzr 0.15. File id' | 
| 1023 | ' generators should be creating utf8 file ids.') | |
| 1024 | ||
| 1025 | ||
| 1026 | 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. | 1027 | """File ids should now be utf8, but at one point they were unicode. | 
| 1028 | ||
| 1029 |     This is the same as safe_utf8, except it uses the cached encode functions
 | |
| 1030 |     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. | 1031 | |
| 1032 |     :param unicode_or_utf8_string: A possibly Unicode file_id. (can also be
 | |
| 1033 |         utf8 or None).
 | |
| 1034 |     :param warn: Functions that are sanitizing user data can set warn=False
 | |
| 1035 |     :return: None or a utf8 file id.
 | |
| 2309.4.3
by John Arbash Meinel (broken) change safe_*_id to emit a warning. | 1036 |     """
 | 
| 1037 | if (unicode_or_utf8_string is None | |
| 1038 | or unicode_or_utf8_string.__class__ == str): | |
| 1039 | return unicode_or_utf8_string | |
| 2309.4.4
by John Arbash Meinel Change what warnings are raised, and add tests that they are used. | 1040 | if warn: | 
| 1041 | symbol_versioning.warn(_file_id_warning, DeprecationWarning, | |
| 1042 | stacklevel=2) | |
| 2309.4.3
by John Arbash Meinel (broken) change safe_*_id to emit a warning. | 1043 | return cache_utf8.encode(unicode_or_utf8_string) | 
| 2294.1.4
by John Arbash Meinel Add safe_file_id as a helper in osutils. | 1044 | |
| 1045 | ||
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 1046 | _platform_normalizes_filenames = False | 
| 1047 | if sys.platform == 'darwin': | |
| 1048 | _platform_normalizes_filenames = True | |
| 1049 | ||
| 1050 | ||
| 1051 | def normalizes_filenames(): | |
| 1052 | """Return True if this platform normalizes unicode filenames. | |
| 1053 | ||
| 1054 |     Mac OSX does, Windows/Linux do not.
 | |
| 1055 |     """
 | |
| 1056 | return _platform_normalizes_filenames | |
| 1057 | ||
| 1058 | ||
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 1059 | 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 | 1060 | """Get the unicode normalized path, and if you can access the file. | 
| 1061 | ||
| 1062 |     On platforms where the system normalizes filenames (Mac OSX),
 | |
| 1063 |     you can access a file by any path which will normalize correctly.
 | |
| 1064 |     On platforms where the system does not normalize filenames 
 | |
| 1065 |     (Windows, Linux), you have to access a file by its exact path.
 | |
| 1066 | ||
| 3201.1.1
by jameinel Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC | 1067 |     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 | 1068 |     the standard for XML documents.
 | 
| 1069 | ||
| 1070 |     So return the normalized path, and a flag indicating if the file
 | |
| 1071 |     can be accessed by that path.
 | |
| 1072 |     """
 | |
| 1073 | ||
| 3201.1.1
by jameinel Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC | 1074 | 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 | 1075 | |
| 1076 | ||
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 1077 | def _inaccessible_normalized_filename(path): | 
| 1078 | __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 | 1079 | |
| 3201.1.1
by jameinel Fix bug #185458, switch from NFKC to NFC and add tests for filenames that would be broken under NFKC | 1080 | 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 | 1081 | return normalized, normalized == path | 
| 1082 | ||
| 1083 | ||
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 1084 | if _platform_normalizes_filenames: | 
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 1085 | normalized_filename = _accessible_normalized_filename | 
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 1086 | else: | 
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 1087 | normalized_filename = _inaccessible_normalized_filename | 
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 1088 | |
| 1089 | ||
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 1090 | def terminal_width(): | 
| 1091 | """Return estimated terminal width.""" | |
| 1704.2.3
by Martin Pool (win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander) | 1092 | if sys.platform == 'win32': | 
| 2245.4.6
by Alexander Belchenko osutils.py: terminal_width() now use win32utils.get_console_size() | 1093 | return win32utils.get_console_size()[0] | 
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 1094 | width = 0 | 
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 1095 | try: | 
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 1096 | import struct, fcntl, termios | 
| 1097 | s = struct.pack('HHHH', 0, 0, 0, 0) | |
| 1098 | x = fcntl.ioctl(1, termios.TIOCGWINSZ, s) | |
| 1099 | width = struct.unpack('HHHH', x)[1] | |
| 1100 | except IOError: | |
| 1101 |         pass
 | |
| 1102 | if width <= 0: | |
| 1103 | try: | |
| 1104 | width = int(os.environ['COLUMNS']) | |
| 1105 | except: | |
| 1106 |             pass
 | |
| 1107 | if width <= 0: | |
| 1108 | width = 80 | |
| 1109 | ||
| 1110 | return width | |
| 1534.7.25
by Aaron Bentley Added set_executability | 1111 | |
| 1963.1.5
by John Arbash Meinel Create an osutils helper function for modifying the environment | 1112 | |
| 1534.7.25
by Aaron Bentley Added set_executability | 1113 | def supports_executable(): | 
| 1534.7.160
by Aaron Bentley Changed implementation of supports_executable | 1114 | return sys.platform != "win32" | 
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 1115 | |
| 1116 | ||
| 1551.10.4
by Aaron Bentley Update to skip on win32 | 1117 | def supports_posix_readonly(): | 
| 1118 | """Return True if 'readonly' has POSIX semantics, False otherwise. | |
| 1119 | ||
| 1120 |     Notably, a win32 readonly file cannot be deleted, unlike POSIX where the
 | |
| 1121 |     directory controls creation/deletion, etc.
 | |
| 1122 | ||
| 1123 |     And under win32, readonly means that the directory itself cannot be
 | |
| 1124 |     deleted.  The contents of a readonly directory can be changed, unlike POSIX
 | |
| 1125 |     where files in readonly directories cannot be added, deleted or renamed.
 | |
| 1126 |     """
 | |
| 1127 | return sys.platform != "win32" | |
| 1128 | ||
| 1129 | ||
| 1963.1.5
by John Arbash Meinel Create an osutils helper function for modifying the environment | 1130 | def set_or_unset_env(env_variable, value): | 
| 1131 | """Modify the environment, setting or removing the env_variable. | |
| 1132 | ||
| 1133 |     :param env_variable: The environment variable in question
 | |
| 1134 |     :param value: The value to set the environment to. If None, then
 | |
| 1135 |         the variable will be removed.
 | |
| 1136 |     :return: The original value of the environment variable.
 | |
| 1137 |     """
 | |
| 1138 | orig_val = os.environ.get(env_variable) | |
| 1139 | if value is None: | |
| 1140 | if orig_val is not None: | |
| 1141 | del os.environ[env_variable] | |
| 1142 | else: | |
| 1143 | if isinstance(value, unicode): | |
| 3224.5.4
by Andrew Bennetts Fix test suite, mainly weeding out uses of bzrlib.user_encoding. | 1144 | value = value.encode(get_user_encoding()) | 
| 1963.1.5
by John Arbash Meinel Create an osutils helper function for modifying the environment | 1145 | os.environ[env_variable] = value | 
| 1146 | return orig_val | |
| 1147 | ||
| 1148 | ||
| 1551.2.56
by Aaron Bentley Better illegal pathname check for Windows | 1149 | _validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$') | 
| 1150 | ||
| 1151 | ||
| 1152 | def check_legal_path(path): | |
| 1153 | """Check whether the supplied path is legal. | |
| 1154 |     This is only required on Windows, so we don't test on other platforms
 | |
| 1155 |     right now.
 | |
| 1156 |     """
 | |
| 1157 | if sys.platform != "win32": | |
| 1158 |         return
 | |
| 1159 | if _validWin32PathRE.match(path) is None: | |
| 1996.3.25
by John Arbash Meinel Make importing errors lazy for osutils | 1160 | raise errors.IllegalPath(path) | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1161 | |
| 1162 | ||
| 3596.2.2
by John Arbash Meinel Factor out the common exception handling looking for ENOTDIR and use it | 1163 | _WIN32_ERROR_DIRECTORY = 267 # Similar to errno.ENOTDIR | 
| 1164 | ||
| 1165 | def _is_error_enotdir(e): | |
| 1166 | """Check if this exception represents ENOTDIR. | |
| 1167 | ||
| 1168 |     Unfortunately, python is very inconsistent about the exception
 | |
| 1169 |     here. The cases are:
 | |
| 1170 |       1) Linux, Mac OSX all versions seem to set errno == ENOTDIR
 | |
| 1171 |       2) Windows, Python2.4, uses errno == ERROR_DIRECTORY (267)
 | |
| 1172 |          which is the windows error code.
 | |
| 1173 |       3) Windows, Python2.5 uses errno == EINVAL and
 | |
| 1174 |          winerror == ERROR_DIRECTORY
 | |
| 1175 | ||
| 1176 |     :param e: An Exception object (expected to be OSError with an errno
 | |
| 1177 |         attribute, but we should be able to cope with anything)
 | |
| 1178 |     :return: True if this represents an ENOTDIR error. False otherwise.
 | |
| 1179 |     """
 | |
| 1180 | en = getattr(e, 'errno', None) | |
| 1181 | if (en == errno.ENOTDIR | |
| 1182 | or (sys.platform == 'win32' | |
| 1183 | and (en == _WIN32_ERROR_DIRECTORY | |
| 1184 | or (en == errno.EINVAL | |
| 1185 | and getattr(e, 'winerror', None) == _WIN32_ERROR_DIRECTORY) | |
| 1186 |         ))):
 | |
| 1187 | return True | |
| 1188 | return False | |
| 1189 | ||
| 1190 | ||
| 1757.2.8
by Robert Collins Teach walkdirs to walk a subdir of a tree. | 1191 | def walkdirs(top, prefix=""): | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1192 | """Yield data about all the directories in a tree. | 
| 1193 |     
 | |
| 1194 |     This yields all the data about the contents of a directory at a time.
 | |
| 1195 |     After each directory has been yielded, if the caller has mutated the list
 | |
| 1196 |     to exclude some directories, they are then not descended into.
 | |
| 1197 |     
 | |
| 1198 |     The data yielded is of the form:
 | |
| 1897.1.2
by Robert Collins cleanup osutils.walkdirs changes after review. | 1199 |     ((directory-relpath, directory-path-from-top),
 | 
| 2694.4.1
by Alexander Belchenko trivial fix for docstring of osutils.walkdirs() | 1200 |     [(relpath, basename, kind, lstat, path-from-top), ...]),
 | 
| 1897.1.2
by Robert Collins cleanup osutils.walkdirs changes after review. | 1201 |      - directory-relpath is the relative path of the directory being returned
 | 
| 1202 |        with respect to top. prefix is prepended to this.
 | |
| 1203 |      - directory-path-from-root is the path including top for this directory. 
 | |
| 1204 |        It is suitable for use with os functions.
 | |
| 1897.1.1
by Robert Collins Add some useful summary data to osutils.walkdirs output. | 1205 |      - relpath is the relative path within the subtree being walked.
 | 
| 1206 |      - basename is the basename of the path
 | |
| 1897.1.2
by Robert Collins cleanup osutils.walkdirs changes after review. | 1207 |      - 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. | 1208 |        present within the tree - but it may be recorded as versioned. See
 | 
| 1209 |        versioned_kind.
 | |
| 1210 |      - lstat is the stat data *if* the file was statted.
 | |
| 1211 |      - planned, not implemented: 
 | |
| 1212 |        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. | 1213 | |
| 1757.2.16
by Robert Collins Review comments. | 1214 |     :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
 | 
| 1215 |         allows one to walk a subtree but get paths that are relative to a tree
 | |
| 1216 |         rooted higher up.
 | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1217 |     :return: an iterator over the dirs.
 | 
| 1218 |     """
 | |
| 1897.1.1
by Robert Collins Add some useful summary data to osutils.walkdirs output. | 1219 |     #TODO there is a bit of a smell where the results of the directory-
 | 
| 1220 |     # summary in this, and the path from the root, may not agree 
 | |
| 1221 |     # depending on top and prefix - i.e. ./foo and foo as a pair leads to
 | |
| 1222 |     # potentially confusing output. We should make this more robust - but
 | |
| 1897.1.2
by Robert Collins cleanup osutils.walkdirs changes after review. | 1223 |     # 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% | 1224 | _lstat = os.lstat | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1225 | _directory = _directory_kind | 
| 1996.3.14
by John Arbash Meinel lazy_import osutils and sign_my_commits | 1226 | _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) | 1227 | _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. | 1228 | 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. | 1229 | while pending: | 
| 1230 |         # 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% | 1231 | relroot, _, _, _, top = pending.pop() | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1232 | if relroot: | 
| 1233 | relprefix = relroot + u'/' | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1234 | else: | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1235 | relprefix = '' | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1236 | top_slash = top + u'/' | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1237 | |
| 1238 | dirblock = [] | |
| 1239 | append = dirblock.append | |
| 3585.2.4
by Robert Collins * Deleting directories by hand before running ``bzr rm`` will not | 1240 | try: | 
| 1241 | names = sorted(_listdir(top)) | |
| 3596.2.2
by John Arbash Meinel Factor out the common exception handling looking for ENOTDIR and use it | 1242 | except OSError, e: | 
| 1243 | if not _is_error_enotdir(e): | |
| 3585.2.4
by Robert Collins * Deleting directories by hand before running ``bzr rm`` will not | 1244 |                 raise
 | 
| 1245 | else: | |
| 1246 | for name in names: | |
| 1247 | abspath = top_slash + name | |
| 1248 | 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) | 1249 | kind = _kind_from_mode(statvalue.st_mode) | 
| 3585.2.4
by Robert Collins * Deleting directories by hand before running ``bzr rm`` will not | 1250 | append((relprefix + name, name, kind, statvalue, abspath)) | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1251 | yield (relroot, top), dirblock | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1252 | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 1253 |         # push the user specified dirs from dirblock
 | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1254 | 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. | 1255 | |
| 1256 | ||
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1257 | class DirReader(object): | 
| 1258 | """An interface for reading directories.""" | |
| 1259 | ||
| 1260 | def top_prefix_to_starting_dir(self, top, prefix=""): | |
| 1261 | """Converts top and prefix to a starting dir entry | |
| 1262 | ||
| 1263 |         :param top: A utf8 path
 | |
| 1264 |         :param prefix: An optional utf8 path to prefix output relative paths
 | |
| 1265 |             with.
 | |
| 1266 |         :return: A tuple starting with prefix, and ending with the native
 | |
| 1267 |             encoding of top.
 | |
| 1268 |         """
 | |
| 1269 | raise NotImplementedError(self.top_prefix_to_starting_dir) | |
| 1270 | ||
| 1271 | def read_dir(self, prefix, top): | |
| 1272 | """Read a specific dir. | |
| 1273 | ||
| 1274 |         :param prefix: A utf8 prefix to be preprended to the path basenames.
 | |
| 1275 |         :param top: A natively encoded path to read.
 | |
| 3696.3.10
by Robert Collins Review feedback. | 1276 |         :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. | 1277 |             (utf8_relpath, utf8_name, kind, lstatvalue, native_abspath)
 | 
| 1278 |         """
 | |
| 1279 | raise NotImplementedError(self.read_dir) | |
| 1280 | ||
| 1281 | ||
| 1282 | _selected_dir_reader = None | |
| 1283 | ||
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1284 | |
| 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 | 1285 | def _walkdirs_utf8(top, prefix=""): | 
| 1286 | """Yield data about all the directories in a tree. | |
| 1287 | ||
| 1288 |     This yields the same information as walkdirs() only each entry is yielded
 | |
| 1289 |     in utf-8. On platforms which have a filesystem encoding of utf8 the paths
 | |
| 1290 |     are returned as exact byte-strings.
 | |
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1291 | |
| 1292 |     :return: yields a tuple of (dir_info, [file_info])
 | |
| 1293 |         dir_info is (utf8_relpath, path-from-top)
 | |
| 1294 |         file_info is (utf8_relpath, utf8_name, kind, lstat, path-from-top)
 | |
| 1295 |         if top is an absolute path, path-from-top is also an absolute path.
 | |
| 1296 |         path-from-top might be unicode or utf8, but it is the correct path to
 | |
| 1297 |         pass to os functions to affect the file in question. (such as os.lstat)
 | |
| 1298 |     """
 | |
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1299 | global _selected_dir_reader | 
| 1300 | if _selected_dir_reader is None: | |
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1301 | fs_encoding = _fs_enc.upper() | 
| 3224.5.17
by Andrew Bennetts Avoid importing win32utils when sys.platform != win32 | 1302 | 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' | 1303 |             # Win98 doesn't have unicode apis like FindFirstFileW
 | 
| 1304 |             # TODO: We possibly could support Win98 by falling back to the
 | |
| 1305 |             #       original FindFirstFile, and using TCHAR instead of WCHAR,
 | |
| 1306 |             #       but that gets a bit tricky, and requires custom compiling
 | |
| 1307 |             #       for win98 anyway.
 | |
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1308 | try: | 
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1309 | from bzrlib._walkdirs_win32 import Win32ReadDir | 
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1310 | except ImportError: | 
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1311 | _selected_dir_reader = UnicodeDirReader() | 
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1312 | else: | 
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1313 | _selected_dir_reader = Win32ReadDir() | 
| 3557.2.3
by John Arbash Meinel Change the logic for selecting a real _walkdirs_utf8 implementation, | 1314 | elif fs_encoding not in ('UTF-8', 'US-ASCII', 'ANSI_X3.4-1968'): | 
| 1315 |             # ANSI_X3.4-1968 is a form of ASCII
 | |
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1316 | _selected_dir_reader = UnicodeDirReader() | 
| 3504.4.5
by John Arbash Meinel Add tests to ensure that you can skip subdirs, start exposing the function. | 1317 | else: | 
| 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) | 1318 | try: | 
| 1319 | from bzrlib._readdir_pyx import UTF8DirReader | |
| 1320 | except ImportError: | |
| 1321 |                 # No optimised code path
 | |
| 1322 | _selected_dir_reader = UnicodeDirReader() | |
| 1323 | else: | |
| 1324 | _selected_dir_reader = UTF8DirReader() | |
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1325 |     # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
 | 
| 1326 |     # 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) | 1327 | 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. | 1328 | read_dir = _selected_dir_reader.read_dir | 
| 1329 | _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 | 1330 | 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) | 1331 | relroot, _, _, _, top = pending[-1].pop() | 
| 1332 | if not pending[-1]: | |
| 1333 | pending.pop() | |
| 1334 | dirblock = sorted(read_dir(relroot, top)) | |
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1335 | yield (relroot, top), dirblock | 
| 1336 |         # 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) | 1337 | next = [d for d in reversed(dirblock) if d[2] == _directory] | 
| 1338 | if next: | |
| 1339 | pending.append(next) | |
| 3696.3.1
by Robert Collins Refactor bzrlib.osutils._walkdirs_utf8 to aid API migration in future. | 1340 | |
| 1341 | ||
| 1342 | class UnicodeDirReader(DirReader): | |
| 1343 | """A dir reader for non-utf8 file systems, which transcodes.""" | |
| 1344 | ||
| 1345 | __slots__ = ['_utf8_encode'] | |
| 1346 | ||
| 1347 | def __init__(self): | |
| 1348 | self._utf8_encode = codecs.getencoder('utf8') | |
| 1349 | ||
| 1350 | def top_prefix_to_starting_dir(self, top, prefix=""): | |
| 1351 | """See DirReader.top_prefix_to_starting_dir.""" | |
| 1352 | return (safe_utf8(prefix), None, None, None, safe_unicode(top)) | |
| 1353 | ||
| 1354 | def read_dir(self, prefix, top): | |
| 1355 | """Read a single directory from a non-utf8 file system. | |
| 1356 | ||
| 1357 |         top, and the abspath element in the output are unicode, all other paths
 | |
| 1358 |         are utf8. Local disk IO is done via unicode calls to listdir etc.
 | |
| 1359 | ||
| 1360 |         This is currently the fallback code path when the filesystem encoding is
 | |
| 1361 |         not UTF-8. It may be better to implement an alternative so that we can
 | |
| 1362 |         safely handle paths that are not properly decodable in the current
 | |
| 1363 |         encoding.
 | |
| 1364 | ||
| 1365 |         See DirReader.read_dir for details.
 | |
| 1366 |         """
 | |
| 1367 | _utf8_encode = self._utf8_encode | |
| 1368 | _lstat = os.lstat | |
| 1369 | _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) | 1370 | _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. | 1371 | |
| 1372 | if prefix: | |
| 1373 | relprefix = prefix + '/' | |
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1374 | else: | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1375 | relprefix = '' | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1376 | top_slash = top + u'/' | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1377 | |
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1378 | dirblock = [] | 
| 2255.7.33
by John Arbash Meinel More inner loop tuning of walkdirs, can save as much as 5% | 1379 | append = dirblock.append | 
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1380 | for name in sorted(_listdir(top)): | 
| 3696.3.12
by Robert Collins Fix PQM test failure. | 1381 | try: | 
| 1382 | name_utf8 = _utf8_encode(name)[0] | |
| 1383 | except UnicodeDecodeError: | |
| 1384 | raise errors.BadFilenameEncoding( | |
| 1385 | _utf8_encode(relprefix)[0] + name, _fs_enc) | |
| 2255.7.32
by John Arbash Meinel Add tests that the walkdirs variants work on unicode paths. | 1386 | abspath = top_slash + name | 
| 1387 | 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) | 1388 | 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% | 1389 | 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. | 1390 | 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 | 1391 | |
| 1392 | ||
| 1907.3.2
by John Arbash Meinel Updated the copy_tree function to allow overriding functionality. | 1393 | def copy_tree(from_path, to_path, handlers={}): | 
| 1907.3.1
by John Arbash Meinel create a copy_tree wrapper around walkdirs() | 1394 | """Copy all of the entries in from_path into to_path. | 
| 1395 | ||
| 1396 |     :param from_path: The base directory to copy. 
 | |
| 1397 |     :param to_path: The target directory. If it does not exist, it will
 | |
| 1398 |         be created.
 | |
| 1907.3.2
by John Arbash Meinel Updated the copy_tree function to allow overriding functionality. | 1399 |     :param handlers: A dictionary of functions, which takes a source and
 | 
| 1400 |         destinations for files, directories, etc.
 | |
| 1401 |         It is keyed on the file kind, such as 'directory', 'symlink', or 'file'
 | |
| 1402 |         'file', 'directory', and 'symlink' should always exist.
 | |
| 1403 |         If they are missing, they will be replaced with 'os.mkdir()',
 | |
| 1404 |         'os.readlink() + os.symlink()', and 'shutil.copy2()', respectively.
 | |
| 1907.3.1
by John Arbash Meinel create a copy_tree wrapper around walkdirs() | 1405 |     """
 | 
| 1406 |     # Now, just copy the existing cached tree to the new location
 | |
| 1407 |     # We use a cheap trick here.
 | |
| 1408 |     # Absolute paths are prefixed with the first parameter
 | |
| 1409 |     # relative paths are prefixed with the second.
 | |
| 1410 |     # So we can get both the source and target returned
 | |
| 1411 |     # without any extra work.
 | |
| 1412 | ||
| 1907.3.2
by John Arbash Meinel Updated the copy_tree function to allow overriding functionality. | 1413 | def copy_dir(source, dest): | 
| 1414 | os.mkdir(dest) | |
| 1415 | ||
| 1416 | def copy_link(source, dest): | |
| 1417 | """Copy the contents of a symlink""" | |
| 1418 | link_to = os.readlink(source) | |
| 1419 | os.symlink(link_to, dest) | |
| 1420 | ||
| 1421 | real_handlers = {'file':shutil.copy2, | |
| 1422 | 'symlink':copy_link, | |
| 1423 | 'directory':copy_dir, | |
| 1424 |                     }
 | |
| 1425 | real_handlers.update(handlers) | |
| 1426 | ||
| 1907.3.1
by John Arbash Meinel create a copy_tree wrapper around walkdirs() | 1427 | if not os.path.exists(to_path): | 
| 1907.3.2
by John Arbash Meinel Updated the copy_tree function to allow overriding functionality. | 1428 | real_handlers['directory'](from_path, to_path) | 
| 1907.3.1
by John Arbash Meinel create a copy_tree wrapper around walkdirs() | 1429 | |
| 1430 | for dir_info, entries in walkdirs(from_path, prefix=to_path): | |
| 1431 | for relpath, name, kind, st, abspath in entries: | |
| 1907.3.2
by John Arbash Meinel Updated the copy_tree function to allow overriding functionality. | 1432 | real_handlers[kind](abspath, relpath) | 
| 1907.3.1
by John Arbash Meinel create a copy_tree wrapper around walkdirs() | 1433 | |
| 1434 | ||
| 1773.3.1
by Robert Collins Add path_prefix_key and compare_paths_prefix_order utility functions. | 1435 | def path_prefix_key(path): | 
| 1436 | """Generate a prefix-order path key for path. | |
| 1437 | ||
| 1438 |     This can be used to sort paths in the same way that walkdirs does.
 | |
| 1439 |     """
 | |
| 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. | 1440 | return (dirname(path) , path) | 
| 1773.3.1
by Robert Collins Add path_prefix_key and compare_paths_prefix_order utility functions. | 1441 | |
| 1442 | ||
| 1443 | def compare_paths_prefix_order(path_a, path_b): | |
| 1444 | """Compare path_a and path_b to generate the same order walkdirs uses.""" | |
| 1445 | key_a = path_prefix_key(path_a) | |
| 1446 | key_b = path_prefix_key(path_b) | |
| 1447 | 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 | 1448 | |
| 1449 | ||
| 1450 | _cached_user_encoding = None | |
| 1451 | ||
| 1452 | ||
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1453 | 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 | 1454 | """Find out what the preferred user encoding is. | 
| 1455 | ||
| 1456 |     This is generally the encoding that is used for command line parameters
 | |
| 1457 |     and file contents. This may be different from the terminal encoding
 | |
| 1458 |     or the filesystem encoding.
 | |
| 1459 | ||
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1460 |     :param  use_cache:  Enable cache for detected encoding.
 | 
| 1461 |                         (This parameter is turned on by default,
 | |
| 1462 |                         and required only for selftesting)
 | |
| 1463 | ||
| 1955.2.2
by John Arbash Meinel Change the name of the test classes (test_lang => test_locale), move the function into osutils.py | 1464 |     :return: A string defining the preferred user encoding
 | 
| 1465 |     """
 | |
| 1466 | global _cached_user_encoding | |
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1467 | 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 | 1468 | return _cached_user_encoding | 
| 1469 | ||
| 1470 | if sys.platform == 'darwin': | |
| 3638.3.10
by Vincent Ladeuil Provides a better default encoding on OSX. | 1471 |         # python locale.getpreferredencoding() always return
 | 
| 1472 |         # '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 | 1473 | sys.platform = 'posix' | 
| 1474 | try: | |
| 3638.3.10
by Vincent Ladeuil Provides a better default encoding on OSX. | 1475 | if os.environ.get('LANG', None) is None: | 
| 1476 |                 # If LANG is not set, we end up with 'ascii', which is bad
 | |
| 1477 |                 # ('mac-roman' is more than ascii), so we set a default which
 | |
| 1478 |                 # will give us UTF-8 (which appears to work in all cases on
 | |
| 1479 |                 # OSX). Users are still free to override LANG of course, as
 | |
| 1480 |                 # long as it give us something meaningful. This work-around
 | |
| 1481 |                 # *may* not be needed with python 3k and/or OSX 10.5, but will
 | |
| 1482 |                 # work with them too -- vila 20080908
 | |
| 1483 | 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 | 1484 | import locale | 
| 1485 | finally: | |
| 1486 | sys.platform = 'darwin' | |
| 1487 | else: | |
| 1488 | import locale | |
| 1489 | ||
| 1490 | try: | |
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1491 | 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 | 1492 | except locale.Error, e: | 
| 1955.2.3
by John Arbash Meinel Change error message text | 1493 | sys.stderr.write('bzr: warning: %s\n' | 
| 2001.2.1
by Jelmer Vernooij Fix typo in encoding warning. | 1494 | ' Could not determine what text encoding to use.\n' | 
| 1955.2.3
by John Arbash Meinel Change error message text | 1495 | ' This error usually means your Python interpreter\n' | 
| 1496 | ' doesn\'t support the locale set by $LANG (%s)\n' | |
| 1497 | " 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 | 1498 | % (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 | 1499 | 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 | 1500 | |
| 2127.4.1
by Alexander Belchenko (jam, bialix) Workaround for cp0 console encoding on Windows | 1501 |     # Windows returns 'cp0' to indicate there is no code page. So we'll just
 | 
| 1502 |     # treat that as ASCII, and not support printing unicode characters to the
 | |
| 1503 |     # console.
 | |
| 3405.3.1
by Neil Martinsen-Burrell accept for an encoding to mean ascii | 1504 |     #
 | 
| 1505 |     # For python scripts run under vim, we get '', so also treat that as ASCII
 | |
| 1506 | if user_encoding in (None, 'cp0', ''): | |
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1507 | user_encoding = 'ascii' | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 1508 | else: | 
| 1509 |         # check encoding
 | |
| 1510 | try: | |
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1511 | codecs.lookup(user_encoding) | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 1512 | except LookupError: | 
| 1513 | sys.stderr.write('bzr: warning:' | |
| 1514 | ' unknown encoding %s.' | |
| 1515 | ' Continuing with ascii encoding.\n' | |
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1516 | % user_encoding | 
| 2192.1.1
by Alexander Belchenko Before actually using encoding need to check that Python has corresponding codec | 1517 |                             )
 | 
| 2192.1.3
by Alexander Belchenko Tests for osutils.get_user_encoding | 1518 | user_encoding = 'ascii' | 
| 1519 | ||
| 1520 | if use_cache: | |
| 1521 | _cached_user_encoding = user_encoding | |
| 1522 | ||
| 1523 | return user_encoding | |
| 2091.1.1
by Martin Pool Avoid MSG_WAITALL as it doesn't work on Windows | 1524 | |
| 1525 | ||
| 3626.1.1
by Mark Hammond Add osutils.get_host_name() to return a unicode hostname to prevent | 1526 | def get_host_name(): | 
| 3626.1.4
by John Arbash Meinel Document the difference in get_host_name, per Robert's request. | 1527 | """Return the current unicode host name. | 
| 1528 | ||
| 1529 |     This is meant to be used in place of socket.gethostname() because that
 | |
| 1530 |     behaves inconsistently on different platforms.
 | |
| 1531 |     """
 | |
| 3626.1.1
by Mark Hammond Add osutils.get_host_name() to return a unicode hostname to prevent | 1532 | if sys.platform == "win32": | 
| 1533 | import win32utils | |
| 1534 | return win32utils.get_host_name() | |
| 1535 | else: | |
| 1536 | import socket | |
| 1537 | return socket.gethostname().decode(get_user_encoding()) | |
| 1538 | ||
| 1539 | ||
| 2091.1.1
by Martin Pool Avoid MSG_WAITALL as it doesn't work on Windows | 1540 | def recv_all(socket, bytes): | 
| 1541 | """Receive an exact number of bytes. | |
| 1542 | ||
| 1543 |     Regular Socket.recv() may return less than the requested number of bytes,
 | |
| 1544 |     dependning on what's in the OS buffer.  MSG_WAITALL is not available
 | |
| 1545 |     on all platforms, but this should work everywhere.  This will return
 | |
| 1546 |     less than the requested amount if the remote end closes.
 | |
| 1547 | ||
| 1548 |     This isn't optimized and is intended mostly for use in testing.
 | |
| 1549 |     """
 | |
| 1550 | b = '' | |
| 1551 | while len(b) < bytes: | |
| 1552 | new = socket.recv(bytes - len(b)) | |
| 1553 | if new == '': | |
| 1554 | break # eof | |
| 1555 | b += new | |
| 1556 | return b | |
| 1557 | ||
| 3118.2.1
by Andrew Bennetts (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall. | 1558 | |
| 1559 | def send_all(socket, bytes): | |
| 1560 | """Send all bytes on a socket. | |
| 1561 | ||
| 1562 |     Regular socket.sendall() can give socket error 10053 on Windows.  This
 | |
| 1563 |     implementation sends no more than 64k at a time, which avoids this problem.
 | |
| 1564 |     """
 | |
| 1565 | chunk_size = 2**16 | |
| 1566 | for pos in xrange(0, len(bytes), chunk_size): | |
| 1567 | socket.sendall(bytes[pos:pos+chunk_size]) | |
| 1568 | ||
| 1569 | ||
| 2091.3.7
by Aaron Bentley Rename real_parent to dereferenced_path | 1570 | def dereference_path(path): | 
| 1571 | """Determine the real path to a file. | |
| 1572 | ||
| 1573 |     All parent elements are dereferenced.  But the file itself is not
 | |
| 1574 |     dereferenced.
 | |
| 1575 |     :param path: The original path.  May be absolute or relative.
 | |
| 1576 |     :return: the real path *to* the file
 | |
| 1577 |     """
 | |
| 2091.3.5
by Aaron Bentley Move realpath functionality into osutils | 1578 | parent, base = os.path.split(path) | 
| 1579 |     # The pathjoin for '.' is a workaround for Python bug #1213894.
 | |
| 1580 |     # (initial path components aren't dereferenced)
 | |
| 1581 | return pathjoin(realpath(pathjoin('.', parent)), base) | |
| 2681.3.4
by Lukáš Lalinsky - Rename 'windows' to 'mapi' | 1582 | |
| 1583 | ||
| 1584 | def supports_mapi(): | |
| 1585 | """Return True if we can use MAPI to launch a mail client.""" | |
| 1586 | return sys.platform == "win32" | |
| 3089.3.8
by Ian Clatworthy move resource loading into a reusable function | 1587 | |
| 1588 | ||
| 1589 | def resource_string(package, resource_name): | |
| 1590 | """Load a resource from a package and return it as a string. | |
| 1591 | ||
| 1592 |     Note: Only packages that start with bzrlib are currently supported.
 | |
| 1593 | ||
| 1594 |     This is designed to be a lightweight implementation of resource
 | |
| 1595 |     loading in a way which is API compatible with the same API from
 | |
| 1596 |     pkg_resources. See
 | |
| 1597 |     http://peak.telecommunity.com/DevCenter/PkgResources#basic-resource-access.
 | |
| 1598 |     If and when pkg_resources becomes a standard library, this routine
 | |
| 1599 |     can delegate to it.
 | |
| 1600 |     """
 | |
| 1601 |     # Check package name is within bzrlib
 | |
| 1602 | if package == "bzrlib": | |
| 1603 | resource_relpath = resource_name | |
| 1604 | elif package.startswith("bzrlib."): | |
| 1605 | package = package[len("bzrlib."):].replace('.', os.sep) | |
| 1606 | resource_relpath = pathjoin(package, resource_name) | |
| 1607 | else: | |
| 1608 | raise errors.BzrError('resource package %s not in bzrlib' % package) | |
| 1609 | ||
| 1610 |     # Map the resource to a file and read its contents
 | |
| 1611 | base = dirname(bzrlib.__file__) | |
| 1612 | if getattr(sys, 'frozen', None): # bzr.exe | |
| 1613 | base = abspath(pathjoin(base, '..', '..')) | |
| 1614 | filename = pathjoin(base, resource_relpath) | |
| 1615 | return open(filename, 'rU').read() | |
| 1739.2.7
by Robert Collins Update readdir pyrex source files and usage in line with current practice. | 1616 | |
| 1617 | ||
| 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) | 1618 | def file_kind_from_stat_mode_thunk(mode): | 
| 1619 | global file_kind_from_stat_mode | |
| 1620 | if file_kind_from_stat_mode is file_kind_from_stat_mode_thunk: | |
| 1621 | try: | |
| 1622 | from bzrlib._readdir_pyx import UTF8DirReader | |
| 1623 | file_kind_from_stat_mode = UTF8DirReader().kind_from_mode | |
| 1624 | except ImportError: | |
| 1625 | from bzrlib._readdir_py import ( | |
| 3696.4.8
by Robert Collins Fix up inter_changes with dirstate both C and python. | 1626 | _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) | 1627 |                 )
 | 
| 1628 | return file_kind_from_stat_mode(mode) | |
| 1629 | file_kind_from_stat_mode = file_kind_from_stat_mode_thunk | |
| 1630 | ||
| 1631 | ||
| 1632 | def file_kind(f, _lstat=os.lstat): | |
| 1633 | try: | |
| 1634 | return file_kind_from_stat_mode(_lstat(f).st_mode) | |
| 1635 | except OSError, e: | |
| 1636 | if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR): | |
| 1637 | raise errors.NoSuchFile(f) | |
| 1638 |         raise
 | |
| 1639 | ||
| 0.16.79
by Aaron Bentley Remove dependencies on bzrtools | 1640 | if sys.platform == "win32": | 
| 1641 | import msvcrt | |
| 1642 | def getchar(): | |
| 1643 | return msvcrt.getch() | |
| 1644 | else: | |
| 1645 | import tty | |
| 1646 | import termios | |
| 1647 | def getchar(): | |
| 1648 | fd = sys.stdin.fileno() | |
| 1649 | settings = termios.tcgetattr(fd) | |
| 1650 | try: | |
| 1651 | tty.setraw(fd) | |
| 1652 | ch = sys.stdin.read(1) | |
| 1653 | finally: | |
| 1654 | termios.tcsetattr(fd, termios.TCSADRAIN, settings) | |
| 1655 | return ch |