--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -17,40 +17,44 @@ """ Class implementing a dialog to enter cherry-pick data. """ + def __init__(self, commits=None, parent=None): """ Constructor - + @param commits list of commits to show in the commits pane (list of strings) @param parent reference to the parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) - + if commits: self.commitsEdit.setPlainText("\n".join(commits)) - + self.on_commitsEdit_textChanged() - + @pyqtSlot() def on_commitsEdit_textChanged(self): """ Private slot to react upon changes of commits. """ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - self.commitsEdit.toPlainText() != "") - + self.commitsEdit.toPlainText() != "" + ) + def getData(self): """ Public method to retrieve the entered data. - + @return tuple with list of commits, a flag indicating to append cherry-pick info to the commit message, a flag indicating to append a signed-off-by line to the commit message and a flag indicating to not commit the action (list of strings, boolean, boolean, boolean) """ - return (self.commitsEdit.toPlainText().strip().splitlines(), - self.appendCheckBox.isChecked(), - self.signoffCheckBox.isChecked(), - self.nocommitCheckBox.isChecked()) + return ( + self.commitsEdit.toPlainText().strip().splitlines(), + self.appendCheckBox.isChecked(), + self.signoffCheckBox.isChecked(), + self.nocommitCheckBox.isChecked(), + )