Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3036
- 30c81c9e88b8
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 317 """ | 317 """ |
| 318 self.process.setReadChannel(QProcess.StandardOutput) | 318 self.process.setReadChannel(QProcess.StandardOutput) |
| 319 | 319 |
| 320 while self.process.canReadLine(): | 320 while self.process.canReadLine(): |
| 321 line = str(self.process.readLine(), | 321 line = str(self.process.readLine(), |
| 322 Preferences.getSystem("IOEncoding"), | 322 Preferences.getSystem("IOEncoding"), |
| 323 'replace') | 323 'replace') |
| 324 self.__processOutputLine(line) | 324 self.__processOutputLine(line) |
| 325 | 325 |
| 326 def __readStderr(self): | 326 def __readStderr(self): |
| 327 """ | 327 """ |
| 328 Private slot to handle the readyReadStandardError signal. | 328 Private slot to handle the readyReadStandardError signal. |
| 445 E5MessageBox.critical( | 445 E5MessageBox.critical( |
| 446 self, self.trUtf8('Save Diff'), | 446 self, self.trUtf8('Save Diff'), |
| 447 self.trUtf8( | 447 self.trUtf8( |
| 448 '<p>The patch file <b>{0}</b> could not be saved.' | 448 '<p>The patch file <b>{0}</b> could not be saved.' |
| 449 '<br>Reason: {1}</p>') | 449 '<br>Reason: {1}</p>') |
| 450 .format(fname, str(why))) | 450 .format(fname, str(why))) |
| 451 | 451 |
| 452 def on_passwordCheckBox_toggled(self, isOn): | 452 def on_passwordCheckBox_toggled(self, isOn): |
| 453 """ | 453 """ |
| 454 Private slot to handle the password checkbox toggled. | 454 Private slot to handle the password checkbox toggled. |
| 455 | 455 |
