Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Tue Sep 24 18:42:25 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Tue Sep 24 18:45:33 2019 +0200
@@ -11,8 +11,9 @@
 import os
 
 from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QRegExp, QTimer
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, \
-    QLineEdit
+from PyQt5.QtWidgets import (
+    QDialog, QDialogButtonBox, QListWidgetItem, QLineEdit
+)
 
 from E5Gui import E5MessageBox
 
@@ -50,11 +51,9 @@
         self.rx_status = QRegExp(
             '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*')
         # flags (8 or 9 anything), revision, changed rev, author, path
-        self.rx_status2 = \
-            QRegExp('(.{8,9})\\s+(.+)\\s*')
+        self.rx_status2 = QRegExp('(.{8,9})\\s+(.+)\\s*')
         # flags (8 or 9 anything), path
-        self.rx_changelist = \
-            QRegExp('--- \\S+ .([\\w\\s]+).:\\s+')
+        self.rx_changelist = QRegExp('--- \\S+ .([\\w\\s]+).:\\s+')
         # three dashes, Changelist (translated), quote,
         # changelist name, quote, :
     
@@ -94,8 +93,10 @@
         args.append('status')
         self.vcs.addArguments(args, self.vcs.options['global'])
         self.vcs.addArguments(args, self.vcs.options['status'])
-        if '--verbose' not in self.vcs.options['global'] and \
-           '--verbose' not in self.vcs.options['status']:
+        if (
+            '--verbose' not in self.vcs.options['global'] and
+            '--verbose' not in self.vcs.options['status']
+        ):
             args.append('--verbose')
         if isinstance(path, list):
             self.dname, fnames = self.vcs.splitPathList(path)
@@ -127,8 +128,10 @@
         Private slot called when the process finished or the user pressed
         the button.
         """
-        if self.process is not None and \
-           self.process.state() != QProcess.NotRunning:
+        if (
+            self.process is not None and
+            self.process.state() != QProcess.NotRunning
+        ):
             self.process.terminate()
             QTimer.singleShot(2000, self.process.kill)
             self.process.waitForFinished(3000)
@@ -183,20 +186,26 @@
                 s = str(self.process.readLine(),
                         Preferences.getSystem("IOEncoding"),
                         'replace')
-                if self.currentChangelist != "" and \
-                        self.rx_status.exactMatch(s):
+                if (
+                    self.currentChangelist != "" and
+                    self.rx_status.exactMatch(s)
+                ):
                     file = self.rx_status.cap(5).strip()
                     filename = file.replace(self.path + os.sep, "")
-                    if filename not in \
-                            self.changeListsDict[self.currentChangelist]:
+                    if filename not in self.changeListsDict[
+                        self.currentChangelist
+                    ]:
                         self.changeListsDict[self.currentChangelist].append(
                             filename)
-                elif self.currentChangelist != "" and \
-                        self.rx_status2.exactMatch(s):
+                elif (
+                    self.currentChangelist != "" and
+                    self.rx_status2.exactMatch(s)
+                ):
                     file = self.rx_status2.cap(2).strip()
                     filename = file.replace(self.path + os.sep, "")
-                    if filename not in \
-                            self.changeListsDict[self.currentChangelist]:
+                    if filename not in self.changeListsDict[
+                        self.currentChangelist
+                    ]:
                         self.changeListsDict[self.currentChangelist].append(
                             filename)
                 elif self.rx_changelist.exactMatch(s):