Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py
- changeset 3302
- e92f0dd51979
- parent 3190
- a9a94491c4fd
- child 3397
- 6a3728826bc3
equal
deleted
inserted
replaced
| 3300:734353e7d679 | 3302:e92f0dd51979 |
|---|---|
| 110 if missing: | 110 if missing: |
| 111 self.__mode = "missing" | 111 self.__mode = "missing" |
| 112 else: | 112 else: |
| 113 self.__mode = "qseries" | 113 self.__mode = "qseries" |
| 114 | 114 |
| 115 args = [] | 115 args = self.vcs.initCommand("qseries") |
| 116 args.append('qseries') | |
| 117 args.append('--summary') | 116 args.append('--summary') |
| 118 args.append('--verbose') | 117 args.append('--verbose') |
| 119 if missing: | 118 if missing: |
| 120 args.append('--missing') | 119 args.append('--missing') |
| 121 | 120 |
| 162 """ | 161 """ |
| 163 Private slot to get patch at the top of the stack. | 162 Private slot to get patch at the top of the stack. |
| 164 """ | 163 """ |
| 165 self.__mode = "qtop" | 164 self.__mode = "qtop" |
| 166 | 165 |
| 167 args = [] | 166 args = self.vcs.initCommand("qtop") |
| 168 args.append('qtop') | |
| 169 | 167 |
| 170 if self.__hgClient: | 168 if self.__hgClient: |
| 171 self.inputGroup.setEnabled(False) | 169 self.inputGroup.setEnabled(False) |
| 172 self.inputGroup.hide() | 170 self.inputGroup.hide() |
| 173 | 171 |
| 336 the contents pane. | 334 the contents pane. |
| 337 """ | 335 """ |
| 338 self.process.setReadChannel(QProcess.StandardOutput) | 336 self.process.setReadChannel(QProcess.StandardOutput) |
| 339 | 337 |
| 340 while self.process.canReadLine(): | 338 while self.process.canReadLine(): |
| 341 s = str(self.process.readLine(), | 339 s = str(self.process.readLine(), self.vcs.getEncoding(), |
| 342 Preferences.getSystem("IOEncoding"), | |
| 343 'replace').strip() | 340 'replace').strip() |
| 344 self.__processOutputLine(s) | 341 self.__processOutputLine(s) |
| 345 | 342 |
| 346 def __processOutputLine(self, line): | 343 def __processOutputLine(self, line): |
| 347 """ | 344 """ |
| 374 It reads the error output of the process and inserts it into the | 371 It reads the error output of the process and inserts it into the |
| 375 error pane. | 372 error pane. |
| 376 """ | 373 """ |
| 377 if self.process is not None: | 374 if self.process is not None: |
| 378 s = str(self.process.readAllStandardError(), | 375 s = str(self.process.readAllStandardError(), |
| 379 Preferences.getSystem("IOEncoding"), | 376 self.vcs.getEncoding(), 'replace') |
| 380 'replace') | |
| 381 self.__showError(s) | 377 self.__showError(s) |
| 382 | 378 |
| 383 def __showError(self, out): | 379 def __showError(self, out): |
| 384 """ | 380 """ |
| 385 Private slot to show some error. | 381 Private slot to show some error. |
