Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
eric6/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py
- branch
- maintenance
- changeset 8273
- 698ae46f40a4
- parent 8234
- fcb6b4b96274
equal
deleted
inserted
replaced
| 8190:fb0ef164f536 | 8273:698ae46f40a4 |
|---|---|
| 43 Constructor | 43 Constructor |
| 44 | 44 |
| 45 @param vcs reference to the vcs object | 45 @param vcs reference to the vcs object |
| 46 @param parent parent widget (QWidget) | 46 @param parent parent widget (QWidget) |
| 47 """ | 47 """ |
| 48 super(SvnStatusDialog, self).__init__(parent) | 48 super().__init__(parent) |
| 49 self.setupUi(self) | 49 self.setupUi(self) |
| 50 SvnDialogMixin.__init__(self) | 50 SvnDialogMixin.__init__(self) |
| 51 | 51 |
| 52 self.__toBeCommittedColumn = 0 | 52 self.__toBeCommittedColumn = 0 |
| 53 self.__changelistColumn = 1 | 53 self.__changelistColumn = 1 |
| 343 | 343 |
| 344 # step 2: determine status of files | 344 # step 2: determine status of files |
| 345 allFiles = self.client.status( | 345 allFiles = self.client.status( |
| 346 name, recurse=recurse, get_all=verbose, | 346 name, recurse=recurse, get_all=verbose, |
| 347 ignore=True, update=update) | 347 ignore=True, update=update) |
| 348 counter = 0 | 348 for counter, file in enumerate(allFiles): |
| 349 for file in allFiles: | |
| 350 uptodate = True | 349 uptodate = True |
| 351 if ( | 350 if ( |
| 352 file.repos_text_status != | 351 file.repos_text_status != |
| 353 pysvn.wc_status_kind.none | 352 pysvn.wc_status_kind.none |
| 354 ): | 353 ): |
| 393 ): | 392 ): |
| 394 lockState = "S" | 393 lockState = "S" |
| 395 | 394 |
| 396 fpath = Utilities.normcasepath( | 395 fpath = Utilities.normcasepath( |
| 397 os.path.join(self.dname, file.path)) | 396 os.path.join(self.dname, file.path)) |
| 398 if fpath in changelistsDict: | 397 changelist = (changelistsDict[fpath] |
| 399 changelist = changelistsDict[fpath] | 398 if fpath in changelistsDict else "") |
| 400 else: | |
| 401 changelist = "" | |
| 402 | 399 |
| 403 hidePropertyStatusColumn = ( | 400 hidePropertyStatusColumn = ( |
| 404 hidePropertyStatusColumn and | 401 hidePropertyStatusColumn and |
| 405 file.prop_status in [ | 402 file.prop_status in [ |
| 406 pysvn.wc_status_kind.none, | 403 pysvn.wc_status_kind.none, |
| 438 file.entry.commit_revision.number | 435 file.entry.commit_revision.number |
| 439 if file.entry else "", | 436 if file.entry else "", |
| 440 file.entry.commit_author if file.entry else "", | 437 file.entry.commit_author if file.entry else "", |
| 441 file.path | 438 file.path |
| 442 ) | 439 ) |
| 443 counter += 1 | 440 if ( |
| 444 if counter == 30: | 441 counter % 30 == 0 and |
| 442 self._clientCancelCallback() | |
| 443 ): | |
| 445 # check for cancel every 30 items | 444 # check for cancel every 30 items |
| 446 counter = 0 | 445 break |
| 447 if self._clientCancelCallback(): | |
| 448 break | |
| 449 if self._clientCancelCallback(): | 446 if self._clientCancelCallback(): |
| 450 break | 447 break |
| 451 except pysvn.ClientError as e: | 448 except pysvn.ClientError as e: |
| 452 self.__showError(e.args[0] + '\n') | 449 self.__showError(e.args[0] + '\n') |
| 453 | 450 |
