d->repositories = repositories;
}
+void Svn::setIdentityMap(const IdentityHash &identityMap)
+{
+ d->identities = identityMap;
+}
+
int Svn::youngestRevision()
{
return d->youngestRevision();
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 ¤t,
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;
}
if (propvalue)
mode = 0100755;
- // maybe it's a symlink?
- SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:special", pool));
- if (propvalue && strcmp(propvalue->data, "symlink") == 0)
- mode = 0120000;
-
return mode;
}
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;
}
svn_filesize_t stream_length;
SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, dumppool));
- QIODevice *io = txn->addFile(finalPathName, mode, stream_length);
#ifndef DRY_RUN
// open the file
svn_stream_t *in_stream, *out_stream;
SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, dumppool));
+#endif
+
+ // maybe it's a symlink?
+ svn_string_t *propvalue;
+ SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:special", dumppool));
+ if (propvalue) {
+ apr_size_t len = strlen("link ");
+#ifndef DRY_RUN
+ QByteArray buf;
+ buf.reserve(len);
+ SVN_ERR(svn_stream_read(in_stream, buf.data(), &len));
+ if (len != strlen("link ") || strncmp(buf, "link ", len) != 0)
+ qFatal("file %s is svn:special but not a symlink", pathname);
+#endif
+ mode = 0120000;
+ stream_length -= len;
+ }
+ QIODevice *io = txn->addFile(finalPathName, mode, stream_length);
+
+#ifndef DRY_RUN
// 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');
memset(&tm, 0, sizeof tm);
QByteArray date(svn_date, strlen(svn_date) - 8);
strptime(date, "%Y-%m-%dT%H:%M:%S", &tm);
- return mktime(&tm);
+ return timegm(&tm);
}
class SvnRevision
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 ¤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);
}
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;
- 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) {
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 ¤t, const Rules::Match &rule)
+ apr_hash_t *changes, const QString ¤t,
+ 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 << ")";
+ //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)
+{
QString svnprefix, repository, branch, path;
splitPathName(rule, current, &svnprefix, &repository, &branch, &path);
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)
// 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
andersk / svn-all-fast-export.git / blobdiff