Add some more line number information

diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index 2371f30e29686624ff7c0a56dd591aef020ae2b8..6d3e4174793feac6eb0b985f983398f5d2064314 100644 (file)
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -117,11 +117,13 @@ void Rules::load()
             state = ReadingRepository;
             repo = Repository(); // clear
             repo.name = repoLine.cap(1);
+            repo.lineNumber = lineNumber;
         } else if (isMatchRule) {
             // match rule
             state = ReadingMatch;
             match = Match();
             match.rx = QRegExp(matchLine.cap(1), Qt::CaseSensitive, QRegExp::RegExp2);
+            match.lineNumber = lineNumber;
         } else {
             qFatal("Malformed line in rules file: line %d: %s",
                    lineNumber, qPrintable(origLine));

diff --git a/src/ruleparser.h b/src/ruleparser.h
index 1d561e073c7bf42b3a4f609404885b9995466de9..e0e311638849d4b06bb020258ab99163241f43c0 100644 (file)
--- a/src/ruleparser.h
+++ b/src/ruleparser.h
@@ -35,6 +35,9 @@ public:
 
         QString name;
         QList<Branch> branches;
+        int lineNumber;
+
+        Repository() : lineNumber(0) { }
     };
 
     struct Match
@@ -45,8 +48,9 @@ public:
         QString path;
         int minRevision;
         int maxRevision;
+        int lineNumber;
 
-        Match() : minRevision(-1), maxRevision(-1) { }
+        Match() : minRevision(-1), maxRevision(-1), lineNumber(0) { }
     };
 
     Rules(const QString &filename);

diff --git a/src/svn.cpp b/src/svn.cpp
index a7c48a100eb1877e8517c57614e79e9a335e5ffa..d294f541feb72f1957d28f99558fdd97c80be02f 100644 (file)
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -346,7 +346,7 @@ int SvnPrivate::exportRevision(int revnum)
                 if (!txn) {
                     Repository *repo = repositories.value(repository, 0);
                     if (!repo) {
-                        qCritical() << "Rule" << rule.rx.pattern()
+                        qCritical() << "Rule" << rule.rx.pattern() << "line" << rule.lineNumber
                                     << "references unknown repository" << repository;
                         return EXIT_FAILURE;
                     }