Mercurial Repositories > eric / file comparison
comparison: Project/Project.py
Project/Project.py
- changeset 6158
- 9765e0c375d0
- parent 6048
- 82ad8ec9548c
- child 6188
- 5a6ae3be31e6
equal
deleted
inserted
replaced
| 6157:708a22e46bbd | 6158:9765e0c375d0 |
|---|---|
| 4496 if self.pdata["VCS"] and self.pdata["VCS"] != 'None': | 4496 if self.pdata["VCS"] and self.pdata["VCS"] != 'None': |
| 4497 vcsSystem = self.pdata["VCS"] | 4497 vcsSystem = self.pdata["VCS"] |
| 4498 else: | 4498 else: |
| 4499 forProject = False | 4499 forProject = False |
| 4500 | 4500 |
| 4501 if self.pdata["VCS"] and self.pdata["VCS"] != 'None': | 4501 if forProject and self.pdata["VCS"] and self.pdata["VCS"] != 'None': |
| 4502 if self.pudata["VCSOVERRIDE"] and \ | 4502 if self.pudata["VCSOVERRIDE"] and \ |
| 4503 not nooverride: | 4503 not nooverride: |
| 4504 vcsSystem = self.pudata["VCSOVERRIDE"] | 4504 vcsSystem = self.pudata["VCSOVERRIDE"] |
| 4505 override = True | 4505 override = True |
| 4506 | 4506 |
| 4558 vcsother = copy.deepcopy(self.pdata["VCSOTHERDATA"]) | 4558 vcsother = copy.deepcopy(self.pdata["VCSOTHERDATA"]) |
| 4559 vcs.vcsSetOtherData(vcsother) | 4559 vcs.vcsSetOtherData(vcsother) |
| 4560 except LookupError: | 4560 except LookupError: |
| 4561 pass | 4561 pass |
| 4562 | 4562 |
| 4563 if vcs is None: | 4563 if forProject: |
| 4564 import VCS | 4564 if vcs is None: |
| 4565 self.vcsProjectHelper = VCS.getBasicHelper(self) | 4565 import VCS |
| 4566 self.vcsBasicHelper = True | 4566 self.vcsProjectHelper = VCS.getBasicHelper(self) |
| 4567 else: | 4567 self.vcsBasicHelper = True |
| 4568 self.vcsProjectHelper = vcs.vcsGetProjectHelper(self) | 4568 else: |
| 4569 self.vcsBasicHelper = False | 4569 self.vcsProjectHelper = vcs.vcsGetProjectHelper(self) |
| 4570 if self.vcsMenu is not None: | 4570 self.vcsBasicHelper = False |
| 4571 self.vcsProjectHelper.initMenu(self.vcsMenu) | 4571 if self.vcsMenu is not None: |
| 4572 self.vcsMenu.setEnabled(self.vcsSoftwareAvailable()) | 4572 self.vcsProjectHelper.initMenu(self.vcsMenu) |
| 4573 self.vcsMenu.setEnabled(self.vcsSoftwareAvailable()) | |
| 4573 return vcs | 4574 return vcs |
| 4574 | 4575 |
| 4575 def __showContextMenuVCS(self): | 4576 def __showContextMenuVCS(self): |
| 4576 """ | 4577 """ |
| 4577 Private slot called before the vcs menu is shown. | 4578 Private slot called before the vcs menu is shown. |
