Mercurial > hg > vamp-build-and-test
changeset 113:b107ed308636
Pick up current tag for hg repo when packaging (if any)
| author | Chris Cannam |
|---|---|
| date | Wed, 09 Sep 2015 10:19:01 +0100 |
| parents | 1c02f4e7876e |
| children | 6015c2048c3f |
| files | SCRIPTS/check-changes.sh SCRIPTS/include.sh |
| diffstat | 1 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/SCRIPTS/include.sh Tue Sep 08 17:20:59 2015 +0100 +++ b/SCRIPTS/include.sh Wed Sep 09 10:19:01 2015 +0100 @@ -3,15 +3,20 @@ vcs_id() { dir="$1" ( cd "$dir" ; - if [ -d .hg ]; then - hg id | awk '{ print $1; }' - elif [ -d .git ]; then - git rev-parse --short HEAD - elif [ -d .svn ]; then - svn info | grep ^Revision | awk '{ print $2; }' - else - echo "unknown" - fi + if [ -d .hg ]; then + tag=$(hg id -t -r 'parents(.)') # tag is always followed by tag-commit + if [ "$tag" != "" ]; then + echo "${tag#$dir-}" # strip dir- prefix from tag if present + else + hg id | awk '{ print $1; }' + fi + elif [ -d .git ]; then + git rev-parse --short HEAD + elif [ -d .svn ]; then + svn info | grep ^Revision | awk '{ print $2; }' + else + echo "unknown" + fi ) }