Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html
- changeset 7156
- c1b6bc83fc76
- parent 6942
- 2602857055c5
- child 7168
- c1f97706c905
equal
deleted
inserted
replaced
| 7155:334c7d0b5036 | 7156:c1b6bc83fc76 |
|---|---|
| 102 <td>Private slot performing the second step of the commit action.</td> | 102 <td>Private slot performing the second step of the commit action.</td> |
| 103 </tr><tr> | 103 </tr><tr> |
| 104 <td><a href="#Hg._createStatusMonitorThread">_createStatusMonitorThread</a></td> | 104 <td><a href="#Hg._createStatusMonitorThread">_createStatusMonitorThread</a></td> |
| 105 <td>Protected method to create an instance of the VCS status monitor thread.</td> | 105 <td>Protected method to create an instance of the VCS status monitor thread.</td> |
| 106 </tr><tr> | 106 </tr><tr> |
| 107 <td><a href="#Hg.canCommitMerge">canCommitMerge</a></td> | |
| 108 <td>Public method to check, if the working directory is an uncommitted merge.</td> | |
| 109 </tr><tr> | |
| 107 <td><a href="#Hg.canPull">canPull</a></td> | 110 <td><a href="#Hg.canPull">canPull</a></td> |
| 108 <td>Public method to check, if pull is possible.</td> | 111 <td>Public method to check, if pull is possible.</td> |
| 109 </tr><tr> | 112 </tr><tr> |
| 110 <td><a href="#Hg.canPush">canPush</a></td> | 113 <td><a href="#Hg.canPush">canPush</a></td> |
| 111 <td>Public method to check, if push is possible.</td> | 114 <td>Public method to check, if push is possible.</td> |
| 129 <td>Public method to get a reference to the plugin object.</td> | 132 <td>Public method to get a reference to the plugin object.</td> |
| 130 </tr><tr> | 133 </tr><tr> |
| 131 <td><a href="#Hg.hasSubrepositories">hasSubrepositories</a></td> | 134 <td><a href="#Hg.hasSubrepositories">hasSubrepositories</a></td> |
| 132 <td>Public method to check, if the project might have sub-repositories.</td> | 135 <td>Public method to check, if the project might have sub-repositories.</td> |
| 133 </tr><tr> | 136 </tr><tr> |
| 137 <td><a href="#Hg.hgAbortMerge">hgAbortMerge</a></td> | |
| 138 <td>Public method to abort an uncommitted merge.</td> | |
| 139 </tr><tr> | |
| 134 <td><a href="#Hg.hgAddSubrepository">hgAddSubrepository</a></td> | 140 <td><a href="#Hg.hgAddSubrepository">hgAddSubrepository</a></td> |
| 135 <td>Public method to add a sub-repository.</td> | 141 <td>Public method to add a sub-repository.</td> |
| 136 </tr><tr> | 142 </tr><tr> |
| 137 <td><a href="#Hg.hgAnnotate">hgAnnotate</a></td> | 143 <td><a href="#Hg.hgAnnotate">hgAnnotate</a></td> |
| 138 <td>Public method to show the output of the hg annotate command.</td> | 144 <td>Public method to show the output of the hg annotate command.</td> |
| 173 <td><a href="#Hg.hgBranch">hgBranch</a></td> | 179 <td><a href="#Hg.hgBranch">hgBranch</a></td> |
| 174 <td>Public method used to create a branch in the Mercurial repository.</td> | 180 <td>Public method used to create a branch in the Mercurial repository.</td> |
| 175 </tr><tr> | 181 </tr><tr> |
| 176 <td><a href="#Hg.hgBundle">hgBundle</a></td> | 182 <td><a href="#Hg.hgBundle">hgBundle</a></td> |
| 177 <td>Public method to create a changegroup file.</td> | 183 <td>Public method to create a changegroup file.</td> |
| 178 </tr><tr> | |
| 179 <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> | |
| 180 <td>Public method to cancel an uncommitted merge.</td> | |
| 181 </tr><tr> | 184 </tr><tr> |
| 182 <td><a href="#Hg.hgConflicts">hgConflicts</a></td> | 185 <td><a href="#Hg.hgConflicts">hgConflicts</a></td> |
| 183 <td>Public method used to show a list of files containing conflicts.</td> | 186 <td>Public method used to show a list of files containing conflicts.</td> |
| 184 </tr><tr> | 187 </tr><tr> |
| 185 <td><a href="#Hg.hgCopy">hgCopy</a></td> | 188 <td><a href="#Hg.hgCopy">hgCopy</a></td> |
| 572 </dl><dl> | 575 </dl><dl> |
| 573 <dt>Returns:</dt> | 576 <dt>Returns:</dt> |
| 574 <dd> | 577 <dd> |
| 575 reference to the monitor thread (QThread) | 578 reference to the monitor thread (QThread) |
| 576 </dd> | 579 </dd> |
| 580 </dl><a NAME="Hg.canCommitMerge" ID="Hg.canCommitMerge"></a> | |
| 581 <h4>Hg.canCommitMerge</h4> | |
| 582 <b>canCommitMerge</b>(<i>name</i>) | |
| 583 <p> | |
| 584 Public method to check, if the working directory is an uncommitted | |
| 585 merge. | |
| 586 </p><dl> | |
| 587 <dt><i>name</i> (str)</dt> | |
| 588 <dd> | |
| 589 file/directory name | |
| 590 </dd> | |
| 591 </dl><dl> | |
| 592 <dt>Returns:</dt> | |
| 593 <dd> | |
| 594 flag indicating commit merge capability | |
| 595 </dd> | |
| 596 </dl><dl> | |
| 597 <dt>Return Type:</dt> | |
| 598 <dd> | |
| 599 bool | |
| 600 </dd> | |
| 577 </dl><a NAME="Hg.canPull" ID="Hg.canPull"></a> | 601 </dl><a NAME="Hg.canPull" ID="Hg.canPull"></a> |
| 578 <h4>Hg.canPull</h4> | 602 <h4>Hg.canPull</h4> |
| 579 <b>canPull</b>(<i></i>) | 603 <b>canPull</b>(<i></i>) |
| 580 <p> | 604 <p> |
| 581 Public method to check, if pull is possible. | 605 Public method to check, if pull is possible. |
| 663 </p><dl> | 687 </p><dl> |
| 664 <dt>Returns:</dt> | 688 <dt>Returns:</dt> |
| 665 <dd> | 689 <dd> |
| 666 flag indicating the existence of sub-repositories (boolean) | 690 flag indicating the existence of sub-repositories (boolean) |
| 667 </dd> | 691 </dd> |
| 692 </dl><a NAME="Hg.hgAbortMerge" ID="Hg.hgAbortMerge"></a> | |
| 693 <h4>Hg.hgAbortMerge</h4> | |
| 694 <b>hgAbortMerge</b>(<i>name</i>) | |
| 695 <p> | |
| 696 Public method to abort an uncommitted merge. | |
| 697 </p><dl> | |
| 698 <dt><i>name</i></dt> | |
| 699 <dd> | |
| 700 file/directory name (string) | |
| 701 </dd> | |
| 702 </dl><dl> | |
| 703 <dt>Returns:</dt> | |
| 704 <dd> | |
| 705 flag indicating, that the abortion contained an add | |
| 706 or delete (boolean) | |
| 707 </dd> | |
| 668 </dl><a NAME="Hg.hgAddSubrepository" ID="Hg.hgAddSubrepository"></a> | 708 </dl><a NAME="Hg.hgAddSubrepository" ID="Hg.hgAddSubrepository"></a> |
| 669 <h4>Hg.hgAddSubrepository</h4> | 709 <h4>Hg.hgAddSubrepository</h4> |
| 670 <b>hgAddSubrepository</b>(<i></i>) | 710 <b>hgAddSubrepository</b>(<i></i>) |
| 671 <p> | 711 <p> |
| 672 Public method to add a sub-repository. | 712 Public method to add a sub-repository. |
| 845 <dd> | 885 <dd> |
| 846 file/directory name | 886 file/directory name |
| 847 </dd><dt><i>bundleData</i> (dict)</dt> | 887 </dd><dt><i>bundleData</i> (dict)</dt> |
| 848 <dd> | 888 <dd> |
| 849 dictionary containing the bundle creation information | 889 dictionary containing the bundle creation information |
| 850 </dd> | |
| 851 </dl><a NAME="Hg.hgCancelMerge" ID="Hg.hgCancelMerge"></a> | |
| 852 <h4>Hg.hgCancelMerge</h4> | |
| 853 <b>hgCancelMerge</b>(<i>name</i>) | |
| 854 <p> | |
| 855 Public method to cancel an uncommitted merge. | |
| 856 </p><dl> | |
| 857 <dt><i>name</i></dt> | |
| 858 <dd> | |
| 859 file/directory name (string) | |
| 860 </dd> | |
| 861 </dl><dl> | |
| 862 <dt>Returns:</dt> | |
| 863 <dd> | |
| 864 flag indicating, that the cancellation contained an add | |
| 865 or delete (boolean) | |
| 866 </dd> | 890 </dd> |
| 867 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> | 891 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> |
| 868 <h4>Hg.hgConflicts</h4> | 892 <h4>Hg.hgConflicts</h4> |
| 869 <b>hgConflicts</b>(<i>name</i>) | 893 <b>hgConflicts</b>(<i>name</i>) |
| 870 <p> | 894 <p> |
| 1625 <dd> | 1649 <dd> |
| 1626 directory name of the working directory (string) | 1650 directory name of the working directory (string) |
| 1627 </dd> | 1651 </dd> |
| 1628 </dl><a NAME="Hg.vcsCommit" ID="Hg.vcsCommit"></a> | 1652 </dl><a NAME="Hg.vcsCommit" ID="Hg.vcsCommit"></a> |
| 1629 <h4>Hg.vcsCommit</h4> | 1653 <h4>Hg.vcsCommit</h4> |
| 1630 <b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False, mq=False</i>) | 1654 <b>vcsCommit</b>(<i>name, message, noDialog=False, closeBranch=False, mq=False, merge=False</i>) |
| 1631 <p> | 1655 <p> |
| 1632 Public method used to make the change of a file/directory permanent | 1656 Public method used to make the change of a file/directory permanent |
| 1633 in the Mercurial repository. | 1657 in the Mercurial repository. |
| 1634 </p><dl> | 1658 </p><dl> |
| 1635 <dt><i>name</i></dt> | 1659 <dt><i>name</i></dt> |
| 1646 <dd> | 1670 <dd> |
| 1647 flag indicating a close branch commit (boolean) | 1671 flag indicating a close branch commit (boolean) |
| 1648 </dd><dt><i>mq=</i></dt> | 1672 </dd><dt><i>mq=</i></dt> |
| 1649 <dd> | 1673 <dd> |
| 1650 flag indicating a queue commit (boolean) | 1674 flag indicating a queue commit (boolean) |
| 1675 </dd><dt><i>merge=</i></dt> | |
| 1676 <dd> | |
| 1677 flag indicating a merge commit (boolean) | |
| 1651 </dd> | 1678 </dd> |
| 1652 </dl><a NAME="Hg.vcsConvertProject" ID="Hg.vcsConvertProject"></a> | 1679 </dl><a NAME="Hg.vcsConvertProject" ID="Hg.vcsConvertProject"></a> |
| 1653 <h4>Hg.vcsConvertProject</h4> | 1680 <h4>Hg.vcsConvertProject</h4> |
| 1654 <b>vcsConvertProject</b>(<i>vcsDataDict, project</i>) | 1681 <b>vcsConvertProject</b>(<i>vcsDataDict, project</i>) |
| 1655 <p> | 1682 <p> |
