Mercurial > public > mercurial-scm > hg-stable

diff mercurial/mergestate.py @ 49314:2e726c934fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: catch FileNotFoundError instead of checking errno == ENOENT
author Manuel Jacob <me@manueljacob.de>
date Tue, 31 May 2022 22:50:01 +0200
parents 642e31cb55f0
children 34e15bbab67c
line wrap: on
line diff
--- a/mercurial/mergestate.py	Tue May 31 21:16:17 2022 +0200
+++ b/mercurial/mergestate.py	Tue May 31 22:50:01 2022 +0200
@@ -1,5 +1,4 @@
 import collections
-import errno
 import shutil
 import struct
 import weakref
@@ -629,9 +628,8 @@
                 else:
                     records.append((RECORD_MERGED, l[:-1]))
             f.close()
-        except IOError as err:
-            if err.errno != errno.ENOENT:
-                raise
+        except FileNotFoundError:
+            pass
         return records
 
     def _readrecordsv2(self):
@@ -669,9 +667,8 @@
                     rtype, record = record[0:1], record[1:]
                 records.append((rtype, record))
             f.close()
-        except IOError as err:
-            if err.errno != errno.ENOENT:
-                raise
+        except FileNotFoundError:
+            pass
         return records
 
     def commit(self):