Complement the recurse rule finding (or not finding)

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

diff --git a/src/svn.cpp b/src/svn.cpp
index e0818fb53eec66552d173fa3247f8ebd001ec150..a32005a023e2cf1ce4f1e6e0de9ae877b66bc8ac 100644 (file)
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -160,7 +160,7 @@ int SvnPrivate::openRepository(const QString &pathToRepository)
     return EXIT_SUCCESS;
 }
 
-enum RuleType { AnyRule = 0, NoIgnoreRule = 0x01 };
+enum RuleType { AnyRule = 0, NoIgnoreRule = 0x01, NoRecurseRule = 0x02 };
 
 static MatchRuleList::ConstIterator
 findMatchRule(const MatchRuleList &matchRules, int revnum, const QString &current,
@@ -175,6 +175,8 @@ findMatchRule(const MatchRuleList &matchRules, int revnum, const QString &curren
             continue;
         if (it->action == Rules::Match::Ignore && ruleMask & NoIgnoreRule)
             continue;
+        if (it->action == Rules::Match::Recurse && ruleMask & NoRecurseRule)
+            continue;
         if (it->rx.indexIn(current) == 0)
             return it;
     }
@@ -352,6 +354,10 @@ public:
     int commit();
 
     int exportEntry(const char *path, const svn_fs_path_change_t *change, apr_hash_t *changes);
+    int exportDispatch(const char *path, const svn_fs_path_change_t *change,
+                       const char *path_from, svn_revnum_t rev_from,
+                       apr_hash_t *changes, const QString &current, const Rules::Match &rule,
+                       apr_pool_t *pool);
     int exportInternal(const char *path, const svn_fs_path_change_t *change,
                        const char *path_from, svn_revnum_t rev_from,
                        const QString &current, const Rules::Match &rule);
@@ -470,7 +476,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
     MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
     if (match != matchRules.constEnd()) {
         const Rules::Match &rule = *match;
-        return exportInternal(key, change, path_from, rev_from, current, rule);
+        return exportDispatch(key, change, path_from, rev_from, changes, current, rule, revpool);
     }
 
     if (is_dir && path_from != NULL) {
@@ -488,17 +494,30 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
     return EXIT_SUCCESS;
 }
 
-int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *change,
+int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change_t *change,
                                 const char *path_from, svn_revnum_t rev_from,
-                                const QString &current, const Rules::Match &rule)
+                                apr_hash_t *changes, const QString &current,
+                                const Rules::Match &rule, apr_pool_t *pool)
 {
-    if (rule.action == Rules::Match::Ignore) {
+    switch (rule.action) {
+    case Rules::Match::Ignore:
         // ignore rule
         qDebug() << "   " << qPrintable(current) << "rev" << revnum
                  << "-> ignored (rule" << rule << ")";
         return EXIT_SUCCESS;
+
+    case Rules::Match::Recurse:
+        return recurse(key, change, path_from, rev_from, changes, pool);
+
+    case Rules::Match::Export:
+        return exportInternal(key, change, path_from, rev_from, current, rule);
     }
+}
 
+int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *change,
+                                const char *path_from, svn_revnum_t rev_from,
+                                const QString &current, const Rules::Match &rule)
+{
     QString svnprefix, repository, branch, path;
     splitPathName(rule, current, &svnprefix, &repository, &branch, &path);
 
@@ -553,7 +572,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha
         }
     }
 
-    Repository::Transaction *txn = transactions.value(repository, 0);
+    Repository::Transaction *txn = transactions.value(repository + branch, 0);
     if (!txn) {
         Repository *repo = repositories.value(repository, 0);
         if (!repo) {
@@ -566,7 +585,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha
         if (!txn)
             return EXIT_FAILURE;
 
-        transactions.insert(repository, txn);
+        transactions.insert(repository + branch, txn);
     }
 
     if (change->change_kind == svn_fs_path_change_delete) {
@@ -618,8 +637,8 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
         // find the first rule that matches this pathname
         MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
         if (match != matchRules.constEnd()) {
-            if (exportInternal(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
-                               rev_from, current, *match) == EXIT_FAILURE)
+            if (exportDispatch(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
+                               rev_from, changes, current, *match, dirpool) == EXIT_FAILURE)
                 return EXIT_FAILURE;
         } else {
             qCritical() << current << "rev" << revnum