Mercurial Repositories > eric / file comparison
comparison: eric6/VCS/ProjectHelper.py
eric6/VCS/ProjectHelper.py
- changeset 7259
- 7c017076c12e
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7258:aff39db4dacc | 7259:7c017076c12e |
|---|---|
| 188 should be performed | 188 should be performed |
| 189 """ | 189 """ |
| 190 if not self.project or not self.project.checkDirty(): | 190 if not self.project or not self.project.checkDirty(): |
| 191 return | 191 return |
| 192 | 192 |
| 193 vcsSystemsDict = e5App().getObject("PluginManager")\ | 193 vcsSystemsDict = e5App().getObject( |
| 194 .getPluginDisplayStrings("version_control") | 194 "PluginManager").getPluginDisplayStrings("version_control") |
| 195 if not vcsSystemsDict: | 195 if not vcsSystemsDict: |
| 196 # no version control system found | 196 # no version control system found |
| 197 return | 197 return |
| 198 | 198 |
| 199 vcsSystemsDisplay = [] | 199 vcsSystemsDisplay = [] |
| 308 yesDefault=True) | 308 yesDefault=True) |
| 309 if res: | 309 if res: |
| 310 self.project.ppath = projectdir | 310 self.project.ppath = projectdir |
| 311 self.project.opened = True | 311 self.project.opened = True |
| 312 | 312 |
| 313 from Project.PropertiesDialog import \ | 313 from Project.PropertiesDialog import ( |
| 314 PropertiesDialog | 314 PropertiesDialog |
| 315 ) | |
| 315 dlg = PropertiesDialog(self.project, False) | 316 dlg = PropertiesDialog(self.project, False) |
| 316 if dlg.exec_() == QDialog.Accepted: | 317 if dlg.exec_() == QDialog.Accepted: |
| 317 dlg.storeData() | 318 dlg.storeData() |
| 318 self.project.initFileTypes() | 319 self.project.initFileTypes() |
| 319 self.project.pdata["VCS"] = selectedVcsSystem | 320 self.project.pdata["VCS"] = selectedVcsSystem |
| 387 pdata_vcs = self.project.pdata["VCS"] | 388 pdata_vcs = self.project.pdata["VCS"] |
| 388 pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"]) | 389 pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"]) |
| 389 pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) | 390 pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) |
| 390 vcs = self.project.vcs | 391 vcs = self.project.vcs |
| 391 vcsHelper = self.project.vcsProjectHelper | 392 vcsHelper = self.project.vcsProjectHelper |
| 392 vcsSystemsDict = e5App().getObject("PluginManager")\ | 393 vcsSystemsDict = e5App().getObject( |
| 393 .getPluginDisplayStrings("version_control") | 394 "PluginManager").getPluginDisplayStrings("version_control") |
| 394 if not vcsSystemsDict: | 395 if not vcsSystemsDict: |
| 395 # no version control system found | 396 # no version control system found |
| 396 return | 397 return |
| 397 | 398 |
| 398 vcsSystemsDisplay = [] | 399 vcsSystemsDisplay = [] |
| 435 """Would you like to edit the VCS command""" | 436 """Would you like to edit the VCS command""" |
| 436 """ options?""")) | 437 """ options?""")) |
| 437 else: | 438 else: |
| 438 vcores = False | 439 vcores = False |
| 439 if vcores: | 440 if vcores: |
| 440 from .CommandOptionsDialog import \ | 441 from .CommandOptionsDialog import ( |
| 441 VcsCommandOptionsDialog | 442 VcsCommandOptionsDialog |
| 443 ) | |
| 442 codlg = VcsCommandOptionsDialog(self.project.vcs) | 444 codlg = VcsCommandOptionsDialog(self.project.vcs) |
| 443 if codlg.exec_() == QDialog.Accepted: | 445 if codlg.exec_() == QDialog.Accepted: |
| 444 self.project.vcs.vcsSetOptions(codlg.getOptions()) | 446 self.project.vcs.vcsSetOptions(codlg.getOptions()) |
| 445 self.project.setDirty(True) | 447 self.project.setDirty(True) |
| 446 self.project.vcs.vcsSetDataFromDict(vcsDataDict) | 448 self.project.vcs.vcsSetDataFromDict(vcsDataDict) |
