Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 1256
- 885706dbb69f
- parent 1246
- 5e9f6df3d1fc
- child 1263
- 1b6054a9b668
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 79 Private slot implementing a close event handler. | 79 Private slot implementing a close event handler. |
| 80 | 80 |
| 81 @param e close event (QCloseEvent) | 81 @param e close event (QCloseEvent) |
| 82 """ | 82 """ |
| 83 if self.__hgClient: | 83 if self.__hgClient: |
| 84 self.__hgClient.cancel() | 84 if self.__hgClient.isExecuting(): |
| 85 self.__hgClient.cancel() | |
| 85 else: | 86 else: |
| 86 if self.process is not None and \ | 87 if self.process is not None and \ |
| 87 self.process.state() != QProcess.NotRunning: | 88 self.process.state() != QProcess.NotRunning: |
| 88 self.process.terminate() | 89 self.process.terminate() |
| 89 QTimer.singleShot(2000, self.process.kill) | 90 QTimer.singleShot(2000, self.process.kill) |
| 151 self.inputGroup.setEnabled(False) | 152 self.inputGroup.setEnabled(False) |
| 152 self.inputGroup.hide() | 153 self.inputGroup.hide() |
| 153 | 154 |
| 154 out, err = self.__hgClient.runcommand(args) | 155 out, err = self.__hgClient.runcommand(args) |
| 155 | 156 |
| 156 if out: | 157 if out and self.isVisible(): |
| 157 for line in out.splitlines(True): | 158 for line in out.splitlines(True): |
| 158 self.__processOutputLine(line) | 159 self.__processOutputLine(line) |
| 160 if self.__hgClient.wasCanceled(): | |
| 161 break | |
| 159 | 162 |
| 160 if err: | 163 if err: |
| 161 self.__showError(err) | 164 self.__showError(err) |
| 162 | 165 |
| 163 self.__finish() | 166 self.__finish() |
