diff options
| author | Chaz Brown <iamparadox@netscape.net> | 2009-04-03 00:24:01 -0400 |
|---|---|---|
| committer | Chaz Brown <iamparadox@netscape.net> | 2009-04-03 00:24:01 -0400 |
| commit | e84fd0e1f83ef89064e4b8b5673cbd0b68f48c0a (patch) | |
| tree | deda16d80330b02096ae9cceb6fff7d850852216 /src | |
| parent | f2e88cae5188b4b1d0451c4a760793a3d881b0b0 (diff) | |
backport genrevision fix from TC2 that allows old and new versions of HG to be used in revision generation
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/genrevision/genrevision.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index a41ba2d86e1..1c22655c782 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://getmangos.com/> + * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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); |