Commit 38b3439d authored by Mike Crowe's avatar Mike Crowe Committed by Michal Marek

setlocalversion: update mercurial tag parsing

The tag output of hg doesn't quite match what setlocalversion currently
expects, so update it to handle the latest format.
Signed-off-by: default avatarMike Crowe <mcrowe@zipitwireless.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 0719e1d2
...@@ -86,12 +86,16 @@ scm_version() ...@@ -86,12 +86,16 @@ scm_version()
# Check for mercurial and a mercurial repo. # Check for mercurial and a mercurial repo.
if test -d .hg && hgid=`hg id 2>/dev/null`; then if test -d .hg && hgid=`hg id 2>/dev/null`; then
tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` # Do we have an tagged version? If so, latesttagdistance == 1
if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then
# Do we have an untagged version? id=`hg log -r . --template '{latesttag}'`
if [ -z "$tag" -o "$tag" = tip ]; then
id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
printf '%s%s' -hg "$id" printf '%s%s' -hg "$id"
else
tag=`printf '%s' "$hgid" | cut -d' ' -f2`
if [ -z "$tag" -o "$tag" = tip ]; then
id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
printf '%s%s' -hg "$id"
fi
fi fi
# Are there uncommitted changes? # Are there uncommitted changes?
......
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