Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lock: properly convert error to bytes
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 20 Dec 2023 20:13:22 +0100
changeset 51286 81224afd938d
parent 51285 9d3721552b6c
child 51287 f15cb5111a1e
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 file | annotate | diff | comparison | revisions
mercurial/lock.py file | annotate | diff | comparison | revisions
mercurial/statichttprepo.py file | annotate | diff | comparison | revisions 
--- 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
 
 
--- a/mercurial/lock.py	Wed Dec 20 12:51:20 2023 +0100
+++ b/mercurial/lock.py	Wed Dec 20 20:13:22 2023 +0100
@@ -12,6 +12,7 @@
 import signal
 import socket
 import time
+import typing
 import warnings
 
 from .i18n import _
@@ -154,8 +155,12 @@
             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
@@ -290,8 +295,13 @@
                             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:
--- a/mercurial/statichttprepo.py	Wed Dec 20 12:51:20 2023 +0100
+++ b/mercurial/statichttprepo.py	Wed Dec 20 20:13:22 2023 +0100
@@ -243,7 +243,7 @@
     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'),
         )
@@ -251,7 +251,7 @@
     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'),
         )
mercurial