Enhance the saving of repository data by adding a "checkpoint" command at the end.

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

diff --git a/src/repository.cpp b/src/repository.cpp
index 538b6f069d331def03227575bb1ca55d103e0706..29235e3650082a1a9a35c68ec5e074ca6f29e51d 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), processHasStarted(false)
+    : name(rule.name), commitCount(0), processHasStarted(false)
 {
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
@@ -38,37 +38,33 @@ Repository::Repository(const Rules::Repository &rule)
 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/");
+    QProcess revParse;
+    revParse.setWorkingDirectory(name);
+    revParse.start("git", QStringList() << "rev-parse" << "--symbolic" << "--branches");
+    revParse.waitForFinished();
 
-        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;
+    if (revParse.exitCode() == 0 && revParse.bytesAvailable()) {
+        startFastImport();
+
+        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");
         }
     }
 }
@@ -114,8 +110,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;
@@ -217,7 +213,7 @@ void Repository::Transaction::commit()
 
         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;
         }