d->repositories = repositories;
}
+void Svn::setIdentityMap(const IdentityHash &identityMap)
+{
+ d->identities = identityMap;
+}
+
int Svn::youngestRevision()
{
return d->youngestRevision();
QIODevice *device = reinterpret_cast<QIODevice *>(baton);
device->write(data, *len);
- if (device->bytesToWrite() > 16384)
- device->waitForBytesWritten(0);
+ while (device->bytesToWrite() > 32*1024) {
+ if (!device->waitForBytesWritten(-1)) {
+ qFatal("Failed to write to process: %s", qPrintable(device->errorString()));
+ return svn_error_createf(APR_EOF, SVN_NO_ERROR, "Failed to write to process: %s",
+ qPrintable(device->errorString()));
+ }
+ }
return SVN_NO_ERROR;
}
// open a generic svn_stream_t for the QIODevice
out_stream = streamForDevice(io, dumppool);
SVN_ERR(svn_stream_copy(in_stream, out_stream, dumppool));
+ svn_stream_close(out_stream);
+ svn_stream_close(in_stream);
// print an ending newline
io->putChar('\n');
svn_fs_dirent_t *dirent = reinterpret_cast<svn_fs_dirent_t *>(value);
QByteArray entryName = pathname + '/' + dirent->name;
- QString entryFinalName;
- if (finalPathName.isEmpty())
- entryFinalName = dirent->name;
- else
- entryFinalName = finalPathName + '/' + dirent->name;
+ QString entryFinalName = finalPathName + dirent->name;
if (dirent->kind == svn_node_dir) {
+ entryFinalName += '/';
if (recursiveDumpDir(txn, fs_root, entryName, entryFinalName, dirpool) == EXIT_FAILURE)
return EXIT_FAILURE;
} else if (dirent->kind == svn_node_file) {
int prepareTransactions();
int commit();
- int exportEntry(const char *path, const svn_fs_path_change_t *change);
+ 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 ¤t, 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 ¤t, const Rules::Match &rule);
int recurse(const char *path, const svn_fs_path_change_t *change,
- const char *path_from, svn_revnum_t rev_from, apr_pool_t *pool);
+ const char *path_from, svn_revnum_t rev_from,
+ apr_hash_t *changes, apr_pool_t *pool);
};
int SvnPrivate::exportRevision(int revnum)
const char *key = reinterpret_cast<const char *>(vkey);
svn_fs_path_change_t *change = reinterpret_cast<svn_fs_path_change_t *>(value);
- if (exportEntry(key, change) == EXIT_FAILURE)
+ if (exportEntry(key, change, changes) == EXIT_FAILURE)
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}
-int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change)
+int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change,
+ apr_hash_t *changes)
{
AprAutoPool revpool(pool.data());
QString current = QString::fromUtf8(key);
}
current += '/';
- qDebug() << " " << key << "was copied from" << path_from;
+ qDebug() << " " << key << "was copied from" << path_from << "rev" << rev_from;
}
// find the first rule that matches this pathname
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" << rule << ")";
- 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
- << "applied to non-directory:" << qPrintable(current);
- return EXIT_SUCCESS;
-
- case Rules::Match::Export:
- 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) {
qDebug() << current << "is a copy-with-history, auto-recursing";
- return recurse(key, change, path_from, rev_from, revpool);
+ return recurse(key, change, path_from, rev_from, changes, 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) {
return EXIT_SUCCESS;
}
+int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change_t *change,
+ const char *path_from, svn_revnum_t rev_from,
+ apr_hash_t *changes, const QString ¤t,
+ const Rules::Match &rule, apr_pool_t *pool)
+{
+ 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);
+ }
+
+ // never reached
+ return EXIT_FAILURE;
+}
+
int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *change,
const char *path_from, svn_revnum_t rev_from,
const QString ¤t, const Rules::Match &rule)
if (path.isEmpty() && path_from != NULL) {
QString previous = QString::fromUtf8(path_from) + '/';
MatchRuleList::ConstIterator prevmatch =
- findMatchRule(matchRules, rev_from, previous, NoRecurseRule | NoIgnoreRule);
+ findMatchRule(matchRules, rev_from, previous, NoIgnoreRule);
if (prevmatch != matchRules.constEnd()) {
QString prevsvnprefix, prevrepository, prevbranch, prevpath;
splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository,
}
repo->createBranch(branch, revnum, prevbranch, rev_from);
+ return EXIT_SUCCESS;
}
}
}
- 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) {
if (!txn)
return EXIT_FAILURE;
- transactions.insert(repository, txn);
+ transactions.insert(repository + branch, txn);
}
if (change->change_kind == svn_fs_path_change_delete) {
} else if (!current.endsWith('/')) {
dumpBlob(txn, fs_root, key, path, pool);
} else {
- txn->deleteFile(path);
+ QString pathNoSlash = path;
+ pathNoSlash.chop(1);
+ txn->deleteFile(pathNoSlash);
recursiveDumpDir(txn, fs_root, key, path, pool);
}
int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
const char *path_from, svn_revnum_t rev_from,
- apr_pool_t *pool)
+ apr_hash_t *changes, apr_pool_t *pool)
{
// get the dir listing
apr_hash_t *entries;
apr_hash_this(i, &vkey, NULL, &value);
svn_fs_dirent_t *dirent = reinterpret_cast<svn_fs_dirent_t *>(value);
+ if (dirent->kind != svn_node_dir)
+ continue; // not a directory, so can't recurse; skip
+
QByteArray entry = path + QByteArray("/") + dirent->name;
QByteArray entryFrom;
if (path_from)
entryFrom = path_from + QByteArray("/") + dirent->name;
+ // check if this entry is in the changelist for this revision already
+ if (apr_hash_get(changes, entry.constData(), APR_HASH_KEY_STRING)) {
+ qDebug() << entry << "rev" << revnum
+ << "is in the change-list, deferring to that one";
+ continue;
+ }
+
QString current = QString::fromUtf8(entry);
if (dirent->kind == svn_node_dir)
current += '/';
// 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 << "did not match any rules; cannot continue";
+ qCritical() << current << "rev" << revnum
+ << "did not match any rules; cannot continue";
return EXIT_FAILURE;
}
}
+
+ return EXIT_SUCCESS;
}
andersk / svn-all-fast-export.git / blobdiff