Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- changeset 2771
- 281c9b30dd91
- parent 2405
- d4b5f3bd4720
- child 2791
- a9577f248f04
- child 2815
- 53c1d1f9ec86
equal
deleted
inserted
replaced
| 2770:fd5ee85f0450 | 2771:281c9b30dd91 |
|---|---|
| 102 else: | 102 else: |
| 103 ioEncoding = Preferences.getSystem("IOEncoding") | 103 ioEncoding = Preferences.getSystem("IOEncoding") |
| 104 process = QProcess() | 104 process = QProcess() |
| 105 process.setWorkingDirectory(repodir) | 105 process.setWorkingDirectory(repodir) |
| 106 process.start('hg', args) | 106 process.start('hg', args) |
| 107 procStarted = process.waitForStarted() | 107 procStarted = process.waitForStarted(5000) |
| 108 if procStarted: | 108 if procStarted: |
| 109 finished = process.waitForFinished(30000) | 109 finished = process.waitForFinished(30000) |
| 110 if finished and process.exitCode() == 0: | 110 if finished and process.exitCode() == 0: |
| 111 output = \ | 111 output = \ |
| 112 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 112 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 142 else: | 142 else: |
| 143 ioEncoding = Preferences.getSystem("IOEncoding") | 143 ioEncoding = Preferences.getSystem("IOEncoding") |
| 144 process = QProcess() | 144 process = QProcess() |
| 145 process.setWorkingDirectory(repodir) | 145 process.setWorkingDirectory(repodir) |
| 146 process.start('hg', args) | 146 process.start('hg', args) |
| 147 procStarted = process.waitForStarted() | 147 procStarted = process.waitForStarted(5000) |
| 148 if procStarted: | 148 if procStarted: |
| 149 finished = process.waitForFinished(30000) | 149 finished = process.waitForFinished(30000) |
| 150 if finished and process.exitCode() == 0: | 150 if finished and process.exitCode() == 0: |
| 151 currentPatch = str( | 151 currentPatch = str( |
| 152 process.readAllStandardOutput(), | 152 process.readAllStandardOutput(), |
| 172 else: | 172 else: |
| 173 ioEncoding = Preferences.getSystem("IOEncoding") | 173 ioEncoding = Preferences.getSystem("IOEncoding") |
| 174 process = QProcess() | 174 process = QProcess() |
| 175 process.setWorkingDirectory(repodir) | 175 process.setWorkingDirectory(repodir) |
| 176 process.start('hg', args) | 176 process.start('hg', args) |
| 177 procStarted = process.waitForStarted() | 177 procStarted = process.waitForStarted(5000) |
| 178 if procStarted: | 178 if procStarted: |
| 179 finished = process.waitForFinished(30000) | 179 finished = process.waitForFinished(30000) |
| 180 if finished and process.exitCode() == 0: | 180 if finished and process.exitCode() == 0: |
| 181 message = str( | 181 message = str( |
| 182 process.readAllStandardOutput(), | 182 process.readAllStandardOutput(), |
| 206 else: | 206 else: |
| 207 ioEncoding = Preferences.getSystem("IOEncoding") | 207 ioEncoding = Preferences.getSystem("IOEncoding") |
| 208 process = QProcess() | 208 process = QProcess() |
| 209 process.setWorkingDirectory(repodir) | 209 process.setWorkingDirectory(repodir) |
| 210 process.start('hg', args) | 210 process.start('hg', args) |
| 211 procStarted = process.waitForStarted() | 211 procStarted = process.waitForStarted(5000) |
| 212 if procStarted: | 212 if procStarted: |
| 213 finished = process.waitForFinished(30000) | 213 finished = process.waitForFinished(30000) |
| 214 if finished and process.exitCode() == 0: | 214 if finished and process.exitCode() == 0: |
| 215 output = \ | 215 output = \ |
| 216 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 216 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 648 client.runcommand(args) | 648 client.runcommand(args) |
| 649 else: | 649 else: |
| 650 process = QProcess() | 650 process = QProcess() |
| 651 process.setWorkingDirectory(repodir) | 651 process.setWorkingDirectory(repodir) |
| 652 process.start('hg', args) | 652 process.start('hg', args) |
| 653 procStarted = process.waitForStarted() | 653 procStarted = process.waitForStarted(5000) |
| 654 if procStarted: | 654 if procStarted: |
| 655 process.waitForFinished(30000) | 655 process.waitForFinished(30000) |
| 656 else: | 656 else: |
| 657 E5MessageBox.information(None, | 657 E5MessageBox.information(None, |
| 658 self.trUtf8("Drop All Guards"), | 658 self.trUtf8("Drop All Guards"), |
| 774 else: | 774 else: |
| 775 ioEncoding = Preferences.getSystem("IOEncoding") | 775 ioEncoding = Preferences.getSystem("IOEncoding") |
| 776 process = QProcess() | 776 process = QProcess() |
| 777 process.setWorkingDirectory(repodir) | 777 process.setWorkingDirectory(repodir) |
| 778 process.start('hg', args) | 778 process.start('hg', args) |
| 779 procStarted = process.waitForStarted() | 779 procStarted = process.waitForStarted(5000) |
| 780 if procStarted: | 780 if procStarted: |
| 781 finished = process.waitForFinished(30000) | 781 finished = process.waitForFinished(30000) |
| 782 if finished: | 782 if finished: |
| 783 if process.exitCode() != 0: | 783 if process.exitCode() != 0: |
| 784 error = \ | 784 error = \ |
| 846 else: | 846 else: |
| 847 ioEncoding = Preferences.getSystem("IOEncoding") | 847 ioEncoding = Preferences.getSystem("IOEncoding") |
| 848 process = QProcess() | 848 process = QProcess() |
| 849 process.setWorkingDirectory(repodir) | 849 process.setWorkingDirectory(repodir) |
| 850 process.start('hg', args) | 850 process.start('hg', args) |
| 851 procStarted = process.waitForStarted() | 851 procStarted = process.waitForStarted(5000) |
| 852 if procStarted: | 852 if procStarted: |
| 853 finished = process.waitForFinished(30000) | 853 finished = process.waitForFinished(30000) |
| 854 if finished: | 854 if finished: |
| 855 if process.exitCode() != 0: | 855 if process.exitCode() != 0: |
| 856 error = \ | 856 error = \ |
