Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
eric6/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 55 Public slot to stop the diff processes. | 55 Public slot to stop the diff processes. |
| 56 """ | 56 """ |
| 57 for process in [self.__process, self.__process2]: | 57 for process in [self.__process, self.__process2]: |
| 58 if ( | 58 if ( |
| 59 process is not None and | 59 process is not None and |
| 60 process.state() != QProcess.NotRunning | 60 process.state() != QProcess.ProcessState.NotRunning |
| 61 ): | 61 ): |
| 62 process.terminate() | 62 process.terminate() |
| 63 QTimer.singleShot(2000, process.kill) | 63 QTimer.singleShot(2000, process.kill) |
| 64 process.waitForFinished(3000) | 64 process.waitForFinished(3000) |
| 65 | 65 |
| 163 | 163 |
| 164 @param exitCode exit code of the process (integer) | 164 @param exitCode exit code of the process (integer) |
| 165 @param exitStatus exit status of the process (QProcess.ExitStatus) | 165 @param exitStatus exit status of the process (QProcess.ExitStatus) |
| 166 """ | 166 """ |
| 167 if ( | 167 if ( |
| 168 self.__process.state() == QProcess.NotRunning and | 168 self.__process.state() == QProcess.ProcessState.NotRunning and |
| 169 self.__process2.state() == QProcess.NotRunning | 169 self.__process2.state() == QProcess.ProcessState.NotRunning |
| 170 ): | 170 ): |
| 171 self.finished.emit() | 171 self.finished.emit() |
| 172 | 172 |
| 173 def getResult(self): | 173 def getResult(self): |
| 174 """ | 174 """ |
| 223 the contents pane. | 223 the contents pane. |
| 224 | 224 |
| 225 @param process reference to the process providing output | 225 @param process reference to the process providing output |
| 226 @type QProcess | 226 @type QProcess |
| 227 """ | 227 """ |
| 228 process.setReadChannel(QProcess.StandardOutput) | 228 process.setReadChannel(QProcess.ProcessChannel.StandardOutput) |
| 229 | 229 |
| 230 isTopDiff = process == self.__process | 230 isTopDiff = process == self.__process |
| 231 | 231 |
| 232 while process.canReadLine(): | 232 while process.canReadLine(): |
| 233 line = str(process.readLine(), self.__ioEncoding, | 233 line = str(process.readLine(), self.__ioEncoding, |
