Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9209
- b99e7fd55fd3
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 128 <p> | 128 <p> |
| 129 Constructor | 129 Constructor |
| 130 </p> | 130 </p> |
| 131 <dl> | 131 <dl> |
| 132 | 132 |
| 133 <dt><i>tagsList</i></dt> | 133 <dt><i>tagsList</i> (list of str)</dt> |
| 134 <dd> | 134 <dd> |
| 135 list of tags (list of strings) | 135 list of tags |
| 136 </dd> | 136 </dd> |
| 137 <dt><i>branchesList</i></dt> | 137 <dt><i>branchesList</i> (list of str)</dt> |
| 138 <dd> | 138 <dd> |
| 139 list of branches (list of strings) | 139 list of branches |
| 140 </dd> | 140 </dd> |
| 141 <dt><i>currentBranch</i></dt> | 141 <dt><i>currentBranch</i> (str)</dt> |
| 142 <dd> | 142 <dd> |
| 143 name of the current branch (string) | 143 name of the current branch |
| 144 </dd> | 144 </dd> |
| 145 <dt><i>remoteBranchesList</i></dt> | 145 <dt><i>remoteBranchesList</i> (list of str)</dt> |
| 146 <dd> | 146 <dd> |
| 147 list of remote branches (list of strings) | 147 list of remote branches |
| 148 </dd> | 148 </dd> |
| 149 <dt><i>parent</i></dt> | 149 <dt><i>parent</i> (QWidget)</dt> |
| 150 <dd> | 150 <dd> |
| 151 reference to the parent widget (QWidget) | 151 reference to the parent widget |
| 152 </dd> | 152 </dd> |
| 153 </dl> | 153 </dl> |
| 154 <a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a> | 154 <a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a> |
| 155 <h4>GitMergeDialog.__generateDefaultCommitMessage</h4> | 155 <h4>GitMergeDialog.__generateDefaultCommitMessage</h4> |
| 156 <b>__generateDefaultCommitMessage</b>(<i></i>) | 156 <b>__generateDefaultCommitMessage</b>(<i></i>) |
| 177 <dt>Return:</dt> | 177 <dt>Return:</dt> |
| 178 <dd> | 178 <dd> |
| 179 tuple naming the revision, a flag indicating that the merge | 179 tuple naming the revision, a flag indicating that the merge |
| 180 shall be committed, the commit message, a flag indicating that a | 180 shall be committed, the commit message, a flag indicating that a |
| 181 log summary shall be appended and a flag indicating to show diff | 181 log summary shall be appended and a flag indicating to show diff |
| 182 statistics at the end of the merge (string, boolean, string, | 182 statistics at the end of the merge |
| 183 boolean, boolean) | 183 </dd> |
| 184 </dl> | |
| 185 <dl> | |
| 186 <dt>Return Type:</dt> | |
| 187 <dd> | |
| 188 tuple of (str, bool, str, bool, bool) | |
| 184 </dd> | 189 </dd> |
| 185 </dl> | 190 </dl> |
| 186 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> | 191 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> |
| 187 <h4>GitMergeDialog.on_branchButton_toggled</h4> | 192 <h4>GitMergeDialog.on_branchButton_toggled</h4> |
| 188 <b>on_branchButton_toggled</b>(<i>checked</i>) | 193 <b>on_branchButton_toggled</b>(<i>checked</i>) |
| 190 <p> | 195 <p> |
| 191 Private slot to handle changes of the Branch select button. | 196 Private slot to handle changes of the Branch select button. |
| 192 </p> | 197 </p> |
| 193 <dl> | 198 <dl> |
| 194 | 199 |
| 195 <dt><i>checked</i></dt> | 200 <dt><i>checked</i> (bool)</dt> |
| 196 <dd> | 201 <dd> |
| 197 state of the button (boolean) | 202 state of the button |
| 198 </dd> | 203 </dd> |
| 199 </dl> | 204 </dl> |
| 200 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> | 205 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> |
| 201 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> | 206 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> |
| 202 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) | 207 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) |
| 204 <p> | 209 <p> |
| 205 Private slot to handle changes of the Branch combo. | 210 Private slot to handle changes of the Branch combo. |
| 206 </p> | 211 </p> |
| 207 <dl> | 212 <dl> |
| 208 | 213 |
| 209 <dt><i>txt</i></dt> | 214 <dt><i>txt</i> (str)</dt> |
| 210 <dd> | 215 <dd> |
| 211 text of the combo (string) | 216 text of the combo |
| 212 </dd> | 217 </dd> |
| 213 </dl> | 218 </dl> |
| 214 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> | 219 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> |
| 215 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4> | 220 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4> |
| 216 <b>on_commitGroupBox_toggled</b>(<i>checked</i>) | 221 <b>on_commitGroupBox_toggled</b>(<i>checked</i>) |
| 218 <p> | 223 <p> |
| 219 Private slot to handle changes of the Commit select group. | 224 Private slot to handle changes of the Commit select group. |
| 220 </p> | 225 </p> |
| 221 <dl> | 226 <dl> |
| 222 | 227 |
| 223 <dt><i>checked</i></dt> | 228 <dt><i>checked</i> (bool)</dt> |
| 224 <dd> | 229 <dd> |
| 225 state of the group (boolean) | 230 state of the group |
| 226 </dd> | 231 </dd> |
| 227 </dl> | 232 </dl> |
| 228 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> | 233 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> |
| 229 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> | 234 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> |
| 230 <b>on_commitMessageEdit_textChanged</b>(<i></i>) | 235 <b>on_commitMessageEdit_textChanged</b>(<i></i>) |
| 239 <p> | 244 <p> |
| 240 Private slot to handle changes of the ID select button. | 245 Private slot to handle changes of the ID select button. |
| 241 </p> | 246 </p> |
| 242 <dl> | 247 <dl> |
| 243 | 248 |
| 244 <dt><i>checked</i></dt> | 249 <dt><i>checked</i> (bool)</dt> |
| 245 <dd> | 250 <dd> |
| 246 state of the button (boolean) | 251 state of the button |
| 247 </dd> | 252 </dd> |
| 248 </dl> | 253 </dl> |
| 249 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> | 254 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> |
| 250 <h4>GitMergeDialog.on_idEdit_textChanged</h4> | 255 <h4>GitMergeDialog.on_idEdit_textChanged</h4> |
| 251 <b>on_idEdit_textChanged</b>(<i>txt</i>) | 256 <b>on_idEdit_textChanged</b>(<i>txt</i>) |
| 253 <p> | 258 <p> |
| 254 Private slot to handle changes of the Commit edit. | 259 Private slot to handle changes of the Commit edit. |
| 255 </p> | 260 </p> |
| 256 <dl> | 261 <dl> |
| 257 | 262 |
| 258 <dt><i>txt</i></dt> | 263 <dt><i>txt</i> (str)</dt> |
| 259 <dd> | 264 <dd> |
| 260 text of the edit (string) | 265 text of the edit |
| 261 </dd> | 266 </dd> |
| 262 </dl> | 267 </dl> |
| 263 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> | 268 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> |
| 264 <h4>GitMergeDialog.on_noneButton_toggled</h4> | 269 <h4>GitMergeDialog.on_noneButton_toggled</h4> |
| 265 <b>on_noneButton_toggled</b>(<i>checked</i>) | 270 <b>on_noneButton_toggled</b>(<i>checked</i>) |
| 267 <p> | 272 <p> |
| 268 Private slot to handle changes of the None select button. | 273 Private slot to handle changes of the None select button. |
| 269 </p> | 274 </p> |
| 270 <dl> | 275 <dl> |
| 271 | 276 |
| 272 <dt><i>checked</i></dt> | 277 <dt><i>checked</i> (bool)</dt> |
| 273 <dd> | 278 <dd> |
| 274 state of the button (boolean) | 279 state of the button |
| 275 </dd> | 280 </dd> |
| 276 </dl> | 281 </dl> |
| 277 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> | 282 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> |
| 278 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> | 283 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> |
| 279 <b>on_remoteBranchButton_toggled</b>(<i>checked</i>) | 284 <b>on_remoteBranchButton_toggled</b>(<i>checked</i>) |
| 281 <p> | 286 <p> |
| 282 Private slot to handle changes of the Remote Branch select button. | 287 Private slot to handle changes of the Remote Branch select button. |
| 283 </p> | 288 </p> |
| 284 <dl> | 289 <dl> |
| 285 | 290 |
| 286 <dt><i>checked</i></dt> | 291 <dt><i>checked</i> (bool)</dt> |
| 287 <dd> | 292 <dd> |
| 288 state of the button (boolean) | 293 state of the button |
| 289 </dd> | 294 </dd> |
| 290 </dl> | 295 </dl> |
| 291 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> | 296 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> |
| 292 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> | 297 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> |
| 293 <b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) | 298 <b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) |
| 295 <p> | 300 <p> |
| 296 Private slot to handle changes of the Remote Branch combo. | 301 Private slot to handle changes of the Remote Branch combo. |
| 297 </p> | 302 </p> |
| 298 <dl> | 303 <dl> |
| 299 | 304 |
| 300 <dt><i>txt</i></dt> | 305 <dt><i>txt</i> (str)</dt> |
| 301 <dd> | 306 <dd> |
| 302 text of the combo (string) | 307 text of the combo |
| 303 </dd> | 308 </dd> |
| 304 </dl> | 309 </dl> |
| 305 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> | 310 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> |
| 306 <h4>GitMergeDialog.on_tagButton_toggled</h4> | 311 <h4>GitMergeDialog.on_tagButton_toggled</h4> |
| 307 <b>on_tagButton_toggled</b>(<i>checked</i>) | 312 <b>on_tagButton_toggled</b>(<i>checked</i>) |
| 309 <p> | 314 <p> |
| 310 Private slot to handle changes of the Tag select button. | 315 Private slot to handle changes of the Tag select button. |
| 311 </p> | 316 </p> |
| 312 <dl> | 317 <dl> |
| 313 | 318 |
| 314 <dt><i>checked</i></dt> | 319 <dt><i>checked</i> (bool)</dt> |
| 315 <dd> | 320 <dd> |
| 316 state of the button (boolean) | 321 state of the button |
| 317 </dd> | 322 </dd> |
| 318 </dl> | 323 </dl> |
| 319 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> | 324 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> |
| 320 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> | 325 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> |
| 321 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) | 326 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) |
| 323 <p> | 328 <p> |
| 324 Private slot to handle changes of the Tag combo. | 329 Private slot to handle changes of the Tag combo. |
| 325 </p> | 330 </p> |
| 326 <dl> | 331 <dl> |
| 327 | 332 |
| 328 <dt><i>txt</i></dt> | 333 <dt><i>txt</i> (str)</dt> |
| 329 <dd> | 334 <dd> |
| 330 text of the combo (string) | 335 text of the combo |
| 331 </dd> | 336 </dd> |
| 332 </dl> | 337 </dl> |
| 333 <div align="right"><a href="#top">Up</a></div> | 338 <div align="right"><a href="#top">Up</a></div> |
| 334 <hr /> | 339 <hr /> |
| 335 </body></html> | 340 </body></html> |
