bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 1
by mbp at sourcefrog import from baz patch-364 | 1 | # Bazaar-NG -- distributed version control
 | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 2 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 3 | # Copyright (C) 2005 by Canonical Ltd
 | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 4 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 5 | # This program is free software; you can redistribute it and/or modify
 | 
| 6 | # it under the terms of the GNU General Public License as published by
 | |
| 7 | # the Free Software Foundation; either version 2 of the License, or
 | |
| 8 | # (at your option) any later version.
 | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 9 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 10 | # This program is distributed in the hope that it will be useful,
 | 
| 11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| 13 | # GNU General Public License for more details.
 | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 14 | #
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 15 | # You should have received a copy of the GNU General Public License
 | 
| 16 | # along with this program; if not, write to the Free Software
 | |
| 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | |
| 18 | ||
| 1390
by Robert Collins pair programming worx... merge integration and weave | 19 | from cStringIO import StringIO | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 20 | import errno | 
| 1711.4.5
by John Arbash Meinel the _posix_* routines should use posixpath not os.path, so tests pass on win32 | 21 | from ntpath import (abspath as _nt_abspath, | 
| 22 | join as _nt_join, | |
| 23 | normpath as _nt_normpath, | |
| 24 | 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 | 25 | 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 | 26 |                     )
 | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 27 | import os | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 28 | from os import listdir | 
| 1711.4.5
by John Arbash Meinel the _posix_* routines should use posixpath not os.path, so tests pass on win32 | 29 | import posixpath | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 30 | import re | 
| 1236
by Martin Pool - fix up imports | 31 | import sha | 
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 32 | import shutil | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 33 | from shutil import copyfile | 
| 1732.1.10
by John Arbash Meinel Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup | 34 | import stat | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 35 | from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE, | 
| 36 | S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK) | |
| 1185.16.38
by Martin Pool - move contains_whitespace and contains_linebreaks to osutils | 37 | import string | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 38 | import sys | 
| 39 | import time | |
| 40 | import types | |
| 1185.31.40
by John Arbash Meinel Added osutils.mkdtemp() | 41 | import tempfile | 
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 42 | import unicodedata | 
| 1
by mbp at sourcefrog import from baz patch-364 | 43 | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 44 | import bzrlib | 
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 45 | from bzrlib.errors import (BzrError, | 
| 1185.65.29
by Robert Collins Implement final review suggestions. | 46 | BzrBadParameterNotUnicode, | 
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 47 | NoSuchFile, | 
| 48 | PathNotChild, | |
| 1551.2.56
by Aaron Bentley Better illegal pathname check for Windows | 49 | IllegalPath, | 
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 50 |                            )
 | 
| 1773.4.1
by Martin Pool Add pyflakes makefile target; fix many warnings | 51 | from bzrlib.symbol_versioning import (deprecated_function, | 
| 52 | zero_nine) | |
| 694
by Martin Pool - weed out all remaining calls to bailout() and remove the function | 53 | from bzrlib.trace import mutter | 
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 54 | |
| 1
by mbp at sourcefrog import from baz patch-364 | 55 | |
| 56 | def make_readonly(filename): | |
| 57 | """Make a filename read-only.""" | |
| 58 | mod = os.stat(filename).st_mode | |
| 59 | mod = mod & 0777555 | |
| 60 | os.chmod(filename, mod) | |
| 61 | ||
| 62 | ||
| 63 | def make_writable(filename): | |
| 64 | mod = os.stat(filename).st_mode | |
| 65 | mod = mod | 0200 | |
| 66 | os.chmod(filename, mod) | |
| 67 | ||
| 68 | ||
| 1077
by Martin Pool - avoid compiling REs at module load time | 69 | _QUOTE_RE = None | 
| 969
by Martin Pool - Add less-sucky is_within_any | 70 | |
| 71 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 72 | def quotefn(f): | 
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 73 | """Return a quoted filename filename | 
| 74 | ||
| 75 |     This previously used backslash quoting, but that works poorly on
 | |
| 76 |     Windows."""
 | |
| 77 |     # TODO: I'm not really sure this is the best format either.x
 | |
| 1077
by Martin Pool - avoid compiling REs at module load time | 78 | global _QUOTE_RE | 
| 79 | if _QUOTE_RE == None: | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 80 | _QUOTE_RE = re.compile(r'([^a-zA-Z0-9.,:/\\_~-])') | 
| 1077
by Martin Pool - avoid compiling REs at module load time | 81 | |
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 82 | if _QUOTE_RE.search(f): | 
| 83 | return '"' + f + '"' | |
| 84 | else: | |
| 85 | return f | |
| 1
by mbp at sourcefrog import from baz patch-364 | 86 | |
| 87 | ||
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 88 | _directory_kind = 'directory' | 
| 89 | ||
| 1732.1.10
by John Arbash Meinel Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup | 90 | _formats = { | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 91 | stat.S_IFDIR:_directory_kind, | 
| 1732.1.10
by John Arbash Meinel Updated version of file_kind. Rather than multiple function calls, one mask + dictionary lookup | 92 | stat.S_IFCHR:'chardev', | 
| 93 | stat.S_IFBLK:'block', | |
| 94 | stat.S_IFREG:'file', | |
| 95 | stat.S_IFIFO:'fifo', | |
| 96 | stat.S_IFLNK:'symlink', | |
| 97 | stat.S_IFSOCK:'socket', | |
| 98 | }
 | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 99 | |
| 100 | ||
| 101 | def file_kind_from_stat_mode(stat_mode, _formats=_formats, _unknown='unknown'): | |
| 102 | """Generate a file kind from a stat mode. This is used in walkdirs. | |
| 103 | ||
| 104 |     Its performance is critical: Do not mutate without careful benchmarking.
 | |
| 105 |     """
 | |
| 1732.1.12
by John Arbash Meinel improve bzrlib.osutils.file_kind performance from 324ms => 275ms | 106 | try: | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 107 | return _formats[stat_mode & 0170000] | 
| 1732.1.12
by John Arbash Meinel improve bzrlib.osutils.file_kind performance from 324ms => 275ms | 108 | except KeyError: | 
| 1732.1.30
by John Arbash Meinel More file_kind tweaks. Use keyword parameters to make everything a local variable. | 109 | return _unknown | 
| 488
by Martin Pool - new helper function kind_marker() | 110 | |
| 111 | ||
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 112 | def file_kind(f, _lstat=os.lstat, _mapper=file_kind_from_stat_mode): | 
| 1757.2.4
by Robert Collins Teach file_kind about NoSuchFile, reducing duplicate code, and add user files before entering the main loop in smart_add. | 113 | try: | 
| 114 | return _mapper(_lstat(f).st_mode) | |
| 115 | except OSError, e: | |
| 116 | if getattr(e, 'errno', None) == errno.ENOENT: | |
| 117 | raise bzrlib.errors.NoSuchFile(f) | |
| 118 |         raise
 | |
| 119 | ||
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 120 | |
| 488
by Martin Pool - new helper function kind_marker() | 121 | def kind_marker(kind): | 
| 122 | if kind == 'file': | |
| 123 | return '' | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 124 | elif kind == _directory_kind: | 
| 488
by Martin Pool - new helper function kind_marker() | 125 | return '/' | 
| 126 | elif kind == 'symlink': | |
| 127 | return '@' | |
| 128 | else: | |
| 129 | raise BzrError('invalid file kind %r' % kind) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 130 | |
| 1732.1.2
by John Arbash Meinel just use os.path.lexists if it exists | 131 | lexists = getattr(os.path, 'lexists', None) | 
| 132 | if lexists is None: | |
| 133 | def lexists(f): | |
| 134 | try: | |
| 135 | if hasattr(os, 'lstat'): | |
| 136 | os.lstat(f) | |
| 137 | else: | |
| 138 | os.stat(f) | |
| 139 | return True | |
| 140 | except OSError,e: | |
| 141 | if e.errno == errno.ENOENT: | |
| 142 | return False; | |
| 143 | else: | |
| 144 | raise BzrError("lstat/stat of (%r): %r" % (f, e)) | |
| 145 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 146 | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 147 | def fancy_rename(old, new, rename_func, unlink_func): | 
| 148 | """A fancy rename, when you don't have atomic rename. | |
| 149 |     
 | |
| 150 |     :param old: The old path, to rename from
 | |
| 151 |     :param new: The new path, to rename to
 | |
| 152 |     :param rename_func: The potentially non-atomic rename function
 | |
| 153 |     :param unlink_func: A way to delete the target file if the full rename succeeds
 | |
| 154 |     """
 | |
| 155 | ||
| 156 |     # sftp rename doesn't allow overwriting, so play tricks:
 | |
| 157 | import random | |
| 158 | base = os.path.basename(new) | |
| 159 | dirname = os.path.dirname(new) | |
| 1553.5.22
by Martin Pool Change fancy_rename to use rand_chars rather than reinvent it. | 160 | 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. | 161 | tmp_name = pathjoin(dirname, tmp_name) | 
| 162 | ||
| 163 |     # Rename the file out of the way, but keep track if it didn't exist
 | |
| 164 |     # We don't want to grab just any exception
 | |
| 165 |     # something like EACCES should prevent us from continuing
 | |
| 166 |     # The downside is that the rename_func has to throw an exception
 | |
| 167 |     # with an errno = ENOENT, or NoSuchFile
 | |
| 168 | file_existed = False | |
| 169 | try: | |
| 170 | rename_func(new, tmp_name) | |
| 171 | except (NoSuchFile,), e: | |
| 172 |         pass
 | |
| 1532
by Robert Collins Merge in John Meinels integration branch. | 173 | except IOError, e: | 
| 174 |         # RBC 20060103 abstraction leakage: the paramiko SFTP clients rename
 | |
| 175 |         # function raises an IOError with errno == None when a rename fails.
 | |
| 176 |         # This then gets caught here.
 | |
| 1185.50.37
by John Arbash Meinel Fixed exception handling for fancy_rename | 177 | if e.errno not in (None, errno.ENOENT, errno.ENOTDIR): | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 178 |             raise
 | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 179 | except Exception, e: | 
| 180 | if (not hasattr(e, 'errno') | |
| 181 | or e.errno not in (errno.ENOENT, errno.ENOTDIR)): | |
| 182 |             raise
 | |
| 183 | else: | |
| 184 | file_existed = True | |
| 185 | ||
| 186 | success = False | |
| 187 | try: | |
| 188 |         # This may throw an exception, in which case success will
 | |
| 189 |         # not be set.
 | |
| 190 | rename_func(old, new) | |
| 191 | success = True | |
| 192 | finally: | |
| 193 | if file_existed: | |
| 194 |             # If the file used to exist, rename it back into place
 | |
| 195 |             # otherwise just delete it from the tmp location
 | |
| 196 | if success: | |
| 197 | unlink_func(tmp_name) | |
| 198 | else: | |
| 1185.31.49
by John Arbash Meinel Some corrections using the new osutils.rename. **ALL TESTS PASS** | 199 | rename_func(tmp_name, new) | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 200 | |
| 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 | 201 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 202 | # In Python 2.4.2 and older, os.path.abspath and os.path.realpath
 | 
| 203 | # choke on a Unicode string containing a relative path if
 | |
| 204 | # os.getcwd() returns a non-sys.getdefaultencoding()-encoded
 | |
| 205 | # string.
 | |
| 206 | _fs_enc = sys.getfilesystemencoding() | |
| 207 | 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 | 208 |     # jam 20060426 rather than encoding to fsencoding
 | 
| 209 |     # copy posixpath.abspath, but use os.getcwdu instead
 | |
| 210 | if not posixpath.isabs(path): | |
| 211 | path = posixpath.join(getcwd(), path) | |
| 212 | return posixpath.normpath(path) | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 213 | |
| 214 | ||
| 215 | 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 | 216 | 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 | 217 | |
| 218 | ||
| 1711.5.2
by John Arbash Meinel win32 likes to return lowercase drive letters sometimes, and uppercase at other times. normalize this | 219 | def _win32_fixdrive(path): | 
| 220 | """Force drive letters to be consistent. | |
| 221 | ||
| 222 |     win32 is inconsistent whether it returns lower or upper case
 | |
| 223 |     and even if it was consistent the user might type the other
 | |
| 224 |     so we force it to uppercase
 | |
| 225 |     running python.exe under cmd.exe return capital C:\\
 | |
| 226 |     running win32 python inside a cygwin shell returns lowercase c:\\
 | |
| 227 |     """
 | |
| 228 | drive, path = _nt_splitdrive(path) | |
| 229 | return drive.upper() + path | |
| 230 | ||
| 231 | ||
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 232 | 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' | 233 |     # 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 | 234 | 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 | 235 | |
| 236 | ||
| 237 | 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' | 238 |     # 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 | 239 | 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 | 240 | |
| 241 | ||
| 242 | def _win32_pathjoin(*args): | |
| 1685.1.31
by John Arbash Meinel Adding tests for the rest of the _win32 functions. | 243 | return _nt_join(*args).replace('\\', '/') | 
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 244 | |
| 245 | ||
| 246 | 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 | 247 | 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 | 248 | |
| 249 | ||
| 250 | 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 | 251 | return _win32_fixdrive(os.getcwdu().replace('\\', '/')) | 
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 252 | |
| 253 | ||
| 254 | 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 | 255 | 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 | 256 | |
| 257 | ||
| 258 | 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. | 259 | """We expect to be able to atomically replace 'new' with old. | 
| 260 | ||
| 1711.7.17
by John Arbash Meinel Delay the extra syscall in _win32_rename until we get a failure. | 261 |     On win32, if new exists, it must be moved out of the way first,
 | 
| 262 |     and then deleted. 
 | |
| 1711.7.6
by John Arbash Meinel Change _win32_rename() so that it raises ENOENT *before* it tries any renaming. | 263 |     """
 | 
| 1711.7.17
by John Arbash Meinel Delay the extra syscall in _win32_rename until we get a failure. | 264 | try: | 
| 265 | fancy_rename(old, new, rename_func=os.rename, unlink_func=os.unlink) | |
| 266 | except OSError, e: | |
| 1830.3.15
by John Arbash Meinel On Mac we get EINVAL when renaming cwd | 267 | if e.errno in (errno.EPERM, errno.EACCES, errno.EBUSY, errno.EINVAL): | 
| 268 |             # If we try to rename a non-existant file onto cwd, we get 
 | |
| 269 |             # EPERM or EACCES instead of ENOENT, this will raise ENOENT 
 | |
| 270 |             # if the old path doesn't exist, sometimes we get EACCES
 | |
| 271 |             # 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. | 272 | os.lstat(old) | 
| 273 |         raise
 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 274 | |
| 275 | ||
| 1830.3.11
by John Arbash Meinel Create a mac version of 'getcwd()' which normalizes the path. | 276 | def _mac_getcwd(): | 
| 277 | return unicodedata.normalize('NFKC', os.getcwdu()) | |
| 278 | ||
| 279 | ||
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 280 | # Default is to just use the python builtins, but these can be rebound on
 | 
| 281 | # particular platforms.
 | |
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 282 | abspath = _posix_abspath | 
| 283 | realpath = _posix_realpath | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 284 | pathjoin = os.path.join | 
| 285 | normpath = os.path.normpath | |
| 286 | getcwd = os.getcwdu | |
| 287 | mkdtemp = tempfile.mkdtemp | |
| 288 | rename = os.rename | |
| 289 | dirname = os.path.dirname | |
| 290 | basename = os.path.basename | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 291 | rmtree = shutil.rmtree | 
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 292 | |
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 293 | MIN_ABS_PATHLENGTH = 1 | 
| 294 | ||
| 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 | 295 | |
| 1185.31.47
by John Arbash Meinel Added a fancy footwork rename to osutils, made SftpTransport use it. | 296 | if sys.platform == 'win32': | 
| 1685.1.20
by John Arbash Meinel More changes to get 'bzr branch' and 'bzr pull' to work | 297 | abspath = _win32_abspath | 
| 298 | realpath = _win32_realpath | |
| 299 | pathjoin = _win32_pathjoin | |
| 300 | normpath = _win32_normpath | |
| 301 | getcwd = _win32_getcwd | |
| 302 | mkdtemp = _win32_mkdtemp | |
| 303 | rename = _win32_rename | |
| 304 | ||
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 305 | MIN_ABS_PATHLENGTH = 3 | 
| 1532
by Robert Collins Merge in John Meinels integration branch. | 306 | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 307 | def _win32_delete_readonly(function, path, excinfo): | 
| 308 | """Error handler for shutil.rmtree function [for win32] | |
| 309 |         Helps to remove files and dirs marked as read-only.
 | |
| 310 |         """
 | |
| 311 | type_, value = excinfo[:2] | |
| 312 | if function in (os.remove, os.rmdir) \ | |
| 313 | and type_ == OSError \ | |
| 314 | and value.errno == errno.EACCES: | |
| 315 | bzrlib.osutils.make_writable(path) | |
| 316 | function(path) | |
| 317 | else: | |
| 318 |             raise
 | |
| 319 | ||
| 320 | def rmtree(path, ignore_errors=False, onerror=_win32_delete_readonly): | |
| 321 | """Replacer for shutil.rmtree: could remove readonly dirs/files""" | |
| 322 | return shutil.rmtree(path, ignore_errors, onerror) | |
| 1830.3.11
by John Arbash Meinel Create a mac version of 'getcwd()' which normalizes the path. | 323 | elif sys.platform == 'darwin': | 
| 324 | getcwd = _mac_getcwd | |
| 1692.7.6
by Martin Pool [patch] force deletion of trees containing readonly files (alexander) | 325 | |
| 1685.1.31
by John Arbash Meinel Adding tests for the rest of the _win32 functions. | 326 | |
| 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. | 327 | def get_terminal_encoding(): | 
| 328 | """Find the best encoding for printing to the screen. | |
| 329 | ||
| 330 |     This attempts to check both sys.stdout and sys.stdin to see
 | |
| 331 |     what encoding they are in, and if that fails it falls back to
 | |
| 332 |     bzrlib.user_encoding.
 | |
| 333 |     The problem is that on Windows, locale.getpreferredencoding()
 | |
| 334 |     is not the same encoding as that used by the console:
 | |
| 335 |     http://mail.python.org/pipermail/python-list/2003-May/162357.html
 | |
| 336 | ||
| 337 |     On my standard US Windows XP, the preferred encoding is
 | |
| 338 |     cp1252, but the console is cp437
 | |
| 339 |     """
 | |
| 340 | output_encoding = getattr(sys.stdout, 'encoding', None) | |
| 341 | if not output_encoding: | |
| 342 | input_encoding = getattr(sys.stdin, 'encoding', None) | |
| 343 | if not input_encoding: | |
| 344 | output_encoding = bzrlib.user_encoding | |
| 345 | mutter('encoding stdout as bzrlib.user_encoding %r', output_encoding) | |
| 346 | else: | |
| 347 | output_encoding = input_encoding | |
| 348 | mutter('encoding stdout as sys.stdin encoding %r', output_encoding) | |
| 349 | else: | |
| 350 | mutter('encoding stdout as sys.stdout encoding %r', output_encoding) | |
| 351 | return output_encoding | |
| 352 | ||
| 353 | ||
| 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 \ | 354 | def normalizepath(f): | 
| 355 | if hasattr(os.path, 'realpath'): | |
| 356 | F = realpath | |
| 357 | else: | |
| 358 | F = abspath | |
| 359 | [p,e] = os.path.split(f) | |
| 360 | if e == "" or e == "." or e == "..": | |
| 361 | return F(f) | |
| 362 | else: | |
| 363 | return pathjoin(F(p), e) | |
| 364 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 365 | |
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 366 | def backup_file(fn): | 
| 367 | """Copy a file to a backup. | |
| 368 | ||
| 369 |     Backups are named in GNU-style, with a ~ suffix.
 | |
| 370 | ||
| 371 |     If the file is already a backup, it's not copied.
 | |
| 372 |     """
 | |
| 373 | if fn[-1] == '~': | |
| 374 |         return
 | |
| 375 | bfn = fn + '~' | |
| 376 | ||
| 1448
by Robert Collins revert symlinks correctly | 377 | if has_symlinks() and os.path.islink(fn): | 
| 378 | target = os.readlink(fn) | |
| 379 | os.symlink(target, bfn) | |
| 380 |         return
 | |
| 779
by Martin Pool - better quotefn for windows: use doublequotes for strings with | 381 | inf = file(fn, 'rb') | 
| 382 | try: | |
| 383 | content = inf.read() | |
| 384 | finally: | |
| 385 | inf.close() | |
| 386 | ||
| 387 | outf = file(bfn, 'wb') | |
| 388 | try: | |
| 389 | outf.write(content) | |
| 390 | finally: | |
| 391 | outf.close() | |
| 392 | ||
| 393 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 394 | def isdir(f): | 
| 395 | """True if f is an accessible directory.""" | |
| 396 | try: | |
| 397 | return S_ISDIR(os.lstat(f)[ST_MODE]) | |
| 398 | except OSError: | |
| 399 | return False | |
| 400 | ||
| 401 | ||
| 402 | def isfile(f): | |
| 403 | """True if f is a regular file.""" | |
| 404 | try: | |
| 405 | return S_ISREG(os.lstat(f)[ST_MODE]) | |
| 406 | except OSError: | |
| 407 | return False | |
| 408 | ||
| 1092.2.6
by Robert Collins symlink support updated to work | 409 | def islink(f): | 
| 410 | """True if f is a symlink.""" | |
| 411 | try: | |
| 412 | return S_ISLNK(os.lstat(f)[ST_MODE]) | |
| 413 | except OSError: | |
| 414 | return False | |
| 1
by mbp at sourcefrog import from baz patch-364 | 415 | |
| 485
by Martin Pool - move commit code into its own module | 416 | def is_inside(dir, fname): | 
| 417 | """True if fname is inside dir. | |
| 969
by Martin Pool - Add less-sucky is_within_any | 418 |     
 | 
| 1185.31.38
by John Arbash Meinel Changing os.path.normpath to osutils.normpath | 419 |     The parameters should typically be passed to osutils.normpath first, so
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 420 |     that . and .. and repeated slashes are eliminated, and the separators
 | 
| 421 |     are canonical for the platform.
 | |
| 422 |     
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 423 |     The empty string as a dir name is taken as top-of-tree and matches 
 | 
| 424 |     everything.
 | |
| 425 |     
 | |
| 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 \ | 426 |     >>> is_inside('src', pathjoin('src', 'foo.c'))
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 427 |     True
 | 
| 428 |     >>> is_inside('src', 'srccontrol')
 | |
| 429 |     False
 | |
| 1185.31.32
by John Arbash Meinel Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ | 430 |     >>> is_inside('src', pathjoin('src', 'a', 'a', 'a', 'foo.c'))
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 431 |     True
 | 
| 432 |     >>> is_inside('foo.c', 'foo.c')
 | |
| 433 |     True
 | |
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 434 |     >>> is_inside('foo.c', '')
 | 
| 435 |     False
 | |
| 436 |     >>> is_inside('', 'foo.c')
 | |
| 437 |     True
 | |
| 485
by Martin Pool - move commit code into its own module | 438 |     """
 | 
| 969
by Martin Pool - Add less-sucky is_within_any | 439 |     # XXX: Most callers of this can actually do something smarter by 
 | 
| 440 |     # looking at the inventory
 | |
| 972
by Martin Pool - less dodgy is_inside function | 441 | if dir == fname: | 
| 442 | return True | |
| 443 | ||
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 444 | if dir == '': | 
| 445 | return True | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 446 | |
| 1185.31.34
by John Arbash Meinel Removing instances of os.sep | 447 | if dir[-1] != '/': | 
| 448 | dir += '/' | |
| 1185.1.41
by Robert Collins massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid | 449 | |
| 972
by Martin Pool - less dodgy is_inside function | 450 | return fname.startswith(dir) | 
| 451 | ||
| 485
by Martin Pool - move commit code into its own module | 452 | |
| 453 | def is_inside_any(dir_list, fname): | |
| 454 | """True if fname is inside any of given dirs.""" | |
| 455 | for dirname in dir_list: | |
| 456 | if is_inside(dirname, fname): | |
| 457 | return True | |
| 458 | else: | |
| 459 | return False | |
| 460 | ||
| 461 | ||
| 1740.3.4
by Jelmer Vernooij Move inventory to commit builder. | 462 | def is_inside_or_parent_of_any(dir_list, fname): | 
| 463 | """True if fname is a child or a parent of any of the given files.""" | |
| 464 | for dirname in dir_list: | |
| 465 | if is_inside(dirname, fname) or is_inside(fname, dirname): | |
| 466 | return True | |
| 467 | else: | |
| 468 | return False | |
| 469 | ||
| 470 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 471 | def pumpfile(fromfile, tofile): | 
| 472 | """Copy contents of one file to another.""" | |
| 1185.49.12
by John Arbash Meinel Changed pumpfile to work on blocks, rather than reading the entire file at once. | 473 | BUFSIZE = 32768 | 
| 474 | while True: | |
| 475 | b = fromfile.read(BUFSIZE) | |
| 476 | if not b: | |
| 477 |             break
 | |
| 1185.49.13
by John Arbash Meinel Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass. | 478 | tofile.write(b) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 479 | |
| 480 | ||
| 1185.67.7
by Aaron Bentley Refactored a bit | 481 | def file_iterator(input_file, readsize=32768): | 
| 482 | while True: | |
| 483 | b = input_file.read(readsize) | |
| 484 | if len(b) == 0: | |
| 485 |             break
 | |
| 486 | yield b | |
| 487 | ||
| 488 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 489 | def sha_file(f): | 
| 490 | if hasattr(f, 'tell'): | |
| 491 | assert f.tell() == 0 | |
| 492 | s = sha.new() | |
| 320
by Martin Pool - Compute SHA-1 of files in chunks | 493 | BUFSIZE = 128<<10 | 
| 494 | while True: | |
| 495 | b = f.read(BUFSIZE) | |
| 496 | if not b: | |
| 497 |             break
 | |
| 498 | s.update(b) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 499 | return s.hexdigest() | 
| 500 | ||
| 501 | ||
| 1235
by Martin Pool - split sha_strings into osutils | 502 | |
| 503 | def sha_strings(strings): | |
| 504 | """Return the sha-1 of concatenation of strings""" | |
| 505 | s = sha.new() | |
| 506 | map(s.update, strings) | |
| 507 | return s.hexdigest() | |
| 508 | ||
| 509 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 510 | def sha_string(f): | 
| 511 | s = sha.new() | |
| 512 | s.update(f) | |
| 513 | return s.hexdigest() | |
| 514 | ||
| 515 | ||
| 124
by mbp at sourcefrog - check file text for past revisions is correct | 516 | def fingerprint_file(f): | 
| 517 | s = sha.new() | |
| 126
by mbp at sourcefrog Use just one big read to fingerprint files | 518 | b = f.read() | 
| 519 | s.update(b) | |
| 520 | size = len(b) | |
| 124
by mbp at sourcefrog - check file text for past revisions is correct | 521 | return {'size': size, | 
| 522 | 'sha1': s.hexdigest()} | |
| 523 | ||
| 524 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 525 | def compare_files(a, b): | 
| 526 | """Returns true if equal in contents""" | |
| 74
by mbp at sourcefrog compare_files: read in one page at a time rather than | 527 | BUFSIZE = 4096 | 
| 528 | while True: | |
| 529 | ai = a.read(BUFSIZE) | |
| 530 | bi = b.read(BUFSIZE) | |
| 531 | if ai != bi: | |
| 532 | return False | |
| 533 | if ai == '': | |
| 534 | return True | |
| 1
by mbp at sourcefrog import from baz patch-364 | 535 | |
| 536 | ||
| 49
by mbp at sourcefrog fix local-time-offset calculation | 537 | def local_time_offset(t=None): | 
| 538 | """Return offset of local zone from GMT, either at present or at time t.""" | |
| 73
by mbp at sourcefrog fix time.localtime call for python 2.3 | 539 |     # python2.3 localtime() can't take None
 | 
| 183
by mbp at sourcefrog pychecker fixups | 540 | if t == None: | 
| 73
by mbp at sourcefrog fix time.localtime call for python 2.3 | 541 | t = time.time() | 
| 542 | ||
| 49
by mbp at sourcefrog fix local-time-offset calculation | 543 | if time.localtime(t).tm_isdst and time.daylight: | 
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 544 | return -time.altzone | 
| 545 | else: | |
| 546 | return -time.timezone | |
| 547 | ||
| 548 | ||
| 1185.12.24
by Aaron Bentley Made format_date more flexible | 549 | def format_date(t, offset=0, timezone='original', date_fmt=None, | 
| 550 | show_offset=True): | |
| 1
by mbp at sourcefrog import from baz patch-364 | 551 |     ## TODO: Perhaps a global option to use either universal or local time?
 | 
| 552 |     ## Or perhaps just let people set $TZ?
 | |
| 553 | assert isinstance(t, float) | |
| 554 | ||
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 555 | if timezone == 'utc': | 
| 1
by mbp at sourcefrog import from baz patch-364 | 556 | tt = time.gmtime(t) | 
| 557 | offset = 0 | |
| 8
by mbp at sourcefrog store committer's timezone in revision and show | 558 | elif timezone == 'original': | 
| 23
by mbp at sourcefrog format_date: handle revisions with no timezone offset | 559 | if offset == None: | 
| 560 | offset = 0 | |
| 16
by mbp at sourcefrog fix inverted calculation for original timezone -> utc | 561 | tt = time.gmtime(t + offset) | 
| 12
by mbp at sourcefrog new --timezone option for bzr log | 562 | elif timezone == 'local': | 
| 1
by mbp at sourcefrog import from baz patch-364 | 563 | tt = time.localtime(t) | 
| 49
by mbp at sourcefrog fix local-time-offset calculation | 564 | offset = local_time_offset(t) | 
| 12
by mbp at sourcefrog new --timezone option for bzr log | 565 | else: | 
| 974.1.26
by aaron.bentley at utoronto merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 | 566 | raise BzrError("unsupported timezone format %r" % timezone, | 
| 567 | ['options are "utc", "original", "local"']) | |
| 1185.12.24
by Aaron Bentley Made format_date more flexible | 568 | if date_fmt is None: | 
| 569 | date_fmt = "%a %Y-%m-%d %H:%M:%S" | |
| 570 | if show_offset: | |
| 571 | offset_str = ' %+03d%02d' % (offset / 3600, (offset / 60) % 60) | |
| 572 | else: | |
| 573 | offset_str = '' | |
| 574 | return (time.strftime(date_fmt, tt) + offset_str) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 575 | |
| 576 | ||
| 577 | def compact_date(when): | |
| 578 | return time.strftime('%Y%m%d%H%M%S', time.gmtime(when)) | |
| 579 | ||
| 580 | ||
| 581 | ||
| 582 | def filesize(f): | |
| 583 | """Return size of given open file.""" | |
| 584 | return os.fstat(f.fileno())[ST_SIZE] | |
| 585 | ||
| 1553.5.5
by Martin Pool New utility routine rand_chars | 586 | |
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 587 | # Define rand_bytes based on platform.
 | 
| 588 | try: | |
| 589 |     # Python 2.4 and later have os.urandom,
 | |
| 590 |     # but it doesn't work on some arches
 | |
| 591 | os.urandom(1) | |
| 1
by mbp at sourcefrog import from baz patch-364 | 592 | rand_bytes = os.urandom | 
| 1185.1.7
by Robert Collins Nathaniel McCallums patch for urandom friendliness on aix. | 593 | except (NotImplementedError, AttributeError): | 
| 594 |     # If python doesn't have os.urandom, or it doesn't work,
 | |
| 595 |     # then try to first pull random data from /dev/urandom
 | |
| 596 | if os.path.exists("/dev/urandom"): | |
| 597 | rand_bytes = file('/dev/urandom', 'rb').read | |
| 598 |     # Otherwise, use this hack as a last resort
 | |
| 599 | else: | |
| 600 |         # not well seeded, but better than nothing
 | |
| 601 | def rand_bytes(n): | |
| 602 | import random | |
| 603 | s = '' | |
| 604 | while n: | |
| 605 | s += chr(random.randint(0, 255)) | |
| 606 | n -= 1 | |
| 607 | return s | |
| 1
by mbp at sourcefrog import from baz patch-364 | 608 | |
| 1553.5.5
by Martin Pool New utility routine rand_chars | 609 | |
| 610 | ALNUM = '0123456789abcdefghijklmnopqrstuvwxyz' | |
| 611 | def rand_chars(num): | |
| 612 | """Return a random string of num alphanumeric characters | |
| 613 |     
 | |
| 614 |     The result only contains lowercase chars because it may be used on 
 | |
| 615 |     case-insensitive filesystems.
 | |
| 616 |     """
 | |
| 617 | s = '' | |
| 618 | for raw_byte in rand_bytes(num): | |
| 619 | s += ALNUM[ord(raw_byte) % 36] | |
| 620 | return s | |
| 621 | ||
| 622 | ||
| 1
by mbp at sourcefrog import from baz patch-364 | 623 | ## 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. | 624 | ## decomposition (might be too tricksy though.)
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 625 | |
| 626 | def splitpath(p): | |
| 627 | """Turn string into list of parts. | |
| 628 | ||
| 629 |     >>> splitpath('a')
 | |
| 630 |     ['a']
 | |
| 631 |     >>> splitpath('a/b')
 | |
| 632 |     ['a', 'b']
 | |
| 633 |     >>> splitpath('a/./b')
 | |
| 634 |     ['a', 'b']
 | |
| 635 |     >>> splitpath('a/.b')
 | |
| 636 |     ['a', '.b']
 | |
| 637 |     >>> splitpath('a/../b')
 | |
| 184
by mbp at sourcefrog pychecker fixups | 638 |     Traceback (most recent call last):
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 639 |     ...
 | 
| 694
by Martin Pool - weed out all remaining calls to bailout() and remove the function | 640 |     BzrError: sorry, '..' not allowed in path
 | 
| 1
by mbp at sourcefrog import from baz patch-364 | 641 |     """
 | 
| 642 | assert isinstance(p, types.StringTypes) | |
| 271
by Martin Pool - Windows path fixes | 643 | |
| 644 |     # split on either delimiter because people might use either on
 | |
| 645 |     # Windows
 | |
| 646 | ps = re.split(r'[\\/]', p) | |
| 647 | ||
| 648 | rps = [] | |
| 1
by mbp at sourcefrog import from baz patch-364 | 649 | for f in ps: | 
| 650 | if f == '..': | |
| 694
by Martin Pool - weed out all remaining calls to bailout() and remove the function | 651 | raise BzrError("sorry, %r not allowed in path" % f) | 
| 271
by Martin Pool - Windows path fixes | 652 | elif (f == '.') or (f == ''): | 
| 653 |             pass
 | |
| 654 | else: | |
| 655 | rps.append(f) | |
| 656 | return rps | |
| 1
by mbp at sourcefrog import from baz patch-364 | 657 | |
| 658 | def joinpath(p): | |
| 659 | assert isinstance(p, list) | |
| 660 | for f in p: | |
| 183
by mbp at sourcefrog pychecker fixups | 661 | if (f == '..') or (f == None) or (f == ''): | 
| 694
by Martin Pool - weed out all remaining calls to bailout() and remove the function | 662 | raise BzrError("sorry, %r not allowed in path" % f) | 
| 1185.31.32
by John Arbash Meinel Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ | 663 | return pathjoin(*p) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 664 | |
| 665 | ||
| 1732.1.1
by John Arbash Meinel deprecating appendpath, it does exactly what pathjoin does | 666 | @deprecated_function(zero_nine) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 667 | def appendpath(p1, p2): | 
| 668 | if p1 == '': | |
| 669 | return p2 | |
| 670 | else: | |
| 1185.31.32
by John Arbash Meinel Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \ | 671 | return pathjoin(p1, p2) | 
| 1
by mbp at sourcefrog import from baz patch-364 | 672 | |
| 673 | ||
| 1231
by Martin Pool - more progress on fetch on top of weaves | 674 | def split_lines(s): | 
| 675 | """Split s into lines, but without removing the newline characters.""" | |
| 1666.1.6
by Robert Collins Make knit the default format. | 676 | lines = s.split('\n') | 
| 677 | result = [line + '\n' for line in lines[:-1]] | |
| 678 | if lines[-1]: | |
| 679 | result.append(lines[-1]) | |
| 680 | return result | |
| 1391
by Robert Collins merge from integration | 681 | |
| 682 | ||
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 683 | def hardlinks_good(): | 
| 1185.10.5
by Aaron Bentley Fixed hardlinks_good test | 684 | return sys.platform not in ('win32', 'cygwin', 'darwin') | 
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 685 | |
| 1185.1.46
by Robert Collins Aarons branch --basis patch | 686 | |
| 1185.10.3
by Aaron Bentley Made copy_multi_immutable create hardlinks opportunistically | 687 | def link_or_copy(src, dest): | 
| 688 | """Hardlink a file, or copy it if it can't be hardlinked.""" | |
| 1185.10.4
by Aaron Bentley Disabled hardlinks on cygwin, mac OS | 689 | if not hardlinks_good(): | 
| 1185.10.3
by Aaron Bentley Made copy_multi_immutable create hardlinks opportunistically | 690 | copyfile(src, dest) | 
| 691 |         return
 | |
| 692 | try: | |
| 693 | os.link(src, dest) | |
| 694 | except (OSError, IOError), e: | |
| 695 | if e.errno != errno.EXDEV: | |
| 696 |             raise
 | |
| 697 | copyfile(src, dest) | |
| 1399.1.4
by Robert Collins move diff and symlink conditionals into inventory.py from diff.py | 698 | |
| 1558.12.9
by Aaron Bentley Handle resolving conflicts with directories properly | 699 | def delete_any(full_path): | 
| 700 | """Delete a file or directory.""" | |
| 701 | try: | |
| 702 | os.unlink(full_path) | |
| 703 | except OSError, e: | |
| 704 |     # We may be renaming a dangling inventory id
 | |
| 705 | if e.errno not in (errno.EISDIR, errno.EACCES, errno.EPERM): | |
| 706 |             raise
 | |
| 707 | os.rmdir(full_path) | |
| 708 | ||
| 1399.1.4
by Robert Collins move diff and symlink conditionals into inventory.py from diff.py | 709 | |
| 710 | def has_symlinks(): | |
| 711 | if hasattr(os, 'symlink'): | |
| 712 | return True | |
| 713 | else: | |
| 714 | return False | |
| 1185.16.38
by Martin Pool - move contains_whitespace and contains_linebreaks to osutils | 715 | |
| 716 | ||
| 717 | def contains_whitespace(s): | |
| 718 | """True if there are any whitespace characters in s.""" | |
| 719 | for ch in string.whitespace: | |
| 720 | if ch in s: | |
| 721 | return True | |
| 722 | else: | |
| 723 | return False | |
| 724 | ||
| 725 | ||
| 726 | def contains_linebreaks(s): | |
| 727 | """True if there is any vertical whitespace in s.""" | |
| 728 | for ch in '\f\n\r': | |
| 729 | if ch in s: | |
| 730 | return True | |
| 731 | else: | |
| 732 | return False | |
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 733 | |
| 734 | ||
| 735 | def relpath(base, path): | |
| 736 | """Return path relative to base, or raise exception. | |
| 737 | ||
| 738 |     The path may be either an absolute path or a path relative to the
 | |
| 739 |     current working directory.
 | |
| 740 | ||
| 741 |     os.path.commonprefix (python2.4) has a bad bug that it works just
 | |
| 742 |     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. | 743 |     avoids that problem.
 | 
| 744 |     """
 | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 745 | |
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 746 | assert len(base) >= MIN_ABS_PATHLENGTH, ('Length of base must be equal or' | 
| 747 | ' exceed the platform minimum length (which is %d)' % | |
| 748 | MIN_ABS_PATHLENGTH) | |
| 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 | 749 | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 750 | rp = abspath(path) | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 751 | |
| 752 | s = [] | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 753 | head = rp | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 754 | while len(head) >= len(base): | 
| 755 | if head == base: | |
| 756 |             break
 | |
| 757 | head, tail = os.path.split(head) | |
| 758 | if tail: | |
| 759 | s.insert(0, tail) | |
| 760 | else: | |
| 1685.1.12
by John Arbash Meinel Some more work to get LocalTransport to only support URLs | 761 | raise PathNotChild(rp, base) | 
| 1457.1.2
by Robert Collins move branch._relpath into osutils as relpath | 762 | |
| 1185.31.35
by John Arbash Meinel Couple small fixes, all tests pass on cygwin. | 763 | if s: | 
| 764 | return pathjoin(*s) | |
| 765 | else: | |
| 766 | return '' | |
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 767 | |
| 768 | ||
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 769 | def safe_unicode(unicode_or_utf8_string): | 
| 770 | """Coerce unicode_or_utf8_string into unicode. | |
| 771 | ||
| 772 |     If it is unicode, it is returned.
 | |
| 773 |     Otherwise it is decoded from utf-8. If a decoding error
 | |
| 774 |     occurs, it is wrapped as a If the decoding fails, the exception is wrapped 
 | |
| 775 |     as a BzrBadParameter exception.
 | |
| 776 |     """
 | |
| 777 | if isinstance(unicode_or_utf8_string, unicode): | |
| 778 | return unicode_or_utf8_string | |
| 779 | try: | |
| 780 | return unicode_or_utf8_string.decode('utf8') | |
| 781 | except UnicodeDecodeError: | |
| 1185.65.29
by Robert Collins Implement final review suggestions. | 782 | raise BzrBadParameterNotUnicode(unicode_or_utf8_string) | 
| 1534.3.1
by Robert Collins * bzrlib.osutils.safe_unicode now exists to provide parameter coercion | 783 | |
| 784 | ||
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 785 | _platform_normalizes_filenames = False | 
| 786 | if sys.platform == 'darwin': | |
| 787 | _platform_normalizes_filenames = True | |
| 788 | ||
| 789 | ||
| 790 | def normalizes_filenames(): | |
| 791 | """Return True if this platform normalizes unicode filenames. | |
| 792 | ||
| 793 |     Mac OSX does, Windows/Linux do not.
 | |
| 794 |     """
 | |
| 795 | return _platform_normalizes_filenames | |
| 796 | ||
| 797 | ||
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 798 | 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 | 799 | """Get the unicode normalized path, and if you can access the file. | 
| 800 | ||
| 801 |     On platforms where the system normalizes filenames (Mac OSX),
 | |
| 802 |     you can access a file by any path which will normalize correctly.
 | |
| 803 |     On platforms where the system does not normalize filenames 
 | |
| 804 |     (Windows, Linux), you have to access a file by its exact path.
 | |
| 805 | ||
| 806 |     Internally, bzr only supports NFC/NFKC normalization, since that is 
 | |
| 807 |     the standard for XML documents.
 | |
| 808 | ||
| 809 |     So return the normalized path, and a flag indicating if the file
 | |
| 810 |     can be accessed by that path.
 | |
| 811 |     """
 | |
| 812 | ||
| 1830.3.8
by John Arbash Meinel unicodedata.normalize requires unicode strings | 813 | return unicodedata.normalize('NFKC', unicode(path)), True | 
| 1830.3.1
by John Arbash Meinel Change the return value of unicode_filename, and make it testable on all platforms | 814 | |
| 815 | ||
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 816 | def _inaccessible_normalized_filename(path): | 
| 817 | __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 | 818 | |
| 1830.3.8
by John Arbash Meinel unicodedata.normalize requires unicode strings | 819 | normalized = unicodedata.normalize('NFKC', unicode(path)) | 
| 1830.3.1
by John Arbash Meinel Change the return value of unicode_filename, and make it testable on all platforms | 820 | return normalized, normalized == path | 
| 821 | ||
| 822 | ||
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 823 | if _platform_normalizes_filenames: | 
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 824 | normalized_filename = _accessible_normalized_filename | 
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 825 | else: | 
| 1830.3.2
by John Arbash Meinel normalized_filename is a much better name | 826 | normalized_filename = _inaccessible_normalized_filename | 
| 1185.85.75
by John Arbash Meinel Adding bzrlib.osutils.unicode_filename to handle unicode normalization for file paths. | 827 | |
| 828 | ||
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 829 | def terminal_width(): | 
| 830 | """Return estimated terminal width.""" | |
| 1704.2.3
by Martin Pool (win32) Detect terminal width using GetConsoleScreenBufferInfo (Alexander) | 831 | if sys.platform == 'win32': | 
| 832 | import bzrlib.win32console | |
| 833 | return bzrlib.win32console.get_console_size()[0] | |
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 834 | width = 0 | 
| 1185.33.60
by Martin Pool Use full terminal width for verbose test output. | 835 | try: | 
| 1704.2.2
by Martin Pool Detect terminal width using ioctl | 836 | import struct, fcntl, termios | 
| 837 | s = struct.pack('HHHH', 0, 0, 0, 0) | |
| 838 | x = fcntl.ioctl(1, termios.TIOCGWINSZ, s) | |
| 839 | width = struct.unpack('HHHH', x)[1] | |
| 840 | except IOError: | |
| 841 |         pass
 | |
| 842 | if width <= 0: | |
| 843 | try: | |
| 844 | width = int(os.environ['COLUMNS']) | |
| 845 | except: | |
| 846 |             pass
 | |
| 847 | if width <= 0: | |
| 848 | width = 80 | |
| 849 | ||
| 850 | return width | |
| 1534.7.25
by Aaron Bentley Added set_executability | 851 | |
| 852 | def supports_executable(): | |
| 1534.7.160
by Aaron Bentley Changed implementation of supports_executable | 853 | return sys.platform != "win32" | 
| 1551.2.53
by abentley Strip trailing slashes in a platform-sensible way | 854 | |
| 855 | ||
| 1551.2.56
by Aaron Bentley Better illegal pathname check for Windows | 856 | _validWin32PathRE = re.compile(r'^([A-Za-z]:[/\\])?[^:<>*"?\|]*$') | 
| 857 | ||
| 858 | ||
| 859 | def check_legal_path(path): | |
| 860 | """Check whether the supplied path is legal. | |
| 861 |     This is only required on Windows, so we don't test on other platforms
 | |
| 862 |     right now.
 | |
| 863 |     """
 | |
| 864 | if sys.platform != "win32": | |
| 865 |         return
 | |
| 866 | if _validWin32PathRE.match(path) is None: | |
| 867 | raise IllegalPath(path) | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 868 | |
| 869 | ||
| 1757.2.8
by Robert Collins Teach walkdirs to walk a subdir of a tree. | 870 | def walkdirs(top, prefix=""): | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 871 | """Yield data about all the directories in a tree. | 
| 872 |     
 | |
| 873 |     This yields all the data about the contents of a directory at a time.
 | |
| 874 |     After each directory has been yielded, if the caller has mutated the list
 | |
| 875 |     to exclude some directories, they are then not descended into.
 | |
| 876 |     
 | |
| 877 |     The data yielded is of the form:
 | |
| 878 |     [(relpath, basename, kind, lstat, path_from_top), ...]
 | |
| 879 | ||
| 1757.2.16
by Robert Collins Review comments. | 880 |     :param prefix: Prefix the relpaths that are yielded with 'prefix'. This 
 | 
| 881 |         allows one to walk a subtree but get paths that are relative to a tree
 | |
| 882 |         rooted higher up.
 | |
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 883 |     :return: an iterator over the dirs.
 | 
| 884 |     """
 | |
| 885 | lstat = os.lstat | |
| 886 | pending = [] | |
| 887 | _directory = _directory_kind | |
| 888 | _listdir = listdir | |
| 1757.2.8
by Robert Collins Teach walkdirs to walk a subdir of a tree. | 889 | pending = [(prefix, "", _directory, None, top)] | 
| 1753.1.1
by Robert Collins (rbc, jam, mbp)Add bzrlib.osutils.walkdirs, an optimised walk-and-stat routine. | 890 | while pending: | 
| 891 | dirblock = [] | |
| 892 | currentdir = pending.pop() | |
| 893 |         # 0 - relpath, 1- basename, 2- kind, 3- stat, 4-toppath
 | |
| 894 | top = currentdir[4] | |
| 895 | if currentdir[0]: | |
| 896 | relroot = currentdir[0] + '/' | |
| 897 | else: | |
| 898 | relroot = "" | |
| 899 | for name in sorted(_listdir(top)): | |
| 900 | abspath = top + '/' + name | |
| 901 | statvalue = lstat(abspath) | |
| 902 | dirblock.append ((relroot + name, name, file_kind_from_stat_mode(statvalue.st_mode), statvalue, abspath)) | |
| 903 | yield dirblock | |
| 904 |         # push the user specified dirs from dirblock
 | |
| 905 | for dir in reversed(dirblock): | |
| 906 | if dir[2] == _directory: | |
| 907 | pending.append(dir) | |
| 1773.3.1
by Robert Collins Add path_prefix_key and compare_paths_prefix_order utility functions. | 908 | |
| 909 | ||
| 910 | def path_prefix_key(path): | |
| 911 | """Generate a prefix-order path key for path. | |
| 912 | ||
| 913 |     This can be used to sort paths in the same way that walkdirs does.
 | |
| 914 |     """
 | |
| 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. | 915 | return (dirname(path) , path) | 
| 1773.3.1
by Robert Collins Add path_prefix_key and compare_paths_prefix_order utility functions. | 916 | |
| 917 | ||
| 918 | def compare_paths_prefix_order(path_a, path_b): | |
| 919 | """Compare path_a and path_b to generate the same order walkdirs uses.""" | |
| 920 | key_a = path_prefix_key(path_a) | |
| 921 | key_b = path_prefix_key(path_b) | |
| 922 | return cmp(key_a, key_b) |