diff options
| author | click <none@none> | 2010-06-24 20:13:07 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-06-24 20:13:07 +0200 |
| commit | 7c6be33ae01efb064114f9375f7153d80c070b3f (patch) | |
| tree | 5ceafc7c578ac63952a0ac8681c30c5af835ee55 | |
| parent | 931a827a0f1b44daf3ee995666fbd7479a59fa2c (diff) | |
Revert previous commit.
--HG--
branch : trunk
| -rw-r--r-- | src/genrevision/genrevision.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
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"); @@ -404,13 +405,13 @@ int main(int argc, char **argv) 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); @@ -430,13 +431,13 @@ int main(int argc, char **argv) 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); |