X-Git-Url: http://andersk.mit.edu/gitweb/svn-all-fast-export.git/blobdiff_plain/b6ba9639a3c908aedb76954a575641c56a76714c..6b450d1d7ec57ed13d5fd22c639f08d0737f4af8:/src/repository.cpp

diff --git a/src/repository.cpp b/src/repository.cpp
index 8a5f4f0..335278a 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -24,7 +24,6 @@ Repository::Repository(const Rules::Repository &rule)
 {
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
-        branch.branchFrom = branchRule.branchFrom;
         branch.isCreated = false;
 
         branches.insert(branchRule.name, branch);
@@ -33,23 +32,82 @@ Repository::Repository(const Rules::Repository &rule)
     // create the default branch
     branches["master"].isCreated = true;
 
-    fastImport.setWorkingDirectory(rule.name);
-    fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
+    fastImport.setWorkingDirectory(name);
 }
 
 Repository::~Repository()
 {
-    if (fastImport.state() == QProcess::Running) {
+    if (fastImport.state() != QProcess::NotRunning) {
         fastImport.closeWriteChannel();
         fastImport.waitForFinished();
     }
 }
 
+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/");
+
+        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->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;
     }
 
@@ -61,16 +119,24 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
     txn->revnum = revnum;
     txn->lastmark = revnum;
 
+    startFastImport();
+    return txn;
+}
+
+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
+        QString outputFile = name;
+        outputFile.replace('/', '_');
+        fastImport.setStandardOutputFile(outputFile, QIODevice::Append);
         fastImport.start("/bin/cat", QStringList());
 #endif
     }
-
-    return txn;
 }
 
 Repository::Transaction::~Transaction()
@@ -122,11 +188,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);
@@ -137,7 +203,6 @@ void Repository::Transaction::commit()
         Branch &br = repository->branches[branch];
         if (!br.isCreated) {
             br.isCreated = true;
-            s << "from " << br.branchFrom << endl;
         }
 
         s << "data " << message.length() << endl;
@@ -146,8 +211,11 @@ void Repository::Transaction::commit()
     repository->fastImport.write(message);
 
     // write the file deletions
-    foreach (QString df, deletedFiles)
-        repository->fastImport.write("D " + df.toUtf8() + "\n");
+    if (deletedFiles.contains(""))
+        repository->fastImport.write("deleteall\n");
+    else
+        foreach (QString df, deletedFiles)
+            repository->fastImport.write("D " + df.toUtf8() + "\n");
 
     // write the file modifications
     QHash<QString, FileProperties>::ConstIterator it = modifiedFiles.constBegin();