aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Naranjo <manuel@evolution.com>2012-08-07 15:24:14 -0300
committerManuel Naranjo <manuel@evolution.com>2012-08-07 15:24:14 -0300
commit13843b3a6d521489ee58ebf9e3218e1317756e19 (patch)
treeff7ec194a12da5ece0cb1855f6ad313b20facf97
parent371abece8cbaf9d0c396c3ab8d4fdd1ab2718e7d (diff)
downloadsvn2git-13843b3a6d521489ee58ebf9e3218e1317756e19.tar
svn2git-13843b3a6d521489ee58ebf9e3218e1317756e19.tar.gz
svn2git-13843b3a6d521489ee58ebf9e3218e1317756e19.tar.bz2
svn2git-13843b3a6d521489ee58ebf9e3218e1317756e19.tar.xz
svn2git-13843b3a6d521489ee58ebf9e3218e1317756e19.zip
Prefix rules should keep spaces if they are part of the rule
This patch fixes a small bug with prefix rules where a prefix like: prefix I\ Am\ A\ Very\ Ugly\ Path/ will not match as the match was made against \S and not .* making the spaces not part of the match. Signed-off-by: Manuel Naranjo <manuel@evolution.com>
-rw-r--r--src/ruleparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index b11ea5b..437f3f8 100644
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -141,7 +141,7 @@ void Rules::load(const QString &filename)
QRegExp matchBranchSubstLine("substitute branch\\s+(.+)$", Qt::CaseInsensitive);
QRegExp matchRevLine("(min|max) revision (\\d+)", Qt::CaseInsensitive);
QRegExp matchAnnotateLine("annotated\\s+(\\S+)", Qt::CaseInsensitive);
- QRegExp matchPrefixLine("prefix\\s+(\\S+)", Qt::CaseInsensitive);
+ QRegExp matchPrefixLine("prefix\\s+(.*)$", Qt::CaseInsensitive);
QRegExp declareLine("declare\\s+("+varRegex+")\\s*=\\s*(\\S+)", Qt::CaseInsensitive);
QRegExp variableLine("\\$\\{("+varRegex+")(\\|[^}$]*)?\\}", Qt::CaseInsensitive);
QRegExp includeLine("include\\s+(.*)", Qt::CaseInsensitive);