Mercurial Repositories > eric / file comparison
comparison: VCS/ProjectHelper.py
VCS/ProjectHelper.py
- branch
- 5_1_x
- changeset 1321
- ff971e15cf95
- parent 1013
- bdf49619d9c6
- child 1510
- e75ecf2bd9dd
equal
deleted
inserted
replaced
| 1320:e94577f27c3e | 1321:ff971e15cf95 |
|---|---|
| 329 self.project.vcs.vcsSetOptions(codlg.getOptions()) | 329 self.project.vcs.vcsSetOptions(codlg.getOptions()) |
| 330 self.project.setDirty(True) | 330 self.project.setDirty(True) |
| 331 self.project.vcs.vcsSetDataFromDict(vcsDataDict) | 331 self.project.vcs.vcsSetDataFromDict(vcsDataDict) |
| 332 self.project.saveProject() | 332 self.project.saveProject() |
| 333 isVcsControlled = \ | 333 isVcsControlled = \ |
| 334 self.project.vcs.vcsImport(vcsDataDict, self.project.ppath)[1] | 334 self.project.vcs.vcsImport(vcsDataDict, self.project.ppath)[0] |
| 335 if isVcsControlled: | 335 if isVcsControlled: |
| 336 # reopen the project | 336 # reopen the project |
| 337 self.project.openProject(self.project.pfile) | 337 self.project.openProject(self.project.pfile) |
| 338 else: | 338 else: |
| 339 # revert the changes to the local project | 339 # revert the changes to the local project |
