Fix initialization of Repository::lastmark when creating a new transaction.

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

diff --git a/src/repository.cpp b/src/repository.cpp
index be24ed4c48d1ce471fcf74706e59f4e2543d097b..5faf2af106338eeb90f349d362751a5cb7930d1a 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -18,9 +18,34 @@
 #include "repository.h"
 #include <QTextStream>
 #include <QDebug>
+#include <QLinkedList>
+
+static const int maxSimultaneousProcesses = 100;
+
+class ProcessCache: QLinkedList<Repository *>
+{
+public:
+    void touch(Repository *repo)
+    {
+        remove(repo);
+
+        // if the cache is too big, remove from the front
+        while (size() >= maxSimultaneousProcesses)
+            takeFirst()->closeFastImport();
+
+        // append to the end
+        append(repo);
+    }
+
+    inline void remove(Repository *repo)
+    {
+        removeOne(repo);
+    }
+};
+static ProcessCache processCache;
 
 Repository::Repository(const Rules::Repository &rule)
-    : name(rule.name), commitCount(0), processHasStarted(false)
+    : name(rule.name), commitCount(0), outstandingTransactions(0), processHasStarted(false)
 {
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
@@ -36,6 +61,12 @@ Repository::Repository(const Rules::Repository &rule)
 }
 
 Repository::~Repository()
+{
+    Q_ASSERT(outstandingTransactions == 0);
+    closeFastImport();
+}
+
+void Repository::closeFastImport()
 {
     if (fastImport.state() != QProcess::NotRunning) {
         fastImport.write("checkpoint\n");
@@ -47,6 +78,8 @@ Repository::~Repository()
                 qWarning() << "git-fast-import for repository" << name << "did not die";
         }
     }
+    processHasStarted = false;
+    processCache.remove(this);
 }
 
 void Repository::reloadBranches()
@@ -122,11 +155,12 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
     txn->svnprefix = svnprefix.toUtf8();
     txn->datetime = 0;
     txn->revnum = revnum;
-    txn->lastmark = revnum;
 
     if ((++commitCount % 10000) == 0)
         // write everything to disk every 10000 commits
         fastImport.write("checkpoint\n");
+    if (outstandingTransactions++ == 0)
+        lastmark = 1;           // reset the mark number
     return txn;
 }
 
@@ -156,6 +190,7 @@ void Repository::startFastImport()
 
 Repository::Transaction::~Transaction()
 {
+    --repository->outstandingTransactions;
 }
 
 void Repository::Transaction::setAuthor(const QByteArray &a)
@@ -180,24 +215,33 @@ void Repository::Transaction::deleteFile(const QString &path)
 
 QIODevice *Repository::Transaction::addFile(const QString &path, int mode, qint64 length)
 {
-    FileProperties fp;
-    fp.mode = mode;
-    fp.mark = ++lastmark;
+    int mark = ++repository->lastmark;
+
+    if (modifiedFiles.capacity() == 0)
+        modifiedFiles.reserve(2048);
+    modifiedFiles.append("M ");
+    modifiedFiles.append(QByteArray::number(mode, 8));
+    modifiedFiles.append(" :");
+    modifiedFiles.append(QByteArray::number(mark));
+    modifiedFiles.append(' ');
+    modifiedFiles.append(path.toUtf8());
+    modifiedFiles.append("\n");
 
 #ifndef DRY_RUN
     repository->fastImport.write("blob\nmark :");
-    repository->fastImport.write(QByteArray::number(fp.mark));
+    repository->fastImport.write(QByteArray::number(mark));
     repository->fastImport.write("\ndata ");
     repository->fastImport.write(QByteArray::number(length));
     repository->fastImport.write("\n", 1);
 #endif
 
-    modifiedFiles.insert(path, fp);
     return &repository->fastImport;
 }
 
 void Repository::Transaction::commit()
 {
+    processCache.touch(repository);
+
     // create the commit message
     QByteArray message = log;
     if (!message.endsWith('\n'))
@@ -211,7 +255,6 @@ void Repository::Transaction::commit()
 
         QTextStream s(&repository->fastImport);
         s << "commit " << branchRef << endl;
-        s << "mark :" << revnum << endl;
         s << "committer " << QString::fromUtf8(author) << ' ' << datetime << " -0000" << endl;
 
         Branch &br = repository->branches[branch];
@@ -235,16 +278,7 @@ void Repository::Transaction::commit()
             repository->fastImport.write("D " + df.toUtf8() + "\n");
 
     // write the file modifications
-    QHash<QString, FileProperties>::ConstIterator it = modifiedFiles.constBegin();
-    for ( ; it != modifiedFiles.constEnd(); ++it) {
-        repository->fastImport.write("M ", 2);
-        repository->fastImport.write(QByteArray::number(it->mode, 8));
-        repository->fastImport.write(" :", 2);
-        repository->fastImport.write(QByteArray::number(it->mark));
-        repository->fastImport.write(" ", 1);
-        repository->fastImport.write(it.key().toUtf8());
-        repository->fastImport.write("\n", 1);
-    }
+    repository->fastImport.write(modifiedFiles);
 
     repository->fastImport.write("\nprogress Commit #" +
                                  QByteArray::number(repository->commitCount) +