Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 10683
- 779cda568acb
- parent 10679
- 4d3e0ce54322
- child 10690
- fab36645aa7d
equal
deleted
inserted
replaced
| 10682:47be220abdaf | 10683:779cda568acb |
|---|---|
| 270 | 270 |
| 271 The initialization is done, when a project is converted into a | 271 The initialization is done, when a project is converted into a |
| 272 Mercurial controlled project. Therefore we always return TRUE without | 272 Mercurial controlled project. Therefore we always return TRUE without |
| 273 doing anything. | 273 doing anything. |
| 274 | 274 |
| 275 @param vcsDir name of the VCS directory | 275 @param vcsDir name of the VCS directory (unused) |
| 276 @type str | 276 @type str |
| 277 @param noDialog flag indicating quiet operations | 277 @param noDialog flag indicating quiet operations (unused) |
| 278 @type bool | 278 @type bool |
| 279 @return always True | 279 @return always True |
| 280 @rtype bool | 280 @rtype bool |
| 281 """ | 281 """ |
| 282 return True | 282 return True |
| 315 | 315 |
| 316 @param vcsDataDict dictionary of data required for the import | 316 @param vcsDataDict dictionary of data required for the import |
| 317 @type dict | 317 @type dict |
| 318 @param projectDir project directory | 318 @param projectDir project directory |
| 319 @type str | 319 @type str |
| 320 @param noDialog flag indicating quiet operations | 320 @param noDialog flag indicating quiet operations (unused) |
| 321 @type bool | 321 @type bool |
| 322 @param addAll flag indicating to add all files to the repository | 322 @param addAll flag indicating to add all files to the repository |
| 323 @type bool | 323 @type bool |
| 324 @return tuple containing a flag indicating an execution without errors | 324 @return tuple containing a flag indicating an execution without errors |
| 325 and a flag indicating the version controll status | 325 and a flag indicating the version controll status |
| 636 def vcsUpdate(self, name=None, noDialog=False, revision=None): # noqa: U100 | 636 def vcsUpdate(self, name=None, noDialog=False, revision=None): # noqa: U100 |
| 637 """ | 637 """ |
| 638 Public method used to update a file/directory with the Mercurial | 638 Public method used to update a file/directory with the Mercurial |
| 639 repository. | 639 repository. |
| 640 | 640 |
| 641 @param name file/directory name to be updated (not used) | 641 @param name file/directory name to be updated (unused) |
| 642 @type str | 642 @type str |
| 643 @param noDialog flag indicating quiet operations | 643 @param noDialog flag indicating quiet operations |
| 644 @type bool | 644 @type bool |
| 645 @param revision revision to update to | 645 @param revision revision to update to |
| 646 @type str | 646 @type str |
| 670 """ | 670 """ |
| 671 Public method used to add a file/directory to the Mercurial repository. | 671 Public method used to add a file/directory to the Mercurial repository. |
| 672 | 672 |
| 673 @param name file/directory name to be added | 673 @param name file/directory name to be added |
| 674 @type str | 674 @type str |
| 675 @param isDir flag indicating name is a directory | 675 @param isDir flag indicating name is a directory (unused) |
| 676 @type bool | 676 @type bool |
| 677 @param noDialog flag indicating quiet operations | 677 @param noDialog flag indicating quiet operations |
| 678 @type bool | 678 @type bool |
| 679 """ | 679 """ |
| 680 args = self.initCommand("add") | 680 args = self.initCommand("add") |
| 724 | 724 |
| 725 The default operation is to remove the local copy as well. | 725 The default operation is to remove the local copy as well. |
| 726 | 726 |
| 727 @param name file/directory name to be removed | 727 @param name file/directory name to be removed |
| 728 @type str or list of str | 728 @type str or list of str |
| 729 @param project flag indicating deletion of a project tree | 729 @param project flag indicating deletion of a project tree (unused) |
| 730 @type bool | 730 @type bool |
| 731 @param noDialog flag indicating quiet operations | 731 @param noDialog flag indicating quiet operations |
| 732 @type bool | 732 @type bool |
| 733 @return flag indicating successfull operation | 733 @return flag indicating successfull operation |
| 734 @rtype bool | 734 @rtype bool |
| 888 | 888 |
| 889 def vcsTag(self, name=None, revision=None, tagName=None): # noqa: U100 | 889 def vcsTag(self, name=None, revision=None, tagName=None): # noqa: U100 |
| 890 """ | 890 """ |
| 891 Public method used to set/remove a tag in the Mercurial repository. | 891 Public method used to set/remove a tag in the Mercurial repository. |
| 892 | 892 |
| 893 @param name file/directory name to determine the repo root from | 893 @param name file/directory name to determine the repo root from (unused) |
| 894 @type str | 894 @type str |
| 895 @param revision revision to set tag for | 895 @param revision revision to set tag for |
| 896 @type str | 896 @type str |
| 897 @param tagName name of the tag | 897 @param tagName name of the tag |
| 898 @type str | 898 @type str |
| 998 | 998 |
| 999 def vcsMerge(self, name, rev=""): # noqa: U100 | 999 def vcsMerge(self, name, rev=""): # noqa: U100 |
| 1000 """ | 1000 """ |
| 1001 Public method used to merge a URL/revision into the local project. | 1001 Public method used to merge a URL/revision into the local project. |
| 1002 | 1002 |
| 1003 @param name file/directory name to be merged | 1003 @param name file/directory name to be merged (unused) |
| 1004 @type str | 1004 @type str |
| 1005 @param rev revision to merge with | 1005 @param rev revision to merge with |
| 1006 @type str | 1006 @type str |
| 1007 """ | 1007 """ |
| 1008 from .HgMergeDialog import HgMergeDialog | 1008 from .HgMergeDialog import HgMergeDialog |
| 1151 | 1151 |
| 1152 @param names dictionary with all filenames to be checked as keys | 1152 @param names dictionary with all filenames to be checked as keys |
| 1153 @type dict | 1153 @type dict |
| 1154 @param dname directory to check in | 1154 @param dname directory to check in |
| 1155 @type str | 1155 @type str |
| 1156 @param shortcut flag indicating a shortcut should be taken | 1156 @param shortcut flag indicating a shortcut should be taken (unused) |
| 1157 @type bool | 1157 @type bool |
| 1158 @return the received dictionary completed with the VCS state or None in | 1158 @return the received dictionary completed with the VCS state or None in |
| 1159 order to signal an error | 1159 order to signal an error |
| 1160 @rtype dict | 1160 @rtype dict |
| 1161 """ | 1161 """ |
| 1281 res = dia.startProcess(args) | 1281 res = dia.startProcess(args) |
| 1282 if res: | 1282 if res: |
| 1283 dia.exec() | 1283 dia.exec() |
| 1284 | 1284 |
| 1285 def vcsOptionsDialog( | 1285 def vcsOptionsDialog( |
| 1286 self, project, archive, editable=False, parent=None # noqa: U100 | 1286 self, project, _archive, editable=False, parent=None # noqa: U100 |
| 1287 ): | 1287 ): |
| 1288 """ | 1288 """ |
| 1289 Public method to get a dialog to enter repository info. | 1289 Public method to get a dialog to enter repository info. |
| 1290 | 1290 |
| 1291 @param project reference to the project object | 1291 @param project reference to the project object |
| 1292 @type Project | 1292 @type Project |
| 1293 @param archive name of the project in the repository | 1293 @param _archive name of the project in the repository (unused) |
| 1294 @type str | 1294 @type str |
| 1295 @param editable flag indicating that the project name is editable | 1295 @param editable flag indicating that the project name is editable (unused) |
| 1296 @type bool | 1296 @type bool |
| 1297 @param parent parent widget | 1297 @param parent parent widget |
| 1298 @type QWidget | 1298 @type QWidget |
| 1299 @return reference to the instantiated options dialog | 1299 @return reference to the instantiated options dialog |
| 1300 @rtype HgOptionsDialog | 1300 @rtype HgOptionsDialog |
| 1315 """ | 1315 """ |
| 1316 from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog | 1316 from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog |
| 1317 | 1317 |
| 1318 return HgNewProjectOptionsDialog(self, parent) | 1318 return HgNewProjectOptionsDialog(self, parent) |
| 1319 | 1319 |
| 1320 def vcsRepositoryInfos(self, ppath): # noqa: U100 | 1320 def vcsRepositoryInfos(self, _ppath): |
| 1321 """ | 1321 """ |
| 1322 Public method to retrieve information about the repository. | 1322 Public method to retrieve information about the repository. |
| 1323 | 1323 |
| 1324 @param ppath local path to get the repository infos | 1324 @param _ppath local path to get the repository infos (unused) |
| 1325 @type str | 1325 @type str |
| 1326 @return string with ready formated info for display | 1326 @return string with ready formated info for display |
| 1327 @rtype str | 1327 @rtype str |
| 1328 """ | 1328 """ |
| 1329 args = self.initCommand("log") | 1329 args = self.initCommand("log") |
