From 7c6be33ae01efb064114f9375f7153d80c070b3f Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Thu, 24 Jun 2010 20:13:07 +0200
Subject: Revert previous commit.

--HG--
branch : trunk
---
 src/genrevision/genrevision.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp
index 35bb315088c..71ca1553689 100644
--- a/src/genrevision/genrevision.cpp
+++ b/src/genrevision/genrevision.cpp
@@ -203,6 +203,7 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
         strcpy(data.rev_str,hash_str);
         strcpy(data.hash_str,"*");
 
+
     time_t rev_time = 0;
     // extracting date/time
     FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r");
@@ -403,14 +404,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromSvn(path+"_svn/entries",use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             // GIT data
             if (!res)
                 res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
@@ -429,14 +430,14 @@ int main(int argc, char **argv)
             if (!res)
                 res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data);
             // HG data
-            if (!res)
-                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
            /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
@@ -449,14 +450,17 @@ int main(int argc, char **argv)
                 res = extractDataFromArchive(path+"_hg_archival.txt",path,use_url,data);
         }
 
+
         else if(hg_prefered)
         {
             // HG data
-            res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
-            if (!res)
-                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
+            res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
             if (!res)
                 res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+".hg/branch.cache",path,use_url,data);
+            if (!res)
+                res = extractDataFromHG(path+"_hg/branch.cache",path,use_url,data);
             /// SVN data
             if (!res)
                 res = extractDataFromSvn(path+".svn/entries",use_url,data);
-- 
cgit v1.2.3