/hg/icedtea-web: Fix mercurial version detection

[omajid at icedtea.classpath.org]

changeset 2446ec028f75 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2446ec028f75
author: Omair Majid <omajid at redhat.com>
date: Mon Mar 07 14:48:01 2011 -0500

	Fix mercurial version detection

	This is pretty much identical to PR497: Mercurial revision detection
	not very reliable.

	2011-03-07 Omair Majid <omajid at redhat.com>

	 * NEWS: Update.
	    * acinclude.m4 (IT_OBTAIN_HG_REVISIONS): Use hg id instead of hg tip.


diffstat:

 ChangeLog    |  5 +++++
 NEWS         |  1 +
 acinclude.m4 |  2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 167e9e2b3a20 -r 2446ec028f75 ChangeLog
--- a/ChangeLog	Mon Mar 07 11:24:34 2011 -0500
+++ b/ChangeLog	Mon Mar 07 14:48:01 2011 -0500
@@ -1,3 +1,8 @@
+2011-03-07  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update.
+	* acinclude.m4 (IT_OBTAIN_HG_REVISIONS): Use hg id instead of hg tip.
+
 2011-03-07  Omair Majid  <omajid at redhat.com>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc: Add plugin_debug_suspend.
diff -r 167e9e2b3a20 -r 2446ec028f75 NEWS
--- a/NEWS	Mon Mar 07 11:24:34 2011 -0500
+++ b/NEWS	Mon Mar 07 14:48:01 2011 -0500
@@ -16,6 +16,7 @@
   - IcedTea-Web now installs to a FHS-compliant location
   - IcedTea-Web can now handle Proxy Auto Config files
 * Common Fixes and Improvements
+  - PR497: Mercurial revision detection not very reliable
   - PR638: JNLPClassLoader.loadClass(String name) can return null
   - RH677772: NoSuchAlgorithmException using SSL/TLS in javaws
 * NetX
diff -r 167e9e2b3a20 -r 2446ec028f75 acinclude.m4
--- a/acinclude.m4	Mon Mar 07 11:24:34 2011 -0500
+++ b/acinclude.m4	Mon Mar 07 14:48:01 2011 -0500
@@ -410,7 +410,7 @@
   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])