lock: properly convert error to bytes

Flagged by pytype when a later changeset is applied moving typing comment to annotation.

We fix this ahead of the annotation change to make sure pytype remains happy
after the change.

We have to do fairly crazy dance for pytype to be happy. This probably comes
from the fact IOError.filename probably claims to be `str` while it is actually
`bytes` if the filename raising that `IOError` is bytes.

At the same time, `IOError.strerror` is consistently `str` and should be passed
as `str` everywhere.

mercurial/error.py

@@ -1,692 +1,691 b''
 # error.py - Mercurial exceptions
 #
 # Copyright 2005-2008 Olivia Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 """Mercurial exceptions.
 
 This allows us to catch exceptions at higher levels without forcing
 imports.
 """
 
 
 import difflib
 
 from typing import (
     Any,
     AnyStr,
     Iterable,
     List,
     Optional,
     Sequence,
     Union,
 )
 
 # Do not import anything but pycompat here, please
 from . import pycompat
 
 
 # keeps pyflakes happy
 assert [
     Any,
     AnyStr,
     Iterable,
     List,
     Optional,
     Sequence,
     Union,
 ]
 
 
 def _tobytes(exc):
     # type: (...) -> bytes
     """Byte-stringify exception in the same way as BaseException_str()"""
     if not exc.args:
         return b''
     if len(exc.args) == 1:
         return pycompat.bytestr(exc.args[0])
     return b'(%s)' % b', '.join(b"'%s'" % pycompat.bytestr(a) for a in exc.args)
 
 
 class Hint:
     """Mix-in to provide a hint of an error
 
     This should come first in the inheritance list to consume a hint and
     pass remaining arguments to the exception class.
     """
 
     def __init__(self, *args, **kw):
         self.hint = kw.pop('hint', None)  # type: Optional[bytes]
         super(Hint, self).__init__(*args, **kw)
 
 
 class Error(Hint, Exception):
     """Base class for Mercurial errors."""
 
     coarse_exit_code = None
     detailed_exit_code = None
 
     def __init__(self, message, hint=None):
         # type: (bytes, Optional[bytes]) -> None
         self.message = message
         self.hint = hint
         # Pass the message into the Exception constructor to help extensions
         # that look for exc.args[0].
         Exception.__init__(self, message)
 
     def __bytes__(self):
         return self.message
 
     def __str__(self):
         # type: () -> str
         # the output would be unreadable if the message was translated,
         # but do not replace it with encoding.strfromlocal(), which
         # may raise another exception.
         return pycompat.sysstr(self.__bytes__())
 
     def format(self):
         # type: () -> bytes
         from .i18n import _
 
         message = _(b"abort: %s\n") % self.message
         if self.hint:
             message += _(b"(%s)\n") % self.hint
         return message
 
 
 class Abort(Error):
     """Raised if a command needs to print an error and exit."""
 
 
 class StorageError(Error):
     """Raised when an error occurs in a storage layer.
 
     Usually subclassed by a storage-specific exception.
     """
 
     detailed_exit_code = 50
 
 
 class RevlogError(StorageError):
     pass
 
 
 class SidedataHashError(RevlogError):
     def __init__(self, key, expected, got):
         # type: (int, bytes, bytes) -> None
         self.hint = None
         self.sidedatakey = key
         self.expecteddigest = expected
         self.actualdigest = got
 
 
 class FilteredIndexError(IndexError):
     __bytes__ = _tobytes
 
 
 class LookupError(RevlogError, KeyError):
     def __init__(self, name, index, message):
         # type: (bytes, bytes, bytes) -> None
         self.name = name
         self.index = index
         # this can't be called 'message' because at least some installs of
         # Python 2.6+ complain about the 'message' property being deprecated
         self.lookupmessage = message
         if isinstance(name, bytes) and len(name) == 20:
             from .node import hex
 
             name = hex(name)
         # if name is a binary node, it can be None
         RevlogError.__init__(
             self, b'%s@%s: %s' % (index, pycompat.bytestr(name), message)
         )
 
     def __bytes__(self):
         return RevlogError.__bytes__(self)
 
     def __str__(self):
         return RevlogError.__str__(self)
 
 
 class AmbiguousPrefixLookupError(LookupError):
     pass
 
 
 class FilteredLookupError(LookupError):
     pass
 
 
 class ManifestLookupError(LookupError):
     pass
 
 
 class CommandError(Exception):
     """Exception raised on errors in parsing the command line."""
 
     def __init__(self, command, message):
         # type: (Optional[bytes], bytes) -> None
         self.command = command
         self.message = message
         super(CommandError, self).__init__()
 
     __bytes__ = _tobytes
 
 
 class UnknownCommand(Exception):
     """Exception raised if command is not in the command table."""
 
     def __init__(self, command, all_commands=None):
         # type: (bytes, Optional[List[bytes]]) -> None
         self.command = command
         self.all_commands = all_commands
         super(UnknownCommand, self).__init__()
 
     __bytes__ = _tobytes
 
 
 class AmbiguousCommand(Exception):
     """Exception raised if command shortcut matches more than one command."""
 
     def __init__(self, prefix, matches):
         # type: (bytes, List[bytes]) -> None
         self.prefix = prefix
         self.matches = matches
         super(AmbiguousCommand, self).__init__()
 
     __bytes__ = _tobytes
 
 
 class WorkerError(Exception):
     """Exception raised when a worker process dies."""
 
     def __init__(self, status_code):
         # type: (int) -> None
         self.status_code = status_code
         # Pass status code to superclass just so it becomes part of __bytes__
         super(WorkerError, self).__init__(status_code)
 
     __bytes__ = _tobytes
 
 
 class InterventionRequired(Abort):
     """Exception raised when a command requires human intervention."""
 
     coarse_exit_code = 1
     detailed_exit_code = 240
 
     def format(self):
         # type: () -> bytes
         from .i18n import _
 
         message = _(b"%s\n") % self.message
         if self.hint:
             message += _(b"(%s)\n") % self.hint
         return message
 
 
 class ConflictResolutionRequired(InterventionRequired):
     """Exception raised when a continuable command required merge conflict resolution."""
 
     def __init__(self, opname):
         # type: (bytes) -> None
         from .i18n import _
 
         self.opname = opname
         InterventionRequired.__init__(
             self,
             _(
                 b"unresolved conflicts (see 'hg resolve', then 'hg %s --continue')"
             )
             % opname,
         )
 
 
 class InputError(Abort):
     """Indicates that the user made an error in their input.
 
     Examples: Invalid command, invalid flags, invalid revision.
     """
 
     detailed_exit_code = 10
 
 
 class StateError(Abort):
     """Indicates that the operation might work if retried in a different state.
 
     Examples: Unresolved merge conflicts, unfinished operations.
     """
 
     detailed_exit_code = 20
 
 
 class CanceledError(Abort):
     """Indicates that the user canceled the operation.
 
     Examples: Close commit editor with error status, quit chistedit.
     """
 
     detailed_exit_code = 250
 
 
 class SecurityError(Abort):
     """Indicates that some aspect of security failed.
 
     Examples: Bad server credentials, expired local credentials for network
     filesystem, mismatched GPG signature, DoS protection.
     """
 
     detailed_exit_code = 150
 
 
 class HookLoadError(Abort):
     """raised when loading a hook fails, aborting an operation
 
     Exists to allow more specialized catching."""
 
 
 class HookAbort(Abort):
     """raised when a validation hook fails, aborting an operation
 
     Exists to allow more specialized catching."""
 
     detailed_exit_code = 40
 
 
 class ConfigError(Abort):
     """Exception raised when parsing config files"""
 
     detailed_exit_code = 30
 
     def __init__(self, message, location=None, hint=None):
         # type: (bytes, Optional[bytes], Optional[bytes]) -> None
         super(ConfigError, self).__init__(message, hint=hint)
         self.location = location
 
     def format(self):
         # type: () -> bytes
         from .i18n import _
 
         if self.location is not None:
             message = _(b"config error at %s: %s\n") % (
                 pycompat.bytestr(self.location),
                 self.message,
             )
         else:
             message = _(b"config error: %s\n") % self.message
         if self.hint:
             message += _(b"(%s)\n") % self.hint
         return message
 
 
 class UpdateAbort(Abort):
     """Raised when an update is aborted for destination issue"""
 
 
 class MergeDestAbort(Abort):
     """Raised when an update is aborted for destination issues"""
 
 
 class NoMergeDestAbort(MergeDestAbort):
     """Raised when an update is aborted because there is nothing to merge"""
 
 
 class ManyMergeDestAbort(MergeDestAbort):
     """Raised when an update is aborted because destination is ambiguous"""
 
 
 class ResponseExpected(Abort):
     """Raised when an EOF is received for a prompt"""
 
     def __init__(self):
         from .i18n import _
 
         Abort.__init__(self, _(b'response expected'))
 
 
 class RemoteError(Abort):
     """Exception raised when interacting with a remote repo fails"""
 
     detailed_exit_code = 100
 
 
 class OutOfBandError(RemoteError):
     """Exception raised when a remote repo reports failure"""
 
     def __init__(self, message=None, hint=None):
         # type: (Optional[bytes], Optional[bytes]) -> None
         from .i18n import _
 
         if message:
             # Abort.format() adds a trailing newline
             message = _(b"remote error:\n%s") % message.rstrip(b'\n')
         else:
             message = _(b"remote error")
         super(OutOfBandError, self).__init__(message, hint=hint)
 
 
 class ParseError(Abort):
     """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
 
     detailed_exit_code = 10
 
     def __init__(self, message, location=None, hint=None):
         # type: (bytes, Optional[Union[bytes, int]], Optional[bytes]) -> None
         super(ParseError, self).__init__(message, hint=hint)
         self.location = location
 
     def format(self):
         # type: () -> bytes
         from .i18n import _
 
         if self.location is not None:
             message = _(b"hg: parse error at %s: %s\n") % (
                 pycompat.bytestr(self.location),
                 self.message,
             )
         else:
             message = _(b"hg: parse error: %s\n") % self.message
         if self.hint:
             message += _(b"(%s)\n") % self.hint
         return message
 
 
 class PatchError(Exception):
     __bytes__ = _tobytes
 
 
 class PatchParseError(PatchError):
     __bytes__ = _tobytes
 
 
 class PatchApplicationError(PatchError):
     __bytes__ = _tobytes
 
 
 def getsimilar(symbols, value):
     # type: (Iterable[bytes], bytes) -> List[bytes]
     sim = lambda x: difflib.SequenceMatcher(None, value, x).ratio()
     # The cutoff for similarity here is pretty arbitrary. It should
     # probably be investigated and tweaked.
     return [s for s in symbols if sim(s) > 0.6]
 
 
 def similarity_hint(similar):
     # type: (List[bytes]) -> Optional[bytes]
     from .i18n import _
 
     if len(similar) == 1:
         return _(b"did you mean %s?") % similar[0]
     elif similar:
         ss = b", ".join(sorted(similar))
         return _(b"did you mean one of %s?") % ss
     else:
         return None
 
 
 class UnknownIdentifier(ParseError):
     """Exception raised when a {rev,file}set references an unknown identifier"""
 
     def __init__(self, function, symbols):
         # type: (bytes, Iterable[bytes]) -> None
         from .i18n import _
 
         similar = getsimilar(symbols, function)
         hint = similarity_hint(similar)
 
         ParseError.__init__(
             self, _(b"unknown identifier: %s") % function, hint=hint
         )
 
 
 class RepoError(Hint, Exception):
     __bytes__ = _tobytes
 
 
 class RepoLookupError(RepoError):
     pass
 
 
 class FilteredRepoLookupError(RepoLookupError):
     pass
 
 
 class CapabilityError(RepoError):
     pass
 
 
 class RequirementError(RepoError):
     """Exception raised if .hg/requires has an unknown entry."""
 
 
 class StdioError(IOError):
     """Raised if I/O to stdout or stderr fails"""
 
     def __init__(self, err):
         # type: (IOError) -> None
         IOError.__init__(self, err.errno, err.strerror)
 
     # no __bytes__() because error message is derived from the standard IOError
 
 
 class UnsupportedMergeRecords(Abort):
     def __init__(self, recordtypes):
         # type: (Iterable[bytes]) -> None
         from .i18n import _
 
         self.recordtypes = sorted(recordtypes)
         s = b' '.join(self.recordtypes)
         Abort.__init__(
             self,
             _(b'unsupported merge state records: %s') % s,
             hint=_(
                 b'see https://mercurial-scm.org/wiki/MergeStateRecords for '
                 b'more information'
             ),
         )
 
 
 class UnknownVersion(Abort):
     """generic exception for aborting from an encounter with an unknown version"""
 
     def __init__(self, msg, hint=None, version=None):
         # type: (bytes, Optional[bytes], Optional[bytes]) -> None
         self.version = version
         super(UnknownVersion, self).__init__(msg, hint=hint)
 
 
 class LockError(IOError):
     def __init__(self, errno, strerror, filename, desc):
-        # TODO: figure out if this should be bytes or str
-        # _type: (int, str, str, bytes) -> None
+        # _type: (int, str, bytes, bytes) -> None
         IOError.__init__(self, errno, strerror, filename)
         self.desc = desc
 
     # no __bytes__() because error message is derived from the standard IOError
 
 
 class LockHeld(LockError):
     def __init__(self, errno, filename, desc, locker):
-        LockError.__init__(self, errno, b'Lock held', filename, desc)
+        LockError.__init__(self, errno, 'Lock held', filename, desc)
         self.locker = locker
 
 
 class LockUnavailable(LockError):
     pass
 
 
 # LockError is for errors while acquiring the lock -- this is unrelated
 class LockInheritanceContractViolation(RuntimeError):
     __bytes__ = _tobytes
 
 
 class ResponseError(Exception):
     """Raised to print an error with part of output and exit."""
 
     __bytes__ = _tobytes
 
 
 # derived from KeyboardInterrupt to simplify some breakout code
 class SignalInterrupt(KeyboardInterrupt):
     """Exception raised on SIGTERM and SIGHUP."""
 
 
 class SignatureError(Exception):
     __bytes__ = _tobytes
 
 
 class PushRaced(RuntimeError):
     """An exception raised during unbundling that indicate a push race"""
 
     __bytes__ = _tobytes
 
 
 class ProgrammingError(Hint, RuntimeError):
     """Raised if a mercurial (core or extension) developer made a mistake"""
 
     def __init__(self, msg, *args, **kwargs):
         # type: (AnyStr, Any, Any) -> None
         # On Python 3, turn the message back into a string since this is
         # an internal-only error that won't be printed except in a
         # stack traces.
         msg = pycompat.sysstr(msg)
         super(ProgrammingError, self).__init__(msg, *args, **kwargs)
 
     __bytes__ = _tobytes
 
 
 class WdirUnsupported(Exception):
     """An exception which is raised when 'wdir()' is not supported"""
 
     __bytes__ = _tobytes
 
 
 # bundle2 related errors
 class BundleValueError(ValueError):
     """error raised when bundle2 cannot be processed"""
 
     __bytes__ = _tobytes
 
 
 class BundleUnknownFeatureError(BundleValueError):
     def __init__(self, parttype=None, params=(), values=()):
         self.parttype = parttype
         self.params = params
         self.values = values
         if self.parttype is None:
             msg = b'Stream Parameter'
         else:
             msg = parttype
         entries = self.params
         if self.params and self.values:
             assert len(self.params) == len(self.values)
             entries = []
             for idx, par in enumerate(self.params):
                 val = self.values[idx]
                 if val is None:
                     entries.append(val)
                 else:
                     entries.append(b"%s=%r" % (par, pycompat.maybebytestr(val)))
         if entries:
             msg = b'%s - %s' % (msg, b', '.join(entries))
         ValueError.__init__(self, msg)  # TODO: convert to str?
 
 
 class ReadOnlyPartError(RuntimeError):
     """error raised when code tries to alter a part being generated"""
 
     __bytes__ = _tobytes
 
 
 class PushkeyFailed(Abort):
     """error raised when a pushkey part failed to update a value"""
 
     def __init__(
         self, partid, namespace=None, key=None, new=None, old=None, ret=None
     ):
         self.partid = partid
         self.namespace = namespace
         self.key = key
         self.new = new
         self.old = old
         self.ret = ret
         # no i18n expected to be processed into a better message
         Abort.__init__(
             self, b'failed to update value for "%s/%s"' % (namespace, key)
         )
 
 
 class CensoredNodeError(StorageError):
     """error raised when content verification fails on a censored node
 
     Also contains the tombstone data substituted for the uncensored data.
     """
 
     def __init__(self, filename, node, tombstone):
         # type: (bytes, bytes, bytes) -> None
         from .node import short
 
         StorageError.__init__(self, b'%s:%s' % (filename, short(node)))
         self.tombstone = tombstone
 
 
 class CensoredBaseError(StorageError):
     """error raised when a delta is rejected because its base is censored
 
     A delta based on a censored revision must be formed as single patch
     operation which replaces the entire base with new content. This ensures
     the delta may be applied by clones which have not censored the base.
     """
 
 
 class InvalidBundleSpecification(Exception):
     """error raised when a bundle specification is invalid.
 
     This is used for syntax errors as opposed to support errors.
     """
 
     __bytes__ = _tobytes
 
 
 class UnsupportedBundleSpecification(Exception):
     """error raised when a bundle specification is not supported."""
 
     __bytes__ = _tobytes
 
 
 class CorruptedState(Exception):
     """error raised when a command is not able to read its state from file"""
 
     __bytes__ = _tobytes
 
 
 class CorruptedDirstate(Exception):
     """error raised the dirstate appears corrupted on-disk. It may be due to
     a dirstate version mismatch (i.e. expecting v2 and finding v1 on disk)."""
 
     __bytes__ = _tobytes
 
 
 class PeerTransportError(Abort):
     """Transport-level I/O error when communicating with a peer repo."""
 
 
 class InMemoryMergeConflictsError(Exception):
     """Exception raised when merge conflicts arose during an in-memory merge."""
 
     __bytes__ = _tobytes
 
 
 class WireprotoCommandError(Exception):
     """Represents an error during execution of a wire protocol command.
 
     Should only be thrown by wire protocol version 2 commands.
 
     The error is a formatter string and an optional iterable of arguments.
     """
 
     def __init__(self, message, args=None):
         # type: (bytes, Optional[Sequence[bytes]]) -> None
         self.message = message
         self.messageargs = args

mercurial/lock.py

@@ -1,392 +1,402 b''
 # lock.py - simple advisory locking scheme for mercurial
 #
 # Copyright 2005, 2006 Olivia Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 
 import contextlib
 import errno
 import os
 import signal
 import socket
 import time
+import typing
 import warnings
 
 from .i18n import _
 
 from . import (
     encoding,
     error,
     pycompat,
     util,
 )
 
 from .utils import procutil
 
 
 def _getlockprefix():
     """Return a string which is used to differentiate pid namespaces
 
     It's useful to detect "dead" processes and remove stale locks with
     confidence. Typically it's just hostname. On modern linux, we include an
     extra Linux-specific pid namespace identifier.
     """
     result = encoding.strtolocal(socket.gethostname())
     if pycompat.sysplatform.startswith(b'linux'):
         try:
             result += b'/%x' % os.stat(b'/proc/self/ns/pid').st_ino
         except (FileNotFoundError, PermissionError, NotADirectoryError):
             pass
     return result
 
 
 @contextlib.contextmanager
 def _delayedinterrupt():
     """Block signal interrupt while doing something critical
 
     This makes sure that the code block wrapped by this context manager won't
     be interrupted.
 
     For Windows developers: It appears not possible to guard time.sleep()
     from CTRL_C_EVENT, so please don't use time.sleep() to test if this is
     working.
     """
     assertedsigs = []
     blocked = False
     orighandlers = {}
 
     def raiseinterrupt(num):
         if num == getattr(signal, 'SIGINT', None) or num == getattr(
             signal, 'CTRL_C_EVENT', None
         ):
             raise KeyboardInterrupt
         else:
             raise error.SignalInterrupt
 
     def catchterm(num, frame):
         if blocked:
             assertedsigs.append(num)
         else:
             raiseinterrupt(num)
 
     try:
         # save handlers first so they can be restored even if a setup is
         # interrupted between signal.signal() and orighandlers[] =.
         for name in [
             'CTRL_C_EVENT',
             'SIGINT',
             'SIGBREAK',
             'SIGHUP',
             'SIGTERM',
         ]:
             num = getattr(signal, name, None)
             if num and num not in orighandlers:
                 orighandlers[num] = signal.getsignal(num)
         try:
             for num in orighandlers:
                 signal.signal(num, catchterm)
         except ValueError:
             pass  # in a thread? no luck
 
         blocked = True
         yield
     finally:
         # no simple way to reliably restore all signal handlers because
         # any loops, recursive function calls, except blocks, etc. can be
         # interrupted. so instead, make catchterm() raise interrupt.
         blocked = False
         try:
             for num, handler in orighandlers.items():
                 signal.signal(num, handler)
         except ValueError:
             pass  # in a thread?
 
     # re-raise interrupt exception if any, which may be shadowed by a new
     # interrupt occurred while re-raising the first one
     if assertedsigs:
         raiseinterrupt(assertedsigs[0])
 
 
 def trylock(ui, vfs, lockname, timeout, warntimeout, *args, **kwargs):
     """return an acquired lock or raise an a LockHeld exception
 
     This function is responsible to issue warnings and or debug messages about
     the held lock while trying to acquires it."""
 
     def printwarning(printer, locker):
         """issue the usual "waiting on lock" message through any channel"""
         # show more details for new-style locks
         if b':' in locker:
             host, pid = locker.split(b":", 1)
             msg = _(
                 b"waiting for lock on %s held by process %r on host %r\n"
             ) % (
                 pycompat.bytestr(l.desc),
                 pycompat.bytestr(pid),
                 pycompat.bytestr(host),
             )
         else:
             msg = _(b"waiting for lock on %s held by %r\n") % (
                 l.desc,
                 pycompat.bytestr(locker),
             )
         printer(msg)
 
     l = lock(vfs, lockname, 0, *args, dolock=False, **kwargs)
 
     debugidx = 0 if (warntimeout and timeout) else -1
     warningidx = 0
     if not timeout:
         warningidx = -1
     elif warntimeout:
         warningidx = warntimeout
 
     delay = 0
     while True:
         try:
             l._trylock()
             break
         except error.LockHeld as inst:
             if delay == debugidx:
                 printwarning(ui.debug, inst.locker)
             if delay == warningidx:
                 printwarning(ui.warn, inst.locker)
             if timeout <= delay:
+                assert isinstance(inst.filename, bytes)
                 raise error.LockHeld(
-                    errno.ETIMEDOUT, inst.filename, l.desc, inst.locker
+                    errno.ETIMEDOUT,
+                    typing.cast(bytes, inst.filename),
+                    l.desc,
+                    inst.locker,
                 )
             time.sleep(1)
             delay += 1
 
     l.delay = delay
     if l.delay:
         if 0 <= warningidx <= l.delay:
             ui.warn(_(b"got lock after %d seconds\n") % l.delay)
         else:
             ui.debug(b"got lock after %d seconds\n" % l.delay)
     if l.acquirefn:
         l.acquirefn()
     return l
 
 
 class lock:
     """An advisory lock held by one process to control access to a set
     of files.  Non-cooperating processes or incorrectly written scripts
     can ignore Mercurial's locking scheme and stomp all over the
     repository, so don't do that.
 
     Typically used via localrepository.lock() to lock the repository
     store (.hg/store/) or localrepository.wlock() to lock everything
     else under .hg/."""
 
     # lock is symlink on platforms that support it, file on others.
 
     # symlink is used because create of directory entry and contents
     # are atomic even over nfs.
 
     # old-style lock: symlink to pid
     # new-style lock: symlink to hostname:pid
 
     _host = None
 
     def __init__(
         self,
         vfs,
         fname,
         timeout=-1,
         releasefn=None,
         acquirefn=None,
         desc=None,
         signalsafe=True,
         dolock=True,
     ):
         self.vfs = vfs
         self.f = fname
         self.held = 0
         self.timeout = timeout
         self.releasefn = releasefn
         self.acquirefn = acquirefn
         self.desc = desc
         if signalsafe:
             self._maybedelayedinterrupt = _delayedinterrupt
         else:
             self._maybedelayedinterrupt = util.nullcontextmanager
         self.postrelease = []
         self.pid = self._getpid()
         if dolock:
             self.delay = self.lock()
             if self.acquirefn:
                 self.acquirefn()
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, exc_tb):
         success = all(a is None for a in (exc_type, exc_value, exc_tb))
         self.release(success=success)
 
     def __del__(self):
         if self.held:
             warnings.warn(
                 "use lock.release instead of del lock",
                 category=DeprecationWarning,
                 stacklevel=2,
             )
 
             # ensure the lock will be removed
             # even if recursive locking did occur
             self.held = 1
 
         self.release()
 
     def _getpid(self):
         # wrapper around procutil.getpid() to make testing easier
         return procutil.getpid()
 
     def lock(self):
         timeout = self.timeout
         while True:
             try:
                 self._trylock()
                 return self.timeout - timeout
             except error.LockHeld as inst:
                 if timeout != 0:
                     time.sleep(1)
                     if timeout > 0:
                         timeout -= 1
                     continue
                 raise error.LockHeld(
                     errno.ETIMEDOUT, inst.filename, self.desc, inst.locker
                 )
 
     def _trylock(self):
         if self.held:
             self.held += 1
             return
         if lock._host is None:
             lock._host = _getlockprefix()
         lockname = b'%s:%d' % (lock._host, self.pid)
         retry = 5
         while not self.held and retry:
             retry -= 1
             try:
                 with self._maybedelayedinterrupt():
                     self.vfs.makelock(lockname, self.f)
                     self.held = 1
             except (OSError, IOError) as why:
                 if why.errno == errno.EEXIST:
                     locker = self._readlock()
                     if locker is None:
                         continue
 
                     locker = self._testlock(locker)
                     if locker is not None:
                         raise error.LockHeld(
                             errno.EAGAIN,
                             self.vfs.join(self.f),
                             self.desc,
                             locker,
                         )
                 else:
+                    assert isinstance(why.filename, bytes)
+                    assert isinstance(why.strerror, str)
                     raise error.LockUnavailable(
-                        why.errno, why.strerror, why.filename, self.desc
+                        why.errno,
+                        why.strerror,
+                        typing.cast(bytes, why.filename),
+                        self.desc,
                     )
 
         if not self.held:
             # use empty locker to mean "busy for frequent lock/unlock
             # by many processes"
             raise error.LockHeld(
                 errno.EAGAIN, self.vfs.join(self.f), self.desc, b""
             )
 
     def _readlock(self):
         """read lock and return its value
 
         Returns None if no lock exists, pid for old-style locks, and host:pid
         for new-style locks.
         """
         try:
             return self.vfs.readlock(self.f)
         except FileNotFoundError:
             return None
 
     def _lockshouldbebroken(self, locker):
         if locker is None:
             return False
         try:
             host, pid = locker.split(b":", 1)
         except ValueError:
             return False
         if host != lock._host:
             return False
         try:
             pid = int(pid)
         except ValueError:
             return False
         if procutil.testpid(pid):
             return False
         return True
 
     def _testlock(self, locker):
         if not self._lockshouldbebroken(locker):
             return locker
 
         # if locker dead, break lock.  must do this with another lock
         # held, or can race and break valid lock.
         try:
             with lock(self.vfs, self.f + b'.break', timeout=0):
                 locker = self._readlock()
                 if not self._lockshouldbebroken(locker):
                     return locker
                 self.vfs.unlink(self.f)
         except error.LockError:
             return locker
 
     def testlock(self):
         """return id of locker if lock is valid, else None.
 
         If old-style lock, we cannot tell what machine locker is on.
         with new-style lock, if locker is on this machine, we can
         see if locker is alive.  If locker is on this machine but
         not alive, we can safely break lock.
 
         The lock file is only deleted when None is returned.
 
         """
         locker = self._readlock()
         return self._testlock(locker)
 
     def release(self, success=True):
         """release the lock and execute callback function if any
 
         If the lock has been acquired multiple times, the actual release is
         delayed to the last release call."""
         if self.held > 1:
             self.held -= 1
         elif self.held == 1:
             self.held = 0
             if self._getpid() != self.pid:
                 # we forked, and are not the parent
                 return
             try:
                 if self.releasefn:
                     self.releasefn()
             finally:
                 try:
                     self.vfs.unlink(self.f)
                 except OSError:
                     pass
             # The postrelease functions typically assume the lock is not held
             # at all.
             for callback in self.postrelease:
                 callback(success)
             # Prevent double usage and help clear cycles.
             self.postrelease = None
 
 
 def release(*locks):
     for lock in locks:
         if lock is not None:
             lock.release()

mercurial/statichttprepo.py

@@ -1,271 +1,271 b''
 # statichttprepo.py - simple http repository class for mercurial
 #
 # This provides read-only repo access to repositories exported via static http
 #
 # Copyright 2005-2007 Olivia Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 
 import errno
 
 from .i18n import _
 from .node import sha1nodeconstants
 from . import (
     branchmap,
     changelog,
     error,
     localrepo,
     manifest,
     namespaces,
     pathutil,
     pycompat,
     requirements as requirementsmod,
     url,
     util,
     vfs as vfsmod,
 )
 from .utils import (
     urlutil,
 )
 
 urlerr = util.urlerr
 urlreq = util.urlreq
 
 
 class httprangereader:
     def __init__(self, url, opener):
         # we assume opener has HTTPRangeHandler
         self.url = url
         self.pos = 0
         self.opener = opener
         self.name = url
 
     def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.close()
 
     def seek(self, pos):
         self.pos = pos
 
     def read(self, bytes=None):
         req = urlreq.request(pycompat.strurl(self.url))
         end = b''
         if bytes:
             end = self.pos + bytes - 1
         if self.pos or end:
             req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))
 
         try:
             f = self.opener.open(req)
             data = f.read()
             code = f.code
         except urlerr.httperror as inst:
             num = inst.code == 404 and errno.ENOENT or None
             # Explicitly convert the exception to str as Py3 will try
             # convert it to local encoding and with as the HTTPResponse
             # instance doesn't support encode.
             raise IOError(num, str(inst))
         except urlerr.urlerror as inst:
             raise IOError(None, inst.reason)
 
         if code == 200:
             # HTTPRangeHandler does nothing if remote does not support
             # Range headers and returns the full entity. Let's slice it.
             if bytes:
                 data = data[self.pos : self.pos + bytes]
             else:
                 data = data[self.pos :]
         elif bytes:
             data = data[:bytes]
         self.pos += len(data)
         return data
 
     def readlines(self):
         return self.read().splitlines(True)
 
     def __iter__(self):
         return iter(self.readlines())
 
     def close(self):
         pass
 
 
 # _RangeError and _HTTPRangeHandler were originally in byterange.py,
 # which was itself extracted from urlgrabber. See the last version of
 # byterange.py from history if you need more information.
 class _RangeError(IOError):
     """Error raised when an unsatisfiable range is requested."""
 
 
 class _HTTPRangeHandler(urlreq.basehandler):
     """Handler that enables HTTP Range headers.
 
     This was extremely simple. The Range header is a HTTP feature to
     begin with so all this class does is tell urllib2 that the
     "206 Partial Content" response from the HTTP server is what we
     expected.
     """
 
     def http_error_206(self, req, fp, code, msg, hdrs):
         # 206 Partial Content Response
         r = urlreq.addinfourl(fp, hdrs, req.get_full_url())
         r.code = code
         r.msg = msg
         return r
 
     def http_error_416(self, req, fp, code, msg, hdrs):
         # HTTP's Range Not Satisfiable error
         raise _RangeError('Requested Range Not Satisfiable')
 
 
 def build_opener(ui, authinfo):
     # urllib cannot handle URLs with embedded user or passwd
     urlopener = url.opener(ui, authinfo)
     urlopener.add_handler(_HTTPRangeHandler())
 
     class statichttpvfs(vfsmod.abstractvfs):
         def __init__(self, base):
             self.base = base
             self.options = {}
 
         def __call__(self, path, mode=b'r', *args, **kw):
             if mode not in (b'r', b'rb'):
                 raise IOError('Permission denied')
             f = b"/".join((self.base, urlreq.quote(path)))
             return httprangereader(f, urlopener)
 
         def join(self, path, *insidef):
             if path:
                 return pathutil.join(self.base, path, *insidef)
             else:
                 return self.base
 
     return statichttpvfs
 
 
 class statichttppeer(localrepo.localpeer):
     def local(self):
         return None
 
     def canpush(self):
         return False
 
 
 class statichttprepository(
     localrepo.localrepository, localrepo.revlogfilestorage
 ):
     supported = localrepo.localrepository._basesupported
 
     def __init__(self, ui, path):
         self._url = path
         self.ui = ui
 
         self.root = path
         u = urlutil.url(path.rstrip(b'/') + b"/.hg")
         self.path, authinfo = u.authinfo()
 
         vfsclass = build_opener(ui, authinfo)
         self.vfs = vfsclass(self.path)
         self.cachevfs = vfsclass(self.vfs.join(b'cache'))
         self._phasedefaults = []
 
         self.names = namespaces.namespaces()
         self.filtername = None
         self._extrafilterid = None
         self._wanted_sidedata = set()
         self.features = set()
 
         try:
             requirements = set(self.vfs.read(b'requires').splitlines())
         except FileNotFoundError:
             requirements = set()
 
             # check if it is a non-empty old-style repository
             try:
                 fp = self.vfs(b"00changelog.i")
                 fp.read(1)
                 fp.close()
             except FileNotFoundError:
                 # we do not care about empty old-style repositories here
                 msg = _(b"'%s' does not appear to be an hg repository") % path
                 raise error.RepoError(msg)
         if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
             storevfs = vfsclass(self.vfs.join(b'store'))
             requirements |= set(storevfs.read(b'requires').splitlines())
 
         supportedrequirements = localrepo.gathersupportedrequirements(ui)
         localrepo.ensurerequirementsrecognized(
             requirements, supportedrequirements
         )
         localrepo.ensurerequirementscompatible(ui, requirements)
         self.nodeconstants = sha1nodeconstants
         self.nullid = self.nodeconstants.nullid
 
         # setup store
         self.store = localrepo.makestore(requirements, self.path, vfsclass)
         self.spath = self.store.path
         self.svfs = self.store.opener
         self.sjoin = self.store.join
         self._filecache = {}
         self.requirements = requirements
 
         rootmanifest = manifest.manifestrevlog(self.nodeconstants, self.svfs)
         self.manifestlog = manifest.manifestlog(
             self.svfs, self, rootmanifest, self.narrowmatch()
         )
         self.changelog = changelog.changelog(self.svfs)
         self._tags = None
         self.nodetagscache = None
         self._branchcaches = branchmap.BranchMapCache()
         self._revbranchcache = None
         self.encodepats = None
         self.decodepats = None
         self._transref = None
         self._dirstate = None
 
     def _restrictcapabilities(self, caps):
         caps = super(statichttprepository, self)._restrictcapabilities(caps)
         return caps.difference([b"pushkey"])
 
     def url(self):
         return self._url
 
     def local(self):
         return False
 
     def peer(self, path=None, remotehidden=False):
         return statichttppeer(self, path=path, remotehidden=remotehidden)
 
     def wlock(self, wait=True):
         raise error.LockUnavailable(
             0,
-            _(b'lock not available'),
+            pycompat.sysstr(_(b'lock not available')),
             b'lock',
             _(b'cannot lock static-http repository'),
         )
 
     def lock(self, wait=True):
         raise error.LockUnavailable(
             0,
-            _(b'lock not available'),
+            pycompat.sysstr(_(b'lock not available')),
             b'lock',
             _(b'cannot lock static-http repository'),
         )
 
     def _writecaches(self):
         pass  # statichttprepository are read only
 
 
 def make_peer(
     ui, path, create, intents=None, createopts=None, remotehidden=False
 ):
     if create:
         raise error.Abort(_(b'cannot create new static-http repository'))
     url = path.loc[7:]
     return statichttprepository(ui, url).peer(
         path=path, remotehidden=remotehidden
     )