Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2677
- 3d4277929fb3
- parent 2771
- 281c9b30dd91
- child 2847
- 1843ef6e2656
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 182 self.process.kill() | 182 self.process.kill() |
| 183 | 183 |
| 184 self.process.setWorkingDirectory(self.repodir) | 184 self.process.setWorkingDirectory(self.repodir) |
| 185 | 185 |
| 186 self.process.start('hg', args) | 186 self.process.start('hg', args) |
| 187 procStarted = self.process.waitForStarted() | 187 procStarted = self.process.waitForStarted(5000) |
| 188 if not procStarted: | 188 if not procStarted: |
| 189 self.inputGroup.setEnabled(False) | 189 self.inputGroup.setEnabled(False) |
| 190 self.inputGroup.hide() | 190 self.inputGroup.hide() |
| 191 E5MessageBox.critical(self, | 191 E5MessageBox.critical(self, |
| 192 self.trUtf8('Process Generation Error'), | 192 self.trUtf8('Process Generation Error'), |
| 227 output, errMsg = self.__hgClient.runcommand(args) | 227 output, errMsg = self.__hgClient.runcommand(args) |
| 228 else: | 228 else: |
| 229 process = QProcess() | 229 process = QProcess() |
| 230 process.setWorkingDirectory(self.repodir) | 230 process.setWorkingDirectory(self.repodir) |
| 231 process.start('hg', args) | 231 process.start('hg', args) |
| 232 procStarted = process.waitForStarted() | 232 procStarted = process.waitForStarted(5000) |
| 233 if procStarted: | 233 if procStarted: |
| 234 finished = process.waitForFinished(30000) | 234 finished = process.waitForFinished(30000) |
| 235 if finished and process.exitCode() == 0: | 235 if finished and process.exitCode() == 0: |
| 236 output = \ | 236 output = \ |
| 237 str(process.readAllStandardOutput(), | 237 str(process.readAllStandardOutput(), |
