Mercurial Repositories > eric / file comparison

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

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

changeset 4130
c5af9f10a061
parent 4110
5a106c734527
equal deleted inserted replaced
4128:6e1ee14d5f23 4130:c5af9f10a061
59 <table> 59 <table>
60 <tr> 60 <tr>
61 <td><a href="#HgDiffDialog.__init__">HgDiffDialog</a></td> 61 <td><a href="#HgDiffDialog.__init__">HgDiffDialog</a></td>
62 <td>Constructor</td> 62 <td>Constructor</td>
63 </tr><tr> 63 </tr><tr>
64 <td><a href="#HgDiffDialog.__appendText">__appendText</a></td> 64 <td><a href="#HgDiffDialog.__generatorFinished">__generatorFinished</a></td>
65 <td>Private method to append text to the end of the contents pane.</td>
66 </tr><tr>
67 <td><a href="#HgDiffDialog.__extractFileName">__extractFileName</a></td>
68 <td>Private method to extract the file name out of a file separator line.</td>
69 </tr><tr>
70 <td><a href="#HgDiffDialog.__finish">__finish</a></td>
71 <td>Private slot called when the process finished or the user pressed the button.</td>
72 </tr><tr>
73 <td><a href="#HgDiffDialog.__getVersionArg">__getVersionArg</a></td>
74 <td>Private method to get a hg revision argument for the given revision.</td>
75 </tr><tr>
76 <td><a href="#HgDiffDialog.__procFinished">__procFinished</a></td>
77 <td>Private slot connected to the finished signal.</td> 65 <td>Private slot connected to the finished signal.</td>
78 </tr><tr>
79 <td><a href="#HgDiffDialog.__processFileLine">__processFileLine</a></td>
80 <td>Private slot to process a line giving the old/new file.</td>
81 </tr><tr>
82 <td><a href="#HgDiffDialog.__processOutputLine">__processOutputLine</a></td>
83 <td>Private method to process the lines of output.</td>
84 </tr><tr>
85 <td><a href="#HgDiffDialog.__readStderr">__readStderr</a></td>
86 <td>Private slot to handle the readyReadStandardError signal.</td>
87 </tr><tr>
88 <td><a href="#HgDiffDialog.__readStdout">__readStdout</a></td>
89 <td>Private slot to handle the readyReadStandardOutput signal.</td>
90 </tr><tr>
91 <td><a href="#HgDiffDialog.__showError">__showError</a></td>
92 <td>Private slot to show some error.</td>
93 </tr><tr> 66 </tr><tr>
94 <td><a href="#HgDiffDialog.closeEvent">closeEvent</a></td> 67 <td><a href="#HgDiffDialog.closeEvent">closeEvent</a></td>
95 <td>Protected slot implementing a close event handler.</td> 68 <td>Protected slot implementing a close event handler.</td>
96 </tr><tr>
97 <td><a href="#HgDiffDialog.keyPressEvent">keyPressEvent</a></td>
98 <td>Protected slot to handle a key press event.</td>
99 </tr><tr> 69 </tr><tr>
100 <td><a href="#HgDiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> 70 <td><a href="#HgDiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
101 <td>Private slot called by a button of the button box clicked.</td> 71 <td>Private slot called by a button of the button box clicked.</td>
102 </tr><tr> 72 </tr><tr>
103 <td><a href="#HgDiffDialog.on_filesCombo_activated">on_filesCombo_activated</a></td> 73 <td><a href="#HgDiffDialog.on_filesCombo_activated">on_filesCombo_activated</a></td>
104 <td>Private slot to handle the selection of a file.</td> 74 <td>Private slot to handle the selection of a file.</td>
105 </tr><tr> 75 </tr><tr>
106 <td><a href="#HgDiffDialog.on_input_returnPressed">on_input_returnPressed</a></td>
107 <td>Private slot to handle the press of the return key in the input field.</td>
108 </tr><tr>
109 <td><a href="#HgDiffDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td>
110 <td>Private slot to handle the password checkbox toggled.</td>
111 </tr><tr>
112 <td><a href="#HgDiffDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> 76 <td><a href="#HgDiffDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
113 <td>Private slot to refresh the display.</td> 77 <td>Private slot to refresh the display.</td>
114 </tr><tr> 78 </tr><tr>
115 <td><a href="#HgDiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td> 79 <td><a href="#HgDiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td>
116 <td>Private slot to handle the Save button press.</td> 80 <td>Private slot to handle the Save button press.</td>
117 </tr><tr>
118 <td><a href="#HgDiffDialog.on_sendButton_clicked">on_sendButton_clicked</a></td>
119 <td>Private slot to send the input to the subversion process.</td>
120 </tr><tr> 81 </tr><tr>
121 <td><a href="#HgDiffDialog.start">start</a></td> 82 <td><a href="#HgDiffDialog.start">start</a></td>
122 <td>Public slot to start the hg diff command.</td> 83 <td>Public slot to start the hg diff command.</td>
123 </tr> 84 </tr>
124 </table> 85 </table>
137 reference to the vcs object 98 reference to the vcs object
138 </dd><dt><i>parent</i></dt> 99 </dd><dt><i>parent</i></dt>
139 <dd> 100 <dd>
140 parent widget (QWidget) 101 parent widget (QWidget)
141 </dd> 102 </dd>
142 </dl><a NAME="HgDiffDialog.__appendText" ID="HgDiffDialog.__appendText"></a> 103 </dl><a NAME="HgDiffDialog.__generatorFinished" ID="HgDiffDialog.__generatorFinished"></a>
143 <h4>HgDiffDialog.__appendText</h4> 104 <h4>HgDiffDialog.__generatorFinished</h4>
144 <b>__appendText</b>(<i>txt</i>) 105 <b>__generatorFinished</b>(<i></i>)
145 <p>
146 Private method to append text to the end of the contents pane.
147 </p><dl>
148 <dt><i>txt</i></dt>
149 <dd>
150 text to insert (string)
151 </dd>
152 </dl><a NAME="HgDiffDialog.__extractFileName" ID="HgDiffDialog.__extractFileName"></a>
153 <h4>HgDiffDialog.__extractFileName</h4>
154 <b>__extractFileName</b>(<i>line</i>)
155 <p>
156 Private method to extract the file name out of a file separator line.
157 </p><dl>
158 <dt><i>line</i></dt>
159 <dd>
160 line to be processed (string)
161 </dd>
162 </dl><dl>
163 <dt>Returns:</dt>
164 <dd>
165 extracted file name (string)
166 </dd>
167 </dl><a NAME="HgDiffDialog.__finish" ID="HgDiffDialog.__finish"></a>
168 <h4>HgDiffDialog.__finish</h4>
169 <b>__finish</b>(<i></i>)
170 <p>
171 Private slot called when the process finished or the user pressed
172 the button.
173 </p><a NAME="HgDiffDialog.__getVersionArg" ID="HgDiffDialog.__getVersionArg"></a>
174 <h4>HgDiffDialog.__getVersionArg</h4>
175 <b>__getVersionArg</b>(<i>version</i>)
176 <p>
177 Private method to get a hg revision argument for the given revision.
178 </p><dl>
179 <dt><i>version</i></dt>
180 <dd>
181 revision (integer or string)
182 </dd>
183 </dl><dl>
184 <dt>Returns:</dt>
185 <dd>
186 version argument (string)
187 </dd>
188 </dl><a NAME="HgDiffDialog.__procFinished" ID="HgDiffDialog.__procFinished"></a>
189 <h4>HgDiffDialog.__procFinished</h4>
190 <b>__procFinished</b>(<i>exitCode, exitStatus</i>)
191 <p> 106 <p>
192 Private slot connected to the finished signal. 107 Private slot connected to the finished signal.
193 </p><dl> 108 </p><a NAME="HgDiffDialog.closeEvent" ID="HgDiffDialog.closeEvent"></a>
194 <dt><i>exitCode</i></dt>
195 <dd>
196 exit code of the process (integer)
197 </dd><dt><i>exitStatus</i></dt>
198 <dd>
199 exit status of the process (QProcess.ExitStatus)
200 </dd>
201 </dl><a NAME="HgDiffDialog.__processFileLine" ID="HgDiffDialog.__processFileLine"></a>
202 <h4>HgDiffDialog.__processFileLine</h4>
203 <b>__processFileLine</b>(<i>line</i>)
204 <p>
205 Private slot to process a line giving the old/new file.
206 </p><dl>
207 <dt><i>line</i></dt>
208 <dd>
209 line to be processed (string)
210 </dd>
211 </dl><a NAME="HgDiffDialog.__processOutputLine" ID="HgDiffDialog.__processOutputLine"></a>
212 <h4>HgDiffDialog.__processOutputLine</h4>
213 <b>__processOutputLine</b>(<i>line</i>)
214 <p>
215 Private method to process the lines of output.
216 </p><dl>
217 <dt><i>line</i></dt>
218 <dd>
219 output line to be processed (string)
220 </dd>
221 </dl><a NAME="HgDiffDialog.__readStderr" ID="HgDiffDialog.__readStderr"></a>
222 <h4>HgDiffDialog.__readStderr</h4>
223 <b>__readStderr</b>(<i></i>)
224 <p>
225 Private slot to handle the readyReadStandardError signal.
226 </p><p>
227 It reads the error output of the process and inserts it into the
228 error pane.
229 </p><a NAME="HgDiffDialog.__readStdout" ID="HgDiffDialog.__readStdout"></a>
230 <h4>HgDiffDialog.__readStdout</h4>
231 <b>__readStdout</b>(<i></i>)
232 <p>
233 Private slot to handle the readyReadStandardOutput signal.
234 </p><p>
235 It reads the output of the process, formats it and inserts it into
236 the contents pane.
237 </p><a NAME="HgDiffDialog.__showError" ID="HgDiffDialog.__showError"></a>
238 <h4>HgDiffDialog.__showError</h4>
239 <b>__showError</b>(<i>out</i>)
240 <p>
241 Private slot to show some error.
242 </p><dl>
243 <dt><i>out</i></dt>
244 <dd>
245 error to be shown (string)
246 </dd>
247 </dl><a NAME="HgDiffDialog.closeEvent" ID="HgDiffDialog.closeEvent"></a>
248 <h4>HgDiffDialog.closeEvent</h4> 109 <h4>HgDiffDialog.closeEvent</h4>
249 <b>closeEvent</b>(<i>e</i>) 110 <b>closeEvent</b>(<i>e</i>)
250 <p> 111 <p>
251 Protected slot implementing a close event handler. 112 Protected slot implementing a close event handler.
252 </p><dl> 113 </p><dl>
253 <dt><i>e</i></dt> 114 <dt><i>e</i></dt>
254 <dd> 115 <dd>
255 close event (QCloseEvent) 116 close event (QCloseEvent)
256 </dd>
257 </dl><a NAME="HgDiffDialog.keyPressEvent" ID="HgDiffDialog.keyPressEvent"></a>
258 <h4>HgDiffDialog.keyPressEvent</h4>
259 <b>keyPressEvent</b>(<i>evt</i>)
260 <p>
261 Protected slot to handle a key press event.
262 </p><dl>
263 <dt><i>evt</i></dt>
264 <dd>
265 the key press event (QKeyEvent)
266 </dd> 117 </dd>
267 </dl><a NAME="HgDiffDialog.on_buttonBox_clicked" ID="HgDiffDialog.on_buttonBox_clicked"></a> 118 </dl><a NAME="HgDiffDialog.on_buttonBox_clicked" ID="HgDiffDialog.on_buttonBox_clicked"></a>
268 <h4>HgDiffDialog.on_buttonBox_clicked</h4> 119 <h4>HgDiffDialog.on_buttonBox_clicked</h4>
269 <b>on_buttonBox_clicked</b>(<i>button</i>) 120 <b>on_buttonBox_clicked</b>(<i>button</i>)
270 <p> 121 <p>
282 </p><dl> 133 </p><dl>
283 <dt><i>index</i></dt> 134 <dt><i>index</i></dt>
284 <dd> 135 <dd>
285 activated row (integer) 136 activated row (integer)
286 </dd> 137 </dd>
287 </dl><a NAME="HgDiffDialog.on_input_returnPressed" ID="HgDiffDialog.on_input_returnPressed"></a>
288 <h4>HgDiffDialog.on_input_returnPressed</h4>
289 <b>on_input_returnPressed</b>(<i></i>)
290 <p>
291 Private slot to handle the press of the return key in the input field.
292 </p><a NAME="HgDiffDialog.on_passwordCheckBox_toggled" ID="HgDiffDialog.on_passwordCheckBox_toggled"></a>
293 <h4>HgDiffDialog.on_passwordCheckBox_toggled</h4>
294 <b>on_passwordCheckBox_toggled</b>(<i>isOn</i>)
295 <p>
296 Private slot to handle the password checkbox toggled.
297 </p><dl>
298 <dt><i>isOn</i></dt>
299 <dd>
300 flag indicating the status of the check box (boolean)
301 </dd>
302 </dl><a NAME="HgDiffDialog.on_refreshButton_clicked" ID="HgDiffDialog.on_refreshButton_clicked"></a> 138 </dl><a NAME="HgDiffDialog.on_refreshButton_clicked" ID="HgDiffDialog.on_refreshButton_clicked"></a>
303 <h4>HgDiffDialog.on_refreshButton_clicked</h4> 139 <h4>HgDiffDialog.on_refreshButton_clicked</h4>
304 <b>on_refreshButton_clicked</b>(<i></i>) 140 <b>on_refreshButton_clicked</b>(<i></i>)
305 <p> 141 <p>
306 Private slot to refresh the display. 142 Private slot to refresh the display.
310 <p> 146 <p>
311 Private slot to handle the Save button press. 147 Private slot to handle the Save button press.
312 </p><p> 148 </p><p>
313 It saves the diff shown in the dialog to a file in the local 149 It saves the diff shown in the dialog to a file in the local
314 filesystem. 150 filesystem.
315 </p><a NAME="HgDiffDialog.on_sendButton_clicked" ID="HgDiffDialog.on_sendButton_clicked"></a>
316 <h4>HgDiffDialog.on_sendButton_clicked</h4>
317 <b>on_sendButton_clicked</b>(<i></i>)
318 <p>
319 Private slot to send the input to the subversion process.
320 </p><a NAME="HgDiffDialog.start" ID="HgDiffDialog.start"></a> 151 </p><a NAME="HgDiffDialog.start" ID="HgDiffDialog.start"></a>
321 <h4>HgDiffDialog.start</h4> 152 <h4>HgDiffDialog.start</h4>
322 <b>start</b>(<i>fn, versions=None, bundle=None, qdiff=False, refreshable=False</i>) 153 <b>start</b>(<i>fn, versions=None, bundle=None, qdiff=False, refreshable=False</i>)
323 <p> 154 <p>
324 Public slot to start the hg diff command. 155 Public slot to start the hg diff command.

Mercurial Repository: eric

eric ide

mercurial