Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- branch
- Py2 comp.
- changeset 2791
- a9577f248f04
- parent 2525
- 8b507a9a2d40
- parent 2771
- 281c9b30dd91
- child 2847
- 1843ef6e2656
equal
deleted
inserted
replaced
| 2790:6686a3326df8 | 2791:a9577f248f04 |
|---|---|
| 108 else: | 108 else: |
| 109 ioEncoding = Preferences.getSystem("IOEncoding") | 109 ioEncoding = Preferences.getSystem("IOEncoding") |
| 110 process = QProcess() | 110 process = QProcess() |
| 111 process.setWorkingDirectory(repodir) | 111 process.setWorkingDirectory(repodir) |
| 112 process.start('hg', args) | 112 process.start('hg', args) |
| 113 procStarted = process.waitForStarted() | 113 procStarted = process.waitForStarted(5000) |
| 114 if procStarted: | 114 if procStarted: |
| 115 finished = process.waitForFinished(30000) | 115 finished = process.waitForFinished(30000) |
| 116 if finished and process.exitCode() == 0: | 116 if finished and process.exitCode() == 0: |
| 117 output = \ | 117 output = \ |
| 118 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 118 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 148 else: | 148 else: |
| 149 ioEncoding = Preferences.getSystem("IOEncoding") | 149 ioEncoding = Preferences.getSystem("IOEncoding") |
| 150 process = QProcess() | 150 process = QProcess() |
| 151 process.setWorkingDirectory(repodir) | 151 process.setWorkingDirectory(repodir) |
| 152 process.start('hg', args) | 152 process.start('hg', args) |
| 153 procStarted = process.waitForStarted() | 153 procStarted = process.waitForStarted(5000) |
| 154 if procStarted: | 154 if procStarted: |
| 155 finished = process.waitForFinished(30000) | 155 finished = process.waitForFinished(30000) |
| 156 if finished and process.exitCode() == 0: | 156 if finished and process.exitCode() == 0: |
| 157 currentPatch = str( | 157 currentPatch = str( |
| 158 process.readAllStandardOutput(), | 158 process.readAllStandardOutput(), |
| 178 else: | 178 else: |
| 179 ioEncoding = Preferences.getSystem("IOEncoding") | 179 ioEncoding = Preferences.getSystem("IOEncoding") |
| 180 process = QProcess() | 180 process = QProcess() |
| 181 process.setWorkingDirectory(repodir) | 181 process.setWorkingDirectory(repodir) |
| 182 process.start('hg', args) | 182 process.start('hg', args) |
| 183 procStarted = process.waitForStarted() | 183 procStarted = process.waitForStarted(5000) |
| 184 if procStarted: | 184 if procStarted: |
| 185 finished = process.waitForFinished(30000) | 185 finished = process.waitForFinished(30000) |
| 186 if finished and process.exitCode() == 0: | 186 if finished and process.exitCode() == 0: |
| 187 message = str( | 187 message = str( |
| 188 process.readAllStandardOutput(), | 188 process.readAllStandardOutput(), |
| 212 else: | 212 else: |
| 213 ioEncoding = Preferences.getSystem("IOEncoding") | 213 ioEncoding = Preferences.getSystem("IOEncoding") |
| 214 process = QProcess() | 214 process = QProcess() |
| 215 process.setWorkingDirectory(repodir) | 215 process.setWorkingDirectory(repodir) |
| 216 process.start('hg', args) | 216 process.start('hg', args) |
| 217 procStarted = process.waitForStarted() | 217 procStarted = process.waitForStarted(5000) |
| 218 if procStarted: | 218 if procStarted: |
| 219 finished = process.waitForFinished(30000) | 219 finished = process.waitForFinished(30000) |
| 220 if finished and process.exitCode() == 0: | 220 if finished and process.exitCode() == 0: |
| 221 output = \ | 221 output = \ |
| 222 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 222 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 654 client.runcommand(args) | 654 client.runcommand(args) |
| 655 else: | 655 else: |
| 656 process = QProcess() | 656 process = QProcess() |
| 657 process.setWorkingDirectory(repodir) | 657 process.setWorkingDirectory(repodir) |
| 658 process.start('hg', args) | 658 process.start('hg', args) |
| 659 procStarted = process.waitForStarted() | 659 procStarted = process.waitForStarted(5000) |
| 660 if procStarted: | 660 if procStarted: |
| 661 process.waitForFinished(30000) | 661 process.waitForFinished(30000) |
| 662 else: | 662 else: |
| 663 E5MessageBox.information(None, | 663 E5MessageBox.information(None, |
| 664 self.trUtf8("Drop All Guards"), | 664 self.trUtf8("Drop All Guards"), |
| 780 else: | 780 else: |
| 781 ioEncoding = Preferences.getSystem("IOEncoding") | 781 ioEncoding = Preferences.getSystem("IOEncoding") |
| 782 process = QProcess() | 782 process = QProcess() |
| 783 process.setWorkingDirectory(repodir) | 783 process.setWorkingDirectory(repodir) |
| 784 process.start('hg', args) | 784 process.start('hg', args) |
| 785 procStarted = process.waitForStarted() | 785 procStarted = process.waitForStarted(5000) |
| 786 if procStarted: | 786 if procStarted: |
| 787 finished = process.waitForFinished(30000) | 787 finished = process.waitForFinished(30000) |
| 788 if finished: | 788 if finished: |
| 789 if process.exitCode() != 0: | 789 if process.exitCode() != 0: |
| 790 error = \ | 790 error = \ |
| 852 else: | 852 else: |
| 853 ioEncoding = Preferences.getSystem("IOEncoding") | 853 ioEncoding = Preferences.getSystem("IOEncoding") |
| 854 process = QProcess() | 854 process = QProcess() |
| 855 process.setWorkingDirectory(repodir) | 855 process.setWorkingDirectory(repodir) |
| 856 process.start('hg', args) | 856 process.start('hg', args) |
| 857 procStarted = process.waitForStarted() | 857 procStarted = process.waitForStarted(5000) |
| 858 if procStarted: | 858 if procStarted: |
| 859 finished = process.waitForFinished(30000) | 859 finished = process.waitForFinished(30000) |
| 860 if finished: | 860 if finished: |
| 861 if process.exitCode() != 0: | 861 if process.exitCode() != 0: |
| 862 error = \ | 862 error = \ |
