Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py

branch
Py2 comp.
changeset 3060
5883ce99ee12
parent 3057
10516539f238
parent 3044
a6cee59c80a4
child 3145
a9de05d4a22f
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Nov 01 15:48:48 2013 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sun Nov 03 15:58:22 2013 +0100
@@ -40,7 +40,7 @@
         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*')
+            '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*')
     
     def _performMonitor(self):
         """
@@ -121,9 +121,9 @@
                 process.kill()
                 process.waitForFinished()
                 return False, \
-                       str(process.readAllStandardError(),
-                           Preferences.getSystem("IOEncoding"),
-                           'replace')
+                    str(process.readAllStandardError(),
+                        Preferences.getSystem("IOEncoding"),
+                        'replace')
         else:
             process.kill()
             process.waitForFinished()

eric ide

mercurial