From e84fd0e1f83ef89064e4b8b5673cbd0b68f48c0a Mon Sep 17 00:00:00 2001 From: Chaz Brown Date: Fri, 3 Apr 2009 00:24:01 -0400 Subject: backport genrevision fix from TC2 that allows old and new versions of HG to be used in revision generation --HG-- branch : trunk --- src/tools/genrevision/genrevision.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/tools') 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 + * Copyright (C) 2005-2009 MaNGOS * * 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); -- cgit v1.2.3