#include <QDebug>
Repository::Repository(const Rules::Repository &rule)
- : name(rule.name), processHasStarted(false)
+ : name(rule.name), commitCount(0), processHasStarted(false)
{
foreach (Rules::Repository::Branch branchRule, rule.branches) {
Branch branch;
Repository::~Repository()
{
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<QString, Branch>::Iterator it = branches.begin(),
- end = branches.end();
- for ( ; it != end; ++it) {
- QString branchRef = it.key();
- if (!branchRef.startsWith("refs/"))
- 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->created = 1;
+ 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";
}
- startFastImport();
QByteArray branchRef = branch.toUtf8();
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");
exit(1);
}
- fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n");
+ 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)) {
qWarning() << branch << "is not a known branch in repository" << name << endl
<< "Going to create it automatically";
txn->revnum = revnum;
txn->lastmark = revnum;
- startFastImport();
if ((++commitCount % 10000) == 0)
// write everything to disk every 10000 commits
fastImport.write("checkpoint\n");
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();
}
}
repository->fastImport.write("\n", 1);
}
- repository->fastImport.write("\n");
+ 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))