Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnDiffDialog.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9209
- b99e7fd55fd3
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 142 <p> | 142 <p> |
| 143 Constructor | 143 Constructor |
| 144 </p> | 144 </p> |
| 145 <dl> | 145 <dl> |
| 146 | 146 |
| 147 <dt><i>vcs</i></dt> | 147 <dt><i>vcs</i> (Subversion)</dt> |
| 148 <dd> | 148 <dd> |
| 149 reference to the vcs object | 149 reference to the vcs object |
| 150 </dd> | 150 </dd> |
| 151 <dt><i>parent</i></dt> | 151 <dt><i>parent</i> (QWidget)</dt> |
| 152 <dd> | 152 <dd> |
| 153 parent widget (QWidget) | 153 parent widget |
| 154 </dd> | 154 </dd> |
| 155 </dl> | 155 </dl> |
| 156 <a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a> | 156 <a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a> |
| 157 <h4>SvnDiffDialog.__appendText</h4> | 157 <h4>SvnDiffDialog.__appendText</h4> |
| 158 <b>__appendText</b>(<i>txt</i>) | 158 <b>__appendText</b>(<i>txt</i>) |
| 160 <p> | 160 <p> |
| 161 Private method to append text to the end of the contents pane. | 161 Private method to append text to the end of the contents pane. |
| 162 </p> | 162 </p> |
| 163 <dl> | 163 <dl> |
| 164 | 164 |
| 165 <dt><i>txt</i></dt> | 165 <dt><i>txt</i> (str)</dt> |
| 166 <dd> | 166 <dd> |
| 167 text to insert (string) | 167 text to insert |
| 168 </dd> | 168 </dd> |
| 169 </dl> | 169 </dl> |
| 170 <a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a> | 170 <a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a> |
| 171 <h4>SvnDiffDialog.__extractFileName</h4> | 171 <h4>SvnDiffDialog.__extractFileName</h4> |
| 172 <b>__extractFileName</b>(<i>line</i>) | 172 <b>__extractFileName</b>(<i>line</i>) |
| 174 <p> | 174 <p> |
| 175 Private method to extract the file name out of a file separator line. | 175 Private method to extract the file name out of a file separator line. |
| 176 </p> | 176 </p> |
| 177 <dl> | 177 <dl> |
| 178 | 178 |
| 179 <dt><i>line</i></dt> | 179 <dt><i>line</i> (str)</dt> |
| 180 <dd> | 180 <dd> |
| 181 line to be processed (string) | 181 line to be processed |
| 182 </dd> | 182 </dd> |
| 183 </dl> | 183 </dl> |
| 184 <dl> | 184 <dl> |
| 185 <dt>Return:</dt> | 185 <dt>Return:</dt> |
| 186 <dd> | 186 <dd> |
| 187 extracted file name (string) | 187 extracted file name |
| 188 </dd> | |
| 189 </dl> | |
| 190 <dl> | |
| 191 <dt>Return Type:</dt> | |
| 192 <dd> | |
| 193 str | |
| 188 </dd> | 194 </dd> |
| 189 </dl> | 195 </dl> |
| 190 <a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a> | 196 <a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a> |
| 191 <h4>SvnDiffDialog.__getVersionArg</h4> | 197 <h4>SvnDiffDialog.__getVersionArg</h4> |
| 192 <b>__getVersionArg</b>(<i>version</i>) | 198 <b>__getVersionArg</b>(<i>version</i>) |
| 194 <p> | 200 <p> |
| 195 Private method to get a svn revision argument for the given revision. | 201 Private method to get a svn revision argument for the given revision. |
| 196 </p> | 202 </p> |
| 197 <dl> | 203 <dl> |
| 198 | 204 |
| 199 <dt><i>version</i></dt> | 205 <dt><i>version</i> (int or str)</dt> |
| 200 <dd> | 206 <dd> |
| 201 revision (integer or string) | 207 revision |
| 202 </dd> | 208 </dd> |
| 203 </dl> | 209 </dl> |
| 204 <dl> | 210 <dl> |
| 205 <dt>Return:</dt> | 211 <dt>Return:</dt> |
| 206 <dd> | 212 <dd> |
| 207 version argument (string) | 213 version argument |
| 214 </dd> | |
| 215 </dl> | |
| 216 <dl> | |
| 217 <dt>Return Type:</dt> | |
| 218 <dd> | |
| 219 str | |
| 208 </dd> | 220 </dd> |
| 209 </dl> | 221 </dl> |
| 210 <a NAME="SvnDiffDialog.__procFinished" ID="SvnDiffDialog.__procFinished"></a> | 222 <a NAME="SvnDiffDialog.__procFinished" ID="SvnDiffDialog.__procFinished"></a> |
| 211 <h4>SvnDiffDialog.__procFinished</h4> | 223 <h4>SvnDiffDialog.__procFinished</h4> |
| 212 <b>__procFinished</b>(<i>exitCode, exitStatus</i>) | 224 <b>__procFinished</b>(<i>exitCode, exitStatus</i>) |
| 214 <p> | 226 <p> |
| 215 Private slot connected to the finished signal. | 227 Private slot connected to the finished signal. |
| 216 </p> | 228 </p> |
| 217 <dl> | 229 <dl> |
| 218 | 230 |
| 219 <dt><i>exitCode</i></dt> | 231 <dt><i>exitCode</i> (int)</dt> |
| 220 <dd> | 232 <dd> |
| 221 exit code of the process (integer) | 233 exit code of the process |
| 222 </dd> | 234 </dd> |
| 223 <dt><i>exitStatus</i></dt> | 235 <dt><i>exitStatus</i> (QProcess.ExitStatus)</dt> |
| 224 <dd> | 236 <dd> |
| 225 exit status of the process (QProcess.ExitStatus) | 237 exit status of the process |
| 226 </dd> | 238 </dd> |
| 227 </dl> | 239 </dl> |
| 228 <a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a> | 240 <a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a> |
| 229 <h4>SvnDiffDialog.__processFileLine</h4> | 241 <h4>SvnDiffDialog.__processFileLine</h4> |
| 230 <b>__processFileLine</b>(<i>line</i>) | 242 <b>__processFileLine</b>(<i>line</i>) |
| 232 <p> | 244 <p> |
| 233 Private slot to process a line giving the old/new file. | 245 Private slot to process a line giving the old/new file. |
| 234 </p> | 246 </p> |
| 235 <dl> | 247 <dl> |
| 236 | 248 |
| 237 <dt><i>line</i></dt> | 249 <dt><i>line</i> (str)</dt> |
| 238 <dd> | 250 <dd> |
| 239 line to be processed (string) | 251 line to be processed |
| 240 </dd> | 252 </dd> |
| 241 </dl> | 253 </dl> |
| 242 <a NAME="SvnDiffDialog.__readStderr" ID="SvnDiffDialog.__readStderr"></a> | 254 <a NAME="SvnDiffDialog.__readStderr" ID="SvnDiffDialog.__readStderr"></a> |
| 243 <h4>SvnDiffDialog.__readStderr</h4> | 255 <h4>SvnDiffDialog.__readStderr</h4> |
| 244 <b>__readStderr</b>(<i></i>) | 256 <b>__readStderr</b>(<i></i>) |
| 268 <p> | 280 <p> |
| 269 Protected slot implementing a close event handler. | 281 Protected slot implementing a close event handler. |
| 270 </p> | 282 </p> |
| 271 <dl> | 283 <dl> |
| 272 | 284 |
| 273 <dt><i>e</i></dt> | 285 <dt><i>e</i> (QCloseEvent)</dt> |
| 274 <dd> | 286 <dd> |
| 275 close event (QCloseEvent) | 287 close event |
| 276 </dd> | 288 </dd> |
| 277 </dl> | 289 </dl> |
| 278 <a NAME="SvnDiffDialog.keyPressEvent" ID="SvnDiffDialog.keyPressEvent"></a> | 290 <a NAME="SvnDiffDialog.keyPressEvent" ID="SvnDiffDialog.keyPressEvent"></a> |
| 279 <h4>SvnDiffDialog.keyPressEvent</h4> | 291 <h4>SvnDiffDialog.keyPressEvent</h4> |
| 280 <b>keyPressEvent</b>(<i>evt</i>) | 292 <b>keyPressEvent</b>(<i>evt</i>) |
| 282 <p> | 294 <p> |
| 283 Protected slot to handle a key press event. | 295 Protected slot to handle a key press event. |
| 284 </p> | 296 </p> |
| 285 <dl> | 297 <dl> |
| 286 | 298 |
| 287 <dt><i>evt</i></dt> | 299 <dt><i>evt</i> (QKeyEvent)</dt> |
| 288 <dd> | 300 <dd> |
| 289 the key press event (QKeyEvent) | 301 the key press event |
| 290 </dd> | 302 </dd> |
| 291 </dl> | 303 </dl> |
| 292 <a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a> | 304 <a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a> |
| 293 <h4>SvnDiffDialog.on_buttonBox_clicked</h4> | 305 <h4>SvnDiffDialog.on_buttonBox_clicked</h4> |
| 294 <b>on_buttonBox_clicked</b>(<i>button</i>) | 306 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 296 <p> | 308 <p> |
| 297 Private slot called by a button of the button box clicked. | 309 Private slot called by a button of the button box clicked. |
| 298 </p> | 310 </p> |
| 299 <dl> | 311 <dl> |
| 300 | 312 |
| 301 <dt><i>button</i></dt> | 313 <dt><i>button</i> (QAbstractButton)</dt> |
| 302 <dd> | 314 <dd> |
| 303 button that was clicked (QAbstractButton) | 315 button that was clicked |
| 304 </dd> | 316 </dd> |
| 305 </dl> | 317 </dl> |
| 306 <a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a> | 318 <a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a> |
| 307 <h4>SvnDiffDialog.on_filesCombo_activated</h4> | 319 <h4>SvnDiffDialog.on_filesCombo_activated</h4> |
| 308 <b>on_filesCombo_activated</b>(<i>index</i>) | 320 <b>on_filesCombo_activated</b>(<i>index</i>) |
| 310 <p> | 322 <p> |
| 311 Private slot to handle the selection of a file. | 323 Private slot to handle the selection of a file. |
| 312 </p> | 324 </p> |
| 313 <dl> | 325 <dl> |
| 314 | 326 |
| 315 <dt><i>index</i></dt> | 327 <dt><i>index</i> (int)</dt> |
| 316 <dd> | 328 <dd> |
| 317 activated row (integer) | 329 activated row |
| 318 </dd> | 330 </dd> |
| 319 </dl> | 331 </dl> |
| 320 <a NAME="SvnDiffDialog.on_input_returnPressed" ID="SvnDiffDialog.on_input_returnPressed"></a> | 332 <a NAME="SvnDiffDialog.on_input_returnPressed" ID="SvnDiffDialog.on_input_returnPressed"></a> |
| 321 <h4>SvnDiffDialog.on_input_returnPressed</h4> | 333 <h4>SvnDiffDialog.on_input_returnPressed</h4> |
| 322 <b>on_input_returnPressed</b>(<i></i>) | 334 <b>on_input_returnPressed</b>(<i></i>) |
| 331 <p> | 343 <p> |
| 332 Private slot to handle the password checkbox toggled. | 344 Private slot to handle the password checkbox toggled. |
| 333 </p> | 345 </p> |
| 334 <dl> | 346 <dl> |
| 335 | 347 |
| 336 <dt><i>isOn</i></dt> | 348 <dt><i>isOn</i> (bool)</dt> |
| 337 <dd> | 349 <dd> |
| 338 flag indicating the status of the check box (boolean) | 350 flag indicating the status of the check box |
| 339 </dd> | 351 </dd> |
| 340 </dl> | 352 </dl> |
| 341 <a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a> | 353 <a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a> |
| 342 <h4>SvnDiffDialog.on_refreshButton_clicked</h4> | 354 <h4>SvnDiffDialog.on_refreshButton_clicked</h4> |
| 343 <b>on_refreshButton_clicked</b>(<i></i>) | 355 <b>on_refreshButton_clicked</b>(<i></i>) |
| 370 <p> | 382 <p> |
| 371 Public slot to start the svn diff command. | 383 Public slot to start the svn diff command. |
| 372 </p> | 384 </p> |
| 373 <dl> | 385 <dl> |
| 374 | 386 |
| 375 <dt><i>fn</i></dt> | 387 <dt><i>fn</i> (str)</dt> |
| 376 <dd> | 388 <dd> |
| 377 filename to be diffed (string) | 389 filename to be diffed |
| 378 </dd> | 390 </dd> |
| 379 <dt><i>versions</i></dt> | 391 <dt><i>versions</i> (list of up to 2 str or None)</dt> |
| 380 <dd> | 392 <dd> |
| 381 list of versions to be diffed (list of up to 2 strings | 393 list of versions to be diffed |
| 382 or None) | 394 </dd> |
| 383 </dd> | 395 <dt><i>urls</i> (list of [str, str])</dt> |
| 384 <dt><i>urls</i></dt> | 396 <dd> |
| 385 <dd> | 397 list of repository URLs |
| 386 list of repository URLs (list of 2 strings) | 398 </dd> |
| 387 </dd> | 399 <dt><i>summary</i> (bool)</dt> |
| 388 <dt><i>summary</i></dt> | |
| 389 <dd> | 400 <dd> |
| 390 flag indicating a summarizing diff | 401 flag indicating a summarizing diff |
| 391 (only valid for URL diffs) (boolean) | 402 (only valid for URL diffs) |
| 392 </dd> | 403 </dd> |
| 393 <dt><i>refreshable</i></dt> | 404 <dt><i>refreshable</i> (bool)</dt> |
| 394 <dd> | 405 <dd> |
| 395 flag indicating a refreshable diff (boolean) | 406 flag indicating a refreshable diff |
| 396 </dd> | 407 </dd> |
| 397 </dl> | 408 </dl> |
| 398 <div align="right"><a href="#top">Up</a></div> | 409 <div align="right"><a href="#top">Up</a></div> |
| 399 <hr /> | 410 <hr /> |
| 400 </body></html> | 411 </body></html> |
