X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/blobdiff_plain/2ddd1758e673d8d5eba2a298eb1c5ad2760b481b..HEAD:/src/ruleparser.cpp diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp index c90d103..6e799c4 100644 --- a/src/ruleparser.cpp +++ b/src/ruleparser.cpp @@ -55,6 +55,7 @@ void Rules::load() QRegExp matchRepoLine("repository\\s+(\\S+)", Qt::CaseInsensitive); QRegExp matchBranchLine("branch\\s+(\\S+)", Qt::CaseInsensitive); QRegExp matchRevLine("(min|max) revision (\\d+)", Qt::CaseInsensitive); + QRegExp matchAnnotateLine("annotated\\s+(\\S+)", Qt::CaseInsensitive); QTextStream s(&file); enum { ReadingNone, ReadingRepository, ReadingMatch } state = ReadingNone; @@ -109,6 +110,9 @@ void Rules::load() else qFatal("Invalid action \"%s\" on line %d", qPrintable(action), lineNumber); continue; + } else if (matchAnnotateLine.exactMatch(line)) { + match.annotate = matchAnnotateLine.cap(1) == "true"; + continue; } else if (line == "end match") { if (!match.repository.isEmpty()) match.action = Match::Export; @@ -144,7 +148,7 @@ void Rules::load() QDebug operator<<(QDebug s, const Rules::Match &rule) { s.nospace() << rule.rx.pattern() << " (line " << rule.lineNumber << ")"; - return s.maybeSpace(); + return s.space(); } #endif