#include <QDebug>
Repository::Repository(const Rules::Repository &rule)
- : name(rule.name)
+ : name(rule.name), processHasStarted(false)
{
foreach (Rules::Repository::Branch branchRule, rule.branches) {
Branch branch;
txn->lastmark = revnum;
startFastImport();
- if (++commitCount % 10000)
+ 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
-#ifndef DRY_RUN
- fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
- fastImport.start("git-fast-import", QStringList());
-#else
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());
+#else
fastImport.start("/bin/cat", QStringList());
#endif
}
repository->fastImport.write("\ndata ");
repository->fastImport.write(QByteArray::number(length));
repository->fastImport.write("\n", 1);
- repository->fastImport.waitForBytesWritten(0);
#endif
modifiedFiles.insert(path, fp);
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.created) {
repository->fastImport.write("\n");
- while (repository->fastImport.bytesToWrite() && repository->fastImport.waitForBytesWritten()) {
- // nothing
- }
+ while (repository->fastImport.bytesToWrite())
+ if (!repository->fastImport.waitForBytesWritten(-1))
+ qFatal("Failed to write to process: %s", qPrintable(repository->fastImport.errorString()));
}