--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sat May 01 14:27:20 2021 +0200
@@ -45,7 +45,7 @@
@param vcs reference to the vcs object
@param parent parent widget (QWidget)
"""
- super(SvnStatusDialog, self).__init__(parent)
+ super().__init__(parent)
self.setupUi(self)
SvnDialogMixin.__init__(self)
@@ -345,8 +345,7 @@
allFiles = self.client.status(
name, recurse=recurse, get_all=verbose,
ignore=True, update=update)
- counter = 0
- for file in allFiles:
+ for counter, file in enumerate(allFiles):
uptodate = True
if (
file.repos_text_status !=
@@ -395,10 +394,8 @@
fpath = Utilities.normcasepath(
os.path.join(self.dname, file.path))
- if fpath in changelistsDict:
- changelist = changelistsDict[fpath]
- else:
- changelist = ""
+ changelist = (changelistsDict[fpath]
+ if fpath in changelistsDict else "")
hidePropertyStatusColumn = (
hidePropertyStatusColumn and
@@ -440,12 +437,12 @@
file.entry.commit_author if file.entry else "",
file.path
)
- counter += 1
- if counter == 30:
+ if (
+ counter % 30 == 0 and
+ self._clientCancelCallback()
+ ):
# check for cancel every 30 items
- counter = 0
- if self._clientCancelCallback():
- break
+ break
if self._clientCancelCallback():
break
except pysvn.ClientError as e:
