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 10479
856476537696
parent 10438
4cd7e5a8b3cf
child 10690
fab36645aa7d
equal deleted inserted replaced
10478:de9106c55c3d 10479:856476537696
5 <link rel="stylesheet" href="styles.css"> 5 <link rel="stylesheet" href="styles.css">
6 </head> 6 </head>
7 <body> 7 <body>
8 <a NAME="top" ID="top"></a> 8 <a NAME="top" ID="top"></a>
9 <h1>eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog</h1> 9 <h1>eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog</h1>
10
11 <p> 10 <p>
12 Module implementing a dialog to enter the merge data. 11 Module implementing a dialog to enter the merge data.
13 </p> 12 </p>
13
14 <h3>Global Attributes</h3> 14 <h3>Global Attributes</h3>
15 15 <table>
16 <table> 16 <tr><td>None</td></tr>
17 <tr><td>None</td></tr> 17 </table>
18 </table> 18
19 <h3>Classes</h3> 19 <h3>Classes</h3>
20 20 <table>
21 <table>
22
23 <tr> 21 <tr>
24 <td><a href="#GitMergeDialog">GitMergeDialog</a></td> 22 <td><a href="#GitMergeDialog">GitMergeDialog</a></td>
25 <td>Class implementing a dialog to enter the merge data.</td> 23 <td>Class implementing a dialog to enter the merge data.</td>
26 </tr> 24 </tr>
27 </table> 25 </table>
26
28 <h3>Functions</h3> 27 <h3>Functions</h3>
29 28 <table>
30 <table> 29 <tr><td>None</td></tr>
31 <tr><td>None</td></tr> 30 </table>
32 </table> 31
33 <hr /> 32 <hr />
34 <hr /> 33 <hr />
35 <a NAME="GitMergeDialog" ID="GitMergeDialog"></a> 34 <a NAME="GitMergeDialog" ID="GitMergeDialog"></a>
36 <h2>GitMergeDialog</h2> 35 <h2>GitMergeDialog</h2>
37
38 <p> 36 <p>
39 Class implementing a dialog to enter the merge data. 37 Class implementing a dialog to enter the merge data.
40 </p> 38 </p>
39
41 <h3>Derived from</h3> 40 <h3>Derived from</h3>
42 QDialog, Ui_GitMergeDialog 41 QDialog, Ui_GitMergeDialog
43 <h3>Class Attributes</h3> 42 <h3>Class Attributes</h3>
44 43 <table>
45 <table> 44 <tr><td>None</td></tr>
46 <tr><td>None</td></tr> 45 </table>
47 </table> 46
48 <h3>Class Methods</h3> 47 <h3>Class Methods</h3>
49 48 <table>
50 <table> 49 <tr><td>None</td></tr>
51 <tr><td>None</td></tr> 50 </table>
52 </table> 51
53 <h3>Methods</h3> 52 <h3>Methods</h3>
54 53 <table>
55 <table>
56
57 <tr> 54 <tr>
58 <td><a href="#GitMergeDialog.__init__">GitMergeDialog</a></td> 55 <td><a href="#GitMergeDialog.__init__">GitMergeDialog</a></td>
59 <td>Constructor</td> 56 <td>Constructor</td>
60 </tr> 57 </tr>
61 <tr> 58 <tr>
113 <tr> 110 <tr>
114 <td><a href="#GitMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> 111 <td><a href="#GitMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td>
115 <td>Private slot to handle changes of the Tag combo.</td> 112 <td>Private slot to handle changes of the Tag combo.</td>
116 </tr> 113 </tr>
117 </table> 114 </table>
115
118 <h3>Static Methods</h3> 116 <h3>Static Methods</h3>
119 117 <table>
120 <table> 118 <tr><td>None</td></tr>
121 <tr><td>None</td></tr> 119 </table>
122 </table> 120
123 121
124 <a NAME="GitMergeDialog.__init__" ID="GitMergeDialog.__init__"></a> 122 <a NAME="GitMergeDialog.__init__" ID="GitMergeDialog.__init__"></a>
125 <h4>GitMergeDialog (Constructor)</h4> 123 <h4>GitMergeDialog (Constructor)</h4>
126 <b>GitMergeDialog</b>(<i>tagsList, branchesList, currentBranch, remoteBranchesList, parent=None</i>) 124 <b>GitMergeDialog</b>(<i>tagsList, branchesList, currentBranch, remoteBranchesList, parent=None</i>)
127
128 <p> 125 <p>
129 Constructor 126 Constructor
130 </p> 127 </p>
128
131 <dl> 129 <dl>
132 130
133 <dt><i>tagsList</i> (list of str)</dt> 131 <dt><i>tagsList</i> (list of str)</dt>
134 <dd> 132 <dd>
135 list of tags 133 list of tags
152 </dd> 150 </dd>
153 </dl> 151 </dl>
154 <a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a> 152 <a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a>
155 <h4>GitMergeDialog.__generateDefaultCommitMessage</h4> 153 <h4>GitMergeDialog.__generateDefaultCommitMessage</h4>
156 <b>__generateDefaultCommitMessage</b>(<i></i>) 154 <b>__generateDefaultCommitMessage</b>(<i></i>)
157
158 <p> 155 <p>
159 Private slot to generate a default commit message based on the 156 Private slot to generate a default commit message based on the
160 data entered. 157 data entered.
161 </p> 158 </p>
159
162 <a NAME="GitMergeDialog.__updateOK" ID="GitMergeDialog.__updateOK"></a> 160 <a NAME="GitMergeDialog.__updateOK" ID="GitMergeDialog.__updateOK"></a>
163 <h4>GitMergeDialog.__updateOK</h4> 161 <h4>GitMergeDialog.__updateOK</h4>
164 <b>__updateOK</b>(<i></i>) 162 <b>__updateOK</b>(<i></i>)
165
166 <p> 163 <p>
167 Private slot to update the OK button. 164 Private slot to update the OK button.
168 </p> 165 </p>
166
169 <a NAME="GitMergeDialog.getParameters" ID="GitMergeDialog.getParameters"></a> 167 <a NAME="GitMergeDialog.getParameters" ID="GitMergeDialog.getParameters"></a>
170 <h4>GitMergeDialog.getParameters</h4> 168 <h4>GitMergeDialog.getParameters</h4>
171 <b>getParameters</b>(<i></i>) 169 <b>getParameters</b>(<i></i>)
172
173 <p> 170 <p>
174 Public method to retrieve the merge data. 171 Public method to retrieve the merge data.
175 </p> 172 </p>
173
176 <dl> 174 <dl>
177 <dt>Return:</dt> 175 <dt>Return:</dt>
178 <dd> 176 <dd>
179 tuple naming the revision, a flag indicating that the merge 177 tuple naming the revision, a flag indicating that the merge
180 shall be committed, the commit message, a flag indicating that a 178 shall be committed, the commit message, a flag indicating that a
189 </dd> 187 </dd>
190 </dl> 188 </dl>
191 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a> 189 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a>
192 <h4>GitMergeDialog.on_branchButton_toggled</h4> 190 <h4>GitMergeDialog.on_branchButton_toggled</h4>
193 <b>on_branchButton_toggled</b>(<i>checked</i>) 191 <b>on_branchButton_toggled</b>(<i>checked</i>)
194
195 <p> 192 <p>
196 Private slot to handle changes of the Branch select button. 193 Private slot to handle changes of the Branch select button.
197 </p> 194 </p>
195
198 <dl> 196 <dl>
199 197
200 <dt><i>checked</i> (bool)</dt> 198 <dt><i>checked</i> (bool)</dt>
201 <dd> 199 <dd>
202 state of the button 200 state of the button
203 </dd> 201 </dd>
204 </dl> 202 </dl>
205 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a> 203 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a>
206 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4> 204 <h4>GitMergeDialog.on_branchCombo_editTextChanged</h4>
207 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) 205 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>)
208
209 <p> 206 <p>
210 Private slot to handle changes of the Branch combo. 207 Private slot to handle changes of the Branch combo.
211 </p> 208 </p>
209
212 <dl> 210 <dl>
213 211
214 <dt><i>txt</i> (str)</dt> 212 <dt><i>txt</i> (str)</dt>
215 <dd> 213 <dd>
216 text of the combo 214 text of the combo
217 </dd> 215 </dd>
218 </dl> 216 </dl>
219 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a> 217 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a>
220 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4> 218 <h4>GitMergeDialog.on_commitGroupBox_toggled</h4>
221 <b>on_commitGroupBox_toggled</b>(<i>checked</i>) 219 <b>on_commitGroupBox_toggled</b>(<i>checked</i>)
222
223 <p> 220 <p>
224 Private slot to handle changes of the Commit select group. 221 Private slot to handle changes of the Commit select group.
225 </p> 222 </p>
223
226 <dl> 224 <dl>
227 225
228 <dt><i>checked</i> (bool)</dt> 226 <dt><i>checked</i> (bool)</dt>
229 <dd> 227 <dd>
230 state of the group 228 state of the group
231 </dd> 229 </dd>
232 </dl> 230 </dl>
233 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a> 231 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a>
234 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4> 232 <h4>GitMergeDialog.on_commitMessageEdit_textChanged</h4>
235 <b>on_commitMessageEdit_textChanged</b>(<i></i>) 233 <b>on_commitMessageEdit_textChanged</b>(<i></i>)
236
237 <p> 234 <p>
238 Private slot to handle changes of the commit message edit. 235 Private slot to handle changes of the commit message edit.
239 </p> 236 </p>
237
240 <a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a> 238 <a NAME="GitMergeDialog.on_idButton_toggled" ID="GitMergeDialog.on_idButton_toggled"></a>
241 <h4>GitMergeDialog.on_idButton_toggled</h4> 239 <h4>GitMergeDialog.on_idButton_toggled</h4>
242 <b>on_idButton_toggled</b>(<i>checked</i>) 240 <b>on_idButton_toggled</b>(<i>checked</i>)
243
244 <p> 241 <p>
245 Private slot to handle changes of the ID select button. 242 Private slot to handle changes of the ID select button.
246 </p> 243 </p>
244
247 <dl> 245 <dl>
248 246
249 <dt><i>checked</i> (bool)</dt> 247 <dt><i>checked</i> (bool)</dt>
250 <dd> 248 <dd>
251 state of the button 249 state of the button
252 </dd> 250 </dd>
253 </dl> 251 </dl>
254 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a> 252 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a>
255 <h4>GitMergeDialog.on_idEdit_textChanged</h4> 253 <h4>GitMergeDialog.on_idEdit_textChanged</h4>
256 <b>on_idEdit_textChanged</b>(<i>txt</i>) 254 <b>on_idEdit_textChanged</b>(<i>txt</i>)
257
258 <p> 255 <p>
259 Private slot to handle changes of the Commit edit. 256 Private slot to handle changes of the Commit edit.
260 </p> 257 </p>
258
261 <dl> 259 <dl>
262 260
263 <dt><i>txt</i> (str)</dt> 261 <dt><i>txt</i> (str)</dt>
264 <dd> 262 <dd>
265 text of the edit 263 text of the edit
266 </dd> 264 </dd>
267 </dl> 265 </dl>
268 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a> 266 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a>
269 <h4>GitMergeDialog.on_noneButton_toggled</h4> 267 <h4>GitMergeDialog.on_noneButton_toggled</h4>
270 <b>on_noneButton_toggled</b>(<i>checked</i>) 268 <b>on_noneButton_toggled</b>(<i>checked</i>)
271
272 <p> 269 <p>
273 Private slot to handle changes of the None select button. 270 Private slot to handle changes of the None select button.
274 </p> 271 </p>
272
275 <dl> 273 <dl>
276 274
277 <dt><i>checked</i> (bool)</dt> 275 <dt><i>checked</i> (bool)</dt>
278 <dd> 276 <dd>
279 state of the button 277 state of the button
280 </dd> 278 </dd>
281 </dl> 279 </dl>
282 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a> 280 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a>
283 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4> 281 <h4>GitMergeDialog.on_remoteBranchButton_toggled</h4>
284 <b>on_remoteBranchButton_toggled</b>(<i>checked</i>) 282 <b>on_remoteBranchButton_toggled</b>(<i>checked</i>)
285
286 <p> 283 <p>
287 Private slot to handle changes of the Remote Branch select button. 284 Private slot to handle changes of the Remote Branch select button.
288 </p> 285 </p>
286
289 <dl> 287 <dl>
290 288
291 <dt><i>checked</i> (bool)</dt> 289 <dt><i>checked</i> (bool)</dt>
292 <dd> 290 <dd>
293 state of the button 291 state of the button
294 </dd> 292 </dd>
295 </dl> 293 </dl>
296 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a> 294 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a>
297 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4> 295 <h4>GitMergeDialog.on_remoteBranchCombo_editTextChanged</h4>
298 <b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>) 296 <b>on_remoteBranchCombo_editTextChanged</b>(<i>txt</i>)
299
300 <p> 297 <p>
301 Private slot to handle changes of the Remote Branch combo. 298 Private slot to handle changes of the Remote Branch combo.
302 </p> 299 </p>
300
303 <dl> 301 <dl>
304 302
305 <dt><i>txt</i> (str)</dt> 303 <dt><i>txt</i> (str)</dt>
306 <dd> 304 <dd>
307 text of the combo 305 text of the combo
308 </dd> 306 </dd>
309 </dl> 307 </dl>
310 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a> 308 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a>
311 <h4>GitMergeDialog.on_tagButton_toggled</h4> 309 <h4>GitMergeDialog.on_tagButton_toggled</h4>
312 <b>on_tagButton_toggled</b>(<i>checked</i>) 310 <b>on_tagButton_toggled</b>(<i>checked</i>)
313
314 <p> 311 <p>
315 Private slot to handle changes of the Tag select button. 312 Private slot to handle changes of the Tag select button.
316 </p> 313 </p>
314
317 <dl> 315 <dl>
318 316
319 <dt><i>checked</i> (bool)</dt> 317 <dt><i>checked</i> (bool)</dt>
320 <dd> 318 <dd>
321 state of the button 319 state of the button
322 </dd> 320 </dd>
323 </dl> 321 </dl>
324 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a> 322 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a>
325 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4> 323 <h4>GitMergeDialog.on_tagCombo_editTextChanged</h4>
326 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) 324 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>)
327
328 <p> 325 <p>
329 Private slot to handle changes of the Tag combo. 326 Private slot to handle changes of the Tag combo.
330 </p> 327 </p>
328
331 <dl> 329 <dl>
332 330
333 <dt><i>txt</i> (str)</dt> 331 <dt><i>txt</i> (str)</dt>
334 <dd> 332 <dd>
335 text of the combo 333 text of the combo

Mercurial Repository: eric

eric ide

mercurial