Add support for branch creation on-the-fly

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

diff --git a/src/repository.cpp b/src/repository.cpp
index c3f52fb1e4e815a73a74708ffa82ceb1d808c6b5..08a5306fa6a10722c0fcefd357b94fb9dd5abfad 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -25,6 +25,8 @@ Repository::Repository(const Rules::Repository &rule)
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
         branch.branchFrom = branchRule.branchFrom;
+        if (!branch.branchFrom.startsWith("refs/"))
+            branch.branchFrom.prepend("refs/heads/");
         branch.isCreated = false;
 
         branches.insert(branchRule.name, branch);
@@ -34,12 +36,11 @@ Repository::Repository(const Rules::Repository &rule)
     branches["master"].isCreated = true;
 
     fastImport.setWorkingDirectory(name);
-    fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
 }
 
 Repository::~Repository()
 {
-    if (fastImport.state() == QProcess::Running) {
+    if (fastImport.state() != QProcess::NotRunning) {
         fastImport.closeWriteChannel();
         fastImport.waitForFinished();
     }
@@ -51,7 +52,7 @@ void Repository::reloadBranches()
                                     end = branches.end();
     for ( ; it != end; ++it) {
         QString branchRef = it.key();
-        if (!branchRef.startsWith("refs/heads/"))
+        if (!branchRef.startsWith("refs/"))
             branchRef.prepend("refs/heads/");
 
         bool branchExists;
@@ -69,17 +70,47 @@ void Repository::reloadBranches()
         if (branchExists) {
             startFastImport();
             fastImport.write("reset " + branchRef.toUtf8() +
-                             "\nfrom " + branchRef.toUtf8() + "^0\n");
+                             "\nfrom " + branchRef.toUtf8() + "^0\n\n");
             it->isCreated = true;
         }
     }
 }
 
+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);
+    }
+
+    startFastImport();
+    QByteArray branchRef = branch.toUtf8();
+    if (!branchRef.startsWith("refs/"))
+        branchRef.prepend("refs/heads/");
+
+    Branch &br = branches[branch];
+    if (br.isCreated) {
+        QByteArray backupBranch = branchRef + '_' + QByteArray::number(revnum);
+        qWarning() << branch << "already exists; backing up to" << backupBranch;
+
+        fastImport.write("reset " + backupBranch + "\nfrom " + branchRef + "\n\n");
+    }
+
+    // now create the branch
+    br.isCreated = true;
+    QByteArray branchFromRef = branchFrom.toUtf8();
+    if (!branchFromRef.startsWith("refs/"))
+        branchFromRef.prepend("refs/heads/");
+
+    fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n");
+}
+
 Repository::Transaction *Repository::newTransaction(const QString &branch, const QString &svnprefix,
                                                     int revnum)
 {
     if (!branches.contains(branch)) {
-        qCritical() << branch << "is not known in repository" << name;
+        qCritical() << branch << "is not a known branch in repository" << name;
         return 0;
     }
 
@@ -100,8 +131,10 @@ void Repository::startFastImport()
     if (fastImport.state() == QProcess::NotRunning) {
         // start the process
 #ifndef DRY_RUN
+        fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
         fastImport.start("git-fast-import", QStringList());
 #else
+        fastImport.setStandardOutputFile(name);
         fastImport.start("/bin/cat", QStringList());
 #endif
     }
@@ -156,11 +189,11 @@ void Repository::Transaction::commit()
     QByteArray message = log;
     if (!message.endsWith('\n'))
         message += '\n';
-    message += "\nsvn=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
+    message += "\nsvn path=" + svnprefix + "; revision=" + QByteArray::number(revnum) + "\n";
 
     {
         QByteArray branchRef = branch;
-        if (!branchRef.startsWith("refs/heads/"))
+        if (!branchRef.startsWith("refs/"))
             branchRef.prepend("refs/heads/");
 
         QTextStream s(&repository->fastImport);