Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py
- changeset 2771
- 281c9b30dd91
- parent 2302
- f29e9405c851
- child 2791
- a9577f248f04
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 143 else: | 143 else: |
| 144 ioEncoding = Preferences.getSystem("IOEncoding") | 144 ioEncoding = Preferences.getSystem("IOEncoding") |
| 145 process = QProcess() | 145 process = QProcess() |
| 146 process.setWorkingDirectory(self.__repodir) | 146 process.setWorkingDirectory(self.__repodir) |
| 147 process.start('hg', args) | 147 process.start('hg', args) |
| 148 procStarted = process.waitForStarted() | 148 procStarted = process.waitForStarted(5000) |
| 149 if procStarted: | 149 if procStarted: |
| 150 finished = process.waitForFinished(30000) | 150 finished = process.waitForFinished(30000) |
| 151 if finished and process.exitCode() == 0: | 151 if finished and process.exitCode() == 0: |
| 152 output = \ | 152 output = \ |
| 153 str(process.readAllStandardOutput(), ioEncoding, 'replace').strip() | 153 str(process.readAllStandardOutput(), ioEncoding, 'replace').strip() |
| 283 else: | 283 else: |
| 284 ioEncoding = Preferences.getSystem("IOEncoding") | 284 ioEncoding = Preferences.getSystem("IOEncoding") |
| 285 process = QProcess() | 285 process = QProcess() |
| 286 process.setWorkingDirectory(self.__repodir) | 286 process.setWorkingDirectory(self.__repodir) |
| 287 process.start('hg', args) | 287 process.start('hg', args) |
| 288 procStarted = process.waitForStarted() | 288 procStarted = process.waitForStarted(5000) |
| 289 if procStarted: | 289 if procStarted: |
| 290 finished = process.waitForFinished(30000) | 290 finished = process.waitForFinished(30000) |
| 291 if finished: | 291 if finished: |
| 292 if process.exitCode() != 0: | 292 if process.exitCode() != 0: |
| 293 error = \ | 293 error = \ |
