Mercurial Repositories > eric / file comparison
comparison: eric6/VCS/ProjectHelper.py
eric6/VCS/ProjectHelper.py
- changeset 8263
- af06dde4f4ef
- parent 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8262:2f6310aac6cd | 8263:af06dde4f4ef |
|---|---|
| 265 ok = vcs.vcsExport(vcsDataDict, projectdir) | 265 ok = vcs.vcsExport(vcsDataDict, projectdir) |
| 266 else: | 266 else: |
| 267 ok = vcs.vcsCheckout(vcsDataDict, projectdir, False) | 267 ok = vcs.vcsCheckout(vcsDataDict, projectdir, False) |
| 268 if ok: | 268 if ok: |
| 269 projectdir = os.path.normpath(projectdir) | 269 projectdir = os.path.normpath(projectdir) |
| 270 filters = ["*.epj", "*.e4p"] | 270 # look for JSON style project file first |
| 271 filters = ["*.epj"] | |
| 271 d = QDir(projectdir) | 272 d = QDir(projectdir) |
| 272 plist = d.entryInfoList(filters) | 273 plist = d.entryInfoList(filters) |
| 273 if len(plist): | 274 if not plist: |
| 275 # look for XML style project file second | |
| 276 filters = ["*.e4p"] | |
| 277 d = QDir(projectdir) | |
| 278 plist = d.entryInfoList(filters) | |
| 279 if plist: | |
| 274 if len(plist) == 1: | 280 if len(plist) == 1: |
| 275 self.project.openProject( | 281 self.project.openProject( |
| 276 plist[0].absoluteFilePath()) | 282 plist[0].absoluteFilePath()) |
| 277 else: | 283 else: |
| 278 pfilenamelist = d.entryList(filters) | 284 pfilenamelist = d.entryList(filters) |
