Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py
- changeset 2771
- 281c9b30dd91
- parent 2581
- a3498dcc75cc
- child 2791
- a9577f248f04
- child 2838
- 0f1423054184
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 176 self.process.kill() | 176 self.process.kill() |
| 177 | 177 |
| 178 self.process.setWorkingDirectory(self.repodir) | 178 self.process.setWorkingDirectory(self.repodir) |
| 179 | 179 |
| 180 self.process.start('hg', args) | 180 self.process.start('hg', args) |
| 181 procStarted = self.process.waitForStarted() | 181 procStarted = self.process.waitForStarted(5000) |
| 182 if not procStarted: | 182 if not procStarted: |
| 183 self.inputGroup.setEnabled(False) | 183 self.inputGroup.setEnabled(False) |
| 184 self.inputGroup.hide() | 184 self.inputGroup.hide() |
| 185 E5MessageBox.critical(self, | 185 E5MessageBox.critical(self, |
| 186 self.trUtf8('Process Generation Error'), | 186 self.trUtf8('Process Generation Error'), |
| 221 output, errMsg = self.__hgClient.runcommand(args) | 221 output, errMsg = self.__hgClient.runcommand(args) |
| 222 else: | 222 else: |
| 223 process = QProcess() | 223 process = QProcess() |
| 224 process.setWorkingDirectory(self.repodir) | 224 process.setWorkingDirectory(self.repodir) |
| 225 process.start('hg', args) | 225 process.start('hg', args) |
| 226 procStarted = process.waitForStarted() | 226 procStarted = process.waitForStarted(5000) |
| 227 if procStarted: | 227 if procStarted: |
| 228 finished = process.waitForFinished(30000) | 228 finished = process.waitForFinished(30000) |
| 229 if finished and process.exitCode() == 0: | 229 if finished and process.exitCode() == 0: |
| 230 output = \ | 230 output = \ |
| 231 str(process.readAllStandardOutput(), | 231 str(process.readAllStandardOutput(), |
