diff options
-rw-r--r-- | .version | 2 | ||||
-rwxr-xr-x | configure | 16 |
2 files changed, 5 insertions, 13 deletions
@@ -1 +1 @@ -1.4.1+svn +1.4.1+hg @@ -340,21 +340,13 @@ IFS="${save_IFS}" # If we can't get the revision number, use date printf "Computing version string... " case "${VERSION}" in - *+svn|svn) - REVISION="$( LC_ALL=C svnversion )" + *+hg|hg) + REVISION="$( hg id -n 2>/dev/null )" case "${REVISION}" in - exported) + "") VERSION="${VERSION}_unknown@$( date +%Y%m%d.%H%M%S )";; *) - URL="$( LC_ALL=C svn info 2>/dev/null \ - |egrep 'URL: ' \ - |cut -d ' ' -f 2- \ - )" - ROOT="$( LC_ALL=C svn info 2>/dev/null \ - |"${grep}" '^Repository Root: ' \ - |cut -d ' ' -f 3- \ - )" - VERSION="${VERSION}${URL#${ROOT}}@${REVISION}" + VERSION="${VERSION}_$( hg id -b )@${REVISION%%+}_$( hg id -i )" ;; esac # Arrange to have no / in the directory name, no need to create an |