Mercurial Repositories > eric / file comparison
comparison: VCS/ProjectHelper.py
VCS/ProjectHelper.py
- changeset 1318
- 6fa303bd65d6
- parent 1131
- 7781e396c903
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1316:0bb67aced672 | 1318:6fa303bd65d6 |
|---|---|
| 330 self.project.vcs.vcsSetOptions(codlg.getOptions()) | 330 self.project.vcs.vcsSetOptions(codlg.getOptions()) |
| 331 self.project.setDirty(True) | 331 self.project.setDirty(True) |
| 332 self.project.vcs.vcsSetDataFromDict(vcsDataDict) | 332 self.project.vcs.vcsSetDataFromDict(vcsDataDict) |
| 333 self.project.saveProject() | 333 self.project.saveProject() |
| 334 isVcsControlled = \ | 334 isVcsControlled = \ |
| 335 self.project.vcs.vcsImport(vcsDataDict, self.project.ppath)[1] | 335 self.project.vcs.vcsImport(vcsDataDict, self.project.ppath)[0] |
| 336 if isVcsControlled: | 336 if isVcsControlled: |
| 337 # reopen the project | 337 # reopen the project |
| 338 self.project.openProject(self.project.pfile) | 338 self.project.openProject(self.project.pfile) |
| 339 else: | 339 else: |
| 340 # revert the changes to the local project | 340 # revert the changes to the local project |
