Support for pathless rules

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

diff --git a/src/repository.cpp b/src/repository.cpp
index b85988514307596d0fa76e923d2152a3b0ca4299..05f01e15b0e745e559cd1d93c27f9edd72352573 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -25,7 +25,7 @@ Repository::Repository(const Rules::Repository &rule)
     foreach (Rules::Repository::Branch branchRule, rule.branches) {
         Branch branch;
         branch.branchFrom = branchRule.branchFrom;
-        if (!branch.branchFrom.startsWith("refs/heads/"))
+        if (!branch.branchFrom.startsWith("refs/"))
             branch.branchFrom.prepend("refs/heads/");
         branch.isCreated = false;
 
@@ -36,7 +36,6 @@ Repository::Repository(const Rules::Repository &rule)
     branches["master"].isCreated = true;
 
     fastImport.setWorkingDirectory(name);
-    fastImport.setProcessChannelMode(QProcess::ForwardedChannels);
 }
 
 Repository::~Repository()
@@ -53,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;
@@ -81,7 +80,7 @@ Repository::Transaction *Repository::newTransaction(const QString &branch, const
                                                     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;
     }
 
@@ -102,8 +101,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
     }
@@ -162,7 +163,7 @@ void Repository::Transaction::commit()
 
     {
         QByteArray branchRef = branch;
-        if (!branchRef.startsWith("refs/heads/"))
+        if (!branchRef.startsWith("refs/"))
             branchRef.prepend("refs/heads/");
 
         QTextStream s(&repository->fastImport);