Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
- changeset 8220
- 006ee31b4835
- parent 8218
- 7c09585bd960
- child 8222
- 5994b80b8760
equal
deleted
inserted
replaced
| 8219:013aee248a62 | 8220:006ee31b4835 |
|---|---|
| 250 else: | 250 else: |
| 251 diffText = self.client.diff( | 251 diffText = self.client.diff( |
| 252 tmpdir, name, | 252 tmpdir, name, |
| 253 revision1=rev1, revision2=rev2, | 253 revision1=rev1, revision2=rev2, |
| 254 recurse=recurse) | 254 recurse=recurse) |
| 255 counter = 0 | 255 for counter, line in enumerate(diffText.splitlines()): |
| 256 for line in diffText.splitlines(): | |
| 257 if ( | 256 if ( |
| 258 line.startswith("--- ") or | 257 line.startswith("--- ") or |
| 259 line.startswith("+++ ") | 258 line.startswith("+++ ") |
| 260 ): | 259 ): |
| 261 self.__processFileLine(line) | 260 self.__processFileLine(line) |
| 262 | 261 |
| 263 self.__appendText( | 262 self.__appendText( |
| 264 "{0}{1}".format(line, os.linesep)) | 263 "{0}{1}".format(line, os.linesep)) |
| 265 counter += 1 | 264 if counter % 30 == 0: |
| 266 if counter == 30: | |
| 267 # check for cancel every 30 lines | 265 # check for cancel every 30 lines |
| 268 counter = 0 | |
| 269 if self._clientCancelCallback(): | 266 if self._clientCancelCallback(): |
| 270 break | 267 break |
| 271 if self._clientCancelCallback(): | 268 if self._clientCancelCallback(): |
| 272 break | 269 break |
| 273 except pysvn.ClientError as e: | 270 except pysvn.ClientError as e: |
