Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py

branch
5_2_x
changeset 1774
fda2bb18c3ae
parent 1690
273c6a70d2e3
child 2302
f29e9405c851
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Apr 07 16:39:36 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Mon Apr 09 18:51:29 2012 +0200
@@ -32,9 +32,9 @@
         self.__ioEncoding = Preferences.getSystem("IOEncoding")
         
         self.rx_status1 = \
-            QRegExp('(.{8})\\s+([0-9-]+)\\s+(.+)\\s*')
+            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+(.+)\\s*')
         self.rx_status2 = \
-            QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
+            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
     
     def _performMonitor(self):
         """
@@ -85,8 +85,8 @@
                     else:
                         continue
                     if flags[0] in "ACDMR" or \
-                       (flags[0] == " " and flags[7] == "*"):
-                        if flags[7] == "*":
+                       (flags[0] == " " and flags[-1] == "*"):
+                        if flags[-1] == "*":
                             status = "U"
                         else:
                             status = flags[0]

eric ide

mercurial