Mercurial Repositories > eric / file comparison

comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html

eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html

changeset 7370
5fb53279f2df
parent 7273
391d6b7b1eff
child 7976
a8a20f558176
equal deleted inserted replaced
7369:dbeeed55df08 7370:5fb53279f2df
85 <tr> 85 <tr>
86 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td> 86 <td><a href="#HgConflictsListDialog.__getEntries">__getEntries</a></td>
87 <td>Private method to get the conflict entries.</td> 87 <td>Private method to get the conflict entries.</td>
88 </tr> 88 </tr>
89 <tr> 89 <tr>
90 <td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td>
91 <td>Private slot connected to the finished signal.</td>
92 </tr>
93 <tr>
94 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td> 90 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td>
95 <td>Private method to process the lines of output.</td> 91 <td>Private method to process the lines of output.</td>
96 </tr> 92 </tr>
97 <tr> 93 <tr>
98 <td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td>
99 <td>Private slot to handle the readyReadStderr signal.</td>
100 </tr>
101 <tr>
102 <td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td>
103 <td>Private slot to handle the readyReadStdout signal.</td>
104 </tr>
105 <tr>
106 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td> 94 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td>
107 <td>Private method to resize the list columns.</td> 95 <td>Private method to resize the list columns.</td>
108 </tr> 96 </tr>
109 <tr> 97 <tr>
110 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td> 98 <td><a href="#HgConflictsListDialog.__resort">__resort</a></td>
117 <tr> 105 <tr>
118 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td> 106 <td><a href="#HgConflictsListDialog.closeEvent">closeEvent</a></td>
119 <td>Protected slot implementing a close event handler.</td> 107 <td>Protected slot implementing a close event handler.</td>
120 </tr> 108 </tr>
121 <tr> 109 <tr>
122 <td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td>
123 <td>Protected slot to handle a key press event.</td>
124 </tr>
125 <tr>
126 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> 110 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
127 <td>Private slot called by a button of the button box clicked.</td> 111 <td>Private slot called by a button of the button box clicked.</td>
128 </tr> 112 </tr>
129 <tr> 113 <tr>
130 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td> 114 <td><a href="#HgConflictsListDialog.on_conflictsList_itemDoubleClicked">on_conflictsList_itemDoubleClicked</a></td>
137 <tr> 121 <tr>
138 <td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td> 122 <td><a href="#HgConflictsListDialog.on_editButton_clicked">on_editButton_clicked</a></td>
139 <td>Private slot to open the selected file in an editor.</td> 123 <td>Private slot to open the selected file in an editor.</td>
140 </tr> 124 </tr>
141 <tr> 125 <tr>
142 <td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td>
143 <td>Private slot to handle the press of the return key in the input field.</td>
144 </tr>
145 <tr>
146 <td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td>
147 <td>Private slot to handle the password checkbox toggled.</td>
148 </tr>
149 <tr>
150 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td> 126 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td>
151 <td>Private slot to re-merge the selected entries.</td> 127 <td>Private slot to re-merge the selected entries.</td>
152 </tr> 128 </tr>
153 <tr> 129 <tr>
154 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> 130 <td><a href="#HgConflictsListDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
155 <td>Private slot to refresh the log.</td> 131 <td>Private slot to refresh the log.</td>
156 </tr> 132 </tr>
157 <tr> 133 <tr>
158 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td> 134 <td><a href="#HgConflictsListDialog.on_resolvedButton_clicked">on_resolvedButton_clicked</a></td>
159 <td>Private slot to mark the selected entries as resolved.</td> 135 <td>Private slot to mark the selected entries as resolved.</td>
160 </tr>
161 <tr>
162 <td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td>
163 <td>Private slot to send the input to the subversion process.</td>
164 </tr> 136 </tr>
165 <tr> 137 <tr>
166 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td> 138 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td>
167 <td>Private slot to mark the selected entries as unresolved.</td> 139 <td>Private slot to mark the selected entries as unresolved.</td>
168 </tr> 140 </tr>
230 <b>__getEntries</b>(<i></i>) 202 <b>__getEntries</b>(<i></i>)
231 203
232 <p> 204 <p>
233 Private method to get the conflict entries. 205 Private method to get the conflict entries.
234 </p> 206 </p>
235 <a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a>
236 <h4>HgConflictsListDialog.__procFinished</h4>
237 <b>__procFinished</b>(<i>exitCode, exitStatus</i>)
238
239 <p>
240 Private slot connected to the finished signal.
241 </p>
242 <dl>
243
244 <dt><i>exitCode</i></dt>
245 <dd>
246 exit code of the process (integer)
247 </dd>
248 <dt><i>exitStatus</i></dt>
249 <dd>
250 exit status of the process (QProcess.ExitStatus)
251 </dd>
252 </dl>
253 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a> 207 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a>
254 <h4>HgConflictsListDialog.__processOutputLine</h4> 208 <h4>HgConflictsListDialog.__processOutputLine</h4>
255 <b>__processOutputLine</b>(<i>line</i>) 209 <b>__processOutputLine</b>(<i>line</i>)
256 210
257 <p> 211 <p>
262 <dt><i>line</i></dt> 216 <dt><i>line</i></dt>
263 <dd> 217 <dd>
264 output line to be processed (string) 218 output line to be processed (string)
265 </dd> 219 </dd>
266 </dl> 220 </dl>
267 <a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a>
268 <h4>HgConflictsListDialog.__readStderr</h4>
269 <b>__readStderr</b>(<i></i>)
270
271 <p>
272 Private slot to handle the readyReadStderr signal.
273 </p>
274 <p>
275 It reads the error output of the process and inserts it into the
276 error pane.
277 </p>
278 <a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a>
279 <h4>HgConflictsListDialog.__readStdout</h4>
280 <b>__readStdout</b>(<i></i>)
281
282 <p>
283 Private slot to handle the readyReadStdout signal.
284 </p>
285 <p>
286 It reads the output of the process, formats it and inserts it into
287 the contents pane.
288 </p>
289 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> 221 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a>
290 <h4>HgConflictsListDialog.__resizeColumns</h4> 222 <h4>HgConflictsListDialog.__resizeColumns</h4>
291 <b>__resizeColumns</b>(<i></i>) 223 <b>__resizeColumns</b>(<i></i>)
292 224
293 <p> 225 <p>
326 <dt><i>e</i></dt> 258 <dt><i>e</i></dt>
327 <dd> 259 <dd>
328 close event (QCloseEvent) 260 close event (QCloseEvent)
329 </dd> 261 </dd>
330 </dl> 262 </dl>
331 <a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a>
332 <h4>HgConflictsListDialog.keyPressEvent</h4>
333 <b>keyPressEvent</b>(<i>evt</i>)
334
335 <p>
336 Protected slot to handle a key press event.
337 </p>
338 <dl>
339
340 <dt><i>evt</i></dt>
341 <dd>
342 the key press event (QKeyEvent)
343 </dd>
344 </dl>
345 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> 263 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a>
346 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4> 264 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4>
347 <b>on_buttonBox_clicked</b>(<i>button</i>) 265 <b>on_buttonBox_clicked</b>(<i>button</i>)
348 266
349 <p> 267 <p>
386 <b>on_editButton_clicked</b>(<i></i>) 304 <b>on_editButton_clicked</b>(<i></i>)
387 305
388 <p> 306 <p>
389 Private slot to open the selected file in an editor. 307 Private slot to open the selected file in an editor.
390 </p> 308 </p>
391 <a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a>
392 <h4>HgConflictsListDialog.on_input_returnPressed</h4>
393 <b>on_input_returnPressed</b>(<i></i>)
394
395 <p>
396 Private slot to handle the press of the return key in the input field.
397 </p>
398 <a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a>
399 <h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4>
400 <b>on_passwordCheckBox_toggled</b>(<i>isOn</i>)
401
402 <p>
403 Private slot to handle the password checkbox toggled.
404 </p>
405 <dl>
406
407 <dt><i>isOn</i></dt>
408 <dd>
409 flag indicating the status of the check box (boolean)
410 </dd>
411 </dl>
412 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a> 309 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a>
413 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4> 310 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4>
414 <b>on_reMergeButton_clicked</b>(<i></i>) 311 <b>on_reMergeButton_clicked</b>(<i></i>)
415 312
416 <p> 313 <p>
428 <b>on_resolvedButton_clicked</b>(<i></i>) 325 <b>on_resolvedButton_clicked</b>(<i></i>)
429 326
430 <p> 327 <p>
431 Private slot to mark the selected entries as resolved. 328 Private slot to mark the selected entries as resolved.
432 </p> 329 </p>
433 <a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a>
434 <h4>HgConflictsListDialog.on_sendButton_clicked</h4>
435 <b>on_sendButton_clicked</b>(<i></i>)
436
437 <p>
438 Private slot to send the input to the subversion process.
439 </p>
440 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a> 330 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a>
441 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4> 331 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4>
442 <b>on_unresolvedButton_clicked</b>(<i></i>) 332 <b>on_unresolvedButton_clicked</b>(<i></i>)
443 333
444 <p> 334 <p>

Mercurial Repository: eric

eric ide

mercurial