1.1 --- a/configure	Sun Nov 13 17:48:17 2011 +0100
     1.2 +++ b/configure	Sun Nov 13 18:24:36 2011 +0100
     1.3 @@ -550,21 +550,19 @@
     1.4  else
     1.5      case "${VERSION}" in
     1.6          *+hg|hg)
     1.7 -            REVISION="$( hg id -n 2>/dev/null || true )"
     1.8 -            case "${REVISION}" in
     1.9 -                "")
    1.10 -                    VERSION="${VERSION}_unknown@$( date +%Y%m%d.%H%M%S )";;
    1.11 -                *)
    1.12 -                    VERSION="${VERSION}_$( hg id -b )@${REVISION%%+}_$( hg id -i )"
    1.13 -                    ;;
    1.14 -            esac
    1.15 -            # Arrange to have no / in the directory name, no need to create an
    1.16 -            # arbitrarily deep directory structure
    1.17 -            VERSION="$( printf "${VERSION}\n" |"${sed}" -r -e 's|/+|_|g;' )"
    1.18 +            rev_id="$( hg log -r . --template '{branch}:{node|short}\n' \
    1.19 +                              2>/dev/null                               \
    1.20 +                       || true                                          \
    1.21 +                     )"
    1.22 +            VERSION="${VERSION}@${rev_id:-unknown:$( date +%Y%m%d.%H%M%S )}"
    1.23              ;;
    1.24      esac
    1.25  fi
    1.26  
    1.27 +# Arrange to have no / in the directory name, no need to create an
    1.28 +# arbitrarily deep directory structure
    1.29 +VERSION="$( printf "${VERSION}" |"${sed}" -r -e 's:/+:_:g;' )"
    1.30 +
    1.31  printf "${VERSION}\n"
    1.32  
    1.33  #---------------------------------------------------------------------