Enhance error message

[svn-all-fast-export.git] / src / repository.cpp

diff --git a/src/repository.cpp b/src/repository.cpp
index 76171abb5bf7ded4a26c23e2ef0dbd3ca18fec44..699e686a25417063fb3b7f70ca0b6d90007c045a 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -20,7 +20,7 @@
 #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;
@@ -77,8 +77,8 @@ void Repository::createBranch(const QString &branch, int revnum,
                               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();
@@ -100,6 +100,13 @@ void Repository::createBranch(const QString &branch, int revnum,
     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");
 }
 
@@ -120,7 +127,7 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
     txn->lastmark = revnum;
 
     startFastImport();
-    if (++commitCount % 10000)
+    if ((++commitCount % 10000) == 0)
         // write everything to disk every 10000 commits
         fastImport.write("checkpoint\n");
     return txn;
@@ -129,14 +136,20 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
 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
     }
@@ -178,7 +191,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);
@@ -201,11 +213,11 @@ void Repository::Transaction::commit()
         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;
         }
@@ -237,7 +249,7 @@ void Repository::Transaction::commit()
 
     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()));
 }