X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2FGetSourceVersion;h=b57a6aa2f3af6652e71f9ba00050685afd3e4349;hb=86779ee177c11863f74a9aecb445fdd8659557e0;hp=63cfe0f499877c267dcdb8c455500b350eb26468;hpb=e40eb09e5e983b09947ab0191584b219ee33dc2e;p=oota-llvm.git

diff --git a/utils/GetSourceVersion b/utils/GetSourceVersion
index 63cfe0f4998..b57a6aa2f3a 100755
--- a/utils/GetSourceVersion
+++ b/utils/GetSourceVersion
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-function usage() {
-   echo "usage: $0 <source root>"
-   echo "  Prints the source control revision of the given source directory,"
-   echo "  the exact format of the revision string depends on the source "
-   echo "  control system. If the source control system isn't known, the output"
-   echo "  is empty and the exit code is 1."
-   exit 1
+usage() {
+  echo "usage: $0 <source root>"
+  echo "  Prints the source control revision of the given source directory,"
+  echo "  the exact format of the revision string depends on the source "
+  echo "  control system. If the source control system isn't known, the output"
+  echo "  is empty and the exit code is 1."
+  exit 1
 }
 
 if [ $# != 1 ] || [ ! -d $1 ]; then
@@ -15,13 +15,13 @@ fi
 
 cd $1
 if [ -d .svn ]; then
-   svnversion
-elif [ -d .git/svn ]; then
-   git svn info | grep 'Revision:' | cut -d: -f2-
+  svnversion | sed -e "s#\([0-9]*\)[A-Z]*#\1#"
+elif [ -f .git/svn/.metadata ]; then
+  git svn info | grep 'Revision:' | cut -d: -f2-
 elif [ -d .git ]; then
-   git log -1 --pretty=format:%H
+  git log -1 --pretty=format:%H
 else
-   exit 1;
+  exit 1;
 fi
 
 exit 0