Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 7167
- b3557e77314a
- parent 6942
- 2602857055c5
- child 7192
- a22eee00b052
equal
deleted
inserted
replaced
| 7166:5a184952ba77 | 7167:b3557e77314a |
|---|---|
| 201 @param noDialog flag indicating quiet operations (boolean) | 201 @param noDialog flag indicating quiet operations (boolean) |
| 202 @return always TRUE | 202 @return always TRUE |
| 203 """ | 203 """ |
| 204 return True | 204 return True |
| 205 | 205 |
| 206 def vcsConvertProject(self, vcsDataDict, project): | 206 def vcsConvertProject(self, vcsDataDict, project, addAll=True): |
| 207 """ | 207 """ |
| 208 Public method to convert an uncontrolled project to a version | 208 Public method to convert an uncontrolled project to a version |
| 209 controlled project. | 209 controlled project. |
| 210 | 210 |
| 211 @param vcsDataDict dictionary of data required for the conversion | 211 @param vcsDataDict dictionary of data required for the conversion |
| 212 @type dict | |
| 212 @param project reference to the project object | 213 @param project reference to the project object |
| 213 """ | 214 @type Project |
| 214 success = self.vcsImport(vcsDataDict, project.ppath)[0] | 215 @param addAll flag indicating to add all files to the repository |
| 216 @type bool | |
| 217 """ | |
| 218 success = self.vcsImport(vcsDataDict, project.ppath, addAll=addAll)[0] | |
| 215 if not success: | 219 if not success: |
| 216 E5MessageBox.critical( | 220 E5MessageBox.critical( |
| 217 self.__ui, | 221 self.__ui, |
| 218 self.tr("Create project in repository"), | 222 self.tr("Create project in repository"), |
| 219 self.tr( | 223 self.tr( |
| 259 return | 263 return |
| 260 shutil.rmtree(tmpProjectDir, True) | 264 shutil.rmtree(tmpProjectDir, True) |
| 261 project.closeProject(noSave=True) | 265 project.closeProject(noSave=True) |
| 262 project.openProject(pfn) | 266 project.openProject(pfn) |
| 263 | 267 |
| 264 def vcsImport(self, vcsDataDict, projectDir, noDialog=False): | 268 def vcsImport(self, vcsDataDict, projectDir, noDialog=False, addAll=True): |
| 265 """ | 269 """ |
| 266 Public method used to import the project into the Subversion | 270 Public method used to import the project into the Subversion |
| 267 repository. | 271 repository. |
| 268 | 272 |
| 269 @param vcsDataDict dictionary of data required for the import | 273 @param vcsDataDict dictionary of data required for the import |
| 274 @type dict | |
| 270 @param projectDir project directory (string) | 275 @param projectDir project directory (string) |
| 276 @type str | |
| 271 @param noDialog flag indicating quiet operations | 277 @param noDialog flag indicating quiet operations |
| 272 @return flag indicating an execution without errors (boolean) | 278 @type bool |
| 273 and a flag indicating the version control status (boolean) | 279 @param addAll flag indicating to add all files to the repository |
| 280 @type bool | |
| 281 @return tuple containing a flag indicating an execution without errors | |
| 282 and a flag indicating the version controll status | |
| 283 @rtype tuple of (bool, bool) | |
| 274 """ | 284 """ |
| 275 noDialog = False | 285 noDialog = False |
| 276 msg = vcsDataDict["message"] | 286 msg = vcsDataDict["message"] |
| 277 if not msg: | 287 if not msg: |
| 278 msg = '***' | 288 msg = '***' |
