General improvements and reload branches automatically when starting git-fast-import

3 files changed, 21 insertions, 14 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 9ad5477..8308eb6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -70,8 +70,6 @@ int main(int argc, char **argv)
     QHash<QString, Repository *> repositories;
     foreach (Rules::Repository rule, rules.repositories()) {
         Repository *repo = new Repository(rule);
-        if (min_rev > 1)
-            repo->reloadBranches();
         repositories.insert(rule.name, repo);
     }
 
diff --git a/src/repository.cpp b/src/repository.cpp
index 29235e3..be24ed4 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -54,17 +54,17 @@ void Repository::reloadBranches()
     QProcess revParse;
     revParse.setWorkingDirectory(name);
     revParse.start("git", QStringList() << "rev-parse" << "--symbolic" << "--branches");
-    revParse.waitForFinished();
+    revParse.waitForFinished(-1);
 
     if (revParse.exitCode() == 0 && revParse.bytesAvailable()) {
-        startFastImport();
-
         while (revParse.canReadLine()) {
             QByteArray branchName = revParse.readLine().trimmed();
 
+            //qDebug() << "Repo" << name << "reloaded branch" << branchName;
             branches[branchName].created = 1;
             fastImport.write("reset refs/heads/" + branchName +
-                             "\nfrom refs/heads/" + branchName + "^0\n\n");
+                             "\nfrom refs/heads/" + branchName + "^0\n\n"
+                             "progress Branch refs/heads/" + branchName + " reloaded\n");
         }
     }
 }
@@ -72,12 +72,12 @@ void Repository::reloadBranches()
 void Repository::createBranch(const QString &branch, int revnum,
                               const QString &branchFrom, int)
 {
+    startFastImport();
     if (!branches.contains(branch)) {
         qWarning() << branch << "is not a known branch in repository" << name << endl
                    << "Going to create it automatically";
     }
 
-    startFastImport();
     QByteArray branchRef = branch.toUtf8();
     if (!branchRef.startsWith("refs/"))
         branchRef.prepend("refs/heads/");
@@ -103,12 +103,14 @@ void Repository::createBranch(const QString &branch, int revnum,
         exit(1);
     }
 
-    fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n");
+    fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n"
+        "progress Branch " + branchRef + " created from " + branchFromRef + "\n\n");
 }
 
 Repository::Transaction *Repository::newTransaction(const QString &branch, const QString &svnprefix,
                                                     int revnum)
 {
+    startFastImport();
     if (!branches.contains(branch)) {
         qWarning() << branch << "is not a known branch in repository" << name << endl
                    << "Going to create it automatically";
@@ -122,7 +124,6 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
     txn->revnum = revnum;
     txn->lastmark = revnum;
 
-    startFastImport();
     if ((++commitCount % 10000) == 0)
         // write everything to disk every 10000 commits
         fastImport.write("checkpoint\n");
@@ -144,10 +145,12 @@ void Repository::startFastImport()
         fastImport.setProcessChannelMode(QProcess::MergedChannels);
 
 #ifndef DRY_RUN
-        fastImport.start("git-fast-import", QStringList());
+        fastImport.start("git", QStringList() << "fast-import");
 #else
         fastImport.start("/bin/cat", QStringList());
 #endif
+
+        reloadBranches();
     }
 }
 
@@ -243,7 +246,13 @@ void Repository::Transaction::commit()
         repository->fastImport.write("\n", 1);
     }
 
-    repository->fastImport.write("\n");
+    repository->fastImport.write("\nprogress Commit #" +
+                                 QByteArray::number(repository->commitCount) +
+                                 " branch " + branch +
+                                 " = SVN r" + QByteArray::number(revnum) + "\n\n");
+    printf(" %d modifications to \"%s\"",
+           deletedFiles.count() + modifiedFiles.count(),
+           qPrintable(repository->name));
 
     while (repository->fastImport.bytesToWrite())
         if (!repository->fastImport.waitForBytesWritten(-1))
diff --git a/src/svn.cpp b/src/svn.cpp
index b3b7d9b..1e7dcbf 100644
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -479,7 +479,7 @@ int SvnRevision::exportEntry(const char *key, const svn_fs_path_change_t *change
         }
 
         current += '/';
-        qDebug() << "   " << key << "was copied from" << path_from;
+        qDebug() << "   " << key << "was copied from" << path_from << "rev" << rev_from;
     }
 
     // find the first rule that matches this pathname
@@ -512,8 +512,8 @@ int SvnRevision::exportDispatch(const char *key, const svn_fs_path_change_t *cha
     switch (rule.action) {
     case Rules::Match::Ignore:
         // ignore rule
-        qDebug() << "   " << qPrintable(current) << "rev" << revnum
-                 << "-> ignored (rule" << rule << ")";
+        //qDebug() << "   " << qPrintable(current) << "rev" << revnum
+        //         << "-> ignored (rule" << rule << ")";
         return EXIT_SUCCESS;
 
     case Rules::Match::Recurse: