Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Fri Dec 22 19:45:17 2023 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py	Sat Dec 23 15:40:23 2023 +0100
@@ -26,11 +26,16 @@
         """
         Constructor
 
-        @param tagsList list of tags (list of strings)
-        @param branchesList list of branches (list of strings)
-        @param currentBranch name of the current branch (string)
-        @param remoteBranchesList list of remote branches (list of strings)
-        @param parent reference to the parent widget (QWidget)
+        @param tagsList list of tags
+        @type list of str
+        @param branchesList list of branches
+        @type list of str
+        @param currentBranch name of the current branch
+        @type str
+        @param remoteBranchesList list of remote branches
+        @type list of str
+        @param parent reference to the parent widget
+        @type QWidget
         """
         super().__init__(parent)
         self.setupUi(self)
@@ -107,7 +112,8 @@
         """
         Private slot to handle changes of the ID select button.
 
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -117,7 +123,8 @@
         """
         Private slot to handle changes of the Tag select button.
 
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -127,7 +134,8 @@
         """
         Private slot to handle changes of the Branch select button.
 
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -137,7 +145,8 @@
         """
         Private slot to handle changes of the Remote Branch select button.
 
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -147,7 +156,8 @@
         """
         Private slot to handle changes of the None select button.
 
-        @param checked state of the button (boolean)
+        @param checked state of the button
+        @type bool
         """
         self.__generateDefaultCommitMessage()
 
@@ -156,7 +166,8 @@
         """
         Private slot to handle changes of the Commit edit.
 
-        @param txt text of the edit (string)
+        @param txt text of the edit
+        @type str
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -166,7 +177,8 @@
         """
         Private slot to handle changes of the Tag combo.
 
-        @param txt text of the combo (string)
+        @param txt text of the combo
+        @type str
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -176,7 +188,8 @@
         """
         Private slot to handle changes of the Branch combo.
 
-        @param txt text of the combo (string)
+        @param txt text of the combo
+        @type str
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -186,7 +199,8 @@
         """
         Private slot to handle changes of the Remote Branch combo.
 
-        @param txt text of the combo (string)
+        @param txt text of the combo
+        @type str
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -196,7 +210,8 @@
         """
         Private slot to handle changes of the Commit select group.
 
-        @param checked state of the group (boolean)
+        @param checked state of the group
+        @type bool
         """
         self.__generateDefaultCommitMessage()
         self.__updateOK()
@@ -215,8 +230,8 @@
         @return tuple naming the revision, a flag indicating that the merge
             shall be committed, the commit message, a flag indicating that a
             log summary shall be appended and a flag indicating to show diff
-            statistics at the end of the merge (string, boolean, string,
-            boolean, boolean)
+            statistics at the end of the merge
+        @rtype tuple of (str, bool, str, bool, bool)
         """
         if self.idButton.isChecked():
             rev = self.idEdit.text()