Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2525
- 8b507a9a2d40
- parent 2771
- 281c9b30dd91
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 89 output, error = self.__client.runcommand(args) | 89 output, error = self.__client.runcommand(args) |
| 90 else: | 90 else: |
| 91 process = QProcess() | 91 process = QProcess() |
| 92 process.setWorkingDirectory(self.projectDir) | 92 process.setWorkingDirectory(self.projectDir) |
| 93 process.start('hg', args) | 93 process.start('hg', args) |
| 94 procStarted = process.waitForStarted() | 94 procStarted = process.waitForStarted(5000) |
| 95 if procStarted: | 95 if procStarted: |
| 96 finished = process.waitForFinished(300000) | 96 finished = process.waitForFinished(300000) |
| 97 if finished and process.exitCode() == 0: | 97 if finished and process.exitCode() == 0: |
| 98 output = \ | 98 output = \ |
| 99 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 99 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
| 131 if self.__client: | 131 if self.__client: |
| 132 output, error = self.__client.runcommand(args) | 132 output, error = self.__client.runcommand(args) |
| 133 else: | 133 else: |
| 134 process.setWorkingDirectory(self.projectDir) | 134 process.setWorkingDirectory(self.projectDir) |
| 135 process.start('hg', args) | 135 process.start('hg', args) |
| 136 procStarted = process.waitForStarted() | 136 procStarted = process.waitForStarted(5000) |
| 137 if procStarted: | 137 if procStarted: |
| 138 finished = process.waitForFinished(300000) | 138 finished = process.waitForFinished(300000) |
| 139 if finished and process.exitCode() == 0: | 139 if finished and process.exitCode() == 0: |
| 140 output = str( | 140 output = str( |
| 141 process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 141 process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
