Make it easier to do automatic branching

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

diff --git a/src/repository.cpp b/src/repository.cpp
index aef71a16e70e846d1de5d63711aa660a016e534a..7c085ceabce94c16c3a10dd88822ccaaf7ee9158 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -45,30 +45,20 @@ Repository::~Repository()
 
 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/");
+    QProcess revParse;
+    revParse.setWorkingDirectory(name);
+    revParse.start("git", QStringList() << "rev-parse" << "--symbolic" << "--branches");
+    revParse.waitForFinished();
+
+    if (revParse.exitCode() == 0 && revParse.bytesAvailable()) {
+        startFastImport();
+
+        while (revParse.canReadLine()) {
+            QByteArray branchName = revParse.readLine();
 
-        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->created = 1;
+            branches[branchName].created = 1;
+            fastImport.write("reset refs/heads/" + branchName +
+                             "\nfrom refs/heads/" + branchName + "^0\n\n");
         }
     }
 }
@@ -77,8 +67,8 @@ 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);
+        qWarning() << branch << "is not a known branch in repository" << name << endl
+                   << "Going to create it automatically";
     }
 
     startFastImport();
@@ -100,6 +90,13 @@ void Repository::createBranch(const QString &branch, int revnum,
     if (!branchFromRef.startsWith("refs/"))
         branchFromRef.prepend("refs/heads/");
 
+    if (!branches.contains(branchFrom) || !branches.value(branchFrom).created) {
+        qCritical() << branch << "in repository" << name
+                    << "is branching from branch" << branchFrom
+                    << "but the latter doesn't exist. Can't continue.";
+        exit(1);
+    }
+
     fastImport.write("reset " + branchRef + "\nfrom " + branchFromRef + "\n\n");
 }
 
@@ -107,8 +104,8 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
                                                     int revnum)
 {
     if (!branches.contains(branch)) {
-        qCritical() << branch << "is not a known branch in repository" << name;
-        return 0;
+        qWarning() << branch << "is not a known branch in repository" << name << endl
+                   << "Going to create it automatically";
     }
 
     Transaction *txn = new Transaction;
@@ -138,9 +135,9 @@ void Repository::startFastImport()
         outputFile.replace('/', '_');
         outputFile.prepend("log-");
         fastImport.setStandardOutputFile(outputFile, QIODevice::Append);
+        fastImport.setProcessChannelMode(QProcess::MergedChannels);
 
 #ifndef DRY_RUN
-        fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
         fastImport.start("git-fast-import", QStringList());
 #else
         fastImport.start("/bin/cat", QStringList());
@@ -206,11 +203,11 @@ void Repository::Transaction::commit()
         QTextStream s(&repository->fastImport);
         s << "commit " << branchRef << endl;
         s << "mark :" << revnum << endl;
-        s << "committer " << author << ' ' << datetime << " -0000" << endl;
+        s << "committer " << QString::fromUtf8(author) << ' ' << datetime << " -0000" << endl;
 
         Branch &br = repository->branches[branch];
         if (!br.created) {
-            qWarning() << "Branch" << branch << "doesn't exist at revision"
+            qWarning() << "Branch" << branch << "in repository" << repository->name << "doesn't exist at revision"
                        << revnum << "-- did you resume from the wrong revision?";
             br.created = revnum;
         }