Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2525
- 8b507a9a2d40
- parent 2771
- 281c9b30dd91
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 149 else: | 149 else: |
| 150 ioEncoding = Preferences.getSystem("IOEncoding") | 150 ioEncoding = Preferences.getSystem("IOEncoding") |
| 151 process = QProcess() | 151 process = QProcess() |
| 152 process.setWorkingDirectory(self.__repodir) | 152 process.setWorkingDirectory(self.__repodir) |
| 153 process.start('hg', args) | 153 process.start('hg', args) |
| 154 procStarted = process.waitForStarted() | 154 procStarted = process.waitForStarted(5000) |
| 155 if procStarted: | 155 if procStarted: |
| 156 finished = process.waitForFinished(30000) | 156 finished = process.waitForFinished(30000) |
| 157 if finished and process.exitCode() == 0: | 157 if finished and process.exitCode() == 0: |
| 158 output = \ | 158 output = \ |
| 159 str(process.readAllStandardOutput(), ioEncoding, 'replace').strip() | 159 str(process.readAllStandardOutput(), ioEncoding, 'replace').strip() |
| 289 else: | 289 else: |
| 290 ioEncoding = Preferences.getSystem("IOEncoding") | 290 ioEncoding = Preferences.getSystem("IOEncoding") |
| 291 process = QProcess() | 291 process = QProcess() |
| 292 process.setWorkingDirectory(self.__repodir) | 292 process.setWorkingDirectory(self.__repodir) |
| 293 process.start('hg', args) | 293 process.start('hg', args) |
| 294 procStarted = process.waitForStarted() | 294 procStarted = process.waitForStarted(5000) |
| 295 if procStarted: | 295 if procStarted: |
| 296 finished = process.waitForFinished(30000) | 296 finished = process.waitForFinished(30000) |
| 297 if finished: | 297 if finished: |
| 298 if process.exitCode() != 0: | 298 if process.exitCode() != 0: |
| 299 error = \ | 299 error = \ |
