Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsGit/git.py
src/eric7/Plugins/VcsPlugins/vcsGit/git.py
- branch
- eric7
- changeset 10683
- 779cda568acb
- parent 10621
- f5631f40c4d9
- child 10690
- fab36645aa7d
equal
deleted
inserted
replaced
| 10682:47be220abdaf | 10683:779cda568acb |
|---|---|
| 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 |
| 231 doing anything. | 231 doing anything. |
| 232 | 232 |
| 233 @param vcsDir name of the VCS directory | 233 @param vcsDir name of the VCS directory (unused) |
| 234 @type str | 234 @type str |
| 235 @param noDialog flag indicating quiet operations | 235 @param noDialog flag indicating quiet operations (unused) |
| 236 @type bool | 236 @type bool |
| 237 @return always True | 237 @return always True |
| 238 @rtype bool | 238 @rtype bool |
| 239 """ | 239 """ |
| 240 return True | 240 return True |
| 273 | 273 |
| 274 @param vcsDataDict dictionary of data required for the import | 274 @param vcsDataDict dictionary of data required for the import |
| 275 @type dict | 275 @type dict |
| 276 @param projectDir project directory | 276 @param projectDir project directory |
| 277 @type str | 277 @type str |
| 278 @param noDialog flag indicating quiet operations | 278 @param noDialog flag indicating quiet operations (unused) |
| 279 @type bool | 279 @type bool |
| 280 @param addAll flag indicating to add all files to the repository | 280 @param addAll flag indicating to add all files to the repository |
| 281 @type bool | 281 @type bool |
| 282 @return tuple containing a flag indicating an execution without errors | 282 @return tuple containing a flag indicating an execution without errors |
| 283 and a flag indicating the version controll status | 283 and a flag indicating the version controll status |
| 678 | 678 |
| 679 The default operation is to remove the local copy as well. | 679 The default operation is to remove the local copy as well. |
| 680 | 680 |
| 681 @param name file/directory name to be removed | 681 @param name file/directory name to be removed |
| 682 @type str or list of str | 682 @type str or list of str |
| 683 @param project flag indicating deletion of a project tree | 683 @param project flag indicating deletion of a project tree (unused) |
| 684 @type bool | 684 @type bool |
| 685 @param noDialog flag indicating quiet operations | 685 @param noDialog flag indicating quiet operations |
| 686 @type bool | 686 @type bool |
| 687 @param stageOnly flag indicating to just remove the file from the | 687 @param stageOnly flag indicating to just remove the file from the |
| 688 staging area | 688 staging area |
| 1135 | 1135 |
| 1136 @param names dictionary with all filenames to be checked as keys | 1136 @param names dictionary with all filenames to be checked as keys |
| 1137 @type dict | 1137 @type dict |
| 1138 @param dname directory to check in | 1138 @param dname directory to check in |
| 1139 @type str | 1139 @type str |
| 1140 @param shortcut flag indicating a shortcut should be taken | 1140 @param shortcut flag indicating a shortcut should be taken (unused) |
| 1141 @type bool | 1141 @type bool |
| 1142 @return the received dictionary completed with the VCS state or None in | 1142 @return the received dictionary completed with the VCS state or None in |
| 1143 order to signal an error | 1143 order to signal an error |
| 1144 @rtype dict | 1144 @rtype dict |
| 1145 """ | 1145 """ |
| 1286 res = dia.startProcess(args, repodir) | 1286 res = dia.startProcess(args, repodir) |
| 1287 if res: | 1287 if res: |
| 1288 dia.exec() | 1288 dia.exec() |
| 1289 | 1289 |
| 1290 def vcsOptionsDialog( | 1290 def vcsOptionsDialog( |
| 1291 self, project, archive, editable=False, parent=None # noqa: U100 | 1291 self, project, _archive, editable=False, parent=None # noqa: U100 |
| 1292 ): | 1292 ): |
| 1293 """ | 1293 """ |
| 1294 Public method to get a dialog to enter repository info. | 1294 Public method to get a dialog to enter repository info. |
| 1295 | 1295 |
| 1296 @param project reference to the project object | 1296 @param project reference to the project object |
| 1297 @type Project | 1297 @type Project |
| 1298 @param archive name of the project in the repository | 1298 @param _archive name of the project in the repository (unused) |
| 1299 @type str | 1299 @type str |
| 1300 @param editable flag indicating that the project name is editable | 1300 @param editable flag indicating that the project name is editable (unused) |
| 1301 @type bool | 1301 @type bool |
| 1302 @param parent parent widget | 1302 @param parent parent widget |
| 1303 @type QWidget | 1303 @type QWidget |
| 1304 @return reference to the instantiated options dialog | 1304 @return reference to the instantiated options dialog |
| 1305 @rtype GitOptionsDialog | 1305 @rtype GitOptionsDialog |
