From b6c5d3c40c505d9b743de9f45efc6a61f8eec047 Mon Sep 17 00:00:00 2001 From: Chaz Brown Date: Thu, 2 Apr 2009 06:28:58 -0400 Subject: fix genrevision to use proper file under new or old HG for revision info --HG-- branch : trunk --- src/tools/genrevision/genrevision.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index 942e440d425..1c22655c782 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -330,6 +330,10 @@ int main(int argc, char **argv) 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); @@ -347,6 +351,10 @@ int main(int argc, char **argv) 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); @@ -360,6 +368,10 @@ int main(int argc, char **argv) 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