Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html
- changeset 3586
- 6e3a6c5b58bf
- parent 3562
- ef3f13a2c599
- child 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3585:f09a457c83fe | 3586:6e3a6c5b58bf |
|---|---|
| 174 <td>Public method to create a changegroup file.</td> | 174 <td>Public method to create a changegroup file.</td> |
| 175 </tr><tr> | 175 </tr><tr> |
| 176 <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> | 176 <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> |
| 177 <td>Public method to cancel an uncommitted merge.</td> | 177 <td>Public method to cancel an uncommitted merge.</td> |
| 178 </tr><tr> | 178 </tr><tr> |
| 179 <td><a href="#Hg.hgConflicts">hgConflicts</a></td> | |
| 180 <td>Public method used to show a list of files containing.</td> | |
| 181 </tr><tr> | |
| 179 <td><a href="#Hg.hgCopy">hgCopy</a></td> | 182 <td><a href="#Hg.hgCopy">hgCopy</a></td> |
| 180 <td>Public method used to copy a file/directory.</td> | 183 <td>Public method used to copy a file/directory.</td> |
| 181 </tr><tr> | 184 </tr><tr> |
| 182 <td><a href="#Hg.hgCreateIgnoreFile">hgCreateIgnoreFile</a></td> | 185 <td><a href="#Hg.hgCreateIgnoreFile">hgCreateIgnoreFile</a></td> |
| 183 <td>Public method to create the ignore file.</td> | 186 <td>Public method to create the ignore file.</td> |
| 246 <td>Public method used to pull changes from a remote Mercurial repository.</td> | 249 <td>Public method used to pull changes from a remote Mercurial repository.</td> |
| 247 </tr><tr> | 250 </tr><tr> |
| 248 <td><a href="#Hg.hgPush">hgPush</a></td> | 251 <td><a href="#Hg.hgPush">hgPush</a></td> |
| 249 <td>Public method used to push changes to a remote Mercurial repository.</td> | 252 <td>Public method used to push changes to a remote Mercurial repository.</td> |
| 250 </tr><tr> | 253 </tr><tr> |
| 254 <td><a href="#Hg.hgReMerge">hgReMerge</a></td> | |
| 255 <td>Public method used to merge a URL/revision into the local project.</td> | |
| 256 </tr><tr> | |
| 251 <td><a href="#Hg.hgRecover">hgRecover</a></td> | 257 <td><a href="#Hg.hgRecover">hgRecover</a></td> |
| 252 <td>Public method to recover an interrupted transaction.</td> | 258 <td>Public method to recover an interrupted transaction.</td> |
| 253 </tr><tr> | 259 </tr><tr> |
| 254 <td><a href="#Hg.hgRemoveSubrepositories">hgRemoveSubrepositories</a></td> | 260 <td><a href="#Hg.hgRemoveSubrepositories">hgRemoveSubrepositories</a></td> |
| 255 <td>Public method to remove sub-repositories.</td> | 261 <td>Public method to remove sub-repositories.</td> |
| 256 </tr><tr> | 262 </tr><tr> |
| 257 <td><a href="#Hg.hgResolve">hgResolve</a></td> | 263 <td><a href="#Hg.hgResolved">hgResolved</a></td> |
| 258 <td>Public method used to resolve conflicts of a file/directory.</td> | 264 <td>Public method used to resolve conflicts of a file/directory.</td> |
| 259 </tr><tr> | 265 </tr><tr> |
| 260 <td><a href="#Hg.hgRevert">hgRevert</a></td> | 266 <td><a href="#Hg.hgRevert">hgRevert</a></td> |
| 261 <td>Public method used to revert changes made to a file/directory.</td> | 267 <td>Public method used to revert changes made to a file/directory.</td> |
| 262 </tr><tr> | 268 </tr><tr> |
| 777 <dt>Returns:</dt> | 783 <dt>Returns:</dt> |
| 778 <dd> | 784 <dd> |
| 779 flag indicating, that the cancellation contained an add | 785 flag indicating, that the cancellation contained an add |
| 780 or delete (boolean) | 786 or delete (boolean) |
| 781 </dd> | 787 </dd> |
| 788 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> | |
| 789 <h4>Hg.hgConflicts</h4> | |
| 790 <b>hgConflicts</b>(<i>name</i>) | |
| 791 <p> | |
| 792 Public method used to show a list of files containing. | |
| 793 </p><dl> | |
| 794 <dt><i>name</i></dt> | |
| 795 <dd> | |
| 796 file/directory name to be resolved (string) | |
| 797 </dd> | |
| 782 </dl><a NAME="Hg.hgCopy" ID="Hg.hgCopy"></a> | 798 </dl><a NAME="Hg.hgCopy" ID="Hg.hgCopy"></a> |
| 783 <h4>Hg.hgCopy</h4> | 799 <h4>Hg.hgCopy</h4> |
| 784 <b>hgCopy</b>(<i>name, project</i>) | 800 <b>hgCopy</b>(<i>name, project</i>) |
| 785 <p> | 801 <p> |
| 786 Public method used to copy a file/directory. | 802 Public method used to copy a file/directory. |
| 1129 flag indicating a forced push (boolean) | 1145 flag indicating a forced push (boolean) |
| 1130 </dd><dt><i>newBranch=</i></dt> | 1146 </dd><dt><i>newBranch=</i></dt> |
| 1131 <dd> | 1147 <dd> |
| 1132 flag indicating to push a new branch (boolean) | 1148 flag indicating to push a new branch (boolean) |
| 1133 </dd> | 1149 </dd> |
| 1150 </dl><a NAME="Hg.hgReMerge" ID="Hg.hgReMerge"></a> | |
| 1151 <h4>Hg.hgReMerge</h4> | |
| 1152 <b>hgReMerge</b>(<i>name</i>) | |
| 1153 <p> | |
| 1154 Public method used to merge a URL/revision into the local project. | |
| 1155 </p><dl> | |
| 1156 <dt><i>name</i></dt> | |
| 1157 <dd> | |
| 1158 file/directory name to be merged (string) | |
| 1159 </dd> | |
| 1134 </dl><a NAME="Hg.hgRecover" ID="Hg.hgRecover"></a> | 1160 </dl><a NAME="Hg.hgRecover" ID="Hg.hgRecover"></a> |
| 1135 <h4>Hg.hgRecover</h4> | 1161 <h4>Hg.hgRecover</h4> |
| 1136 <b>hgRecover</b>(<i>name</i>) | 1162 <b>hgRecover</b>(<i>name</i>) |
| 1137 <p> | 1163 <p> |
| 1138 Public method to recover an interrupted transaction. | 1164 Public method to recover an interrupted transaction. |
| 1144 </dl><a NAME="Hg.hgRemoveSubrepositories" ID="Hg.hgRemoveSubrepositories"></a> | 1170 </dl><a NAME="Hg.hgRemoveSubrepositories" ID="Hg.hgRemoveSubrepositories"></a> |
| 1145 <h4>Hg.hgRemoveSubrepositories</h4> | 1171 <h4>Hg.hgRemoveSubrepositories</h4> |
| 1146 <b>hgRemoveSubrepositories</b>(<i></i>) | 1172 <b>hgRemoveSubrepositories</b>(<i></i>) |
| 1147 <p> | 1173 <p> |
| 1148 Public method to remove sub-repositories. | 1174 Public method to remove sub-repositories. |
| 1149 </p><a NAME="Hg.hgResolve" ID="Hg.hgResolve"></a> | 1175 </p><a NAME="Hg.hgResolved" ID="Hg.hgResolved"></a> |
| 1150 <h4>Hg.hgResolve</h4> | 1176 <h4>Hg.hgResolved</h4> |
| 1151 <b>hgResolve</b>(<i>name</i>) | 1177 <b>hgResolved</b>(<i>name, unresolve=False</i>) |
| 1152 <p> | 1178 <p> |
| 1153 Public method used to resolve conflicts of a file/directory. | 1179 Public method used to resolve conflicts of a file/directory. |
| 1154 </p><dl> | 1180 </p><dl> |
| 1155 <dt><i>name</i></dt> | 1181 <dt><i>name</i></dt> |
| 1156 <dd> | 1182 <dd> |
| 1157 file/directory name to be resolved (string) | 1183 file/directory name to be resolved (string) |
| 1184 </dd><dt><i>unresolve</i></dt> | |
| 1185 <dd> | |
| 1186 flag indicating to mark the file/directory as | |
| 1187 unresolved (boolean) | |
| 1158 </dd> | 1188 </dd> |
| 1159 </dl><a NAME="Hg.hgRevert" ID="Hg.hgRevert"></a> | 1189 </dl><a NAME="Hg.hgRevert" ID="Hg.hgRevert"></a> |
| 1160 <h4>Hg.hgRevert</h4> | 1190 <h4>Hg.hgRevert</h4> |
| 1161 <b>hgRevert</b>(<i>name</i>) | 1191 <b>hgRevert</b>(<i>name</i>) |
| 1162 <p> | 1192 <p> |
