Mercurial Repositories > eric / changeset
changeset
Made the subversion status regexp a bit more relaxed with respect to the author name.
Sat, 19 Oct 2013 20:02:09 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 19 Oct 2013 20:02:09 +0200
- changeset 3044
- a6cee59c80a4
- parent 3043
- 71f5c524d427
- child 3046
- c481f2a33b16
Made the subversion status regexp a bit more relaxed with respect to the author name.
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Sat Oct 19 19:38:17 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*') + '(.{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*')
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sat Oct 19 19:38:17 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*') + '(.{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*')
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Sat Oct 19 19:38:17 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*') + '(.{8,9})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)\\s*') def _performMonitor(self): """
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Oct 19 19:38:17 2013 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Oct 19 20:02:09 2013 +0200 @@ -98,7 +98,7 @@ # regular expression object for evaluation of the status output self.rx_status1 = QRegExp( - '(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+([\\w?]+)\\s+(.+)') + '(.{8})\\s+([0-9-]+)\\s+([0-9?]+)\\s+(\\S+)\\s+(.+)') self.rx_status2 = QRegExp('(.{8})\\s+(.+)\\s*') self.statusCache = {}
