Mercurial Repositories > eric / file comparison
comparison: src/eric7/VCS/VersionControl.py
src/eric7/VCS/VersionControl.py
- branch
- eric7
- changeset 9473
- 3f23dbf37dbe
- parent 9413
- 80c06d472826
- child 9653
- e67609152c5e
equal
deleted
inserted
replaced
| 9472:5798ee4a8807 | 9473:3f23dbf37dbe |
|---|---|
| 11 import contextlib | 11 import contextlib |
| 12 import json | 12 import json |
| 13 import os | 13 import os |
| 14 | 14 |
| 15 from PyQt6.QtCore import ( | 15 from PyQt6.QtCore import ( |
| 16 QCoreApplication, | |
| 17 QLockFile, | |
| 18 QMutex, | |
| 16 QObject, | 19 QObject, |
| 17 QThread, | |
| 18 QMutex, | |
| 19 QProcess, | 20 QProcess, |
| 20 Qt, | 21 Qt, |
| 22 QThread, | |
| 21 pyqtSignal, | 23 pyqtSignal, |
| 22 QCoreApplication, | |
| 23 QLockFile, | |
| 24 ) | 24 ) |
| 25 from PyQt6.QtWidgets import QApplication | 25 from PyQt6.QtWidgets import QApplication |
| 26 | 26 |
| 27 from eric7 import Preferences | |
| 27 from eric7.EricWidgets import EricMessageBox | 28 from eric7.EricWidgets import EricMessageBox |
| 28 from eric7.EricWidgets.EricApplication import ericApp | 29 from eric7.EricWidgets.EricApplication import ericApp |
| 29 | |
| 30 from eric7 import Preferences | |
| 31 | 30 |
| 32 | 31 |
| 33 class VersionControl(QObject): | 32 class VersionControl(QObject): |
| 34 """ | 33 """ |
| 35 Class implementing an abstract base class to be subclassed by all specific | 34 Class implementing an abstract base class to be subclassed by all specific |
