X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fgetver.sh;h=4643ca63ff0bb43b344fa4f9dfef383567c128ff;hp=5155792016ad8af36e63db9a7d3654b14eb9e8eb;hb=fe33c185bd7027bb37d8cc0b16ba2cea3e834ccd;hpb=d58dd061fea1d30e4179828415aa887ff931cd48

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 5155792016..4643ca63ff 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -11,17 +11,24 @@ try_version() {
 
 try_svn() {
 	[ -d .svn ] || return 1
-	REV="$(svn info | awk '/^Revision:/ { print $2 }')"
+	REV="$(svn info | awk '/^Last Changed Rev:/ { print $4 }')"
 	REV="${REV:+r$REV}"
 	[ -n "$REV" ]
 }
 
 try_git() {
-	[ -d .git ] || return 1
-	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
+	[ -e .git ] || return 1
+	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $0); print $1 }')"
 	REV="${REV:+r$REV}"
 	[ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || REV="unknown"
+try_hg() {
+	[ -d .hg ] || return 1
+	REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
+	REV="${REV:+$REV}"
+	[ -n "$REV" ]
+}
+
+try_version || try_svn || try_git || try_hg || REV="unknown"
 echo "$REV"