Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 3036
- 30c81c9e88b8
- parent 3023
- 34ce20603bf7
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3035:36e9f388958b | 3036:30c81c9e88b8 |
|---|---|
| 311 """ | 311 """ |
| 312 self.process.setReadChannel(QProcess.StandardOutput) | 312 self.process.setReadChannel(QProcess.StandardOutput) |
| 313 | 313 |
| 314 while self.process.canReadLine(): | 314 while self.process.canReadLine(): |
| 315 line = str(self.process.readLine(), | 315 line = str(self.process.readLine(), |
| 316 Preferences.getSystem("IOEncoding"), | 316 Preferences.getSystem("IOEncoding"), |
| 317 'replace') | 317 'replace') |
| 318 self.__processOutputLine(line) | 318 self.__processOutputLine(line) |
| 319 | 319 |
| 320 def __readStderr(self): | 320 def __readStderr(self): |
| 321 """ | 321 """ |
| 322 Private slot to handle the readyReadStandardError signal. | 322 Private slot to handle the readyReadStandardError signal. |
| 439 E5MessageBox.critical( | 439 E5MessageBox.critical( |
| 440 self, self.trUtf8('Save Diff'), | 440 self, self.trUtf8('Save Diff'), |
| 441 self.trUtf8( | 441 self.trUtf8( |
| 442 '<p>The patch file <b>{0}</b> could not be saved.' | 442 '<p>The patch file <b>{0}</b> could not be saved.' |
| 443 '<br>Reason: {1}</p>') | 443 '<br>Reason: {1}</p>') |
| 444 .format(fname, str(why))) | 444 .format(fname, str(why))) |
| 445 | 445 |
| 446 def on_passwordCheckBox_toggled(self, isOn): | 446 def on_passwordCheckBox_toggled(self, isOn): |
| 447 """ | 447 """ |
| 448 Private slot to handle the password checkbox toggled. | 448 Private slot to handle the password checkbox toggled. |
| 449 | 449 |
