[PATCH] windows: fix use of undefined exception (issue1707)
Henrik Stuart
hg at hstuart.dk
Thu Jun 25 12:11:48 CDT 2009
# HG changeset patch
# User Henrik Stuart <hg at hstuart.dk>
# Date 1245948386 -7200
# Node ID 0823bdb69ce6b06d2aeea599af0f5fae2d588332
# Parent bc9ac7a29a737d7b99289598d376fb0b03d2b6c2
windows: fix use of undefined exception (issue1707)
This fixes the implied reliance on pywin32 and the win32 module. This
also fixes a regression in ae275ad46bd0 that made Mercurial unusable
without pywin32.
The exception classes are needed to wrap the buffered posixfile from
osutil in normal IOError semantics, otherwise several uses of the file
opener fails in unexpected ways making it impossible to operate on
repositories.
The error constants are introduced as needed from pywin32's winerror
module.
diff -r bc9ac7a29a73 -r 0823bdb69ce6 mercurial/win32.py
--- a/mercurial/win32.py Thu Jun 25 09:53:47 2009 +0200
+++ b/mercurial/win32.py Thu Jun 25 18:46:26 2009 +0200
@@ -20,139 +20,6 @@
import osutil, encoding
from win32com.shell import shell,shellcon
-class WinError(Exception):
- winerror_map = {
- winerror.ERROR_ACCESS_DENIED: errno.EACCES,
- winerror.ERROR_ACCOUNT_DISABLED: errno.EACCES,
- winerror.ERROR_ACCOUNT_RESTRICTION: errno.EACCES,
- winerror.ERROR_ALREADY_ASSIGNED: errno.EBUSY,
- winerror.ERROR_ALREADY_EXISTS: errno.EEXIST,
- winerror.ERROR_ARITHMETIC_OVERFLOW: errno.ERANGE,
- winerror.ERROR_BAD_COMMAND: errno.EIO,
- winerror.ERROR_BAD_DEVICE: errno.ENODEV,
- winerror.ERROR_BAD_DRIVER_LEVEL: errno.ENXIO,
- winerror.ERROR_BAD_EXE_FORMAT: errno.ENOEXEC,
- winerror.ERROR_BAD_FORMAT: errno.ENOEXEC,
- winerror.ERROR_BAD_LENGTH: errno.EINVAL,
- winerror.ERROR_BAD_PATHNAME: errno.ENOENT,
- winerror.ERROR_BAD_PIPE: errno.EPIPE,
- winerror.ERROR_BAD_UNIT: errno.ENODEV,
- winerror.ERROR_BAD_USERNAME: errno.EINVAL,
- winerror.ERROR_BROKEN_PIPE: errno.EPIPE,
- winerror.ERROR_BUFFER_OVERFLOW: errno.ENAMETOOLONG,
- winerror.ERROR_BUSY: errno.EBUSY,
- winerror.ERROR_BUSY_DRIVE: errno.EBUSY,
- winerror.ERROR_CALL_NOT_IMPLEMENTED: errno.ENOSYS,
- winerror.ERROR_CANNOT_MAKE: errno.EACCES,
- winerror.ERROR_CANTOPEN: errno.EIO,
- winerror.ERROR_CANTREAD: errno.EIO,
- winerror.ERROR_CANTWRITE: errno.EIO,
- winerror.ERROR_CRC: errno.EIO,
- winerror.ERROR_CURRENT_DIRECTORY: errno.EACCES,
- winerror.ERROR_DEVICE_IN_USE: errno.EBUSY,
- winerror.ERROR_DEV_NOT_EXIST: errno.ENODEV,
- winerror.ERROR_DIRECTORY: errno.EINVAL,
- winerror.ERROR_DIR_NOT_EMPTY: errno.ENOTEMPTY,
- winerror.ERROR_DISK_CHANGE: errno.EIO,
- winerror.ERROR_DISK_FULL: errno.ENOSPC,
- winerror.ERROR_DRIVE_LOCKED: errno.EBUSY,
- winerror.ERROR_ENVVAR_NOT_FOUND: errno.EINVAL,
- winerror.ERROR_EXE_MARKED_INVALID: errno.ENOEXEC,
- winerror.ERROR_FILENAME_EXCED_RANGE: errno.ENAMETOOLONG,
- winerror.ERROR_FILE_EXISTS: errno.EEXIST,
- winerror.ERROR_FILE_INVALID: errno.ENODEV,
- winerror.ERROR_FILE_NOT_FOUND: errno.ENOENT,
- winerror.ERROR_GEN_FAILURE: errno.EIO,
- winerror.ERROR_HANDLE_DISK_FULL: errno.ENOSPC,
- winerror.ERROR_INSUFFICIENT_BUFFER: errno.ENOMEM,
- winerror.ERROR_INVALID_ACCESS: errno.EACCES,
- winerror.ERROR_INVALID_ADDRESS: errno.EFAULT,
- winerror.ERROR_INVALID_BLOCK: errno.EFAULT,
- winerror.ERROR_INVALID_DATA: errno.EINVAL,
- winerror.ERROR_INVALID_DRIVE: errno.ENODEV,
- winerror.ERROR_INVALID_EXE_SIGNATURE: errno.ENOEXEC,
- winerror.ERROR_INVALID_FLAGS: errno.EINVAL,
- winerror.ERROR_INVALID_FUNCTION: errno.ENOSYS,
- winerror.ERROR_INVALID_HANDLE: errno.EBADF,
- winerror.ERROR_INVALID_LOGON_HOURS: errno.EACCES,
- winerror.ERROR_INVALID_NAME: errno.EINVAL,
- winerror.ERROR_INVALID_OWNER: errno.EINVAL,
- winerror.ERROR_INVALID_PARAMETER: errno.EINVAL,
- winerror.ERROR_INVALID_PASSWORD: errno.EPERM,
- winerror.ERROR_INVALID_PRIMARY_GROUP: errno.EINVAL,
- winerror.ERROR_INVALID_SIGNAL_NUMBER: errno.EINVAL,
- winerror.ERROR_INVALID_TARGET_HANDLE: errno.EIO,
- winerror.ERROR_INVALID_WORKSTATION: errno.EACCES,
- winerror.ERROR_IO_DEVICE: errno.EIO,
- winerror.ERROR_IO_INCOMPLETE: errno.EINTR,
- winerror.ERROR_LOCKED: errno.EBUSY,
- winerror.ERROR_LOCK_VIOLATION: errno.EACCES,
- winerror.ERROR_LOGON_FAILURE: errno.EACCES,
- winerror.ERROR_MAPPED_ALIGNMENT: errno.EINVAL,
- winerror.ERROR_META_EXPANSION_TOO_LONG: errno.E2BIG,
- winerror.ERROR_MORE_DATA: errno.EPIPE,
- winerror.ERROR_NEGATIVE_SEEK: errno.ESPIPE,
- winerror.ERROR_NOACCESS: errno.EFAULT,
- winerror.ERROR_NONE_MAPPED: errno.EINVAL,
- winerror.ERROR_NOT_ENOUGH_MEMORY: errno.ENOMEM,
- winerror.ERROR_NOT_READY: errno.EAGAIN,
- winerror.ERROR_NOT_SAME_DEVICE: errno.EXDEV,
- winerror.ERROR_NO_DATA: errno.EPIPE,
- winerror.ERROR_NO_MORE_SEARCH_HANDLES: errno.EIO,
- winerror.ERROR_NO_PROC_SLOTS: errno.EAGAIN,
- winerror.ERROR_NO_SUCH_PRIVILEGE: errno.EACCES,
- winerror.ERROR_OPEN_FAILED: errno.EIO,
- winerror.ERROR_OPEN_FILES: errno.EBUSY,
- winerror.ERROR_OPERATION_ABORTED: errno.EINTR,
- winerror.ERROR_OUTOFMEMORY: errno.ENOMEM,
- winerror.ERROR_PASSWORD_EXPIRED: errno.EACCES,
- winerror.ERROR_PATH_BUSY: errno.EBUSY,
- winerror.ERROR_PATH_NOT_FOUND: errno.ENOENT,
- winerror.ERROR_PIPE_BUSY: errno.EBUSY,
- winerror.ERROR_PIPE_CONNECTED: errno.EPIPE,
- winerror.ERROR_PIPE_LISTENING: errno.EPIPE,
- winerror.ERROR_PIPE_NOT_CONNECTED: errno.EPIPE,
- winerror.ERROR_PRIVILEGE_NOT_HELD: errno.EACCES,
- winerror.ERROR_READ_FAULT: errno.EIO,
- winerror.ERROR_SEEK: errno.EIO,
- winerror.ERROR_SEEK_ON_DEVICE: errno.ESPIPE,
- winerror.ERROR_SHARING_BUFFER_EXCEEDED: errno.ENFILE,
- winerror.ERROR_SHARING_VIOLATION: errno.EACCES,
- winerror.ERROR_STACK_OVERFLOW: errno.ENOMEM,
- winerror.ERROR_SWAPERROR: errno.ENOENT,
- winerror.ERROR_TOO_MANY_MODULES: errno.EMFILE,
- winerror.ERROR_TOO_MANY_OPEN_FILES: errno.EMFILE,
- winerror.ERROR_UNRECOGNIZED_MEDIA: errno.ENXIO,
- winerror.ERROR_UNRECOGNIZED_VOLUME: errno.ENODEV,
- winerror.ERROR_WAIT_NO_CHILDREN: errno.ECHILD,
- winerror.ERROR_WRITE_FAULT: errno.EIO,
- winerror.ERROR_WRITE_PROTECT: errno.EROFS,
- }
-
- def __init__(self, err):
- try:
- # unpack a pywintypes.error tuple
- self.win_errno, self.win_function, self.win_strerror = err
- except ValueError:
- # get attributes from a WindowsError
- self.win_errno = err.winerror
- self.win_function = None
- self.win_strerror = err.strerror
- self.win_strerror = self.win_strerror.rstrip('.')
-
-class WinIOError(WinError, IOError):
- def __init__(self, err, filename=None):
- WinError.__init__(self, err)
- IOError.__init__(self, self.winerror_map.get(self.win_errno, 0),
- self.win_strerror)
- self.filename = filename
-
-class WinOSError(WinError, OSError):
- def __init__(self, err):
- WinError.__init__(self, err)
- OSError.__init__(self, self.winerror_map.get(self.win_errno, 0),
- self.win_strerror)
-
def os_link(src, dst):
try:
win32file.CreateHardLink(dst, src)
diff -r bc9ac7a29a73 -r 0823bdb69ce6 mercurial/windows.py
--- a/mercurial/windows.py Thu Jun 25 09:53:47 2009 +0200
+++ b/mercurial/windows.py Thu Jun 25 18:46:26 2009 +0200
@@ -8,17 +8,255 @@
from i18n import _
import osutil, error
import errno, msvcrt, os, re, sys
-from mercurial import win32
nulldev = 'NUL:'
umask = 002
+ERROR_ACCESS_DENIED = 5
+ERROR_ACCOUNT_DISABLED = 1331
+ERROR_ACCOUNT_RESTRICTION = 1327
+ERROR_ALREADY_ASSIGNED = 85
+ERROR_ALREADY_EXISTS = 183
+ERROR_ARITHMETIC_OVERFLOW = 534
+ERROR_BAD_COMMAND = 22
+ERROR_BAD_DEVICE = 1200
+ERROR_BAD_DRIVER_LEVEL = 119
+ERROR_BAD_EXE_FORMAT = 193
+ERROR_BAD_FORMAT = 11
+ERROR_BAD_LENGTH = 24
+ERROR_BAD_PATHNAME = 161
+ERROR_BAD_PIPE = 230
+ERROR_BAD_UNIT = 20
+ERROR_BAD_USERNAME = 2202
+ERROR_BROKEN_PIPE = 109
+ERROR_BUFFER_OVERFLOW = 111
+ERROR_BUSY = 170
+ERROR_BUSY_DRIVE = 142
+ERROR_CALL_NOT_IMPLEMENTED = 120
+ERROR_CANNOT_MAKE = 82
+ERROR_CANTOPEN = 1011
+ERROR_CANTREAD = 1012
+ERROR_CANTWRITE = 1013
+ERROR_CRC = 23
+ERROR_CURRENT_DIRECTORY = 16
+ERROR_DEVICE_IN_USE = 2404
+ERROR_DEV_NOT_EXIST = 55
+ERROR_DIRECTORY = 267
+ERROR_DIR_NOT_EMPTY = 145
+ERROR_DISK_CHANGE = 107
+ERROR_DISK_FULL = 112
+ERROR_DRIVE_LOCKED = 108
+ERROR_ENVVAR_NOT_FOUND = 203
+ERROR_EXE_MARKED_INVALID = 192
+ERROR_FILENAME_EXCED_RANGE = 206
+ERROR_FILE_EXISTS = 80
+ERROR_FILE_INVALID = 1006
+ERROR_FILE_NOT_FOUND = 2
+ERROR_GEN_FAILURE = 31
+ERROR_HANDLE_DISK_FULL = 39
+ERROR_INSUFFICIENT_BUFFER = 122
+ERROR_INVALID_ACCESS = 12
+ERROR_INVALID_ADDRESS = 487
+ERROR_INVALID_BLOCK = 9
+ERROR_INVALID_DATA = 13
+ERROR_INVALID_DRIVE = 15
+ERROR_INVALID_EXE_SIGNATURE = 191
+ERROR_INVALID_FLAGS = 1004
+ERROR_INVALID_FUNCTION = 1
+ERROR_INVALID_HANDLE = 6
+ERROR_INVALID_LOGON_HOURS = 1328
+ERROR_INVALID_NAME = 123
+ERROR_INVALID_OWNER = 1307
+ERROR_INVALID_PARAMETER = 87
+ERROR_INVALID_PASSWORD = 86
+ERROR_INVALID_PRIMARY_GROUP = 1308
+ERROR_INVALID_SIGNAL_NUMBER = 209
+ERROR_INVALID_TARGET_HANDLE = 114
+ERROR_INVALID_WORKSTATION = 1329
+ERROR_IO_DEVICE = 1117
+ERROR_IO_INCOMPLETE = 996
+ERROR_LOCKED = 212
+ERROR_LOCK_VIOLATION = 33
+ERROR_LOGON_FAILURE = 1326
+ERROR_MAPPED_ALIGNMENT = 1132
+ERROR_META_EXPANSION_TOO_LONG = 208
+ERROR_MORE_DATA = 234
+ERROR_NEGATIVE_SEEK = 131
+ERROR_NOACCESS = 998
+ERROR_NONE_MAPPED = 1332
+ERROR_NOT_ENOUGH_MEMORY = 8
+ERROR_NOT_READY = 21
+ERROR_NOT_SAME_DEVICE = 17
+ERROR_NO_DATA = 232
+ERROR_NO_MORE_SEARCH_HANDLES = 113
+ERROR_NO_PROC_SLOTS = 89
+ERROR_NO_SUCH_PRIVILEGE = 1313
+ERROR_OPEN_FAILED = 110
+ERROR_OPEN_FILES = 2401
+ERROR_OPERATION_ABORTED = 995
+ERROR_OUTOFMEMORY = 14
+ERROR_PASSWORD_EXPIRED = 1330
+ERROR_PATH_BUSY = 148
+ERROR_PATH_NOT_FOUND = 3
+ERROR_PIPE_BUSY = 231
+ERROR_PIPE_CONNECTED = 535
+ERROR_PIPE_LISTENING = 356
+ERROR_PIPE_NOT_CONNECTED = 233
+ERROR_PRIVILEGE_NOT_HELD = 1314
+ERROR_READ_FAULT = 30
+ERROR_SEEK = 25
+ERROR_SEEK_ON_DEVICE = 132
+ERROR_SHARING_BUFFER_EXCEEDED = 36
+ERROR_SHARING_VIOLATION = 32
+ERROR_STACK_OVERFLOW = 1001
+ERROR_SWAPERROR = 999
+ERROR_TOO_MANY_MODULES = 214
+ERROR_TOO_MANY_OPEN_FILES = 4
+ERROR_UNRECOGNIZED_MEDIA = 1785
+ERROR_UNRECOGNIZED_VOLUME = 1005
+ERROR_WAIT_NO_CHILDREN = 128
+ERROR_WRITE_FAULT = 29
+ERROR_WRITE_PROTECT = 19
+
+class WinError(Exception):
+ winerror_map = {
+ ERROR_ACCESS_DENIED: errno.EACCES,
+ ERROR_ACCOUNT_DISABLED: errno.EACCES,
+ ERROR_ACCOUNT_RESTRICTION: errno.EACCES,
+ ERROR_ALREADY_ASSIGNED: errno.EBUSY,
+ ERROR_ALREADY_EXISTS: errno.EEXIST,
+ ERROR_ARITHMETIC_OVERFLOW: errno.ERANGE,
+ ERROR_BAD_COMMAND: errno.EIO,
+ ERROR_BAD_DEVICE: errno.ENODEV,
+ ERROR_BAD_DRIVER_LEVEL: errno.ENXIO,
+ ERROR_BAD_EXE_FORMAT: errno.ENOEXEC,
+ ERROR_BAD_FORMAT: errno.ENOEXEC,
+ ERROR_BAD_LENGTH: errno.EINVAL,
+ ERROR_BAD_PATHNAME: errno.ENOENT,
+ ERROR_BAD_PIPE: errno.EPIPE,
+ ERROR_BAD_UNIT: errno.ENODEV,
+ ERROR_BAD_USERNAME: errno.EINVAL,
+ ERROR_BROKEN_PIPE: errno.EPIPE,
+ ERROR_BUFFER_OVERFLOW: errno.ENAMETOOLONG,
+ ERROR_BUSY: errno.EBUSY,
+ ERROR_BUSY_DRIVE: errno.EBUSY,
+ ERROR_CALL_NOT_IMPLEMENTED: errno.ENOSYS,
+ ERROR_CANNOT_MAKE: errno.EACCES,
+ ERROR_CANTOPEN: errno.EIO,
+ ERROR_CANTREAD: errno.EIO,
+ ERROR_CANTWRITE: errno.EIO,
+ ERROR_CRC: errno.EIO,
+ ERROR_CURRENT_DIRECTORY: errno.EACCES,
+ ERROR_DEVICE_IN_USE: errno.EBUSY,
+ ERROR_DEV_NOT_EXIST: errno.ENODEV,
+ ERROR_DIRECTORY: errno.EINVAL,
+ ERROR_DIR_NOT_EMPTY: errno.ENOTEMPTY,
+ ERROR_DISK_CHANGE: errno.EIO,
+ ERROR_DISK_FULL: errno.ENOSPC,
+ ERROR_DRIVE_LOCKED: errno.EBUSY,
+ ERROR_ENVVAR_NOT_FOUND: errno.EINVAL,
+ ERROR_EXE_MARKED_INVALID: errno.ENOEXEC,
+ ERROR_FILENAME_EXCED_RANGE: errno.ENAMETOOLONG,
+ ERROR_FILE_EXISTS: errno.EEXIST,
+ ERROR_FILE_INVALID: errno.ENODEV,
+ ERROR_FILE_NOT_FOUND: errno.ENOENT,
+ ERROR_GEN_FAILURE: errno.EIO,
+ ERROR_HANDLE_DISK_FULL: errno.ENOSPC,
+ ERROR_INSUFFICIENT_BUFFER: errno.ENOMEM,
+ ERROR_INVALID_ACCESS: errno.EACCES,
+ ERROR_INVALID_ADDRESS: errno.EFAULT,
+ ERROR_INVALID_BLOCK: errno.EFAULT,
+ ERROR_INVALID_DATA: errno.EINVAL,
+ ERROR_INVALID_DRIVE: errno.ENODEV,
+ ERROR_INVALID_EXE_SIGNATURE: errno.ENOEXEC,
+ ERROR_INVALID_FLAGS: errno.EINVAL,
+ ERROR_INVALID_FUNCTION: errno.ENOSYS,
+ ERROR_INVALID_HANDLE: errno.EBADF,
+ ERROR_INVALID_LOGON_HOURS: errno.EACCES,
+ ERROR_INVALID_NAME: errno.EINVAL,
+ ERROR_INVALID_OWNER: errno.EINVAL,
+ ERROR_INVALID_PARAMETER: errno.EINVAL,
+ ERROR_INVALID_PASSWORD: errno.EPERM,
+ ERROR_INVALID_PRIMARY_GROUP: errno.EINVAL,
+ ERROR_INVALID_SIGNAL_NUMBER: errno.EINVAL,
+ ERROR_INVALID_TARGET_HANDLE: errno.EIO,
+ ERROR_INVALID_WORKSTATION: errno.EACCES,
+ ERROR_IO_DEVICE: errno.EIO,
+ ERROR_IO_INCOMPLETE: errno.EINTR,
+ ERROR_LOCKED: errno.EBUSY,
+ ERROR_LOCK_VIOLATION: errno.EACCES,
+ ERROR_LOGON_FAILURE: errno.EACCES,
+ ERROR_MAPPED_ALIGNMENT: errno.EINVAL,
+ ERROR_META_EXPANSION_TOO_LONG: errno.E2BIG,
+ ERROR_MORE_DATA: errno.EPIPE,
+ ERROR_NEGATIVE_SEEK: errno.ESPIPE,
+ ERROR_NOACCESS: errno.EFAULT,
+ ERROR_NONE_MAPPED: errno.EINVAL,
+ ERROR_NOT_ENOUGH_MEMORY: errno.ENOMEM,
+ ERROR_NOT_READY: errno.EAGAIN,
+ ERROR_NOT_SAME_DEVICE: errno.EXDEV,
+ ERROR_NO_DATA: errno.EPIPE,
+ ERROR_NO_MORE_SEARCH_HANDLES: errno.EIO,
+ ERROR_NO_PROC_SLOTS: errno.EAGAIN,
+ ERROR_NO_SUCH_PRIVILEGE: errno.EACCES,
+ ERROR_OPEN_FAILED: errno.EIO,
+ ERROR_OPEN_FILES: errno.EBUSY,
+ ERROR_OPERATION_ABORTED: errno.EINTR,
+ ERROR_OUTOFMEMORY: errno.ENOMEM,
+ ERROR_PASSWORD_EXPIRED: errno.EACCES,
+ ERROR_PATH_BUSY: errno.EBUSY,
+ ERROR_PATH_NOT_FOUND: errno.ENOENT,
+ ERROR_PIPE_BUSY: errno.EBUSY,
+ ERROR_PIPE_CONNECTED: errno.EPIPE,
+ ERROR_PIPE_LISTENING: errno.EPIPE,
+ ERROR_PIPE_NOT_CONNECTED: errno.EPIPE,
+ ERROR_PRIVILEGE_NOT_HELD: errno.EACCES,
+ ERROR_READ_FAULT: errno.EIO,
+ ERROR_SEEK: errno.EIO,
+ ERROR_SEEK_ON_DEVICE: errno.ESPIPE,
+ ERROR_SHARING_BUFFER_EXCEEDED: errno.ENFILE,
+ ERROR_SHARING_VIOLATION: errno.EACCES,
+ ERROR_STACK_OVERFLOW: errno.ENOMEM,
+ ERROR_SWAPERROR: errno.ENOENT,
+ ERROR_TOO_MANY_MODULES: errno.EMFILE,
+ ERROR_TOO_MANY_OPEN_FILES: errno.EMFILE,
+ ERROR_UNRECOGNIZED_MEDIA: errno.ENXIO,
+ ERROR_UNRECOGNIZED_VOLUME: errno.ENODEV,
+ ERROR_WAIT_NO_CHILDREN: errno.ECHILD,
+ ERROR_WRITE_FAULT: errno.EIO,
+ ERROR_WRITE_PROTECT: errno.EROFS,
+ }
+
+ def __init__(self, err):
+ try:
+ # unpack a pywintypes.error tuple
+ self.win_errno, self.win_function, self.win_strerror = err
+ except ValueError:
+ # get attributes from a WindowsError
+ self.win_errno = err.winerror
+ self.win_function = None
+ self.win_strerror = err.strerror
+ self.win_strerror = self.win_strerror.rstrip('.')
+
+class WinIOError(WinError, IOError):
+ def __init__(self, err, filename=None):
+ WinError.__init__(self, err)
+ IOError.__init__(self, self.winerror_map.get(self.win_errno, 0),
+ self.win_strerror)
+ self.filename = filename
+
+class WinOSError(WinError, OSError):
+ def __init__(self, err):
+ WinError.__init__(self, err)
+ OSError.__init__(self, self.winerror_map.get(self.win_errno, 0),
+ self.win_strerror)
+
# wrap osutil.posixfile to provide friendlier exceptions
def posixfile(name, mode='r', buffering=-1):
try:
return osutil.posixfile(name, mode, buffering)
except WindowsError, err:
- raise win32.WinIOError(err)
+ raise WinIOError(err)
posixfile.__doc__ = osutil.posixfile.__doc__
class winstdout(object):
More information about the Mercurial-devel
mailing list