diff -r 53e9422a9b45 -r 2e726c934fcd mercurial/util.py --- a/mercurial/util.py Tue May 31 21:16:17 2022 +0200 +++ b/mercurial/util.py Tue May 31 22:50:01 2022 +0200 @@ -2426,9 +2426,7 @@ def frompath(cls, path): try: stat = os.stat(path) - except OSError as err: - if err.errno != errno.ENOENT: - raise + except FileNotFoundError: stat = None return cls(stat) @@ -2612,12 +2610,11 @@ def tryunlink(f): # type: (bytes) -> None - """Attempt to remove a file, ignoring ENOENT errors.""" + """Attempt to remove a file, ignoring FileNotFoundError.""" try: unlink(f) - except OSError as e: - if e.errno != errno.ENOENT: - raise + except FileNotFoundError: + pass def makedirs(name, mode=None, notindexed=False):