Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py
- changeset 7257
- c4d0cac9b5c9
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7256:4ef3b78ebb4e | 7257:c4d0cac9b5c9 |
|---|---|
| 47 """ | 47 """ |
| 48 if self.__hgClient: | 48 if self.__hgClient: |
| 49 if self.__hgClient.isExecuting(): | 49 if self.__hgClient.isExecuting(): |
| 50 self.__hgClient.cancel() | 50 self.__hgClient.cancel() |
| 51 else: | 51 else: |
| 52 if self.process is not None and \ | 52 if ( |
| 53 self.process.state() != QProcess.NotRunning: | 53 self.process is not None and |
| 54 self.process.state() != QProcess.NotRunning | |
| 55 ): | |
| 54 self.process.terminate() | 56 self.process.terminate() |
| 55 QTimer.singleShot(2000, self.process.kill) | 57 QTimer.singleShot(2000, self.process.kill) |
| 56 self.process.waitForFinished(3000) | 58 self.process.waitForFinished(3000) |
| 57 | 59 |
| 58 def __getVersionArg(self, version): | 60 def __getVersionArg(self, version): |
| 207 """ | 209 """ |
| 208 Private method to process the lines of output. | 210 Private method to process the lines of output. |
| 209 | 211 |
| 210 @param line output line to be processed (string) | 212 @param line output line to be processed (string) |
| 211 """ | 213 """ |
| 212 if line.startswith("--- ") or \ | 214 if ( |
| 213 line.startswith("+++ "): | 215 line.startswith("--- ") or |
| 216 line.startswith("+++ ") | |
| 217 ): | |
| 214 self.__processFileLine(line) | 218 self.__processFileLine(line) |
| 215 | 219 |
| 216 self.__output.append(line) | 220 self.__output.append(line) |
| 217 | 221 |
| 218 def __readStdout(self): | 222 def __readStdout(self): |
