From: Kevin McCarthy <kevin@8t8.us>
Date: Mon, 4 Dec 2017 01:55:59 +0000 (-0800)
Subject: Convert version.sh to work with git.
X-Git-Tag: mutt-1-9-2-rel~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6df931c8c8ccd860829bff42b74c30e936d72646;p=mutt

Convert version.sh to work with git.

Use the built-in `git describe` to get the tag, distance, and
revision id.
---

diff --git a/version.sh b/version.sh
index d7988df7..4bf5fdf2 100644
--- a/version.sh
+++ b/version.sh
@@ -1,53 +1,30 @@
 #!/bin/sh
 
-HG=hg
-
 # Switch to directory where this script lives so that further commands are run
 # from the root directory of the source.  The script path and srcdir are double
 # quoted to allow the space character to appear in the path.
 srcdir=`dirname "$0"` && cd "$srcdir" || exit 1
 
-# Ensure that we have a repo here and that mercurial is installed.  If
-# not, just cat the VERSION file; it contains the latest release number.
-{ [ -d ".hg" ] && $HG >/dev/null 2>&1; } \
-|| exec cat VERSION
-
-# This is a mercurial repo and we have the hg command.
-
-# Get essential properties of the current working copy
-set -- `$HG parents --template='{rev} {node|short}\n'`
-rev="$1"
-node="$2"
+# Ensure that we have a repo here.
+# If not, just cat the VERSION file; it contains the latest release number.
+[ -d ".git" ] || exec cat VERSION
 
 # translate release tags into ##.##.## notation
-cleantag () {
-	case "$1" in
-		mutt-*-rel) echo "$1" | sed -e 's/mutt-//' -e 's/-rel//' | tr - . ;;
-		*)          echo "$1" ;;
-	esac
-}
-
-getdistance_old () {
-	# fudge it
-	set -- `$HG tags | sort -n -k 2 | egrep 'mutt-.*rel' | tail -1 | cut -d: -f1`
-	latesttag="$1"
-	latestrev="$2"
-	distance=`expr $rev - $latestrev`
-	echo $latesttag $distance
+get_tag () {
+	sed -e 's/mutt-//' -e 's/-rel.*//' | tr - .
 }
 
-getdistance_new () {
-	$HG parents --template='{latesttag} {latesttagdistance}\n'
+get_dist_node() {
+	sed -e 's/.*-rel-//' -e 's/-/ /'
 }
 
+describe=`git describe --tags --long --match 'mutt-*-rel' 2>/dev/null` || exec cat VERSION
 
-# latesttag appeared in hg 1.4.  Test for it.
-[ "`$HG log -r . --template='{latesttag}'`" = '' ] && 
-set -- `getdistance_old` ||
-set -- `getdistance_new`
+tag=`echo $describe | get_tag`
 
-tag=`cleantag "$1"`
-dist=$2
+set -- `echo $describe | get_dist_node`
+dist="$1"
+node="$2"
 
 if [ $dist -eq 0 ]; then
 	dist=
@@ -55,14 +32,5 @@ else
 	dist="+$dist"
 fi
 
-# if we have mq patches applied, mention it
-qparent=`$HG log -r qparent --template='{rev}\n' 2>/dev/null || echo $rev`
-qdelta=`expr $rev - $qparent`
-if [ $qdelta -eq 0 ]; then
-	qdist=""
-else
-	qdist=",mq+$qdelta"
-fi
-
-echo "$tag$dist$qdist ($node)"
+echo "$tag$dist ($node)"
 exit 0