Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py
- changeset 3037
- a417a0670a36
- parent 3025
- 67064c71df21
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3036:30c81c9e88b8 | 3037:a417a0670a36 |
|---|---|
| 263 """ | 263 """ |
| 264 self.process.setReadChannel(QProcess.StandardOutput) | 264 self.process.setReadChannel(QProcess.StandardOutput) |
| 265 | 265 |
| 266 while self.process.canReadLine(): | 266 while self.process.canReadLine(): |
| 267 line = str(self.process.readLine(), | 267 line = str(self.process.readLine(), |
| 268 Preferences.getSystem("IOEncoding"), | 268 Preferences.getSystem("IOEncoding"), |
| 269 'replace') | 269 'replace') |
| 270 if self.summaryPath: | 270 if self.summaryPath: |
| 271 line = line.replace(self.summaryPath + '/', '') | 271 line = line.replace(self.summaryPath + '/', '') |
| 272 line = " ".join(line.split()) | 272 line = " ".join(line.split()) |
| 273 if line.startswith("--- ") or \ | 273 if line.startswith("--- ") or line.startswith("+++ "): |
| 274 line.startswith("+++ "): | |
| 275 self.__processFileLine(line) | 274 self.__processFileLine(line) |
| 276 | 275 |
| 277 if line.startswith('+') or line.startswith('>') or \ | 276 if line.startswith('+') or line.startswith('>') or \ |
| 278 line.startswith('A '): | 277 line.startswith('A '): |
| 279 format = self.cAddedFormat | 278 format = self.cAddedFormat |
| 401 E5MessageBox.critical( | 400 E5MessageBox.critical( |
| 402 self, self.trUtf8('Save Diff'), | 401 self, self.trUtf8('Save Diff'), |
| 403 self.trUtf8( | 402 self.trUtf8( |
| 404 '<p>The patch file <b>{0}</b> could not be saved.' | 403 '<p>The patch file <b>{0}</b> could not be saved.' |
| 405 '<br>Reason: {1}</p>') | 404 '<br>Reason: {1}</p>') |
| 406 .format(fname, str(why))) | 405 .format(fname, str(why))) |
| 407 | 406 |
| 408 def on_passwordCheckBox_toggled(self, isOn): | 407 def on_passwordCheckBox_toggled(self, isOn): |
| 409 """ | 408 """ |
| 410 Private slot to handle the password checkbox toggled. | 409 Private slot to handle the password checkbox toggled. |
| 411 | 410 |
