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, NoRecurseRule = 0x02 };
+
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();
continue;
if (it->maxRevision != -1 && it->maxRevision < revnum)
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;
}
static int dumpBlob(Repository::Transaction *txn, svn_fs_root_t *fs_root,
const char *pathname, const QString &finalPathName, apr_pool_t *pool)
{
+ AprAutoPool dumppool(pool);
// what type is it?
- int mode = pathMode(fs_root, pathname, pool);
+ int mode = pathMode(fs_root, pathname, dumppool);
svn_filesize_t stream_length;
- SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, pool));
- QIODevice *io = txn->addFile(finalPathName, mode, stream_length);
+ SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, dumppool));
#ifndef DRY_RUN
// open the file
svn_stream_t *in_stream, *out_stream;
- SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, pool));
+ 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, pool);
- SVN_ERR(svn_stream_copy(in_stream, out_stream, pool));
+ 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 = 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) {
return EXIT_FAILURE;
}
}
+
+ return EXIT_SUCCESS;
}
static bool wasDir(svn_fs_t *fs, int revnum, const char *pathname, apr_pool_t *pool)
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);
}
-int SvnPrivate::exportRevision(int revnum)
+class SvnRevision
{
- AprAutoPool pool(global_pool.data());
+public:
+ AprAutoPool pool;
QHash<QString, Repository::Transaction *> transactions;
+ MatchRuleList matchRules;
+ RepositoryHash repositories;
+ IdentityHash identities;
- // open this revision:
- qDebug() << "Exporting revision" << revnum;
+ svn_fs_t *fs;
svn_fs_root_t *fs_root;
- SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum, pool));
+ int revnum;
- // find out what was changed in this revision:
- apr_hash_t *changes;
- SVN_ERR(svn_fs_paths_changed(&changes, fs_root, pool));
- AprAutoPool revpool(pool.data());
- for (apr_hash_index_t *i = apr_hash_first(pool, changes); i; i = apr_hash_next(i)) {
- revpool.clear();
+ // must call fetchRevProps first:
+ QByteArray authorident;
+ QByteArray log;
+ uint epoch;
- const void *vkey;
- void *value;
- apr_hash_this(i, &vkey, NULL, &value);
- const char *key = reinterpret_cast<const char *>(vkey);
+ SvnRevision(int revision, svn_fs_t *f, apr_pool_t *parent_pool)
+ : pool(parent_pool), fs(f), fs_root(0), revnum(revision)
+ {
+ }
- // was this copied from somewhere?
- svn_revnum_t rev_from;
- const char *path_from;
- SVN_ERR(svn_fs_copied_from(&rev_from, &path_from, fs_root, key, revpool));
-
- // is this a directory?
- svn_boolean_t is_dir;
- 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
- // Git doesn't handle directories, so we don't either
- qDebug() << " mkdir ignored:" << key;
- continue;
- }
+ int open()
+ {
+ SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum, pool));
+ return EXIT_SUCCESS;
+ }
- qDebug() << " " << key << "was copied from" << path_from;
- }
+ int prepareTransactions();
+ int fetchRevProps();
+ 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);
+ int recurse(const char *path, const svn_fs_path_change_t *change,
+ const char *path_from, svn_revnum_t rev_from,
+ apr_hash_t *changes, apr_pool_t *pool);
+};
- QString current = QString::fromUtf8(key);
- if (is_dir)
- current += '/';
+int SvnPrivate::exportRevision(int revnum)
+{
+ SvnRevision rev(revnum, fs, global_pool);
+ rev.matchRules = matchRules;
+ rev.repositories = repositories;
+ rev.identities = identities;
- // find the first rule that matches this pathname
- MatchRuleList::ConstIterator match = findMatchRule(matchRules, revnum, current);
- if (match != matchRules.constEnd()) {
- const Rules::Match &rule = *match;
- if (rule.repository.isEmpty()) {
- // ignore rule
- qDebug() << " " << qPrintable(current) << "rev" << revnum
- << "-> ignored (rule line" << rule.lineNumber << ")";
- continue;
- } else {
- QString svnprefix, repository, branch, path;
- splitPathName(rule, current, &svnprefix, &repository, &branch, &path);
-
- if (path.isEmpty() && path_from != NULL) {
- QString previous = QString::fromUtf8(path_from) + '/';
- MatchRuleList::ConstIterator prevmatch =
- findMatchRule(matchRules, rev_from, previous);
- if (prevmatch != matchRules.constEnd()) {
- QString prevsvnprefix, prevrepository, prevbranch, prevpath;
- splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository,
- &prevbranch, &prevpath);
-
- if (!prevpath.isEmpty()) {
- qDebug() << qPrintable(current) << "is a partial branch of repository"
- << qPrintable(prevrepository) << "branch"
- << qPrintable(prevbranch) << "subdir"
- << qPrintable(prevpath);
- } else if (prevrepository != repository) {
- qWarning() << qPrintable(current) << "rev" << revnum
- << "is a cross-repository copy (from repository"
- << qPrintable(prevrepository) << "branch"
- << qPrintable(prevbranch) << "path"
- << qPrintable(prevpath) << "rev" << rev_from << ")";
- } else if (prevbranch == branch) {
- // same branch and same repository
- qDebug() << qPrintable(current) << "rev" << revnum
- << "is an SVN rename from"
- << qPrintable(previous) << "rev" << rev_from;
- continue;
- } else {
- // same repository but not same branch
- // this means this is a plain branch
- qDebug() << qPrintable(repository) << ": branch"
- << qPrintable(branch) << "is branching from"
- << qPrintable(prevbranch);
-
- Repository *repo = repositories.value(repository, 0);
- if (!repo) {
- qCritical() << "Rule" << rule.rx.pattern() << "line" << rule.lineNumber
- << "references unknown repository" << repository;
- return EXIT_FAILURE;
- }
-
- repo->createBranch(branch, revnum, prevbranch, rev_from);
- }
- }
- }
+ // open this revision:
+ printf("Exporting revision %d ", revnum);
+ fflush(stdout);
- printf(".");
- fflush(stdout);
-// qDebug() << " " << qPrintable(current) << "rev" << revnum << "->"
-// << qPrintable(repository) << qPrintable(branch) << qPrintable(path);
+ if (rev.open() == EXIT_FAILURE)
+ return EXIT_FAILURE;
- Repository::Transaction *txn = transactions.value(repository, 0);
- if (!txn) {
- Repository *repo = repositories.value(repository, 0);
- if (!repo) {
- qCritical() << "Rule" << rule.rx.pattern() << "line" << rule.lineNumber
- << "references unknown repository" << repository;
- return EXIT_FAILURE;
- }
+ if (rev.prepareTransactions() == EXIT_FAILURE)
+ return EXIT_FAILURE;
- txn = repo->newTransaction(branch, svnprefix, revnum);
- if (!txn)
- return EXIT_FAILURE;
+ if (rev.transactions.isEmpty()) {
+ printf(" nothing to do\n");
+ return EXIT_SUCCESS; // no changes?
+ }
- transactions.insert(repository, txn);
- }
+ if (rev.commit() == EXIT_FAILURE)
+ return EXIT_FAILURE;
- svn_fs_path_change_t *change = reinterpret_cast<svn_fs_path_change_t *>(value);
- if (change->change_kind == svn_fs_path_change_delete)
- txn->deleteFile(path);
- else if (!is_dir)
- dumpBlob(txn, fs_root, key, path, revpool);
- else
- recursiveDumpDir(txn, fs_root, key, path, revpool);
+ printf(" done\n");
+ return EXIT_SUCCESS;
+}
- continue;
- }
- }
+int SvnRevision::prepareTransactions()
+{
+ // find out what was changed in this revision:
+ apr_hash_t *changes;
+ SVN_ERR(svn_fs_paths_changed(&changes, fs_root, pool));
+ for (apr_hash_index_t *i = apr_hash_first(pool, changes); i; i = apr_hash_next(i)) {
+ const void *vkey;
+ void *value;
+ apr_hash_this(i, &vkey, NULL, &value);
+ const char *key = reinterpret_cast<const char *>(vkey);
+ svn_fs_path_change_t *change = reinterpret_cast<svn_fs_path_change_t *>(value);
- if (is_dir) {
- qDebug() << current << "is a new directory; ignoring";
- } else if (wasDir(fs, revnum - 1, key, pool)) {
- qDebug() << current << "was a directory; ignoring";
- } else {
- qCritical() << current << "did not match any rules; cannot continue";
+ if (exportEntry(key, change, changes) == EXIT_FAILURE)
return EXIT_FAILURE;
- }
}
- revpool.clear();
- if (transactions.isEmpty())
- return EXIT_SUCCESS; // no changes?
+ return EXIT_SUCCESS;
+}
- // now create the commit
+int SvnRevision::fetchRevProps()
+{
apr_hash_t *revprops;
SVN_ERR(svn_fs_revision_proplist(&revprops, fs, revnum, pool));
svn_string_t *svnauthor = (svn_string_t*)apr_hash_get(revprops, "svn:author", APR_HASH_KEY_STRING);
svn_string_t *svndate = (svn_string_t*)apr_hash_get(revprops, "svn:date", APR_HASH_KEY_STRING);
svn_string_t *svnlog = (svn_string_t*)apr_hash_get(revprops, "svn:log", APR_HASH_KEY_STRING);
- QByteArray log = (char *)svnlog->data;
- QByteArray authorident = svnauthor ? identities.value((char *)svnauthor->data) : QByteArray();
- time_t epoch = get_epoch((char*)svndate->data);
+ log = (char *)svnlog->data;
+ authorident = svnauthor ? identities.value((char *)svnauthor->data) : QByteArray();
+ epoch = get_epoch((char*)svndate->data);
if (authorident.isEmpty()) {
if (!svnauthor || svn_string_isempty(svnauthor))
authorident = "nobody <nobody@localhost>";
authorident = svnauthor->data + QByteArray(" <") +
svnauthor->data + QByteArray("@localhost>");
}
+ return EXIT_SUCCESS;
+}
+int SvnRevision::commit()
+{
+ // now create the commit
+ if (fetchRevProps() != EXIT_SUCCESS)
+ return EXIT_FAILURE;
foreach (Repository::Transaction *txn, transactions) {
txn->setAuthor(authorident);
txn->setDateTime(epoch);
delete txn;
}
- printf("\n");
+ return EXIT_SUCCESS;
+}
+
+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);
+
+ // was this copied from somewhere?
+ svn_revnum_t rev_from;
+ const char *path_from;
+ SVN_ERR(svn_fs_copied_from(&rev_from, &path_from, fs_root, key, revpool));
+
+ // is this a directory?
+ svn_boolean_t is_dir;
+ 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
+ // Git doesn't handle directories, so we don't either
+ //qDebug() << " mkdir ignored:" << key;
+ return EXIT_SUCCESS;
+ }
+
+ current += '/';
+ 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 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, 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) {
+ qDebug() << current << "is being deleted but I don't know anything about it; ignoring";
+ } else {
+ qCritical() << current << "did not match any rules; cannot continue";
+ return EXIT_FAILURE;
+ }
+
+ 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)
+{
+ QString svnprefix, repository, branch, path;
+ splitPathName(rule, current, &svnprefix, &repository, &branch, &path);
+
+ printf(".");
+ fflush(stdout);
+// qDebug() << " " << qPrintable(current) << "rev" << revnum << "->"
+// << qPrintable(repository) << qPrintable(branch) << qPrintable(path);
+
+ if (path.isEmpty() && path_from != NULL) {
+ QString previous = QString::fromUtf8(path_from) + '/';
+ MatchRuleList::ConstIterator prevmatch =
+ findMatchRule(matchRules, rev_from, previous, NoIgnoreRule);
+ if (prevmatch != matchRules.constEnd()) {
+ QString prevsvnprefix, prevrepository, prevbranch, prevpath;
+ splitPathName(*prevmatch, previous, &prevsvnprefix, &prevrepository,
+ &prevbranch, &prevpath);
+
+ if (!prevpath.isEmpty()) {
+ qDebug() << qPrintable(current) << "is a partial branch of repository"
+ << qPrintable(prevrepository) << "branch"
+ << qPrintable(prevbranch) << "subdir"
+ << qPrintable(prevpath);
+ } else if (prevrepository != repository) {
+ qWarning() << qPrintable(current) << "rev" << revnum
+ << "is a cross-repository copy (from repository"
+ << qPrintable(prevrepository) << "branch"
+ << qPrintable(prevbranch) << "path"
+ << qPrintable(prevpath) << "rev" << rev_from << ")";
+ } else if (prevbranch == branch) {
+ // same branch and same repository
+ qDebug() << qPrintable(current) << "rev" << revnum
+ << "is an SVN rename from"
+ << qPrintable(previous) << "rev" << rev_from;
+ return EXIT_SUCCESS;
+ } else {
+ // same repository but not same branch
+ // this means this is a plain branch
+ qDebug() << qPrintable(repository) << ": branch"
+ << qPrintable(branch) << "is branching from"
+ << qPrintable(prevbranch);
+
+ Repository *repo = repositories.value(repository, 0);
+ if (!repo) {
+ qCritical() << "Rule" << rule
+ << "references unknown repository" << repository;
+ return EXIT_FAILURE;
+ }
+
+ repo->createBranch(branch, revnum, prevbranch, rev_from);
+ if (rule.annotate) {
+ // create an annotated tag
+ fetchRevProps();
+ repo->createAnnotatedTag(branch, svnprefix, revnum, authorident,
+ epoch, log);
+ }
+ return EXIT_SUCCESS;
+ }
+ }
+ }
+
+ Repository::Transaction *txn = transactions.value(repository + branch, 0);
+ if (!txn) {
+ Repository *repo = repositories.value(repository, 0);
+ if (!repo) {
+ qCritical() << "Rule" << rule
+ << "references unknown repository" << repository;
+ return EXIT_FAILURE;
+ }
+
+ txn = repo->newTransaction(branch, svnprefix, revnum);
+ if (!txn)
+ return EXIT_FAILURE;
+
+ transactions.insert(repository + branch, txn);
+ }
+
+ if (change->change_kind == svn_fs_path_change_delete) {
+ txn->deleteFile(path);
+ } else if (!current.endsWith('/')) {
+ dumpBlob(txn, fs_root, key, path, pool);
+ } else {
+ QString pathNoSlash = path;
+ pathNoSlash.chop(1);
+ txn->deleteFile(pathNoSlash);
+ recursiveDumpDir(txn, fs_root, key, path, pool);
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
+ const char *path_from, svn_revnum_t rev_from,
+ apr_hash_t *changes, apr_pool_t *pool)
+{
+ // get the dir listing
+ apr_hash_t *entries;
+ SVN_ERR(svn_fs_dir_entries(&entries, fs_root, path, pool));
+
+ AprAutoPool dirpool(pool);
+ for (apr_hash_index_t *i = apr_hash_first(pool, entries); i; i = apr_hash_next(i)) {
+ dirpool.clear();
+ const void *vkey;
+ void *value;
+ 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
+ svn_fs_path_change_t *otherchange =
+ (svn_fs_path_change_t*)apr_hash_get(changes, entry.constData(), APR_HASH_KEY_STRING);
+ if (otherchange && otherchange->change_kind == svn_fs_path_change_add) {
+ 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 (exportDispatch(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
+ rev_from, changes, current, *match, dirpool) == EXIT_FAILURE)
+ return EXIT_FAILURE;
+ } else {
+ qCritical() << current << "rev" << revnum
+ << "did not match any rules; cannot continue";
+ return EXIT_FAILURE;
+ }
+ }
+
return EXIT_SUCCESS;
}
andersk / svn-all-fast-export.git / blobdiff