Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat May 01 14:27:20 2021 +0200
@@ -41,7 +41,7 @@
         @param vcs reference to the vcs object
         @param parent parent widget (QWidget)
         """
-        super(SvnDiffDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         SvnDialogMixin.__init__(self)
         
@@ -88,19 +88,15 @@
             secs = QDateTime.fromString(
                 dateStr, Qt.DateFormat.ISODate).toTime_t()
             return pysvn.Revision(pysvn.opt_revision_kind.date, secs)
-        elif version == "HEAD":
-            return pysvn.Revision(pysvn.opt_revision_kind.head)
-        elif version == "COMMITTED":
-            return pysvn.Revision(pysvn.opt_revision_kind.committed)
-        elif version == "BASE":
-            return pysvn.Revision(pysvn.opt_revision_kind.base)
-        elif version == "WORKING":
-            return pysvn.Revision(pysvn.opt_revision_kind.working)
-        elif version == "PREV":
-            return pysvn.Revision(pysvn.opt_revision_kind.previous)
         else:
-            return pysvn.Revision(pysvn.opt_revision_kind.unspecified)
-        
+            return {
+                "HEAD": pysvn.Revision(pysvn.opt_revision_kind.head),
+                "COMMITTED": pysvn.Revision(pysvn.opt_revision_kind.committed),
+                "BASE": pysvn.Revision(pysvn.opt_revision_kind.base),
+                "WORKING": pysvn.Revision(pysvn.opt_revision_kind.working),
+                "PREV": pysvn.Revision(pysvn.opt_revision_kind.previous),
+            }.get(version, pysvn.Revision(pysvn.opt_revision_kind.unspecified))
+    
     def __getDiffSummaryKind(self, summaryKind):
         """
         Private method to get a string descripion of the diff summary.
@@ -252,8 +248,7 @@
                                     tmpdir, name,
                                     revision1=rev1, revision2=rev2,
                                     recurse=recurse)
-                        counter = 0
-                        for line in diffText.splitlines():
+                        for counter, line in enumerate(diffText.splitlines()):
                             if (
                                 line.startswith("--- ") or
                                 line.startswith("+++ ")
@@ -262,12 +257,12 @@
                             
                             self.__appendText(
                                 "{0}{1}".format(line, os.linesep))
-                            counter += 1
-                            if counter == 30:
+                            if (
+                                counter % 30 == 0 and
+                                self._clientCancelCallback()
+                            ):
                                 # check for cancel every 30 lines
-                                counter = 0
-                                if self._clientCancelCallback():
-                                    break
+                                break
                         if self._clientCancelCallback():
                             break
             except pysvn.ClientError as e: