Mercurial Repositories > eric / file comparison
comparison: eric6/VCS/ProjectHelper.py
eric6/VCS/ProjectHelper.py
- changeset 8143
- 2c730d5fd177
- parent 8047
- b5594178c7fa
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 220 return | 220 return |
| 221 | 221 |
| 222 vcs = self.project.initVCS(selectedVcsSystem) | 222 vcs = self.project.initVCS(selectedVcsSystem) |
| 223 if vcs is not None: | 223 if vcs is not None: |
| 224 vcsdlg = vcs.vcsNewProjectOptionsDialog() | 224 vcsdlg = vcs.vcsNewProjectOptionsDialog() |
| 225 if vcsdlg.exec() == QDialog.Accepted: | 225 if vcsdlg.exec() == QDialog.DialogCode.Accepted: |
| 226 projectdir, vcsDataDict = vcsdlg.getData() | 226 projectdir, vcsDataDict = vcsdlg.getData() |
| 227 # edit VCS command options | 227 # edit VCS command options |
| 228 if vcs.vcsSupportCommandOptions(): | 228 if vcs.vcsSupportCommandOptions(): |
| 229 vcores = E5MessageBox.yesNo( | 229 vcores = E5MessageBox.yesNo( |
| 230 self.parent(), | 230 self.parent(), |
| 237 else: | 237 else: |
| 238 vcores = False | 238 vcores = False |
| 239 if vcores: | 239 if vcores: |
| 240 from .CommandOptionsDialog import VcsCommandOptionsDialog | 240 from .CommandOptionsDialog import VcsCommandOptionsDialog |
| 241 codlg = VcsCommandOptionsDialog(vcs) | 241 codlg = VcsCommandOptionsDialog(vcs) |
| 242 if codlg.exec() == QDialog.Accepted: | 242 if codlg.exec() == QDialog.DialogCode.Accepted: |
| 243 vcs.vcsSetOptions(codlg.getOptions()) | 243 vcs.vcsSetOptions(codlg.getOptions()) |
| 244 | 244 |
| 245 # create the project directory if it doesn't exist already | 245 # create the project directory if it doesn't exist already |
| 246 if not os.path.isdir(projectdir): | 246 if not os.path.isdir(projectdir): |
| 247 try: | 247 try: |
| 311 | 311 |
| 312 from Project.PropertiesDialog import ( | 312 from Project.PropertiesDialog import ( |
| 313 PropertiesDialog | 313 PropertiesDialog |
| 314 ) | 314 ) |
| 315 dlg = PropertiesDialog(self.project, False) | 315 dlg = PropertiesDialog(self.project, False) |
| 316 if dlg.exec() == QDialog.Accepted: | 316 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 317 dlg.storeData() | 317 dlg.storeData() |
| 318 self.project.initFileTypes() | 318 self.project.initFileTypes() |
| 319 self.project.pdata["VCS"] = selectedVcsSystem | 319 self.project.pdata["VCS"] = selectedVcsSystem |
| 320 self.project.setDirty(True) | 320 self.project.setDirty(True) |
| 321 if self.project.pdata["MAINSCRIPT"]: | 321 if self.project.pdata["MAINSCRIPT"]: |
| 420 self.project.pdata["VCS"] = selectedVcsSystem | 420 self.project.pdata["VCS"] = selectedVcsSystem |
| 421 self.project.vcs = self.project.initVCS(selectedVcsSystem) | 421 self.project.vcs = self.project.initVCS(selectedVcsSystem) |
| 422 if self.project.vcs is not None: | 422 if self.project.vcs is not None: |
| 423 vcsdlg = self.project.vcs.vcsOptionsDialog( | 423 vcsdlg = self.project.vcs.vcsOptionsDialog( |
| 424 self.project, self.project.name, 1) | 424 self.project, self.project.name, 1) |
| 425 if vcsdlg.exec() == QDialog.Accepted: | 425 if vcsdlg.exec() == QDialog.DialogCode.Accepted: |
| 426 vcsDataDict = vcsdlg.getData() | 426 vcsDataDict = vcsdlg.getData() |
| 427 # edit VCS command options | 427 # edit VCS command options |
| 428 if self.project.vcs.vcsSupportCommandOptions(): | 428 if self.project.vcs.vcsSupportCommandOptions(): |
| 429 vcores = E5MessageBox.yesNo( | 429 vcores = E5MessageBox.yesNo( |
| 430 self.parent(), | 430 self.parent(), |
| 439 if vcores: | 439 if vcores: |
| 440 from .CommandOptionsDialog import ( | 440 from .CommandOptionsDialog import ( |
| 441 VcsCommandOptionsDialog | 441 VcsCommandOptionsDialog |
| 442 ) | 442 ) |
| 443 codlg = VcsCommandOptionsDialog(self.project.vcs) | 443 codlg = VcsCommandOptionsDialog(self.project.vcs) |
| 444 if codlg.exec() == QDialog.Accepted: | 444 if codlg.exec() == QDialog.DialogCode.Accepted: |
| 445 self.project.vcs.vcsSetOptions(codlg.getOptions()) | 445 self.project.vcs.vcsSetOptions(codlg.getOptions()) |
| 446 self.project.setDirty(True) | 446 self.project.setDirty(True) |
| 447 self.project.vcs.vcsSetDataFromDict(vcsDataDict) | 447 self.project.vcs.vcsSetDataFromDict(vcsDataDict) |
| 448 self.project.saveProject() | 448 self.project.saveProject() |
| 449 isVcsControlled = self.project.vcs.vcsImport( | 449 isVcsControlled = self.project.vcs.vcsImport( |
| 532 return | 532 return |
| 533 | 533 |
| 534 if self.vcs.vcsSupportCommandOptions(): | 534 if self.vcs.vcsSupportCommandOptions(): |
| 535 from .CommandOptionsDialog import VcsCommandOptionsDialog | 535 from .CommandOptionsDialog import VcsCommandOptionsDialog |
| 536 codlg = VcsCommandOptionsDialog(self.vcs) | 536 codlg = VcsCommandOptionsDialog(self.vcs) |
| 537 if codlg.exec() == QDialog.Accepted: | 537 if codlg.exec() == QDialog.DialogCode.Accepted: |
| 538 self.vcs.vcsSetOptions(codlg.getOptions()) | 538 self.vcs.vcsSetOptions(codlg.getOptions()) |
| 539 self.project.setDirty(True) | 539 self.project.setDirty(True) |
| 540 | 540 |
| 541 def _vcsLog(self): | 541 def _vcsLog(self): |
| 542 """ | 542 """ |
