Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py
eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 7167
- b3557e77314a
- parent 6942
- 2602857055c5
- child 7192
- a22eee00b052
equal
deleted
inserted
replaced
| 7166:5a184952ba77 | 7167:b3557e77314a |
|---|---|
| 188 @param noDialog flag indicating quiet operations (boolean) | 188 @param noDialog flag indicating quiet operations (boolean) |
| 189 @return always TRUE | 189 @return always TRUE |
| 190 """ | 190 """ |
| 191 return True | 191 return True |
| 192 | 192 |
| 193 def vcsConvertProject(self, vcsDataDict, project): | 193 def vcsConvertProject(self, vcsDataDict, project, addAll=True): |
| 194 """ | 194 """ |
| 195 Public method to convert an uncontrolled project to a version | 195 Public method to convert an uncontrolled project to a version |
| 196 controlled project. | 196 controlled project. |
| 197 | 197 |
| 198 @param vcsDataDict dictionary of data required for the conversion | 198 @param vcsDataDict dictionary of data required for the conversion |
| 199 @type dict | |
| 199 @param project reference to the project object | 200 @param project reference to the project object |
| 200 """ | 201 @type Project |
| 201 success = self.vcsImport(vcsDataDict, project.ppath)[0] | 202 @param addAll flag indicating to add all files to the repository |
| 203 @type bool | |
| 204 """ | |
| 205 success = self.vcsImport(vcsDataDict, project.ppath, addAll=addAll)[0] | |
| 202 if not success: | 206 if not success: |
| 203 E5MessageBox.critical( | 207 E5MessageBox.critical( |
| 204 self.__ui, | 208 self.__ui, |
| 205 self.tr("Create project in repository"), | 209 self.tr("Create project in repository"), |
| 206 self.tr( | 210 self.tr( |
| 246 return | 250 return |
| 247 shutil.rmtree(tmpProjectDir, True) | 251 shutil.rmtree(tmpProjectDir, True) |
| 248 project.closeProject(noSave=True) | 252 project.closeProject(noSave=True) |
| 249 project.openProject(pfn) | 253 project.openProject(pfn) |
| 250 | 254 |
| 251 def vcsImport(self, vcsDataDict, projectDir, noDialog=False): | 255 def vcsImport(self, vcsDataDict, projectDir, noDialog=False, addAll=True): |
| 252 """ | 256 """ |
| 253 Public method used to import the project into the Subversion | 257 Public method used to import the project into the Subversion |
| 254 repository. | 258 repository. |
| 255 | 259 |
| 256 @param vcsDataDict dictionary of data required for the import | 260 @param vcsDataDict dictionary of data required for the import |
| 261 @type dict | |
| 257 @param projectDir project directory (string) | 262 @param projectDir project directory (string) |
| 263 @type str | |
| 258 @param noDialog flag indicating quiet operations | 264 @param noDialog flag indicating quiet operations |
| 259 @return flag indicating an execution without errors (boolean) | 265 @type bool |
| 260 and a flag indicating the version controll status (boolean) | 266 @param addAll flag indicating to add all files to the repository |
| 267 @type bool | |
| 268 @return tuple containing a flag indicating an execution without errors | |
| 269 and a flag indicating the version controll status | |
| 270 @rtype tuple of (bool, bool) | |
| 261 """ | 271 """ |
| 262 noDialog = False | 272 noDialog = False |
| 263 msg = vcsDataDict["message"] | 273 msg = vcsDataDict["message"] |
| 264 if not msg: | 274 if not msg: |
| 265 msg = '***' | 275 msg = '***' |
