Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
- changeset 7257
- c4d0cac9b5c9
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7256:4ef3b78ebb4e | 7257:c4d0cac9b5c9 |
|---|---|
| 55 """ | 55 """ |
| 56 Protected slot implementing a close event handler. | 56 Protected slot implementing a close event handler. |
| 57 | 57 |
| 58 @param e close event (QCloseEvent) | 58 @param e close event (QCloseEvent) |
| 59 """ | 59 """ |
| 60 if self.process is not None and \ | 60 if ( |
| 61 self.process.state() != QProcess.NotRunning: | 61 self.process is not None and |
| 62 self.process.state() != QProcess.NotRunning | |
| 63 ): | |
| 62 self.process.terminate() | 64 self.process.terminate() |
| 63 QTimer.singleShot(2000, self.process.kill) | 65 QTimer.singleShot(2000, self.process.kill) |
| 64 self.process.waitForFinished(3000) | 66 self.process.waitForFinished(3000) |
| 65 | 67 |
| 66 e.accept() | 68 e.accept() |
| 118 def __finish(self): | 120 def __finish(self): |
| 119 """ | 121 """ |
| 120 Private slot called when the process finished or the user pressed | 122 Private slot called when the process finished or the user pressed |
| 121 the button. | 123 the button. |
| 122 """ | 124 """ |
| 123 if self.process is not None and \ | 125 if ( |
| 124 self.process.state() != QProcess.NotRunning: | 126 self.process is not None and |
| 127 self.process.state() != QProcess.NotRunning | |
| 128 ): | |
| 125 self.process.terminate() | 129 self.process.terminate() |
| 126 QTimer.singleShot(2000, self.process.kill) | 130 QTimer.singleShot(2000, self.process.kill) |
| 127 self.process.waitForFinished(3000) | 131 self.process.waitForFinished(3000) |
| 128 | 132 |
| 129 self.refreshButton.setEnabled(True) | 133 self.refreshButton.setEnabled(True) |
| 408 "%n new changeset(s)", "", infoDict["update"][1]) | 412 "%n new changeset(s)", "", infoDict["update"][1]) |
| 409 uinfo2 = self.tr( | 413 uinfo2 = self.tr( |
| 410 "%n branch head(s)", "", infoDict["update"][2]) | 414 "%n branch head(s)", "", infoDict["update"][2]) |
| 411 uinfo = self.tr( | 415 uinfo = self.tr( |
| 412 "{0}<br/>{1}<br/>Merge required", | 416 "{0}<br/>{1}<br/>Merge required", |
| 413 "0 is changesets, 1 is branch heads")\ | 417 "0 is changesets, 1 is branch heads" |
| 414 .format(uinfo1, uinfo2) | 418 ).format(uinfo1, uinfo2) |
| 415 else: | 419 else: |
| 416 uinfo = self.tr("unknown status") | 420 uinfo = self.tr("unknown status") |
| 417 info.append(self.tr( | 421 info.append(self.tr( |
| 418 "<tr><td><b>Update Status</b></td><td>{0}</td></tr>") | 422 "<tr><td><b>Update Status</b></td><td>{0}</td></tr>") |
| 419 .format(uinfo)) | 423 .format(uinfo)) |
