diff -r 9db77d46de79 -r 24ee91ba9aa8 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Jan 06 14:15:40 2025 -0500 +++ b/mercurial/localrepo.py Sun Jan 05 21:03:17 2025 -0500 @@ -877,19 +877,19 @@ try: ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base) ret = True - except IOError: + except OSError: pass try: ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base) ret = True - except IOError: + except OSError: pass try: ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base) ret = True - except IOError: + except OSError: pass return ret @@ -2814,7 +2814,7 @@ b'repository tip rolled back to revision %d (undo %s)\n' ) % (oldtip, desc) parentgone = any(self[p].rev() > oldtip for p in parents) - except IOError: + except OSError: msg = _(b'rolling back unknown transaction\n') desc = None parentgone = True @@ -3966,7 +3966,7 @@ try: sharedpath = os.path.relpath(sharedpath, hgvfs.base) sharedpath = util.pconvert(sharedpath) - except (IOError, ValueError) as e: + except (OSError, ValueError) as e: # ValueError is raised on Windows if the drive letters differ # on each path. raise error.Abort(