remove the source branch in the rules

diff --git a/src/repository.cpp b/src/repository.cpp
index 08a5306fa6a10722c0fcefd357b94fb9dd5abfad..1a422f8fbd45da092563be7669ae6af5e49161cf 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -24,9 +24,6 @@ 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);
@@ -204,7 +201,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;

diff --git a/src/repository.h b/src/repository.h
index b6b0708ba714c87a27c4dadcdbabf4613e1457d0..2cee3f25cded7d9462c7c7b8538c1ac525f16e67 100644 (file)
--- a/src/repository.h
+++ b/src/repository.h
@@ -70,7 +70,6 @@ public:
 private:
     struct Branch
     {
-        QString branchFrom;
         bool isCreated;
     };
 

diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index da05749e66fdb47e18867aedbcb0ea33cc93e725..e9a1192901757643e7b2f05cec8d4d7a87ade872 100644 (file)
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -48,7 +48,7 @@ void Rules::load()
 
     // initialize the regexps we will use
     QRegExp repoLine("create repository\\s+(\\S+)", Qt::CaseInsensitive);
-    QRegExp repoBranchLine("branch\\s+(\\S+)\\s+from\\s+(\\S+)", Qt::CaseInsensitive);
+    QRegExp repoBranchLine("branch\\s+(\\S+)", Qt::CaseInsensitive);
 
     QRegExp matchLine("match\\s+(.*)", Qt::CaseInsensitive);
     QRegExp matchRepoLine("repository\\s+(\\S+)", Qt::CaseInsensitive);
@@ -76,7 +76,6 @@ void Rules::load()
             if (repoBranchLine.exactMatch(line)) {
                 Repository::Branch branch;
                 branch.name = repoBranchLine.cap(1);
-                branch.branchFrom = repoBranchLine.cap(2);
 
                 repo.branches += branch;
                 continue;

diff --git a/src/ruleparser.h b/src/ruleparser.h
index f882289442a97b71b9392cb021c16f71d5010b72..443386251e5f7d9fc9db3ec70823646fabcee29b 100644 (file)
--- a/src/ruleparser.h
+++ b/src/ruleparser.h
@@ -30,7 +30,6 @@ public:
         struct Branch
         {
             QString name;
-            QString branchFrom;
         };
 
         QString name;

diff --git a/src/svn.cpp b/src/svn.cpp
index 7ec39087e502fa4437b80ce4f843dd2ee5ed3d1b..6cb7bc765e80a4d60ef9758592cbd7c8731b9fe3 100644 (file)
--- a/src/svn.cpp
+++ b/src/svn.cpp
@@ -353,7 +353,7 @@ int SvnPrivate::exportRevision(int revnum)
             if (path_from == NULL) {
                 // no, it's a new directory being added
                 // Git doesn't handle directories, so we don't either
-                qDebug() << "   mkdir ignored:" << key;
+                //qDebug() << "   mkdir ignored:" << key;
                 continue;
             }