Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.VCS.VersionControl.html
src/eric7/Documentation/Source/eric7.VCS.VersionControl.html
- branch
- eric7
- changeset 10259
- b51dfacef37f
- parent 10070
- 9f5758c0fec1
- child 10436
- f6881d10e995
equal
deleted
inserted
replaced
| 10258:e7764f992a01 | 10259:b51dfacef37f |
|---|---|
| 112 <td><a href="#VersionControl.__statusMonitorStatus">__statusMonitorStatus</a></td> | 112 <td><a href="#VersionControl.__statusMonitorStatus">__statusMonitorStatus</a></td> |
| 113 <td>Private slot to receive the status monitor status.</td> | 113 <td>Private slot to receive the status monitor status.</td> |
| 114 </tr> | 114 </tr> |
| 115 <tr> | 115 <tr> |
| 116 <td><a href="#VersionControl._createStatusMonitorThread">_createStatusMonitorThread</a></td> | 116 <td><a href="#VersionControl._createStatusMonitorThread">_createStatusMonitorThread</a></td> |
| 117 <td></td> | 117 <td>Protected method to create an instance of the VCS status monitor thread.</td> |
| 118 </tr> | 118 </tr> |
| 119 <tr> | 119 <tr> |
| 120 <td><a href="#VersionControl._vcsAddProjectCommitMessage">_vcsAddProjectCommitMessage</a></td> | 120 <td><a href="#VersionControl._vcsAddProjectCommitMessage">_vcsAddProjectCommitMessage</a></td> |
| 121 <td>Protected method to add a commit message to the list of project specific saved messages.</td> | 121 <td>Protected method to add a commit message to the list of project specific saved messages.</td> |
| 122 </tr> | 122 </tr> |
| 308 <td><a href="#VersionControl.vcsRepositoryInfos">vcsRepositoryInfos</a></td> | 308 <td><a href="#VersionControl.vcsRepositoryInfos">vcsRepositoryInfos</a></td> |
| 309 <td>Public method to retrieve information about the repository.</td> | 309 <td>Public method to retrieve information about the repository.</td> |
| 310 </tr> | 310 </tr> |
| 311 <tr> | 311 <tr> |
| 312 <td><a href="#VersionControl.vcsResolved">vcsResolved</a></td> | 312 <td><a href="#VersionControl.vcsResolved">vcsResolved</a></td> |
| 313 <td></td> | 313 <td>Public method used to resolve conflicts of a file/directory.</td> |
| 314 </tr> | 314 </tr> |
| 315 <tr> | 315 <tr> |
| 316 <td><a href="#VersionControl.vcsRevert">vcsRevert</a></td> | 316 <td><a href="#VersionControl.vcsRevert">vcsRevert</a></td> |
| 317 <td>Public method used to revert changes made to a file/directory.</td> | 317 <td>Public method used to revert changes made to a file/directory.</td> |
| 318 </tr> | 318 </tr> |
| 459 </dl> | 459 </dl> |
| 460 <a NAME="VersionControl._createStatusMonitorThread" ID="VersionControl._createStatusMonitorThread"></a> | 460 <a NAME="VersionControl._createStatusMonitorThread" ID="VersionControl._createStatusMonitorThread"></a> |
| 461 <h4>VersionControl._createStatusMonitorThread</h4> | 461 <h4>VersionControl._createStatusMonitorThread</h4> |
| 462 <b>_createStatusMonitorThread</b>(<i>interval, project</i>) | 462 <b>_createStatusMonitorThread</b>(<i>interval, project</i>) |
| 463 | 463 |
| 464 <p> | |
| 465 Protected method to create an instance of the VCS status monitor | |
| 466 thread. | |
| 467 </p> | |
| 468 <p> | |
| 469 Note: This method should be overwritten in subclasses in order to | |
| 470 support VCS status monitoring. | |
| 471 </p> | |
| 472 <dl> | |
| 473 | |
| 474 <dt><i>interval</i></dt> | |
| 475 <dd> | |
| 476 check interval for the monitor thread in seconds | |
| 477 (integer) | |
| 478 </dd> | |
| 479 <dt><i>project</i></dt> | |
| 480 <dd> | |
| 481 reference to the project object | |
| 482 </dd> | |
| 483 </dl> | |
| 484 <dl> | |
| 485 <dt>Return:</dt> | |
| 486 <dd> | |
| 487 reference to the monitor thread (QThread) | |
| 488 </dd> | |
| 489 </dl> | |
| 464 <a NAME="VersionControl._vcsAddProjectCommitMessage" ID="VersionControl._vcsAddProjectCommitMessage"></a> | 490 <a NAME="VersionControl._vcsAddProjectCommitMessage" ID="VersionControl._vcsAddProjectCommitMessage"></a> |
| 465 <h4>VersionControl._vcsAddProjectCommitMessage</h4> | 491 <h4>VersionControl._vcsAddProjectCommitMessage</h4> |
| 466 <b>_vcsAddProjectCommitMessage</b>(<i>message</i>) | 492 <b>_vcsAddProjectCommitMessage</b>(<i>message</i>) |
| 467 | 493 |
| 468 <p> | 494 <p> |
| 1611 </dl> | 1637 </dl> |
| 1612 <a NAME="VersionControl.vcsResolved" ID="VersionControl.vcsResolved"></a> | 1638 <a NAME="VersionControl.vcsResolved" ID="VersionControl.vcsResolved"></a> |
| 1613 <h4>VersionControl.vcsResolved</h4> | 1639 <h4>VersionControl.vcsResolved</h4> |
| 1614 <b>vcsResolved</b>(<i>name</i>) | 1640 <b>vcsResolved</b>(<i>name</i>) |
| 1615 | 1641 |
| 1642 <p> | |
| 1643 Public method used to resolve conflicts of a file/directory. | |
| 1644 </p> | |
| 1645 <dl> | |
| 1646 | |
| 1647 <dt><i>name</i> (str)</dt> | |
| 1648 <dd> | |
| 1649 file/directory name to be resolved | |
| 1650 </dd> | |
| 1651 </dl> | |
| 1616 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a> | 1652 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a> |
| 1617 <h4>VersionControl.vcsRevert</h4> | 1653 <h4>VersionControl.vcsRevert</h4> |
| 1618 <b>vcsRevert</b>(<i>name</i>) | 1654 <b>vcsRevert</b>(<i>name</i>) |
| 1619 | 1655 |
| 1620 <p> | 1656 <p> |
