Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Oct 18 23:00:41 2013 +0200
@@ -39,8 +39,8 @@
         
         self.rx_status1 = \
             QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*')
-        self.rx_status2 = \
-            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
+        self.rx_status2 = QRegExp(
+            '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
     
     def _performMonitor(self):
         """
@@ -78,8 +78,8 @@
         if procStarted:
             finished = process.waitForFinished(300000)
             if finished and process.exitCode() == 0:
-                output = \
-                    str(process.readAllStandardOutput(), self.__ioEncoding, 'replace')
+                output = str(process.readAllStandardOutput(),
+                             self.__ioEncoding, 'replace')
                 states = {}
                 for line in output.splitlines():
                     if self.rx_status1.exactMatch(line):
@@ -106,23 +106,26 @@
                         states[name] = status
                         try:
                             if self.reportedStates[name] != status:
-                                self.statusList.append("{0} {1}".format(status, name))
+                                self.statusList.append(
+                                    "{0} {1}".format(status, name))
                         except KeyError:
-                            self.statusList.append("{0} {1}".format(status, name))
+                            self.statusList.append(
+                                "{0} {1}".format(status, name))
                 for name in list(self.reportedStates.keys()):
                     if name not in states:
                         self.statusList.append("  {0}".format(name))
                 self.reportedStates = states
-                return True, \
-                       self.trUtf8("Subversion status checked successfully (using svn)")
+                return True, self.trUtf8(
+                    "Subversion status checked successfully (using svn)")
             else:
                 process.kill()
                 process.waitForFinished()
                 return False, \
                        str(process.readAllStandardError(),
-                            Preferences.getSystem("IOEncoding"),
-                            'replace')
+                           Preferences.getSystem("IOEncoding"),
+                           'replace')
         else:
             process.kill()
             process.waitForFinished()
-            return False, self.trUtf8("Could not start the Subversion process.")
+            return False, self.trUtf8(
+                "Could not start the Subversion process.")