Translate svn commands to git commands for chkmanifest and bbrelease

scripts with source in git repository.
This commit is contained in:
lrknox 2016-08-29 16:42:53 -05:00
parent b947f7e911
commit ba5652ffc2
2 changed files with 15 additions and 13 deletions

View File

@ -268,9 +268,11 @@ if [ X$revmode = Xyes ]; then
# Copy old version of config/lt_vers.am, since it's hard to
# "undo" changes to it.
cp config/lt_vers.am $tmpdir
branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'`
revision=`svn info | grep "Revision:" | awk '{print $2}'`
# Set version information to m.n.r-r$revision.
#branch=`svn info | grep ^URL: | awk -F/ '{print $NF}'`
#revision=`svn info | grep "Revision:" | awk '{print $2}'`
branch=`git branch | awk '{print $2}'`
revision=`git rev-parse HEAD`
# Set version information to m.n.r-r$revision.
# (h5vers does not correctly handle just m.n.r-$today.)
VERS=`echo $VERS | sed -e s/-.*//`-r$revision
echo Private release of $VERS

View File

@ -93,23 +93,23 @@ done
# Get the list of files under version control and check that they are
# present.
#
# First get a list of all the pending files with svn stat and
# First get a list of all the pending files with git status and
# check those.
svn_stat=`svn stat -q`
for file in $svn_stat; do
git_stat=`git status -s`
for file in $git_stat; do
# Newly added files are not listed by svn ls, which
# Newly added files are not listed by git ls-files, which
# we check later.
# The line listing new files starts with 'A'.
letter=`echo $file | head -c 1`
if [ "$letter" = "A" ]; then
# Convert the seven Subversion status columns to './' so it matches
# Convert the git status columns to './' so it matches
# the manifest file name.
#
# There is a space between the status columns and file name, hence
# the '8' instead of '7'.
path=`echo $file | sed 's/^.\{8\}/\.\//g'`
# the '3'.
path=`echo $file | sed 's/^.\{3\}/\.\//g'`
# Ignore directories
if [ ! -d $path ]; then
if (grep ^$path$ $MANIFEST >/dev/null); then
@ -122,10 +122,10 @@ for file in $svn_stat; do
fi
done
# Next check svn ls, which gets a list of all files that are
# Next check git ls-files, which gets a list of all files that are
# checked in.
svn_ls=`svn ls -R`
for file in $svn_ls; do
git_ls=`git ls-files`
for file in $git_ls; do
path="./${file}"
# Ignore directories
if [ ! -d $path ]; then