aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChaz Brown <iamparadox@netscape.net>2009-04-02 06:28:58 -0400
committerChaz Brown <iamparadox@netscape.net>2009-04-02 06:28:58 -0400
commitb6c5d3c40c505d9b743de9f45efc6a61f8eec047 (patch)
tree05d3781521ad790c80a1bff8769f9c1e83b0511d /src
parentc73cfdd4516228dca3bbb86b91c24a83e6b4465e (diff)
fix genrevision to use proper file under new or old HG for revision info
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/tools/genrevision/genrevision.cpp12
1 files changed, 12 insertions, 0 deletions
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);