Changeset View
Changeset View
Standalone View
Standalone View
sys/conf/newvers.sh
Show First 20 Lines • Show All 243 Lines • ▼ Show 20 Lines | |||||
if [ -n "$git_cmd" ] ; then | if [ -n "$git_cmd" ] ; then | ||||
git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` | git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null` | ||||
gitsvn=`$git_cmd svn find-rev $git 2>/dev/null` | gitsvn=`$git_cmd svn find-rev $git 2>/dev/null` | ||||
if [ -n "$gitsvn" ] ; then | if [ -n "$gitsvn" ] ; then | ||||
svn=" r${gitsvn}" | svn=" r${gitsvn}" | ||||
git="=${git}" | git="=${git}" | ||||
else | else | ||||
gitsvn=`$git_cmd log --grep '^git-svn-id:' | \ | # XXXXX | ||||
imp: kill the xxxx's please
| |||||
# Log searches are limited to 10k commits to speed up failures. | |||||
# We assume that if a tree is more than 10k commits out-of-sync | |||||
# with FreeBSD, it has forked the the OS and the SVN rev no | |||||
Not Done Inline Actionslooks like the comment is cut off - it has forked the OS and the svn rev is not important? emaste: looks like the comment is cut off - it has forked the OS and the svn rev //is not important//? | |||||
Not Done Inline ActionsOh, strange, the comment is indeed there - not sure what happened. emaste: Oh, strange, the comment is indeed there - not sure what happened. | |||||
# longer matters. | |||||
# XXXXX | |||||
gitsvn=`$git_cmd log -n 10000 | | |||||
grep '^ git-svn-id:' | head -1 | \ | grep '^ git-svn-id:' | head -1 | \ | ||||
sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` | sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'` | ||||
if [ -z "$gitsvn" ] ; then | if [ -z "$gitsvn" ] ; then | ||||
gitsvn=`$git_cmd log --format='format:%N' | \ | gitsvn=`$git_cmd log -n 10000 --format='format:%N' | \ | ||||
grep '^svn ' | head -1 | \ | grep '^svn ' | head -1 | \ | ||||
sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'` | sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'` | ||||
fi | fi | ||||
if [ -n "$gitsvn" ] ; then | if [ -n "$gitsvn" ] ; then | ||||
svn=" r${gitsvn}" | svn=" r${gitsvn}" | ||||
git="+${git}" | git="+${git}" | ||||
else | else | ||||
git=" ${git}" | git=" ${git}" | ||||
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines |
kill the xxxx's please