From 1448160e1e63a9a1945a91c79fe8c2068ba081bd Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 29 May 2009 21:24:51 +0000 Subject: [PATCH] (svn r16462) -Change [FS#2930]: use a safer way to detect the hash of a mercurial repository (planetmaker) --- findversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/findversion.sh b/findversion.sh index f9ddd1bcb8..1e607a7ac5 100755 --- a/findversion.sh +++ b/findversion.sh @@ -93,7 +93,7 @@ elif [ -d "$ROOT_DIR/.hg" ]; then if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then MODIFIED="2" fi - HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3` + HASH=`LC_ALL=C hg parents --template="{node}"` REV="h`echo $HASH | cut -c1-8`" BRANCH=`hg branch | sed 's@^default$@@'` REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`