Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3037
- a417a0670a36
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 269 """ | 269 """ |
| 270 self.process.setReadChannel(QProcess.StandardOutput) | 270 self.process.setReadChannel(QProcess.StandardOutput) |
| 271 | 271 |
| 272 while self.process.canReadLine(): | 272 while self.process.canReadLine(): |
| 273 line = str(self.process.readLine(), | 273 line = str(self.process.readLine(), |
| 274 Preferences.getSystem("IOEncoding"), | 274 Preferences.getSystem("IOEncoding"), |
| 275 'replace') | 275 'replace') |
| 276 if self.summaryPath: | 276 if self.summaryPath: |
| 277 line = line.replace(self.summaryPath + '/', '') | 277 line = line.replace(self.summaryPath + '/', '') |
| 278 line = " ".join(line.split()) | 278 line = " ".join(line.split()) |
| 279 if line.startswith("--- ") or \ | 279 if line.startswith("--- ") or line.startswith("+++ "): |
| 280 line.startswith("+++ "): | |
| 281 self.__processFileLine(line) | 280 self.__processFileLine(line) |
| 282 | 281 |
| 283 if line.startswith('+') or line.startswith('>') or \ | 282 if line.startswith('+') or line.startswith('>') or \ |
| 284 line.startswith('A '): | 283 line.startswith('A '): |
| 285 format = self.cAddedFormat | 284 format = self.cAddedFormat |
| 407 E5MessageBox.critical( | 406 E5MessageBox.critical( |
| 408 self, self.trUtf8('Save Diff'), | 407 self, self.trUtf8('Save Diff'), |
| 409 self.trUtf8( | 408 self.trUtf8( |
| 410 '<p>The patch file <b>{0}</b> could not be saved.' | 409 '<p>The patch file <b>{0}</b> could not be saved.' |
| 411 '<br>Reason: {1}</p>') | 410 '<br>Reason: {1}</p>') |
| 412 .format(fname, str(why))) | 411 .format(fname, str(why))) |
| 413 | 412 |
| 414 def on_passwordCheckBox_toggled(self, isOn): | 413 def on_passwordCheckBox_toggled(self, isOn): |
| 415 """ | 414 """ |
| 416 Private slot to handle the password checkbox toggled. | 415 Private slot to handle the password checkbox toggled. |
| 417 | 416 |
