Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
src/eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9653
- e67609152c5e
- child 10439
- 21c28b0f9e41
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 24 self, tagsList, branchesList, currentBranch, remoteBranchesList, parent=None | 24 self, tagsList, branchesList, currentBranch, remoteBranchesList, parent=None |
| 25 ): | 25 ): |
| 26 """ | 26 """ |
| 27 Constructor | 27 Constructor |
| 28 | 28 |
| 29 @param tagsList list of tags (list of strings) | 29 @param tagsList list of tags |
| 30 @param branchesList list of branches (list of strings) | 30 @type list of str |
| 31 @param currentBranch name of the current branch (string) | 31 @param branchesList list of branches |
| 32 @param remoteBranchesList list of remote branches (list of strings) | 32 @type list of str |
| 33 @param parent reference to the parent widget (QWidget) | 33 @param currentBranch name of the current branch |
| 34 @type str | |
| 35 @param remoteBranchesList list of remote branches | |
| 36 @type list of str | |
| 37 @param parent reference to the parent widget | |
| 38 @type QWidget | |
| 34 """ | 39 """ |
| 35 super().__init__(parent) | 40 super().__init__(parent) |
| 36 self.setupUi(self) | 41 self.setupUi(self) |
| 37 | 42 |
| 38 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) | 43 self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) |
| 105 @pyqtSlot(bool) | 110 @pyqtSlot(bool) |
| 106 def on_idButton_toggled(self, checked): | 111 def on_idButton_toggled(self, checked): |
| 107 """ | 112 """ |
| 108 Private slot to handle changes of the ID select button. | 113 Private slot to handle changes of the ID select button. |
| 109 | 114 |
| 110 @param checked state of the button (boolean) | 115 @param checked state of the button |
| 116 @type bool | |
| 111 """ | 117 """ |
| 112 self.__generateDefaultCommitMessage() | 118 self.__generateDefaultCommitMessage() |
| 113 self.__updateOK() | 119 self.__updateOK() |
| 114 | 120 |
| 115 @pyqtSlot(bool) | 121 @pyqtSlot(bool) |
| 116 def on_tagButton_toggled(self, checked): | 122 def on_tagButton_toggled(self, checked): |
| 117 """ | 123 """ |
| 118 Private slot to handle changes of the Tag select button. | 124 Private slot to handle changes of the Tag select button. |
| 119 | 125 |
| 120 @param checked state of the button (boolean) | 126 @param checked state of the button |
| 127 @type bool | |
| 121 """ | 128 """ |
| 122 self.__generateDefaultCommitMessage() | 129 self.__generateDefaultCommitMessage() |
| 123 self.__updateOK() | 130 self.__updateOK() |
| 124 | 131 |
| 125 @pyqtSlot(bool) | 132 @pyqtSlot(bool) |
| 126 def on_branchButton_toggled(self, checked): | 133 def on_branchButton_toggled(self, checked): |
| 127 """ | 134 """ |
| 128 Private slot to handle changes of the Branch select button. | 135 Private slot to handle changes of the Branch select button. |
| 129 | 136 |
| 130 @param checked state of the button (boolean) | 137 @param checked state of the button |
| 138 @type bool | |
| 131 """ | 139 """ |
| 132 self.__generateDefaultCommitMessage() | 140 self.__generateDefaultCommitMessage() |
| 133 self.__updateOK() | 141 self.__updateOK() |
| 134 | 142 |
| 135 @pyqtSlot(bool) | 143 @pyqtSlot(bool) |
| 136 def on_remoteBranchButton_toggled(self, checked): | 144 def on_remoteBranchButton_toggled(self, checked): |
| 137 """ | 145 """ |
| 138 Private slot to handle changes of the Remote Branch select button. | 146 Private slot to handle changes of the Remote Branch select button. |
| 139 | 147 |
| 140 @param checked state of the button (boolean) | 148 @param checked state of the button |
| 149 @type bool | |
| 141 """ | 150 """ |
| 142 self.__generateDefaultCommitMessage() | 151 self.__generateDefaultCommitMessage() |
| 143 self.__updateOK() | 152 self.__updateOK() |
| 144 | 153 |
| 145 @pyqtSlot(bool) | 154 @pyqtSlot(bool) |
| 146 def on_noneButton_toggled(self, checked): | 155 def on_noneButton_toggled(self, checked): |
| 147 """ | 156 """ |
| 148 Private slot to handle changes of the None select button. | 157 Private slot to handle changes of the None select button. |
| 149 | 158 |
| 150 @param checked state of the button (boolean) | 159 @param checked state of the button |
| 160 @type bool | |
| 151 """ | 161 """ |
| 152 self.__generateDefaultCommitMessage() | 162 self.__generateDefaultCommitMessage() |
| 153 | 163 |
| 154 @pyqtSlot(str) | 164 @pyqtSlot(str) |
| 155 def on_idEdit_textChanged(self, txt): | 165 def on_idEdit_textChanged(self, txt): |
| 156 """ | 166 """ |
| 157 Private slot to handle changes of the Commit edit. | 167 Private slot to handle changes of the Commit edit. |
| 158 | 168 |
| 159 @param txt text of the edit (string) | 169 @param txt text of the edit |
| 170 @type str | |
| 160 """ | 171 """ |
| 161 self.__generateDefaultCommitMessage() | 172 self.__generateDefaultCommitMessage() |
| 162 self.__updateOK() | 173 self.__updateOK() |
| 163 | 174 |
| 164 @pyqtSlot(str) | 175 @pyqtSlot(str) |
| 165 def on_tagCombo_editTextChanged(self, txt): | 176 def on_tagCombo_editTextChanged(self, txt): |
| 166 """ | 177 """ |
| 167 Private slot to handle changes of the Tag combo. | 178 Private slot to handle changes of the Tag combo. |
| 168 | 179 |
| 169 @param txt text of the combo (string) | 180 @param txt text of the combo |
| 181 @type str | |
| 170 """ | 182 """ |
| 171 self.__generateDefaultCommitMessage() | 183 self.__generateDefaultCommitMessage() |
| 172 self.__updateOK() | 184 self.__updateOK() |
| 173 | 185 |
| 174 @pyqtSlot(str) | 186 @pyqtSlot(str) |
| 175 def on_branchCombo_editTextChanged(self, txt): | 187 def on_branchCombo_editTextChanged(self, txt): |
| 176 """ | 188 """ |
| 177 Private slot to handle changes of the Branch combo. | 189 Private slot to handle changes of the Branch combo. |
| 178 | 190 |
| 179 @param txt text of the combo (string) | 191 @param txt text of the combo |
| 192 @type str | |
| 180 """ | 193 """ |
| 181 self.__generateDefaultCommitMessage() | 194 self.__generateDefaultCommitMessage() |
| 182 self.__updateOK() | 195 self.__updateOK() |
| 183 | 196 |
| 184 @pyqtSlot(str) | 197 @pyqtSlot(str) |
| 185 def on_remoteBranchCombo_editTextChanged(self, txt): | 198 def on_remoteBranchCombo_editTextChanged(self, txt): |
| 186 """ | 199 """ |
| 187 Private slot to handle changes of the Remote Branch combo. | 200 Private slot to handle changes of the Remote Branch combo. |
| 188 | 201 |
| 189 @param txt text of the combo (string) | 202 @param txt text of the combo |
| 203 @type str | |
| 190 """ | 204 """ |
| 191 self.__generateDefaultCommitMessage() | 205 self.__generateDefaultCommitMessage() |
| 192 self.__updateOK() | 206 self.__updateOK() |
| 193 | 207 |
| 194 @pyqtSlot(bool) | 208 @pyqtSlot(bool) |
| 195 def on_commitGroupBox_toggled(self, checked): | 209 def on_commitGroupBox_toggled(self, checked): |
| 196 """ | 210 """ |
| 197 Private slot to handle changes of the Commit select group. | 211 Private slot to handle changes of the Commit select group. |
| 198 | 212 |
| 199 @param checked state of the group (boolean) | 213 @param checked state of the group |
| 214 @type bool | |
| 200 """ | 215 """ |
| 201 self.__generateDefaultCommitMessage() | 216 self.__generateDefaultCommitMessage() |
| 202 self.__updateOK() | 217 self.__updateOK() |
| 203 | 218 |
| 204 @pyqtSlot() | 219 @pyqtSlot() |
| 213 Public method to retrieve the merge data. | 228 Public method to retrieve the merge data. |
| 214 | 229 |
| 215 @return tuple naming the revision, a flag indicating that the merge | 230 @return tuple naming the revision, a flag indicating that the merge |
| 216 shall be committed, the commit message, a flag indicating that a | 231 shall be committed, the commit message, a flag indicating that a |
| 217 log summary shall be appended and a flag indicating to show diff | 232 log summary shall be appended and a flag indicating to show diff |
| 218 statistics at the end of the merge (string, boolean, string, | 233 statistics at the end of the merge |
| 219 boolean, boolean) | 234 @rtype tuple of (str, bool, str, bool, bool) |
| 220 """ | 235 """ |
| 221 if self.idButton.isChecked(): | 236 if self.idButton.isChecked(): |
| 222 rev = self.idEdit.text() | 237 rev = self.idEdit.text() |
| 223 elif self.tagButton.isChecked(): | 238 elif self.tagButton.isChecked(): |
| 224 rev = self.tagCombo.currentText() | 239 rev = self.tagCombo.currentText() |
