Allow repository names with dashes too

[svn-all-fast-export.git] / src / ruleparser.cpp

diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index ea678658128acce1b86ead3f0cf846b32b031265..d0b3b768cddca6e4c7af029990028dc44b5c83ba 100644 (file)
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -47,10 +47,10 @@ void Rules::load()
         return;
 
     // initialize the regexps we will use
-    QRegExp repoLine("create repository\\s+(\\w+)", Qt::CaseInsensitive);
+    QRegExp repoLine("create repository\\s+(\\S+)", Qt::CaseInsensitive);
     QRegExp repoBranchLine("branch\\s+(\\S+)\\s+from\\s+(\\S+)", Qt::CaseInsensitive);
     QRegExp matchLine("match\\s+(.*)", Qt::CaseInsensitive);
-    QRegExp matchRepoLine("repository\\s+(\\w+)", Qt::CaseInsensitive);
+    QRegExp matchRepoLine("repository\\s+(\\S+)", Qt::CaseInsensitive);
     QRegExp matchBranchLine("branch\\s+(\\S+)", Qt::CaseInsensitive);
     QRegExp matchPathLine("path\\s+(.*)", Qt::CaseInsensitive);
 
@@ -60,53 +60,58 @@ void Rules::load()
     Match match;
     while (!s.atEnd()) {
         QString origLine = s.readLine();
-        QString line = origLine.trimmed();
+        QString line = origLine;
 
         int hash = line.indexOf('#');
-        if (hash != -1) {
+        if (hash != -1)
             line.truncate(hash);
-            line = line.trimmed();
-        }
+        line = line.trimmed();
         if (line.isEmpty())
             continue;
 
         if (state == ReadingRepository) {
             if (repoBranchLine.exactMatch(line)) {
                 Repository::Branch branch;
-                branch.name = repoBranchLine.cap(0);
-                branch.branchFrom = repoBranchLine.cap(1);
+                branch.name = repoBranchLine.cap(1);
+                branch.branchFrom = repoBranchLine.cap(2);
 
                 repo.branches += branch;
+                continue;
+            } else if (line == "end repository") {
+                m_repositories += repo;
+                state = ReadingNone;
+                continue;
             }
         } else if (state == ReadingMatch) {
-            if (matchRepoLine.exactMatch(line))
-                match.repository = matchRepoLine.cap(0);
-            else if (matchBranchLine.exactMatch(line))
-                match.branch = matchBranchLine.cap(0);
-            else if (matchPathLine.exactMatch(line))
-                match.path = matchPathLine.cap(0);
+            if (matchRepoLine.exactMatch(line)) {
+                match.repository = matchRepoLine.cap(1);
+                continue;
+            } else if (matchBranchLine.exactMatch(line)) {
+                match.branch = matchBranchLine.cap(1);
+                continue;
+            } else if (matchPathLine.exactMatch(line)) {
+                match.path = matchPathLine.cap(1);
+                continue;
+            } else if (line == "end match") {
+                m_matchRules += match;
+                state = ReadingNone;
+                continue;
+            }
         }
 
         bool isRepositoryRule = repoLine.exactMatch(line);
         bool isMatchRule = matchLine.exactMatch(line);
-        if (isRepositoryRule || isMatchRule) {
-            // save the current rule
-            if (state == ReadingRepository)
-                m_repositories += repo;
-            else if (state == ReadingMatch)
-                m_matchRules += match;
-        }
 
         if (isRepositoryRule) {
             // repository rule
             state = ReadingRepository;
             repo = Repository(); // clear
-            repo.name = repoLine.cap(0);
+            repo.name = repoLine.cap(1);
         } else if (isMatchRule) {
             // match rule
             state = ReadingMatch;
             match = Match();
-            match.rx = QRegExp(matchLine.cap(0), Qt::CaseSensitive, QRegExp::RegExp2);
+            match.rx = QRegExp(matchLine.cap(1), Qt::CaseSensitive, QRegExp::RegExp2);
         } else {
             qWarning() << "Malformed line in configure file:" << origLine;
             state = ReadingNone;