diff -r 9d3721552b6c -r 81224afd938d mercurial/error.py --- a/mercurial/error.py Wed Dec 20 12:51:20 2023 +0100 +++ b/mercurial/error.py Wed Dec 20 20:13:22 2023 +0100 @@ -498,8 +498,7 @@ 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 @@ -508,7 +507,7 @@ 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