mercurial/scmutil.py

40166:11727e38a920

            raise
    # Global exception handling, alphabetically
    # Mercurial-specific first, followed by built-in and library exceptions
    except error.LockHeld as inst:
        if inst.errno == errno.ETIMEDOUT:
            reason = _('timed out waiting for lock held by %r') % inst.locker
        else:
            reason = _('lock held by %r') % inst.locker
        ui.error(_("abort: %s: %s\n") % (
            inst.desc or stringutil.forcebytestr(inst.filename), reason))
        if not inst.locker:

40167:c554dc0cc16e

            raise
    # Global exception handling, alphabetically
    # Mercurial-specific first, followed by built-in and library exceptions
    except error.LockHeld as inst:
        if inst.errno == errno.ETIMEDOUT:
            reason = _('timed out waiting for lock held by %r') % (
                pycompat.bytestr(inst.locker))
        else:
            reason = _('lock held by %r') % inst.locker
        ui.error(_("abort: %s: %s\n") % (
            inst.desc or stringutil.forcebytestr(inst.filename), reason))
        if not inst.locker: