From af0103861eb05f1bd2d5136563d6d6b339836f24 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 23 Dec 2007 18:07:12 -0200 Subject: [PATCH] Add SVN code --- src/main.cpp | 8 -- src/repository.h | 43 +++++++- src/src.pro | 9 +- src/svn.cpp | 277 ++++++++++++++++++++++++++++++++++++++++++++++- src/svn.h | 2 +- 5 files changed, 320 insertions(+), 19 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 9d61db8..0b7ab85 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,14 +42,6 @@ int main(int argc, char **argv) foreach (Rules::Repository rule, rules.repositories()) repositories.insert(rule.name, new Repository(rule)); - // verify the match rules - foreach (Rules::Match rule, rules.matchRules()) - if (!repositories.contains(rule.repository)) { - fprintf(stderr, "Error: rule \"%s\" references unknown repository \"%s\"\n", - qPrintable(rule.rx.pattern()), qPrintable(rule.repository)); - return 1; - } - // success return 0; } diff --git a/src/repository.h b/src/repository.h index 7779bdf..cd50cdc 100644 --- a/src/repository.h +++ b/src/repository.h @@ -26,18 +26,53 @@ class Repository { public: - struct Branch + class Transaction { - QString branchFrom; - bool isCreated; - }; + Q_DISABLE_COPY(Transaction) + friend class Repository; + struct FileProperties { + int mode; + int mark; + }; + + Repository *repository; + QByteArray branchRef; + QByteArray svnprefix; + QByteArray author; + QByteArray log; + uint datetime; + int revnum; + QStringList deletedFiles; + QHash modifiedFiles; + + public: + ~Transaction(); + void commit(); + + void setAuthor(const QByteArray &author); + void setDateTime(uint dt); + void setLog(const QByteArray &log); + + void deleteFile(const QString &path); + QIODevice *addFile(const QString &path, int mode, qint64 length); + }; Repository(const Rules::Repository &rule); ~Repository(); + Transaction *newTransaction(const QString &branch, const QString &svnprefix, int revnum); + private: + struct Branch + { + QString branchFrom; + bool isCreated; + }; + QHash branches; QProcess fastImport; + + Q_DISABLE_COPY(Repository) }; #endif diff --git a/src/src.pro b/src/src.pro index 3f38817..2a2783f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,12 +2,19 @@ # Automatically generated by qmake (2.01a) dim. déc. 23 13:49:28 2007 ###################################################################### +SVN_INCLUDE = /usr/include/subversion-1 +APR_INCLUDE = /usr/include/apr-1.0 +exists(local-config.pri):include(local-config.pri) + TEMPLATE = app TARGET = ../svn-all-fast-export DEPENDPATH += . -INCLUDEPATH += . QT = core +INCLUDEPATH += . $$SVN_INCLUDE $$APR_INCLUDE +!isEmpty($$SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR +LIBS += -lsvn_fs-1 -lsvn_repos-1 + # Input SOURCES += ruleparser.cpp repository.cpp svn.cpp main.cpp HEADERS += ruleparser.h repository.h svn.h diff --git a/src/svn.cpp b/src/svn.cpp index 6096056..9e917ab 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -15,26 +15,88 @@ * along with this program. If not, see . */ +/* + * Based on svn-fast-export by Chris Lee + * License: MIT + * URL: git://repo.or.cz/fast-import.git http://repo.or.cz/w/fast-export.git + */ + +#define _XOPEN_SOURCE +#define _LARGEFILE_SUPPORT +#define _LARGEFILE64_SUPPORT + #include "svn.h" + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + #include "repository.h" +#undef SVN_ERR +#define SVN_ERR(expr) SVN_INT_ERR(expr) + typedef QList MatchRuleList; typedef QHash RepositoryHash; +typedef QHash IdentityHash; + +class AprAutoPool +{ + apr_pool_t *pool; +public: + inline AprAutoPool(apr_pool_t *parent = NULL) + { pool = svn_pool_create(parent); } + inline ~AprAutoPool() + { svn_pool_destroy(pool); } + + inline apr_pool_t *data() const { return pool; } + inline operator apr_pool_t *() const { return pool; } +}; class SvnPrivate { public: + MatchRuleList matchRules; + RepositoryHash repositories; + IdentityHash identities; + SvnPrivate(const QString &pathToRepository); ~SvnPrivate(); int youngestRevision(); - void exportRevision(int revnum); + int exportRevision(int revnum); - MatchRuleList matchRules; - RepositoryHash repositories; + int openRepository(const QString &pathToRepository); + +private: + AprAutoPool global_pool; + svn_fs_t *fs; + svn_revnum_t youngest_rev; }; void Svn::initialize() { + // initialize APR or exit + if (apr_initialize() != APR_SUCCESS) { + fprintf(stderr, "You lose at apr_initialize().\n"); + exit(1); + } + + // static destructor + static struct Destructor { ~Destructor() { apr_terminate(); } } destructor; } Svn::Svn(const QString &pathToRepository) @@ -62,8 +124,213 @@ int Svn::youngestRevision() return d->youngestRevision(); } -void Svn::exportRevision(int revnum) +bool Svn::exportRevision(int revnum) +{ + return d->exportRevision(revnum) == EXIT_SUCCESS; +} + +SvnPrivate::SvnPrivate(const QString &pathToRepository) + : global_pool(NULL) +{ + openRepository(pathToRepository); + + // get the youngest revision + svn_fs_youngest_rev(&youngest_rev, fs, global_pool); +} + +SvnPrivate::~SvnPrivate() +{ + svn_pool_destroy(global_pool); +} + +int SvnPrivate::youngestRevision() +{ + return youngest_rev; +} + +int SvnPrivate::openRepository(const QString &pathToRepository) +{ + svn_repos_t *repos; + SVN_ERR(svn_repos_open(&repos, QFile::encodeName(pathToRepository), global_pool)); + fs = svn_repos_fs(repos); + + return EXIT_SUCCESS; +} + +static int pathMode(svn_fs_root_t *fs_root, const char *pathname, apr_pool_t *pool) +{ + svn_string_t *propvalue; + SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:executable", pool)); + int mode = 0100644; + if (propvalue) + mode = 0100755; + + // maybe it's a symlink? + SVN_ERR(svn_fs_node_prop(&propvalue, fs_root, pathname, "svn:special", pool)); + if (strcmp(propvalue->data, "symlink") == 0) + mode = 0120000; + + return mode; +} + +svn_error_t *QIODevice_write(void *baton, const char *data, apr_size_t *len) { - d->exportRevision(revnum); + QIODevice *device = reinterpret_cast(baton); + device->write(data, *len); + return SVN_NO_ERROR; } +static svn_stream_t *streamForDevice(QIODevice *device, apr_pool_t *pool) +{ + svn_stream_t *stream = svn_stream_create(device, pool); + svn_stream_set_write(stream, QIODevice_write); + + return stream; +} + +static int dumpBlob(Repository::Transaction *txn, svn_fs_root_t *fs_root, + const char *pathname, apr_pool_t *pool) +{ + // what type is it? + int mode = pathMode(fs_root, pathname, pool); + + svn_stream_t *in_stream, *out_stream; + svn_filesize_t stream_length; + + SVN_ERR(svn_fs_file_length(&stream_length, fs_root, pathname, pool)); + QIODevice *io = txn->addFile(pathname, mode, stream_length); + + // open the file + SVN_ERR(svn_fs_file_contents(&in_stream, fs_root, pathname, pool)); + + // open a generic svn_stream_t for the QIODevice + out_stream = streamForDevice(io, pool); + SVN_ERR(svn_stream_copy(in_stream, out_stream, pool)); + + return EXIT_SUCCESS; +} + +time_t get_epoch(char *svn_date) +{ + struct tm tm; + 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); +} + +int SvnPrivate::exportRevision(int revnum) +{ + AprAutoPool pool(global_pool); + + // open this revision: + svn_fs_root_t *fs_root; + SVN_ERR(svn_fs_revision_root(&fs_root, fs, revnum, pool)); + qDebug() << "Exporting revision" << revnum; + + // find out what was changed in this revision: + QHash transactions; + apr_hash_t *changes; + SVN_ERR(svn_fs_paths_changed(&changes, fs_root, pool)); + AprAutoPool revpool(pool); + for (apr_hash_index_t *i = apr_hash_first(pool, changes); i; i = apr_hash_next(i)) { + svn_pool_clear(revpool); + + const void *vkey; + void *value; + apr_hash_this(i, &vkey, NULL, &value); + const char *key = reinterpret_cast(vkey); + + // is this a directory? + svn_boolean_t is_dir; + SVN_ERR(svn_fs_is_dir(&is_dir, fs_root, key, revpool)); + if (is_dir) + continue; // Git doesn't handle directories, so we don't either + + QString current = QString::fromUtf8(key); + + // find the first rule that matches this pathname + bool foundMatch = false; + foreach (Rules::Match rule, matchRules) + if (rule.rx.exactMatch(current)) { + foundMatch = true; + QString repository = current; + QString branch = current; + QString path = current; + + // do the replacement + repository.replace(rule.rx, rule.repository); + branch.replace(rule.rx, rule.branch); + path.replace(rule.rx, rule.path); + + qDebug() << "..." << current << "->" + << repository << branch << path; + + Repository::Transaction *txn = transactions.value(repository, 0); + if (!txn) { + Repository *repo = repositories.value(repository, 0); + if (!repo) { + qCritical() << "Rule" << rule.rx.pattern() + << "references unknown repository" << repository; + return EXIT_FAILURE; + } + + QString svnprefix = current; + if (current.endsWith(path)) + current.chop(path.length()); + + txn = repo->newTransaction(branch, svnprefix, revnum); + if (!txn) + return EXIT_FAILURE; + + transactions.insert(repository, txn); + } + + svn_fs_path_change_t *change = reinterpret_cast(value); + if (change->change_kind == svn_fs_path_change_delete) + txn->deleteFile(path); + else + dumpBlob(txn, fs_root, key, revpool); + + break; + } + + if (!foundMatch) { + qCritical() << current << "did not match any rules; cannot continue"; + return EXIT_FAILURE; + } + } + svn_pool_clear(revpool); + + if (transactions.isEmpty()) + return true; // no changes? + + // now create the commit + 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 = identities.value((char *)svnauthor->data); + time_t epoch = get_epoch((char*)svndate->data); + if (authorident.isEmpty()) { + if (!svnauthor || svn_string_isempty(svnauthor)) + authorident = "nobody "; + else + authorident = svnauthor->data + QByteArray(" <") + + svnauthor->data + QByteArray("@localhost>"); + } + + foreach (Repository::Transaction *txn, transactions) { + txn->setAuthor(authorident); + txn->setDateTime(epoch); + txn->setLog(log); + + txn->commit(); + delete txn; + } + + return EXIT_SUCCESS; +} diff --git a/src/svn.h b/src/svn.h index f7c4477..c878428 100644 --- a/src/svn.h +++ b/src/svn.h @@ -37,7 +37,7 @@ public: void setRepositories(const QHash &repositories); int youngestRevision(); - void exportRevision(int revnum); + bool exportRevision(int revnum); private: SvnPrivate * const d; -- 2.45.0