josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert previous commit.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-06-24 20:13:07 +02:00
parent 931a827a0f
commit 7c6be33ae0
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/genrevision/genrevision.cpp
+15 -11
View File
@@ -203,6 +203,7 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData&
strcpy(data.rev_str,hash_str); strcpy(data.rev_str,hash_str);
strcpy(data.hash_str,"*"); strcpy(data.hash_str,"*");
time_t rev_time = 0; time_t rev_time = 0;
// extracting date/time // extracting date/time
FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r"); FILE* LogFile = fopen((path+".git/logs/HEAD").c_str(), "r");
@@ -403,14 +404,14 @@ int main(int argc, char **argv)
if (!res) if (!res)
res = extractDataFromSvn(path+"_svn/entries",use_url,data); res = extractDataFromSvn(path+"_svn/entries",use_url,data);
// HG 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) if (!res)
res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
if (!res) if (!res)
res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); 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 // GIT data
if (!res) if (!res)
res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data); res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data);
@@ -429,14 +430,14 @@ int main(int argc, char **argv)
if (!res) if (!res)
res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data); res = extractDataFromGit(path+"_git/FETCH_HEAD",path,use_url,data);
// HG 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) if (!res)
res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data);
if (!res) if (!res)
res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); 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 /// SVN data
if (!res) if (!res)
res = extractDataFromSvn(path+".svn/entries",use_url,data); 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); res = extractDataFromArchive(path+"_hg_archival.txt",path,use_url,data);
} }
else if(hg_prefered) else if(hg_prefered)
{ {
// HG data // HG data
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/branch.cache",path,use_url,data);
if (!res) if (!res)
res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); 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 /// SVN data
if (!res) if (!res)
res = extractDataFromSvn(path+".svn/entries",use_url,data); res = extractDataFromSvn(path+".svn/entries",use_url,data);