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