Mercurial Repositories > eric / file comparison
comparison: eric7/VCS/VersionControl.py
eric7/VCS/VersionControl.py
- branch
- eric7
- changeset 8356
- 68ec9c3d4de5
- parent 8322
- b422b4e77d19
- child 8358
- 144a6b854f70
equal
deleted
inserted
replaced
| 8355:8a7677a63c8d | 8356:68ec9c3d4de5 |
|---|---|
| 14 from PyQt6.QtCore import ( | 14 from PyQt6.QtCore import ( |
| 15 QObject, QThread, QMutex, QProcess, Qt, pyqtSignal, QCoreApplication | 15 QObject, QThread, QMutex, QProcess, Qt, pyqtSignal, QCoreApplication |
| 16 ) | 16 ) |
| 17 from PyQt6.QtWidgets import QApplication | 17 from PyQt6.QtWidgets import QApplication |
| 18 | 18 |
| 19 from E5Gui import E5MessageBox | 19 from E5Gui import EricMessageBox |
| 20 | 20 |
| 21 import Preferences | 21 import Preferences |
| 22 | 22 |
| 23 | 23 |
| 24 class VersionControl(QObject): | 24 class VersionControl(QObject): |
| 599 if workingDir: | 599 if workingDir: |
| 600 proc.setWorkingDirectory(workingDir) | 600 proc.setWorkingDirectory(workingDir) |
| 601 proc.start(program, arguments) | 601 proc.start(program, arguments) |
| 602 procStarted = proc.waitForStarted(5000) | 602 procStarted = proc.waitForStarted(5000) |
| 603 if not procStarted: | 603 if not procStarted: |
| 604 E5MessageBox.critical( | 604 EricMessageBox.critical( |
| 605 None, | 605 None, |
| 606 QCoreApplication.translate( | 606 QCoreApplication.translate( |
| 607 "VersionControl", 'Process Generation Error'), | 607 "VersionControl", 'Process Generation Error'), |
| 608 QCoreApplication.translate( | 608 QCoreApplication.translate( |
| 609 "VersionControl", | 609 "VersionControl", |
