/hg/icedtea6: PR497: Mercurial revision detection not very reliable

[andrew at icedtea.classpath.org]

changeset 3ebdb1a50ba8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ebdb1a50ba8
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 12:52:39 2011 +0000

	PR497: Mercurial revision detection not very reliable

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 PR497: Mercurial revision detection not very reliable
		* acinclude.m4: (IT_OBTAIN_HG_REVISIONS): Use hg id rather
	than hg tip.


diffstat:

2 files changed, 10 insertions(+), 3 deletions(-)
ChangeLog    |    7 +++++++
acinclude.m4 |    6 +++---

diffs (40 lines):

diff -r 7d23f65c73a8 -r 3ebdb1a50ba8 ChangeLog
--- a/ChangeLog	Tue Feb 22 12:21:34 2011 +0100
+++ b/ChangeLog	Tue Feb 22 12:52:39 2011 +0000
@@ -1,3 +1,10 @@ 2011-02-22  Xerxes Ranby  <xerxes at zafena
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR497: Mercurial revision detection not very reliable
+	* acinclude.m4:
+	(IT_OBTAIN_HG_REVISIONS): Use hg id rather
+	than hg tip.
+
 2011-02-22  Xerxes Ranby  <xerxes at zafena.se>
 
 	JamVM: Taste the New --enable-jamvm Flavour!
diff -r 7d23f65c73a8 -r 3ebdb1a50ba8 acinclude.m4
--- a/acinclude.m4	Tue Feb 22 12:21:34 2011 +0100
+++ b/acinclude.m4	Tue Feb 22 12:52:39 2011 +0000
@@ -1451,19 +1451,19 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS],
   if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then
     AC_MSG_CHECKING([for IcedTea Mercurial revision ID])
     if test -e ${abs_top_srcdir}/.hg ; then 
-      ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ; 
+      ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} id -i)`" ; 
     fi ;
     AC_MSG_RESULT([${ICEDTEA_REVISION}])
     AC_SUBST([ICEDTEA_REVISION])
     AC_MSG_CHECKING([for JDK Mercurial revision ID])
     if test -e ${OPENJDK_SRC_DIR}/jdk/.hg ; then
-      JDK_REVISION="r`(cd ${OPENJDK_SRC_DIR}/jdk; ${HG} tip --template '{node|short}')`" ;
+      JDK_REVISION="r`(cd ${OPENJDK_SRC_DIR}/jdk; ${HG} id -i)`" ;
     fi ;
     AC_MSG_RESULT([${JDK_REVISION}])
     AC_SUBST([JDK_REVISION])
     AC_MSG_CHECKING([for HotSpot Mercurial revision ID])
     if test -e ${OPENJDK_SRC_DIR}/hotspot/.hg ; then \
-      HOTSPOT_REVISION="r`(cd ${OPENJDK_SRC_DIR}/hotspot; ${HG} tip --template '{node|short}')`" ;
+      HOTSPOT_REVISION="r`(cd ${OPENJDK_SRC_DIR}/hotspot; ${HG} id -i)`" ;
     fi ; 
     AC_MSG_RESULT([${HOTSPOT_REVISION}])
     AC_SUBST([HOTSPOT_REVISION])