Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py
- changeset 1256
- 885706dbb69f
- parent 1251
- d40491ba96ce
- child 1260
- 9488a3aceb0e
equal
deleted
inserted
replaced
| 1255:e1d8a8a4d40c | 1256:885706dbb69f |
|---|---|
| 53 """ | 53 """ |
| 54 Private slot implementing a close event handler. | 54 Private slot implementing a close event handler. |
| 55 | 55 |
| 56 @param e close event (QCloseEvent) | 56 @param e close event (QCloseEvent) |
| 57 """ | 57 """ |
| 58 if self.process is not None and \ | 58 if self.__hgClient: |
| 59 self.process.state() != QProcess.NotRunning: | 59 if self.__hgClient.isExecuting(): |
| 60 self.process.terminate() | 60 self.__hgClient.cancel() |
| 61 QTimer.singleShot(2000, self.process.kill) | 61 else: |
| 62 self.process.waitForFinished(3000) | 62 if self.process is not None and \ |
| 63 self.process.state() != QProcess.NotRunning: | |
| 64 self.process.terminate() | |
| 65 QTimer.singleShot(2000, self.process.kill) | |
| 66 self.process.waitForFinished(3000) | |
| 63 | 67 |
| 64 e.accept() | 68 e.accept() |
| 65 | 69 |
| 66 def start(self, path, bookmarksList): | 70 def start(self, path, bookmarksList): |
| 67 """ | 71 """ |
| 97 if err: | 101 if err: |
| 98 self.__showError(err) | 102 self.__showError(err) |
| 99 if out: | 103 if out: |
| 100 for line in out.splitlines(): | 104 for line in out.splitlines(): |
| 101 self.__processOutputLine(line) | 105 self.__processOutputLine(line) |
| 106 if self.__hgClient.wasCanceled(): | |
| 107 break | |
| 102 self.__finish() | 108 self.__finish() |
| 103 else: | 109 else: |
| 104 self.process.kill() | 110 self.process.kill() |
| 105 self.process.setWorkingDirectory(repodir) | 111 self.process.setWorkingDirectory(repodir) |
| 106 | 112 |
