const QString &branchFrom, int)
{
if (!branches.contains(branch)) {
- qCritical() << branch << "is not a known branch in repository" << name;
- exit(1);
+ qWarning() << branch << "is not a known branch in repository" << name << endl
+ << "Going to create it automatically";
}
startFastImport();
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");
}
int revnum)
{
if (!branches.contains(branch)) {
- qCritical() << branch << "is not a known branch 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;
outputFile.replace('/', '_');
outputFile.prepend("log-");
fastImport.setStandardOutputFile(outputFile, QIODevice::Append);
+ fastImport.setProcessChannelMode(QProcess::MergedChannels);
#ifndef DRY_RUN
- fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
fastImport.start("git-fast-import", QStringList());
#else
fastImport.start("/bin/cat", QStringList());
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) {
- qWarning() << "Branch" << branch << "doesn't exist at revision"
+ qWarning() << "Branch" << branch << "in repository" << repository->name << "doesn't exist at revision"
<< revnum << "-- did you resume from the wrong revision?";
br.created = revnum;
}
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()));
}