aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago@cassini.local.lan>2007-12-27 15:49:15 -0200
committerThiago Macieira <thiago@cassini.local.lan>2007-12-27 15:49:15 -0200
commit392c009ad5ee4276a7ced33257a0b15f56bb5a4b (patch)
treead896342793679630b37881ac9cbd99410331639
parentb4cb51888233275e6ec09f084f9fba371e01e759 (diff)
downloadsvn2git-392c009ad5ee4276a7ced33257a0b15f56bb5a4b.tar
svn2git-392c009ad5ee4276a7ced33257a0b15f56bb5a4b.tar.gz
svn2git-392c009ad5ee4276a7ced33257a0b15f56bb5a4b.tar.bz2
svn2git-392c009ad5ee4276a7ced33257a0b15f56bb5a4b.tar.xz
svn2git-392c009ad5ee4276a7ced33257a0b15f56bb5a4b.zip
Complement the recurse rule finding (or not finding)
-rw-r--r--src/svn.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/svn.cpp b/src/svn.cpp
index 378dc77..a32005a 100644
--- 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;
}