diff -r 2f70ca07f0af -r 4cd7e5a8b3cf src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Fri Dec 22 19:45:17 2023 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sat Dec 23 15:40:23 2023 +0100
@@ -38,7 +38,9 @@
Constructor
@param vcs reference to the vcs object
- @param parent parent widget (QWidget)
+ @type Hg
+ @param parent parent widget
+ @type QWidget
"""
super().__init__(parent)
self.setupUi(self)
@@ -66,7 +68,8 @@
"""
Protected slot implementing a close event handler.
- @param e close event (QCloseEvent)
+ @param e close event
+ @type QCloseEvent
"""
if self.__hgClient.isExecuting():
self.__hgClient.cancel()
@@ -137,7 +140,8 @@
"""
Private slot called by a button of the button box clicked.
- @param button button that was clicked (QAbstractButton)
+ @param button button that was clicked
+ @type QAbstractButton
"""
if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Close):
self.close()
@@ -168,8 +172,10 @@
"""
Private method to generate a tag item in the tag list.
- @param status status of the file (string)
- @param name name of the file (string)
+ @param status status of the file
+ @type str
+ @param name name of the file
+ @type str
"""
itm = QTreeWidgetItem(self.conflictsList)
if status == "U":
@@ -187,7 +193,8 @@
"""
Private method to process the lines of output.
- @param line output line to be processed (string)
+ @param line output line to be processed
+ @type str
"""
status, filename = line.strip().split(None, 1)
self.__generateItem(status, filename)
@@ -196,7 +203,8 @@
"""
Private slot to show some error.
- @param out error to be shown (string)
+ @param out error to be shown
+ @type str
"""
self.errorGroup.show()
self.errors.insertPlainText(out)
@@ -219,8 +227,10 @@
"""
Private slot to open the double clicked entry.
- @param item reference to the double clicked item (QTreeWidgetItem)
- @param column column that was double clicked (integer)
+ @param item reference to the double clicked item
+ @type QTreeWidgetItem
+ @param column column that was double clicked
+ @type int
"""
self.on_editButton_clicked()
