From 931a827a0f1b44daf3ee995666fbd7479a59fa2c Mon Sep 17 00:00:00 2001 From: click Date: Thu, 24 Jun 2010 18:46:38 +0200 Subject: Fix genrevision to use the revision of the CHECKED OUT sourcetree, not the revision from when it was last CACHED (BAH-HUMBUG-CRAP-BUG! Grrrr...) --HG-- branch : trunk --- src/genrevision/genrevision.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp index 7e304b25a7e..35bb315088c 100644 --- a/src/genrevision/genrevision.cpp +++ b/src/genrevision/genrevision.cpp @@ -403,14 +403,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/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); + if (!res) + res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); // GIT data if (!res) res = extractDataFromGit(path+".git/FETCH_HEAD",path,use_url,data); @@ -429,14 +429,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/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); + if (!res) + res = extractDataFromHG(path+".hg/branchheads.cache",path,use_url,data); + if (!res) + res = extractDataFromHG(path+"_hg/branchheads.cache",path,use_url,data); /// SVN data if (!res) res = extractDataFromSvn(path+".svn/entries",use_url,data); @@ -452,13 +452,11 @@ int main(int argc, char **argv) else if(hg_prefered) { // HG 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); + 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); /// SVN data if (!res) res = extractDataFromSvn(path+".svn/entries",use_url,data); -- cgit v1.2.3