Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Tue Sep 21 19:11:31 2021 +0200
@@ -234,18 +234,18 @@
         self.__actionsMenu.addSeparator()
         
         self.__forgetAct = self.__actionsMenu.addAction(
-            self.tr("Forget missing"), self.__forget)
+            self.tr("Forget Missing"), self.__forget)
         self.__forgetAct.setToolTip(self.tr(
             "Forgets about the selected missing files"))
         self.__restoreAct = self.__actionsMenu.addAction(
-            self.tr("Restore missing"), self.__restoreMissing)
+            self.tr("Restore Missing"), self.__restoreMissing)
         self.__restoreAct.setToolTip(self.tr(
             "Restores the selected missing files"))
         
         self.__actionsMenu.addSeparator()
         
         self.__editAct = self.__actionsMenu.addAction(
-            self.tr("Edit file"), self.__editConflict)
+            self.tr("Edit Conflict"), self.__editConflict)
         self.__editAct.setToolTip(self.tr(
             "Edit the selected conflicting file"))
         
@@ -796,7 +796,7 @@
                         """ available/selected."""))
             return
 
-        self.vcs.gitRevert(names)
+        self.vcs.vcsRevert(names)
         self.raise_()
         self.activateWindow()
         self.on_refreshButton_clicked()
@@ -820,13 +820,13 @@
                         """ available/selected."""))
             return
 
-        self.vcs.gitRevert(names)
+        self.vcs.vcsRevert(names)
         self.on_refreshButton_clicked()
         self.vcs.checkVCSStatus()
     
     def __editConflict(self):
         """
-        Private slot to handle the Edit file context menu entry.
+        Private slot to handle the Edit Conflict context menu entry.
         """
         itm = self.__getConflictingItems()[0]
         filename = os.path.join(self.__repodir, itm.text(self.__pathColumn))
@@ -860,7 +860,7 @@
     
     def __sbsDiff(self):
         """
-        Private slot to handle the Diff context menu entry.
+        Private slot to handle the Side-By-Side Diff context menu entry.
         """
         itm = self.__getModifiedOnlyItems()[0]
         workModified = (itm.text(self.__statusWorkColumn) in
@@ -878,7 +878,7 @@
             ]
             result, ok = QInputDialog.getItem(
                 None,
-                self.tr("Side-by-Side Difference"),
+                self.tr("Differences Side-by-Side"),
                 self.tr("Select the compare method."),
                 messages,
                 0, False)
@@ -899,7 +899,7 @@
             ]
             result, ok = QInputDialog.getItem(
                 None,
-                self.tr("Side-by-Side Difference"),
+                self.tr("Differences Side-by-Side"),
                 self.tr("Select the compare method."),
                 messages,
                 0, False)
@@ -913,7 +913,7 @@
         else:
             revisions = ["HEAD", "Stage"]
         
-        self.vcs.gitSbsDiff(names[0], revisions=revisions)
+        self.vcs.vcsSbsDiff(names[0], revisions=revisions)
     
     def __getCommitableItems(self):
         """