Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 1256
- 885706dbb69f
- parent 1246
- 5e9f6df3d1fc
- child 1297
- 6347cf782036
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 64 Private slot implementing a close event handler. | 64 Private slot implementing a close event handler. |
| 65 | 65 |
| 66 @param e close event (QCloseEvent) | 66 @param e close event (QCloseEvent) |
| 67 """ | 67 """ |
| 68 if self.__hgClient: | 68 if self.__hgClient: |
| 69 self.__hgClient.cancel() | 69 if self.__hgClient.isExecuting(): |
| 70 self.__hgClient.cancel() | |
| 70 else: | 71 else: |
| 71 if self.process is not None and \ | 72 if self.process is not None and \ |
| 72 self.process.state() != QProcess.NotRunning: | 73 self.process.state() != QProcess.NotRunning: |
| 73 self.process.terminate() | 74 self.process.terminate() |
| 74 QTimer.singleShot(2000, self.process.kill) | 75 QTimer.singleShot(2000, self.process.kill) |
| 153 out, err = self.__hgClient.runcommand(args) | 154 out, err = self.__hgClient.runcommand(args) |
| 154 | 155 |
| 155 if out: | 156 if out: |
| 156 for line in out.splitlines(True): | 157 for line in out.splitlines(True): |
| 157 self.__processOutputLine(line) | 158 self.__processOutputLine(line) |
| 159 if self.__hgClient.wasCanceled(): | |
| 160 break | |
| 158 | 161 |
| 159 if err: | 162 if err: |
| 160 self.__showError(err) | 163 self.__showError(err) |
| 161 | 164 |
| 162 self.__finish() | 165 self.__finish() |
