Mercurial Repositories > eric / file comparison
comparison: eric6/VCS/VersionControl.py
eric6/VCS/VersionControl.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8176
- 31965986ecd1
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 613 'The process {0} could not be started. ' | 613 'The process {0} could not be started. ' |
| 614 'Ensure, that it is in the search path.' | 614 'Ensure, that it is in the search path.' |
| 615 ).format(program)) | 615 ).format(program)) |
| 616 return False | 616 return False |
| 617 else: | 617 else: |
| 618 while proc.state() == QProcess.Running: | 618 while proc.state() == QProcess.ProcessState.Running: |
| 619 QApplication.processEvents() | 619 QApplication.processEvents() |
| 620 QThread.msleep(300) | 620 QThread.msleep(300) |
| 621 QApplication.processEvents() | 621 QApplication.processEvents() |
| 622 return ( | 622 return ( |
| 623 (proc.exitStatus() == QProcess.NormalExit) and | 623 (proc.exitStatus() == QProcess.ExitStatus.NormalExit) and |
| 624 (proc.exitCode() == 0) | 624 (proc.exitCode() == 0) |
| 625 ) | 625 ) |
| 626 | 626 |
| 627 def splitPath(self, name): | 627 def splitPath(self, name): |
| 628 """ | 628 """ |
| 726 if vcsStatusMonitorInterval > 0: | 726 if vcsStatusMonitorInterval > 0: |
| 727 self.statusMonitorThread = self._createStatusMonitorThread( | 727 self.statusMonitorThread = self._createStatusMonitorThread( |
| 728 vcsStatusMonitorInterval, project) | 728 vcsStatusMonitorInterval, project) |
| 729 if self.statusMonitorThread is not None: | 729 if self.statusMonitorThread is not None: |
| 730 self.statusMonitorThread.vcsStatusMonitorData.connect( | 730 self.statusMonitorThread.vcsStatusMonitorData.connect( |
| 731 self.__statusMonitorData, Qt.QueuedConnection) | 731 self.__statusMonitorData, |
| 732 Qt.ConnectionType.QueuedConnection) | |
| 732 self.statusMonitorThread.vcsStatusMonitorStatus.connect( | 733 self.statusMonitorThread.vcsStatusMonitorStatus.connect( |
| 733 self.__statusMonitorStatus, Qt.QueuedConnection) | 734 self.__statusMonitorStatus, |
| 735 Qt.ConnectionType.QueuedConnection) | |
| 734 self.statusMonitorThread.vcsStatusMonitorInfo.connect( | 736 self.statusMonitorThread.vcsStatusMonitorInfo.connect( |
| 735 self.__statusMonitorInfo, Qt.QueuedConnection) | 737 self.__statusMonitorInfo, |
| 738 Qt.ConnectionType.QueuedConnection) | |
| 736 self.statusMonitorThread.setAutoUpdate( | 739 self.statusMonitorThread.setAutoUpdate( |
| 737 Preferences.getVCS("AutoUpdate")) | 740 Preferences.getVCS("AutoUpdate")) |
| 738 self.statusMonitorThread.start() | 741 self.statusMonitorThread.start() |
| 739 else: | 742 else: |
| 740 self.statusMonitorThread = None | 743 self.statusMonitorThread = None |
