Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
- changeset 2771
- 281c9b30dd91
- parent 2405
- d4b5f3bd4720
- child 2791
- a9577f248f04
- child 3008
- 7848489bcb92
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 83 output, error = self.__client.runcommand(args) | 83 output, error = self.__client.runcommand(args) |
| 84 else: | 84 else: |
| 85 process = QProcess() | 85 process = QProcess() |
| 86 process.setWorkingDirectory(self.projectDir) | 86 process.setWorkingDirectory(self.projectDir) |
| 87 process.start('hg', args) | 87 process.start('hg', args) |
| 88 procStarted = process.waitForStarted() | 88 procStarted = process.waitForStarted(5000) |
| 89 if procStarted: | 89 if procStarted: |
| 90 finished = process.waitForFinished(300000) | 90 finished = process.waitForFinished(300000) |
| 91 if finished and process.exitCode() == 0: | 91 if finished and process.exitCode() == 0: |
| 92 output = \ | 92 output = \ |
| 93 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 93 str(process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
| 125 if self.__client: | 125 if self.__client: |
| 126 output, error = self.__client.runcommand(args) | 126 output, error = self.__client.runcommand(args) |
| 127 else: | 127 else: |
| 128 process.setWorkingDirectory(self.projectDir) | 128 process.setWorkingDirectory(self.projectDir) |
| 129 process.start('hg', args) | 129 process.start('hg', args) |
| 130 procStarted = process.waitForStarted() | 130 procStarted = process.waitForStarted(5000) |
| 131 if procStarted: | 131 if procStarted: |
| 132 finished = process.waitForFinished(300000) | 132 finished = process.waitForFinished(300000) |
| 133 if finished and process.exitCode() == 0: | 133 if finished and process.exitCode() == 0: |
| 134 output = str( | 134 output = str( |
| 135 process.readAllStandardOutput(), self.__ioEncoding, 'replace') | 135 process.readAllStandardOutput(), self.__ioEncoding, 'replace') |
