Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py
- changeset 3023
- 34ce20603bf7
- parent 3020
- 542e97d4ecb3
- child 3034
- 7ce719013078
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3022:57179e4cdadd | 3023:34ce20603bf7 |
|---|---|
| 155 """ | 155 """ |
| 156 if self.process is not None: | 156 if self.process is not None: |
| 157 self.process.setReadChannel(QProcess.StandardOutput) | 157 self.process.setReadChannel(QProcess.StandardOutput) |
| 158 | 158 |
| 159 while self.process.canReadLine(): | 159 while self.process.canReadLine(): |
| 160 line = str(self.process.readLine(), | 160 line = str( |
| 161 Preferences.getSystem("IOEncoding"), | 161 self.process.readLine(), |
| 162 'replace') | 162 Preferences.getSystem("IOEncoding"), |
| 163 'replace') | |
| 163 self.__buffer.append(line) | 164 self.__buffer.append(line) |
| 164 | 165 |
| 165 def __readStderr(self): | 166 def __readStderr(self): |
| 166 """ | 167 """ |
| 167 Private slot to handle the readyReadStandardError signal. | 168 Private slot to handle the readyReadStandardError signal. |
| 419 l = [] | 420 l = [] |
| 420 if infoDict["remote"][0]: | 421 if infoDict["remote"][0]: |
| 421 l.append(self.trUtf8("1 or more incoming")) | 422 l.append(self.trUtf8("1 or more incoming")) |
| 422 if infoDict["remote"][1]: | 423 if infoDict["remote"][1]: |
| 423 l.append(self.trUtf8("{0} outgoing")\ | 424 l.append(self.trUtf8("{0} outgoing")\ |
| 424 .format(infoDict["remote"][1])) | 425 .format(infoDict["remote"][1])) |
| 425 if infoDict["remote"][2]: | 426 if infoDict["remote"][2]: |
| 426 l.append(self.trUtf8("%n incoming bookmark(s)", "", | 427 l.append(self.trUtf8("%n incoming bookmark(s)", "", |
| 427 infoDict["remote"][2])) | 428 infoDict["remote"][2])) |
| 428 if infoDict["remote"][3]: | 429 if infoDict["remote"][3]: |
| 429 l.append(self.trUtf8("%n outgoing bookmark(s)", "", | 430 l.append(self.trUtf8("%n outgoing bookmark(s)", "", |
