d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newvers: avoid clearing svn revision information with nested VCS dirs

Browse Source 
Consider the case where FreeBSD is checked out via Subversion with a
(perhaps unrelated) .git or .hg directory at a higher level - for
example,

    .../.git
    .../src/freebsd

Previously newvers obtained the SVN revision information via svnversion,
and then tried to obtain the SVN revision corresponding to the git or hg
commit, overwriting the existing information.

As a short term fix use a different variable for hg-svn or git-svn
information, setting $svn from hg or git info only if not empty.

Reported by:	Matthias Apitz
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
emaste 2019-01-04 14:42:36 +00:00
parent 9fd2b2061c
commit 58fe2d8756
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/conf/newvers.sh
View File

@ -244,21 +244,21 @@ fi
if [ -n "$git_cmd" ] ; then
git=`$git_cmd rev-parse --verify --short HEAD 2>/dev/null`
svn=`$git_cmd svn find-rev $git 2>/dev/null`
if [ -n "$svn" ] ; then
svn=" r${svn}"
gitsvn=`$git_cmd svn find-rev $git 2>/dev/null`
if [ -n "$gitsvn" ] ; then
svn=" r${gitsvn}"
git="=${git}"
else
svn=`$git_cmd log --grep '^git-svn-id:' | \
gitsvn=`$git_cmd log --grep '^git-svn-id:' | \
grep '^ git-svn-id:' | head -1 | \
sed -n 's/^.*@\([0-9][0-9]*\).*$/\1/p'`
if [ -z "$svn" ] ; then
svn=`$git_cmd log --format='format:%N' | \
if [ -z "$gitsvn" ] ; then
gitsvn=`$git_cmd log --format='format:%N' | \
grep '^svn ' | head -1 | \
sed -n 's/^.*revision=\([0-9][0-9]*\).*$/\1/p'`
fi
if [ -n "$svn" ] ; then
svn=" r${svn}"
if [ -n "$gitsvn" ] ; then
svn=" r${gitsvn}"
git="+${git}"
else
git=" ${git}"
@ -295,10 +295,10 @@ fi
if [ -n "$hg_cmd" ] ; then
hg=`$hg_cmd id 2>/dev/null`
svn=`$hg_cmd svn info 2>/dev/null | \
hgsvn=`$hg_cmd svn info 2>/dev/null | \
awk -F': ' '/Revision/ { print $2 }'`
if [ -n "$svn" ] ; then
svn=" r${svn}"
if [ -n "$hgsvn" ] ; then
svn=" r${hgsvn}"
fi
if [ -n "$hg" ] ; then
hg=" ${hg}"