diff -r f99d60d6b59b -r 2602857055c5 eric6/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/eric6/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py Sun Apr 14 15:09:21 2019 +0200
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2014 - 2019 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to enter cherry-pick data.
+"""
+
+from __future__ import unicode_literals
+
+from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+
+from .Ui_GitCherryPickDialog import Ui_GitCherryPickDialog
+
+
+class GitCherryPickDialog(QDialog, Ui_GitCherryPickDialog):
+ """
+ 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(GitCherryPickDialog, self).__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.Ok).setEnabled(
+ 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())
