export LC_ALL=C
[ -n "$TOPDIR" ] && cd $TOPDIR
+GET_REV=$1
+
try_version() {
[ -f version ] || return 1
REV="$(cat version)"
[ -n "$REV" ]
}
-try_svn() {
- [ -d .svn ] || return 1
- REV="$(svn info -r COMMITTED | awk '/^Revision:/ { print $2 }')"
- REV="${REV:+r$REV}"
- [ -n "$REV" ]
-}
-
try_git() {
- [ -d .git ] || return 1
- REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
- REV="${REV:+r$REV}"
+ REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
+ git rev-parse --git-dir >/dev/null 2>&1 || return 1
+
+ [ -n "$GET_REV" ] || GET_REV="HEAD"
+
+ case "$GET_REV" in
+ r*)
+ GET_REV="$(echo $GET_REV | tr -d 'r')"
+ BASE_REV="$(git rev-list ${REBOOT}..HEAD 2>/dev/null | wc -l | awk '{print $1}')"
+ [ $((BASE_REV - GET_REV)) -ge 0 ] && REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
+ ;;
+ *)
+ BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+ ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
+ [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name master@{u} 2>/dev/null)"
+ REV="$(git rev-list ${REBOOT}..$GET_REV 2>/dev/null | wc -l | awk '{print $1}')"
+
+ if [ -n "$ORIGIN" ]; then
+ UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
+ UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE 2>/dev/null | wc -l | awk '{print $1}')"
+ else
+ UPSTREAM_REV=0
+ fi
+
+ if [ "$REV" -gt "$UPSTREAM_REV" ]; then
+ REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
+ fi
+
+ REV="${REV:+r$REV-$(git log -n 1 --format="%h" $UPSTREAM_BASE)}"
+
+ ;;
+ esac
+
[ -n "$REV" ]
}
try_hg() {
[ -d .hg ] || return 1
REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
- REV="${REV:+$REV}"
+ REV="${REV:+r$REV}"
[ -n "$REV" ]
}
-try_version || try_svn || try_git || try_hg || REV="unknown"
+try_version || try_git || try_hg || REV="unknown"
echo "$REV"