X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/blobdiff_plain/898704e4260e2d42c75e123938470dab581a8d80..1602441997715867882c9ff2102cb13bcfd241ee:/src/svn.cpp diff --git a/src/svn.cpp b/src/svn.cpp index d818283..552e506 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -160,8 +160,11 @@ int SvnPrivate::openRepository(const QString &pathToRepository) return EXIT_SUCCESS; } +enum RuleType { AnyRule = 0, NoIgnoreRule = 0x01 }; + static MatchRuleList::ConstIterator -findMatchRule(const MatchRuleList &matchRules, int revnum, const QString ¤t) +findMatchRule(const MatchRuleList &matchRules, int revnum, const QString ¤t, + int ruleMask = AnyRule) { MatchRuleList::ConstIterator it = matchRules.constBegin(), end = matchRules.constEnd(); @@ -170,6 +173,8 @@ findMatchRule(const MatchRuleList &matchRules, int revnum, const QString ¤ continue; if (it->maxRevision != -1 && it->maxRevision < revnum) continue; + if (it->action == Rules::Match::Ignore && ruleMask & NoIgnoreRule) + continue; if (it->rx.indexIn(current) == 0) return it; } @@ -449,7 +454,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change // is this a directory? svn_boolean_t is_dir; - SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, pool)); + SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, revpool)); if (is_dir) { if (path_from == NULL) { // no, it's a new directory being added @@ -466,28 +471,13 @@ 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; - switch (rule.action) { - case Rules::Match::Ignore: - // ignore rule - qDebug() << " " << qPrintable(current) << "rev" << revnum - << "-> ignored (rule line" << rule.lineNumber << ")"; - return EXIT_SUCCESS; - - case Rules::Match::Recurse: - // recurse rule - if (is_dir) - return recurse(key, change, path_from, rev_from, revpool); - if (change->change_kind != svn_fs_path_change_delete) - qWarning() << " recurse rule " << rule.rx.pattern() << "line" << rule.lineNumber - << "applied to non-directory:" << qPrintable(current); - return EXIT_SUCCESS; - - case Rules::Match::Export: - return exportInternal(key, change, path_from, rev_from, current, rule); - } + return exportInternal(key, change, path_from, rev_from, current, rule); } - if (wasDir(fs, revnum - 1, key, pool)) { + if (is_dir && path_from != NULL) { + qDebug() << current << "is a copy-with-history, auto-recursing"; + return recurse(key, change, path_from, rev_from, revpool); + } else if (wasDir(fs, revnum - 1, key, revpool)) { qDebug() << current << "was a directory; ignoring"; } else if (change->change_kind == svn_fs_path_change_delete) { qDebug() << current << "is being deleted but I don't know anything about it; ignoring"; @@ -503,6 +493,13 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha const char *path_from, svn_revnum_t rev_from, const QString ¤t, const Rules::Match &rule) { + if (rule.action == Rules::Match::Ignore) { + // ignore rule + qDebug() << " " << qPrintable(current) << "rev" << revnum + << "-> ignored (rule" << rule << ")"; + return EXIT_SUCCESS; + } + QString svnprefix, repository, branch, path; splitPathName(rule, current, &svnprefix, &repository, &branch, &path); @@ -514,7 +511,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha if (path.isEmpty() && path_from != NULL) { QString previous = QString::fromUtf8(path_from) + '/'; MatchRuleList::ConstIterator prevmatch = - findMatchRule(matchRules, rev_from, previous); + findMatchRule(matchRules, rev_from, previous, NoIgnoreRule); if (prevmatch != matchRules.constEnd()) { QString prevsvnprefix, prevrepository, prevbranch, prevpath; splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository, @@ -546,7 +543,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha Repository *repo = repositories.value(repository, 0); if (!repo) { - qCritical() << "Rule" << rule.rx.pattern() << "line" << rule.lineNumber + qCritical() << "Rule" << rule << "references unknown repository" << repository; return EXIT_FAILURE; } @@ -560,7 +557,7 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha if (!txn) { Repository *repo = repositories.value(repository, 0); if (!repo) { - qCritical() << "Rule" << rule.rx.pattern() << "line" << rule.lineNumber + qCritical() << "Rule" << rule << "references unknown repository" << repository; return EXIT_FAILURE; } @@ -572,12 +569,14 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha transactions.insert(repository, txn); } - if (change->change_kind == svn_fs_path_change_delete) + if (change->change_kind == svn_fs_path_change_delete) { txn->deleteFile(path); - else if (!current.endsWith('/')) + } else if (!current.endsWith('/')) { dumpBlob(txn, fs_root, key, path, pool); - else + } else { + txn->deleteFile(path); recursiveDumpDir(txn, fs_root, key, path, pool); + } return EXIT_SUCCESS; } @@ -599,7 +598,9 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change, svn_fs_dirent_t *dirent = reinterpret_cast(value); QByteArray entry = path + QByteArray("/") + dirent->name; - QByteArray entryFrom = path_from + QByteArray("/") + dirent->name; + QByteArray entryFrom; + if (path_from) + entryFrom = path_from + QByteArray("/") + dirent->name; QString current = QString::fromUtf8(entry); if (dirent->kind == svn_node_dir) @@ -608,7 +609,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, rev_from, current, *match) == EXIT_FAILURE) + if (exportInternal(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(), + rev_from, current, *match) == EXIT_FAILURE) return EXIT_FAILURE; } else { qCritical() << current << "did not match any rules; cannot continue";