Mercurial Repositories > eric / file comparison
comparison: eric7/VCS/VersionControl.py
eric7/VCS/VersionControl.py
- branch
- eric7
- changeset 8625
- d52ae1294878
- parent 8624
- 5192a2592324
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8624:5192a2592324 | 8625:d52ae1294878 |
|---|---|
| 228 @rtype list of str | 228 @rtype list of str |
| 229 """ | 229 """ |
| 230 messages = [] | 230 messages = [] |
| 231 if Preferences.getVCS("PerProjectCommitHistory"): | 231 if Preferences.getVCS("PerProjectCommitHistory"): |
| 232 projectMgmtDir = ( | 232 projectMgmtDir = ( |
| 233 ericApp().getObject("Project").getProjectManagementDir | 233 ericApp().getObject("Project").getProjectManagementDir() |
| 234 ) | 234 ) |
| 235 with contextlib.suppress(OSError, json.JSONDecodeError): | 235 with contextlib.suppress(OSError, json.JSONDecodeError): |
| 236 with open(os.path.join(projectMgmtDir, | 236 with open(os.path.join(projectMgmtDir, |
| 237 VersionControl.commitHistoryData), | 237 VersionControl.commitHistoryData), |
| 238 "r") as f: | 238 "r") as f: |
| 262 @return flag indicating success | 262 @return flag indicating success |
| 263 @rtype bool | 263 @rtype bool |
| 264 """ | 264 """ |
| 265 if Preferences.getVCS("PerProjectCommitHistory"): | 265 if Preferences.getVCS("PerProjectCommitHistory"): |
| 266 projectMgmtDir = ( | 266 projectMgmtDir = ( |
| 267 ericApp().getObject("Project").getProjectManagementDir | 267 ericApp().getObject("Project").getProjectManagementDir() |
| 268 ) | 268 ) |
| 269 lockFile = QLockFile( | 269 lockFile = QLockFile( |
| 270 os.path.join(projectMgmtDir, VersionControl.commitHistoryLock)) | 270 os.path.join(projectMgmtDir, VersionControl.commitHistoryLock)) |
| 271 if lockFile.lock(): | 271 if lockFile.lock(): |
| 272 noMessages = Preferences.getVCS("CommitMessages") | 272 noMessages = Preferences.getVCS("CommitMessages") |
| 303 @return flag indicating success | 303 @return flag indicating success |
| 304 @rtype bool | 304 @rtype bool |
| 305 """ | 305 """ |
| 306 if Preferences.getVCS("PerProjectCommitHistory"): | 306 if Preferences.getVCS("PerProjectCommitHistory"): |
| 307 projectMgmtDir = ( | 307 projectMgmtDir = ( |
| 308 ericApp().getObject("Project").getProjectManagementDir | 308 ericApp().getObject("Project").getProjectManagementDir() |
| 309 ) | 309 ) |
| 310 lockFile = QLockFile( | 310 lockFile = QLockFile( |
| 311 os.path.join(projectMgmtDir, VersionControl.commitHistoryLock)) | 311 os.path.join(projectMgmtDir, VersionControl.commitHistoryLock)) |
| 312 if lockFile.lock(): | 312 if lockFile.lock(): |
| 313 with contextlib.suppress(TypeError, OSError): | 313 with contextlib.suppress(TypeError, OSError): |
