Mercurial Repositories > eric / file comparison
comparison: src/eric7/VCS/ProjectHelper.py
src/eric7/VCS/ProjectHelper.py
- branch
- eric7
- changeset 10595
- 59579e8aff98
- parent 10439
- 21c28b0f9e41
- child 10683
- 779cda568acb
equal
deleted
inserted
replaced
| 10593:b7ebfc2e47d4 | 10595:59579e8aff98 |
|---|---|
| 302 else: | 302 else: |
| 303 ok = vcs.vcsCheckout(vcsDataDict, projectdir, False) | 303 ok = vcs.vcsCheckout(vcsDataDict, projectdir, False) |
| 304 if ok: | 304 if ok: |
| 305 projectdir = os.path.normpath(projectdir) | 305 projectdir = os.path.normpath(projectdir) |
| 306 dpath = pathlib.Path(projectdir) | 306 dpath = pathlib.Path(projectdir) |
| 307 # look for JSON style project file first | |
| 308 plist = list(dpath.glob("*.epj")) | 307 plist = list(dpath.glob("*.epj")) |
| 309 if not plist: | |
| 310 # look for XML style project file second | |
| 311 plist = list(dpath.glob("*.e4p")) | |
| 312 if plist: | 308 if plist: |
| 313 if len(plist) == 1: | 309 if len(plist) == 1: |
| 314 self.project.openProject(str(plist[0].resolve())) | 310 self.project.openProject(str(plist[0].resolve())) |
| 315 else: | 311 else: |
| 316 pfilenamelist = [p.name for p in plist] | 312 pfilenamelist = [p.name for p in plist] |
