Made the subversion status regexp a bit more relaxed with respect to the author name. 5_3_x

Sat, 19 Oct 2013 20:02:09 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 19 Oct 2013 20:02:09 +0200
branch
5_3_x
changeset 3045
246a9fcead25
parent 3027
879c9e237986
child 3049
a6847e5eb1b9

Made the subversion status regexp a bit more relaxed with respect to the author name.

Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/subversion.py file | annotate | diff | comparison | revisions
diff -r 879c9e237986 -r 246a9fcead25 Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Thu Oct 17 10:12:33 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Sat Oct 19 20:02:09 2013 +0200
@@ -40,7 +40,7 @@
         self.vcs = vcs
         
         self.rx_status = \
-            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
+            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*')
diff -r 879c9e237986 -r 246a9fcead25 Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Thu Oct 17 10:12:33 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Sat Oct 19 20:02:09 2013 +0200
@@ -189,7 +189,7 @@
         }
         
         self.rx_status = \
-            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)\\s*')
+            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*')
diff -r 879c9e237986 -r 246a9fcead25 Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Thu Oct 17 10:12:33 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Sat Oct 19 20:02:09 2013 +0200
@@ -34,7 +34,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*')
+            QRegExp('(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*')
     
     def _performMonitor(self):
         """
diff -r 879c9e237986 -r 246a9fcead25 Plugins/VcsPlugins/vcsSubversion/subversion.py
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Thu Oct 17 10:12:33 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Sat Oct 19 20:02:09 2013 +0200
@@ -122,7 +122,7 @@
         self.repoBrowser = None
         
         # regular expression object for evaluation of the status output
-        self.rx_status1 = QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)')
+        self.rx_status1 = QRegExp('(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)')
         self.rx_status2 = QRegExp('(.{8})\\s+(.+)\\s*')
         self.statusCache = {}
         

eric ide

mercurial