Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitCherryPickDialog.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9653
- e67609152c5e
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 20 | 20 |
| 21 def __init__(self, commits=None, parent=None): | 21 def __init__(self, commits=None, parent=None): |
| 22 """ | 22 """ |
| 23 Constructor | 23 Constructor |
| 24 | 24 |
| 25 @param commits list of commits to show in the commits pane (list of | 25 @param commits list of commits to show in the commits pane |
| 26 strings) | 26 @type list of str |
| 27 @param parent reference to the parent widget (QWidget) | 27 @param parent reference to the parent widget |
| 28 @type QWidget | |
| 28 """ | 29 """ |
| 29 super().__init__(parent) | 30 super().__init__(parent) |
| 30 self.setupUi(self) | 31 self.setupUi(self) |
| 31 | 32 |
| 32 if commits: | 33 if commits: |
| 48 Public method to retrieve the entered data. | 49 Public method to retrieve the entered data. |
| 49 | 50 |
| 50 @return tuple with list of commits, a flag indicating to append | 51 @return tuple with list of commits, a flag indicating to append |
| 51 cherry-pick info to the commit message, a flag indicating to append | 52 cherry-pick info to the commit message, a flag indicating to append |
| 52 a signed-off-by line to the commit message and a flag indicating to | 53 a signed-off-by line to the commit message and a flag indicating to |
| 53 not commit the action (list of strings, boolean, boolean, boolean) | 54 not commit the action |
| 55 @rtype tuple of (list of str, bool, bool, bool) | |
| 54 """ | 56 """ |
| 55 return ( | 57 return ( |
| 56 self.commitsEdit.toPlainText().strip().splitlines(), | 58 self.commitsEdit.toPlainText().strip().splitlines(), |
| 57 self.appendCheckBox.isChecked(), | 59 self.appendCheckBox.isChecked(), |
| 58 self.signoffCheckBox.isChecked(), | 60 self.signoffCheckBox.isChecked(), |
