Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 11148
- 15e30f0c76a8
- parent 11109
- 3de1710db709
- child 11218
- 43dfc40728d2
equal
deleted
inserted
replaced
| 11147:dee6e106b4d3 | 11148:15e30f0c76a8 |
|---|---|
| 271 hgExists = errMsg == "" | 271 hgExists = errMsg == "" |
| 272 if hgExists: | 272 if hgExists: |
| 273 self.__getExtensionsInfo() | 273 self.__getExtensionsInfo() |
| 274 return hgExists, errMsg | 274 return hgExists, errMsg |
| 275 | 275 |
| 276 def vcsInit(self, _vcsDir, noDialog=False): # noqa: U100 | 276 def vcsInit(self, _vcsDir, noDialog=False): # noqa: U-100 |
| 277 """ | 277 """ |
| 278 Public method used to initialize the mercurial repository. | 278 Public method used to initialize the mercurial repository. |
| 279 | 279 |
| 280 The initialization is done, when a project is converted into a | 280 The initialization is done, when a project is converted into a |
| 281 Mercurial controlled project. Therefore we always return TRUE without | 281 Mercurial controlled project. Therefore we always return TRUE without |
| 315 pfn += "z" | 315 pfn += "z" |
| 316 project.closeProject() | 316 project.closeProject() |
| 317 project.openProject(pfn) | 317 project.openProject(pfn) |
| 318 | 318 |
| 319 def vcsImport( | 319 def vcsImport( |
| 320 self, vcsDataDict, projectDir, noDialog=False, addAll=True # noqa: U100 | 320 self, vcsDataDict, projectDir, noDialog=False, addAll=True # noqa: U-100 |
| 321 ): | 321 ): |
| 322 """ | 322 """ |
| 323 Public method used to import the project into the Mercurial repository. | 323 Public method used to import the project into the Mercurial repository. |
| 324 | 324 |
| 325 @param vcsDataDict dictionary of data required for the import | 325 @param vcsDataDict dictionary of data required for the import |
| 654 | 654 |
| 655 output, error = self.__client.runcommand(args) | 655 output, error = self.__client.runcommand(args) |
| 656 | 656 |
| 657 return output | 657 return output |
| 658 | 658 |
| 659 def vcsUpdate(self, name=None, noDialog=False, revision=None): # noqa: U100 | 659 def vcsUpdate(self, name=None, noDialog=False, revision=None): # noqa: U-100 |
| 660 """ | 660 """ |
| 661 Public method used to update a file/directory with the Mercurial | 661 Public method used to update a file/directory with the Mercurial |
| 662 repository. | 662 repository. |
| 663 | 663 |
| 664 @param name file/directory name to be updated (unused) | 664 @param name file/directory name to be updated (unused) |
| 691 dia.exec() | 691 dia.exec() |
| 692 res = dia.hasAddOrDelete() | 692 res = dia.hasAddOrDelete() |
| 693 self.checkVCSStatus() | 693 self.checkVCSStatus() |
| 694 return res | 694 return res |
| 695 | 695 |
| 696 def vcsAdd(self, name, isDir=False, noDialog=False): # noqa: U100 | 696 def vcsAdd(self, name, isDir=False, noDialog=False): # noqa: U-100 |
| 697 """ | 697 """ |
| 698 Public method used to add a file/directory to the Mercurial repository. | 698 Public method used to add a file/directory to the Mercurial repository. |
| 699 | 699 |
| 700 @param name file/directory name to be added | 700 @param name file/directory name to be added |
| 701 @type str | 701 @type str |
| 744 @param path root directory of the tree to be added | 744 @param path root directory of the tree to be added |
| 745 @type str or list of str | 745 @type str or list of str |
| 746 """ | 746 """ |
| 747 self.vcsAdd(path, isDir=False) | 747 self.vcsAdd(path, isDir=False) |
| 748 | 748 |
| 749 def vcsRemove(self, name, project=False, noDialog=False): # noqa: U100 | 749 def vcsRemove(self, name, project=False, noDialog=False): # noqa: U-100 |
| 750 """ | 750 """ |
| 751 Public method used to remove a file/directory from the Mercurial | 751 Public method used to remove a file/directory from the Mercurial |
| 752 repository. | 752 repository. |
| 753 | 753 |
| 754 The default operation is to remove the local copy as well. | 754 The default operation is to remove the local copy as well. |
| 916 self.summary = HgSummaryDialog(self) | 916 self.summary = HgSummaryDialog(self) |
| 917 self.summary.show() | 917 self.summary.show() |
| 918 self.summary.raise_() | 918 self.summary.raise_() |
| 919 self.summary.start(mq=mq, largefiles=largefiles) | 919 self.summary.start(mq=mq, largefiles=largefiles) |
| 920 | 920 |
| 921 def vcsTag(self, name=None, revision=None, tagName=None): # noqa: U100 | 921 def vcsTag(self, name=None, revision=None, tagName=None): # noqa: U-100 |
| 922 """ | 922 """ |
| 923 Public method used to set/remove a tag in the Mercurial repository. | 923 Public method used to set/remove a tag in the Mercurial repository. |
| 924 | 924 |
| 925 @param name file/directory name to determine the repo root from (unused) | 925 @param name file/directory name to determine the repo root from (unused) |
| 926 @type str | 926 @type str |
| 1030 else: | 1030 else: |
| 1031 res = False | 1031 res = False |
| 1032 | 1032 |
| 1033 return res | 1033 return res |
| 1034 | 1034 |
| 1035 def vcsMerge(self, name, rev=""): # noqa: U100 | 1035 def vcsMerge(self, name, rev=""): # noqa: U-100 |
| 1036 """ | 1036 """ |
| 1037 Public method used to merge a URL/revision into the local project. | 1037 Public method used to merge a URL/revision into the local project. |
| 1038 | 1038 |
| 1039 @param name file/directory name to be merged (unused) | 1039 @param name file/directory name to be merged (unused) |
| 1040 @type str | 1040 @type str |
| 1178 if flag not in "?I" and absname == name: | 1178 if flag not in "?I" and absname == name: |
| 1179 return VersionControlState.Controlled | 1179 return VersionControlState.Controlled |
| 1180 | 1180 |
| 1181 return VersionControlState.Uncontrolled | 1181 return VersionControlState.Uncontrolled |
| 1182 | 1182 |
| 1183 def vcsAllRegisteredStates(self, names, dname, shortcut=True): # noqa: U100 | 1183 def vcsAllRegisteredStates(self, names, dname, shortcut=True): # noqa: U-100 |
| 1184 """ | 1184 """ |
| 1185 Public method used to get the registered states of a number of files | 1185 Public method used to get the registered states of a number of files |
| 1186 in the vcs. | 1186 in the vcs. |
| 1187 | 1187 |
| 1188 <b>Note:</b> If a shortcut is to be taken, the code will only check, | 1188 <b>Note:</b> If a shortcut is to be taken, the code will only check, |
| 1321 res = dia.startProcess(args) | 1321 res = dia.startProcess(args) |
| 1322 if res: | 1322 if res: |
| 1323 dia.exec() | 1323 dia.exec() |
| 1324 | 1324 |
| 1325 def vcsOptionsDialog( | 1325 def vcsOptionsDialog( |
| 1326 self, project, _archive, editable=False, parent=None # noqa: U100 | 1326 self, project, _archive, editable=False, parent=None # noqa: U-100 |
| 1327 ): | 1327 ): |
| 1328 """ | 1328 """ |
| 1329 Public method to get a dialog to enter repository info. | 1329 Public method to get a dialog to enter repository info. |
| 1330 | 1330 |
| 1331 @param project reference to the project object | 1331 @param project reference to the project object |
