X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/blobdiff_plain/d91c2d9b90280decfafae66d4a72e735eeb1a125..25e6c28e0da95faa8bd6644cebf3f20d0afb6f53:/src/repository.cpp diff --git a/src/repository.cpp b/src/repository.cpp index 205330c..be24ed4 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -20,67 +20,100 @@ #include Repository::Repository(const Rules::Repository &rule) - : name(rule.name) + : name(rule.name), commitCount(0), processHasStarted(false) { foreach (Rules::Repository::Branch branchRule, rule.branches) { Branch branch; - branch.branchFrom = branchRule.branchFrom; - branch.isCreated = false; + branch.created = 0; // not created branches.insert(branchRule.name, branch); } // create the default branch - branches["master"].isCreated = true; + branches["master"].created = 1; fastImport.setWorkingDirectory(name); - fastImport.setProcessChannelMode(QProcess::ForwardedChannels); } Repository::~Repository() { - if (fastImport.state() == QProcess::Running) { + if (fastImport.state() != QProcess::NotRunning) { + fastImport.write("checkpoint\n"); + fastImport.waitForBytesWritten(-1); fastImport.closeWriteChannel(); - fastImport.waitForFinished(); + if (!fastImport.waitForFinished()) { + fastImport.terminate(); + if (!fastImport.waitForFinished(200)) + qWarning() << "git-fast-import for repository" << name << "did not die"; + } } } void Repository::reloadBranches() { - QHash::Iterator it = branches.begin(), - end = branches.end(); - for ( ; it != end; ++it) { - QString branchRef = it.key(); - if (!branchRef.startsWith("refs/heads/")) - branchRef.prepend("refs/heads/"); - - bool branchExists; - // does this branch already exist? - QProcess revParse; - revParse.setWorkingDirectory(name); - revParse.start("git-rev-parse", QStringList() << "--verify" << branchRef); - revParse.waitForFinished(); - - if (revParse.exitCode() == 0) - branchExists = true; - else - branchExists = false; - - if (branchExists) { - startFastImport(); - fastImport.write("reset " + branchRef.toUtf8() + - "\nfrom " + branchRef.toUtf8() + "^0\n\n"); - it->isCreated = true; + QProcess revParse; + revParse.setWorkingDirectory(name); + revParse.start("git", QStringList() << "rev-parse" << "--symbolic" << "--branches"); + revParse.waitForFinished(-1); + + if (revParse.exitCode() == 0 && revParse.bytesAvailable()) { + while (revParse.canReadLine()) { + QByteArray branchName = revParse.readLine().trimmed(); + + //qDebug() << "Repo" << name << "reloaded branch" << branchName; + branches[branchName].created = 1; + fastImport.write("reset refs/heads/" + branchName + + "\nfrom refs/heads/" + branchName + "^0\n\n" + "progress Branch refs/heads/" + branchName + " reloaded\n"); } } } +void Repository::createBranch(const QString &branch, int revnum, + const QString &branchFrom, int) +{ + startFastImport(); + if (!branches.contains(branch)) { + qWarning() << branch << "is not a known branch in repository" << name << endl + << "Going to create it automatically"; + } + + QByteArray branchRef = branch.toUtf8(); + if (!branchRef.startsWith("refs/")) + branchRef.prepend("refs/heads/"); + + Branch &br = branches[branch]; + if (br.created && br.created != revnum) { + QByteArray backupBranch = branchRef + '_' + QByteArray::number(revnum); + qWarning() << branch << "already exists; backing up to" << backupBranch; + + fastImport.write("reset " + backupBranch + "\nfrom " + branchRef + "\n\n"); + } + + // now create the branch + br.created = revnum; + QByteArray branchFromRef = branchFrom.toUtf8(); + if (!branchFromRef.startsWith("refs/")) + branchFromRef.prepend("refs/heads/"); + + if (!branches.contains(branchFrom) || !branches.value(branchFrom).created) { + qCritical() << branch << "in repository" << name + << "is branching from branch" << branchFrom + << "but the latter doesn't exist. Can't continue."; + exit(1); + } + + fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n" + "progress Branch " + branchRef + " created from " + branchFromRef + "\n\n"); +} + Repository::Transaction *Repository::newTransaction(const QString &branch, const QString &svnprefix, int revnum) { + startFastImport(); if (!branches.contains(branch)) { - qCritical() << branch << "is not known in repository" << name; - return 0; + qWarning() << branch << "is not a known branch in repository" << name << endl + << "Going to create it automatically"; } Transaction *txn = new Transaction; @@ -91,19 +124,33 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const txn->revnum = revnum; txn->lastmark = revnum; - startFastImport(); + if ((++commitCount % 10000) == 0) + // write everything to disk every 10000 commits + fastImport.write("checkpoint\n"); return txn; } void Repository::startFastImport() { if (fastImport.state() == QProcess::NotRunning) { + if (processHasStarted) + qFatal("git-fast-import has been started once and crashed?"); + processHasStarted = true; + // start the process + QString outputFile = name; + outputFile.replace('/', '_'); + outputFile.prepend("log-"); + fastImport.setStandardOutputFile(outputFile, QIODevice::Append); + fastImport.setProcessChannelMode(QProcess::MergedChannels); + #ifndef DRY_RUN - fastImport.start("git-fast-import", QStringList()); + fastImport.start("git", QStringList() << "fast-import"); #else fastImport.start("/bin/cat", QStringList()); #endif + + reloadBranches(); } } @@ -143,7 +190,6 @@ QIODevice *Repository::Transaction::addFile(const QString &path, int mode, qint6 repository->fastImport.write("\ndata "); repository->fastImport.write(QByteArray::number(length)); repository->fastImport.write("\n", 1); - repository->fastImport.waitForBytesWritten(0); #endif modifiedFiles.insert(path, fp); @@ -160,28 +206,33 @@ void Repository::Transaction::commit() { QByteArray branchRef = branch; - if (!branchRef.startsWith("refs/heads/")) + if (!branchRef.startsWith("refs/")) branchRef.prepend("refs/heads/"); QTextStream s(&repository->fastImport); s << "commit " << branchRef << endl; s << "mark :" << revnum << endl; - s << "committer " << author << ' ' << datetime << " -0000" << endl; + s << "committer " << QString::fromUtf8(author) << ' ' << datetime << " -0000" << endl; Branch &br = repository->branches[branch]; - if (!br.isCreated) { - br.isCreated = true; - s << "from " << br.branchFrom << endl; + if (!br.created) { + qWarning() << "Branch" << branch << "in repository" << repository->name << "doesn't exist at revision" + << revnum << "-- did you resume from the wrong revision?"; + br.created = revnum; } s << "data " << message.length() << endl; } repository->fastImport.write(message); + repository->fastImport.putChar('\n'); // write the file deletions - foreach (QString df, deletedFiles) - repository->fastImport.write("D " + df.toUtf8() + "\n"); + if (deletedFiles.contains("")) + repository->fastImport.write("deleteall\n"); + else + foreach (QString df, deletedFiles) + repository->fastImport.write("D " + df.toUtf8() + "\n"); // write the file modifications QHash::ConstIterator it = modifiedFiles.constBegin(); @@ -195,9 +246,15 @@ void Repository::Transaction::commit() repository->fastImport.write("\n", 1); } - repository->fastImport.write("\n"); - - while (repository->fastImport.bytesToWrite() && repository->fastImport.waitForBytesWritten()) { - // nothing - } + repository->fastImport.write("\nprogress Commit #" + + QByteArray::number(repository->commitCount) + + " branch " + branch + + " = SVN r" + QByteArray::number(revnum) + "\n\n"); + printf(" %d modifications to \"%s\"", + deletedFiles.count() + modifiedFiles.count(), + qPrintable(repository->name)); + + while (repository->fastImport.bytesToWrite()) + if (!repository->fastImport.waitForBytesWritten(-1)) + qFatal("Failed to write to process: %s", qPrintable(repository->fastImport.errorString())); }