X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/blobdiff_plain/e087596c78237db34511211719218fe0fb2e8e51..9413f4488b5d0eb39fee8af8edca2e99cf2254ca:/src/repository.cpp

diff --git a/src/repository.cpp b/src/repository.cpp
index 1cb7c41..72bbd60 100644
--- 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), commitCount(0), processHasStarted(false)
 {
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
@@ -45,30 +45,20 @@ Repository::~Repository()
 
 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/");
+    QProcess revParse;
+    revParse.setWorkingDirectory(name);
+    revParse.start("git", QStringList() << "rev-parse" << "--symbolic" << "--branches");
+    revParse.waitForFinished();
+
+    if (revParse.exitCode() == 0 && revParse.bytesAvailable()) {
+        startFastImport();
 
-        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;
+        while (revParse.canReadLine()) {
+            QByteArray branchName = revParse.readLine().trimmed();
+
+            branches[branchName].created = 1;
+            fastImport.write("reset refs/heads/" + branchName +
+                             "\nfrom refs/heads/" + branchName + "^0\n\n");
         }
     }
 }
@@ -77,8 +67,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 +90,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");
 }
 
@@ -107,8 +104,8 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
                                                     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;
@@ -120,20 +117,29 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
     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
-#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
     }
@@ -175,7 +181,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);
@@ -198,15 +203,20 @@ 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];
-        Q_ASSERT(br.created);
+        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
     if (deletedFiles.contains(""))
@@ -229,7 +239,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()));
 }