Mercurial Repositories > eric / file comparison
comparison: eric6/VCS/VersionControl.py
eric6/VCS/VersionControl.py
- changeset 7259
- 7c017076c12e
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7258:aff39db4dacc | 7259:7c017076c12e |
|---|---|
| 9 """ | 9 """ |
| 10 | 10 |
| 11 | 11 |
| 12 import os | 12 import os |
| 13 | 13 |
| 14 from PyQt5.QtCore import QObject, QThread, QMutex, QProcess, \ | 14 from PyQt5.QtCore import ( |
| 15 Qt, pyqtSignal, QCoreApplication | 15 QObject, QThread, QMutex, QProcess, Qt, pyqtSignal, QCoreApplication |
| 16 ) | |
| 16 from PyQt5.QtWidgets import QApplication | 17 from PyQt5.QtWidgets import QApplication |
| 17 | 18 |
| 18 from E5Gui import E5MessageBox | 19 from E5Gui import E5MessageBox |
| 19 | 20 |
| 20 import Preferences | 21 import Preferences |
| 617 else: | 618 else: |
| 618 while proc.state() == QProcess.Running: | 619 while proc.state() == QProcess.Running: |
| 619 QApplication.processEvents() | 620 QApplication.processEvents() |
| 620 QThread.msleep(300) | 621 QThread.msleep(300) |
| 621 QApplication.processEvents() | 622 QApplication.processEvents() |
| 622 return (proc.exitStatus() == QProcess.NormalExit) and \ | 623 return ( |
| 624 (proc.exitStatus() == QProcess.NormalExit) and | |
| 623 (proc.exitCode() == 0) | 625 (proc.exitCode() == 0) |
| 626 ) | |
| 624 | 627 |
| 625 def splitPath(self, name): | 628 def splitPath(self, name): |
| 626 """ | 629 """ |
| 627 Public method splitting name into a directory part and a file part. | 630 Public method splitting name into a directory part and a file part. |
| 628 | 631 |
