Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 3024
- 17c01303a239
- parent 3020
- 542e97d4ecb3
- child 3037
- a417a0670a36
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3023:34ce20603bf7 | 3024:17c01303a239 |
|---|---|
| 217 self.__getDiffSummaryKind( | 217 self.__getDiffSummaryKind( |
| 218 diff_sum['summarize_kind']), | 218 diff_sum['summarize_kind']), |
| 219 diff_sum['path'])) | 219 diff_sum['path'])) |
| 220 diffText = os.linesep.join(diff_list) | 220 diffText = os.linesep.join(diff_list) |
| 221 else: | 221 else: |
| 222 diffText = self.client.diff(tmpdir, | 222 diffText = self.client.diff( |
| 223 tmpdir, | |
| 223 url1, revision1=rev1, | 224 url1, revision1=rev1, |
| 224 url_or_path2=url2, revision2=rev2, | 225 url_or_path2=url2, revision2=rev2, |
| 225 recurse=recurse) | 226 recurse=recurse) |
| 226 else: | 227 else: |
| 227 if pegRev is not None: | 228 if pegRev is not None: |
| 229 tmpdir, name, | 230 tmpdir, name, |
| 230 peg_revision=self.__getVersionArg(pegRev), | 231 peg_revision=self.__getVersionArg(pegRev), |
| 231 revision_start=rev1, revision_end=rev2, | 232 revision_start=rev1, revision_end=rev2, |
| 232 recurse=recurse) | 233 recurse=recurse) |
| 233 else: | 234 else: |
| 234 diffText = self.client.diff(tmpdir, name, | 235 diffText = self.client.diff( |
| 236 tmpdir, name, | |
| 235 revision1=rev1, revision2=rev2, recurse=recurse) | 237 revision1=rev1, revision2=rev2, recurse=recurse) |
| 236 counter = 0 | 238 counter = 0 |
| 237 for line in diffText.splitlines(): | 239 for line in diffText.splitlines(): |
| 238 if line.startswith("--- ") or \ | 240 if line.startswith("--- ") or \ |
| 239 line.startswith("+++ "): | 241 line.startswith("+++ "): |
| 436 f.write(eol.join(self.contents.toPlainText().splitlines())) | 438 f.write(eol.join(self.contents.toPlainText().splitlines())) |
| 437 f.close() | 439 f.close() |
| 438 except IOError as why: | 440 except IOError as why: |
| 439 E5MessageBox.critical( | 441 E5MessageBox.critical( |
| 440 self, self.trUtf8('Save Diff'), | 442 self, self.trUtf8('Save Diff'), |
| 441 self.trUtf8('<p>The patch file <b>{0}</b> could not be saved.' | 443 self.trUtf8( |
| 444 '<p>The patch file <b>{0}</b> could not be saved.' | |
| 442 '<br>Reason: {1}</p>') | 445 '<br>Reason: {1}</p>') |
| 443 .format(fname, str(why))) | 446 .format(fname, str(why))) |
| 444 | 447 |
| 445 def __showError(self, msg): | 448 def __showError(self, msg): |
| 446 """ | 449 """ |
