Don't start the git-fast-import process twice. And make it log its

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

diff --git a/src/repository.cpp b/src/repository.cpp
index 335278abdbbcfbdc6ea81b5cc48b472b77255231..63252b589fe576b7c38eb5f6d95852776e2582ca 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -20,17 +20,17 @@
 #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;
-        branch.isCreated = false;
+        branch.created = 0;     // not created
 
         branches.insert(branchRule.name, branch);
     }
 
     // create the default branch
-    branches["master"].isCreated = true;
+    branches["master"].created = 1;
 
     fastImport.setWorkingDirectory(name);
 }
@@ -68,7 +68,7 @@ void Repository::reloadBranches()
             startFastImport();
             fastImport.write("reset " + branchRef.toUtf8() +
                              "\nfrom " + branchRef.toUtf8() + "^0\n\n");
-            it->isCreated = true;
+            it->created = 1;
         }
     }
 }
@@ -87,7 +87,7 @@ void Repository::createBranch(const QString &branch, int revnum,
         branchRef.prepend("refs/heads/");
 
     Branch &br = branches[branch];
-    if (br.isCreated) {
+    if (br.created && br.created != revnum) {
         QByteArray backupBranch = branchRef + '_' + QByteArray::number(revnum);
         qWarning() << branch << "already exists; backing up to" << backupBranch;
 
@@ -95,7 +95,7 @@ void Repository::createBranch(const QString &branch, int revnum,
     }
 
     // now create the branch
-    br.isCreated = true;
+    br.created = revnum;
     QByteArray branchFromRef = branchFrom.toUtf8();
     if (!branchFromRef.startsWith("refs/"))
         branchFromRef.prepend("refs/heads/");
@@ -120,20 +120,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
+        QString outputFile = name;
+        outputFile.replace('/', '_');
+        outputFile.prepend("log-");
+        fastImport.setStandardOutputFile(outputFile, QIODevice::Append);
+
 #ifndef DRY_RUN
         fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
         fastImport.start("git-fast-import", QStringList());
 #else
-        QString outputFile = name;
-        outputFile.replace('/', '_');
-        fastImport.setStandardOutputFile(outputFile, QIODevice::Append);
         fastImport.start("/bin/cat", QStringList());
 #endif
     }
@@ -201,14 +210,17 @@ void Repository::Transaction::commit()
         s << "committer " << author << ' ' << datetime << " -0000" << endl;
 
         Branch &br = repository->branches[branch];
-        if (!br.isCreated) {
-            br.isCreated = true;
+        if (!br.created) {
+            qWarning() << "Branch" << branch << "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(""))