Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
- branch
- Py2 comp.
- changeset 3058
- 0a02c433f52d
- parent 3057
- 10516539f238
- parent 3023
- 34ce20603bf7
- child 3060
- 5883ce99ee12
equal
deleted
inserted
replaced
| 3057:10516539f238 | 3058:0a02c433f52d |
|---|---|
| 107 self.__buffer = [] | 107 self.__buffer = [] |
| 108 | 108 |
| 109 self.process.start('hg', args) | 109 self.process.start('hg', args) |
| 110 procStarted = self.process.waitForStarted(5000) | 110 procStarted = self.process.waitForStarted(5000) |
| 111 if not procStarted: | 111 if not procStarted: |
| 112 E5MessageBox.critical(self, | 112 E5MessageBox.critical( |
| 113 self, | |
| 113 self.trUtf8('Process Generation Error'), | 114 self.trUtf8('Process Generation Error'), |
| 114 self.trUtf8( | 115 self.trUtf8( |
| 115 'The process {0} could not be started. ' | 116 'The process {0} could not be started. ' |
| 116 'Ensure, that it is in the search path.' | 117 'Ensure, that it is in the search path.' |
| 117 ).format('hg')) | 118 ).format('hg')) |
| 160 """ | 161 """ |
| 161 if self.process is not None: | 162 if self.process is not None: |
| 162 self.process.setReadChannel(QProcess.StandardOutput) | 163 self.process.setReadChannel(QProcess.StandardOutput) |
| 163 | 164 |
| 164 while self.process.canReadLine(): | 165 while self.process.canReadLine(): |
| 165 line = str(self.process.readLine(), | 166 line = str( |
| 166 Preferences.getSystem("IOEncoding"), | 167 self.process.readLine(), |
| 167 'replace') | 168 Preferences.getSystem("IOEncoding"), |
| 169 'replace') | |
| 168 self.__buffer.append(line) | 170 self.__buffer.append(line) |
| 169 | 171 |
| 170 def __readStderr(self): | 172 def __readStderr(self): |
| 171 """ | 173 """ |
| 172 Private slot to handle the readyReadStandardError signal. | 174 Private slot to handle the readyReadStandardError signal. |
| 424 l = [] | 426 l = [] |
| 425 if infoDict["remote"][0]: | 427 if infoDict["remote"][0]: |
| 426 l.append(self.trUtf8("1 or more incoming")) | 428 l.append(self.trUtf8("1 or more incoming")) |
| 427 if infoDict["remote"][1]: | 429 if infoDict["remote"][1]: |
| 428 l.append(self.trUtf8("{0} outgoing")\ | 430 l.append(self.trUtf8("{0} outgoing")\ |
| 429 .format(infoDict["remote"][1])) | 431 .format(infoDict["remote"][1])) |
| 430 if infoDict["remote"][2]: | 432 if infoDict["remote"][2]: |
| 431 l.append(self.trUtf8("%n incoming bookmark(s)", "", | 433 l.append(self.trUtf8("%n incoming bookmark(s)", "", |
| 432 infoDict["remote"][2])) | 434 infoDict["remote"][2])) |
| 433 if infoDict["remote"][3]: | 435 if infoDict["remote"][3]: |
| 434 l.append(self.trUtf8("%n outgoing bookmark(s)", "", | 436 l.append(self.trUtf8("%n outgoing bookmark(s)", "", |
