Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 11148
- 15e30f0c76a8
- parent 11090
- f5f5f5803935
- child 11218
- 43dfc40728d2
equal
deleted
inserted
replaced
| 11147:dee6e106b4d3 | 11148:15e30f0c76a8 |
|---|---|
| 220 else: | 220 else: |
| 221 errMsg = self.tr("Could not start the git executable.") | 221 errMsg = self.tr("Could not start the git executable.") |
| 222 | 222 |
| 223 return False, errMsg | 223 return False, errMsg |
| 224 | 224 |
| 225 def vcsInit(self, _vcsDir, noDialog=False): # noqa: U100 | 225 def vcsInit(self, _vcsDir, noDialog=False): # noqa: U-100 |
| 226 """ | 226 """ |
| 227 Public method used to initialize the Git repository. | 227 Public method used to initialize the Git repository. |
| 228 | 228 |
| 229 The initialization is done, when a project is converted into a | 229 The initialization is done, when a project is converted into a |
| 230 Git controlled project. Therefore we always return TRUE without | 230 Git controlled project. Therefore we always return TRUE without |
| 264 pfn += "z" | 264 pfn += "z" |
| 265 project.closeProject() | 265 project.closeProject() |
| 266 project.openProject(pfn) | 266 project.openProject(pfn) |
| 267 | 267 |
| 268 def vcsImport( | 268 def vcsImport( |
| 269 self, vcsDataDict, projectDir, noDialog=False, addAll=True # noqa: U100 | 269 self, vcsDataDict, projectDir, noDialog=False, addAll=True # noqa: U-100 |
| 270 ): | 270 ): |
| 271 """ | 271 """ |
| 272 Public method used to import the project into the Git repository. | 272 Public method used to import the project into the Git repository. |
| 273 | 273 |
| 274 @param vcsDataDict dictionary of data required for the import | 274 @param vcsDataDict dictionary of data required for the import |
| 690 @type str or list of str | 690 @type str or list of str |
| 691 """ | 691 """ |
| 692 self.vcsAdd(path, isDir=False) | 692 self.vcsAdd(path, isDir=False) |
| 693 | 693 |
| 694 def vcsRemove( | 694 def vcsRemove( |
| 695 self, name, project=False, noDialog=False, stageOnly=False # noqa: U100 | 695 self, name, project=False, noDialog=False, stageOnly=False # noqa: U-100 |
| 696 ): | 696 ): |
| 697 """ | 697 """ |
| 698 Public method used to remove a file/directory from the Git | 698 Public method used to remove a file/directory from the Git |
| 699 repository. | 699 repository. |
| 700 | 700 |
| 1152 else: | 1152 else: |
| 1153 return VersionControlState.Controlled | 1153 return VersionControlState.Controlled |
| 1154 | 1154 |
| 1155 return VersionControlState.Uncontrolled | 1155 return VersionControlState.Uncontrolled |
| 1156 | 1156 |
| 1157 def vcsAllRegisteredStates(self, names, dname, shortcut=True): # noqa: U100 | 1157 def vcsAllRegisteredStates(self, names, dname, shortcut=True): # noqa: U-100 |
| 1158 """ | 1158 """ |
| 1159 Public method used to get the registered states of a number of files | 1159 Public method used to get the registered states of a number of files |
| 1160 in the vcs. | 1160 in the vcs. |
| 1161 | 1161 |
| 1162 <b>Note:</b> If a shortcut is to be taken, the code will only check, | 1162 <b>Note:</b> If a shortcut is to be taken, the code will only check, |
| 1316 res = dia.startProcess(args, repodir) | 1316 res = dia.startProcess(args, repodir) |
| 1317 if res: | 1317 if res: |
| 1318 dia.exec() | 1318 dia.exec() |
| 1319 | 1319 |
| 1320 def vcsOptionsDialog( | 1320 def vcsOptionsDialog( |
| 1321 self, project, _archive, editable=False, parent=None # noqa: U100 | 1321 self, project, _archive, editable=False, parent=None # noqa: U-100 |
| 1322 ): | 1322 ): |
| 1323 """ | 1323 """ |
| 1324 Public method to get a dialog to enter repository info. | 1324 Public method to get a dialog to enter repository info. |
| 1325 | 1325 |
| 1326 @param project reference to the project object | 1326 @param project reference to the project object |
