eric6/Plugins/VcsPlugins/vcsMercurial/hg.py

changeset 7836
2f0d208b8137
parent 7791
f07ded9bc64d
child 7900
72b88fb20261
child 7924
8a96736d465e
diff -r 0835ed67714b -r 2f0d208b8137 eric6/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sat Nov 21 19:31:16 2020 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Nov 22 16:04:59 2020 +0100
@@ -1713,7 +1713,7 @@
                 with open(name, "r", encoding="utf-8") as f1:
                     output2 = f1.read()
                 name2 = "{0} (Work)".format(name)
-            except IOError:
+            except OSError:
                 E5MessageBox.critical(
                     self.__ui,
                     self.tr("Mercurial Side-by-Side Difference"),
@@ -2163,7 +2163,7 @@
                                     "\n  ".join(lfPattern)))
                 self.__monitorRepoIniFile(repodir)
                 self.__iniFileChanged(cfgFile)
-            except IOError:
+            except OSError:
                 pass
         self.repoEditor = MiniEditor(cfgFile, "Properties")
         self.repoEditor.show()
@@ -2329,7 +2329,7 @@
                     ignore.write("\n".join(ignorePatterns))
                     ignore.write("\n")
                 status = True
-            except IOError:
+            except OSError:
                 status = False
             
             if status and autoAdd:
@@ -3063,7 +3063,7 @@
                 try:
                     with open(hgsub, "r") as f:
                         contents = f.readlines()
-                except IOError as err:
+                except OSError as err:
                     E5MessageBox.critical(
                         self.__ui,
                         self.tr("Add Sub-repository"),
@@ -3091,7 +3091,7 @@
             try:
                 with open(hgsub, "w") as f:
                     f.writelines(contents)
-            except IOError as err:
+            except OSError as err:
                 E5MessageBox.critical(
                     self.__ui,
                     self.tr("Add Sub-repository"),
@@ -3123,7 +3123,7 @@
         try:
             with open(hgsub, "r") as f:
                 subrepositories = [line.strip() for line in f.readlines()]
-        except IOError as err:
+        except OSError as err:
             E5MessageBox.critical(
                 self.__ui,
                 self.tr("Remove Sub-repositories"),
@@ -3142,7 +3142,7 @@
             try:
                 with open(hgsub, "w") as f:
                     f.write(contents)
-            except IOError as err:
+            except OSError as err:
                 E5MessageBox.critical(
                     self.__ui,
                     self.tr("Remove Sub-repositories"),

eric ide

mercurial