Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 7260
- 4cc6f121119a
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7259:7c017076c12e | 7260:4cc6f121119a |
|---|---|
| 61 self.contents.setFontPointSize(font.pointSize()) | 61 self.contents.setFontPointSize(font.pointSize()) |
| 62 | 62 |
| 63 self.highlighter = SvnDiffHighlighter(self.contents.document()) | 63 self.highlighter = SvnDiffHighlighter(self.contents.document()) |
| 64 | 64 |
| 65 self.client = self.vcs.getClient() | 65 self.client = self.vcs.getClient() |
| 66 self.client.callback_cancel = \ | 66 self.client.callback_cancel = self._clientCancelCallback |
| 67 self._clientCancelCallback | 67 self.client.callback_get_login = self._clientLoginCallback |
| 68 self.client.callback_get_login = \ | 68 self.client.callback_ssl_server_trust_prompt = ( |
| 69 self._clientLoginCallback | |
| 70 self.client.callback_ssl_server_trust_prompt = \ | |
| 71 self._clientSslServerTrustPromptCallback | 69 self._clientSslServerTrustPromptCallback |
| 70 ) | |
| 72 | 71 |
| 73 def __getVersionArg(self, version): | 72 def __getVersionArg(self, version): |
| 74 """ | 73 """ |
| 75 Private method to get a pysvn revision object for the given version | 74 Private method to get a pysvn revision object for the given version |
| 76 number. | 75 number. |
| 244 diffText = self.client.diff( | 243 diffText = self.client.diff( |
| 245 tmpdir, name, | 244 tmpdir, name, |
| 246 revision1=rev1, revision2=rev2, recurse=recurse) | 245 revision1=rev1, revision2=rev2, recurse=recurse) |
| 247 counter = 0 | 246 counter = 0 |
| 248 for line in diffText.splitlines(): | 247 for line in diffText.splitlines(): |
| 249 if line.startswith("--- ") or \ | 248 if line.startswith("--- ") or line.startswith("+++ "): |
| 250 line.startswith("+++ "): | |
| 251 self.__processFileLine(line) | 249 self.__processFileLine(line) |
| 252 | 250 |
| 253 self.__appendText("{0}{1}".format(line, os.linesep)) | 251 self.__appendText("{0}{1}".format(line, os.linesep)) |
| 254 counter += 1 | 252 counter += 1 |
| 255 if counter == 30: | 253 if counter == 30: |
