summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/setlocalversion14
1 files changed, 14 insertions, 0 deletions
diff --git a/tools/setlocalversion b/tools/setlocalversion
index 9bbdafdb6dc..bbb2ab2f71f 100755
--- a/tools/setlocalversion
+++ b/tools/setlocalversion
@@ -22,4 +22,18 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
| read dummy; then
printf '%s' -dirty
fi
+
+ # Is this git on svn?
+ if git config --get svn-remote.svn.url >/dev/null; then
+ printf -- '-svn%s' "`git-svn find-rev $head`"
+ fi
fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null` ; then
+ rev=`echo "${rev}" | grep '^Revision' | awk '{print $NF}'`
+ printf -- '-svn%s' $rev
+fi
+
+# Check for any localversion-* files
+printf '%s' "`cat localversion-* 2>/dev/null`"