Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -16,8 +16,8 @@
     QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem
 )
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
 
 from .Ui_HgStatusDialog import Ui_HgStatusDialog
 
@@ -503,7 +503,7 @@
             names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                      for itm in self.__getCommitableItems()]
             if not names:
-                E5MessageBox.information(
+                EricMessageBox.information(
                     self,
                     self.tr("Commit"),
                     self.tr("""There are no entries selected to be"""
@@ -511,7 +511,7 @@
                 return
             
             if Preferences.getVCS("AutoSaveFiles"):
-                vm = e5App().getObject("ViewManager")
+                vm = ericApp().getObject("ViewManager")
                 for name in names:
                     vm.saveEditor(name)
             self.vcs.vcsCommit(names, '')
@@ -543,7 +543,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getUnversionedItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Add"),
                 self.tr("""There are no unversioned entries"""
@@ -553,7 +553,7 @@
         self.vcs.vcsAdd(names)
         self.on_refreshButton_clicked()
         
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         for name in names:
             project.getModel().updateVCSStatus(name)
         self.vcs.checkVCSStatus()
@@ -567,7 +567,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getUnversionedItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Add"),
                 self.tr("""There are no unversioned entries"""
@@ -578,7 +578,7 @@
             names, mode)
         self.on_refreshButton_clicked()
         
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         for name in names:
             project.getModel().updateVCSStatus(name)
         self.vcs.checkVCSStatus()
@@ -590,7 +590,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getMissingItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Remove"),
                 self.tr("""There are no missing entries"""
@@ -607,7 +607,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getModifiedItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Revert"),
                 self.tr("""There are no uncommitted changes"""
@@ -619,7 +619,7 @@
         self.activateWindow()
         self.on_refreshButton_clicked()
         
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         for name in names:
             project.getModel().updateVCSStatus(name)
         self.vcs.checkVCSStatus()
@@ -631,7 +631,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getMissingItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Revert"),
                 self.tr("""There are no missing entries"""
@@ -649,7 +649,7 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getModifiedItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Differences"),
                 self.tr("""There are no uncommitted changes"""
@@ -669,14 +669,14 @@
         names = [os.path.join(self.__repoPath, itm.text(self.__pathColumn))
                  for itm in self.__getModifiedItems()]
         if not names:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Side-by-Side Diff"),
                 self.tr("""There are no uncommitted changes"""
                         """ available/selected."""))
             return
         elif len(names) > 1:
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Side-by-Side Diff"),
                 self.tr("""Only one file with uncommitted changes"""