Commit 96294bce authored by Brendan Cully's avatar Brendan Cully

Back out f1b4d1d17200. It is nice, but it breaks make dist.

parent 85106787
......@@ -7,7 +7,7 @@ AC_PREREQ([2.54])
AC_INIT([mutt.h])
AM_CONFIG_HEADER([config.h])
mutt_cv_version=`./version.sh`
mutt_cv_version=`cat $srcdir/VERSION`
AM_INIT_AUTOMAKE(mutt, $mutt_cv_version)
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
......
#!/bin/sh
# 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"
# 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 +1 | egrep 'mutt-.*rel' | tail -1 | cut -d: -f1`
latesttag="$1"
latestrev="$2"
distance=`expr $rev - $latestrev`
echo $latesttag $distance
}
getdistance_new () {
hg parents --template='{latesttag} {latesttagdistance}\n'
}
# latesttag appeared in hg 1.4. Test for it.
[ "`hg log -r . --template='{latesttag}'`" = '' ] &&
set -- `getdistance_old` ||
set -- `getdistance_new`
tag=`cleantag "$1"`
dist=$2
if [ $dist -eq 0 ]; then
dist=
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)"
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment