Revision: 78359
http://sourceforge.net/p/brlcad/code/78359
Author: starseeker
Date: 2021-03-01 21:48:29 +0000 (Mon, 01 Mar 2021)
Log Message:
-----------
Don't try any checkouts if we don't have the necessary info.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
Modified: brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
===================================================================
--- brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
2021-03-01 21:21:18 UTC (rev 78358)
+++ brlcad/trunk/misc/repoconv/verify2/checkout_check_parallel.sh
2021-03-01 21:48:29 UTC (rev 78359)
@@ -10,27 +10,37 @@
cd $CWD
git -c advice.detachedHead=false clone $GITREPO g$REV && cd g$REV
BRANCH=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%B" |grep
:branch:|awk -F':' '{print $3}'|uniq)
-SHA1=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H" |head
-n 1)
-echo "$REV -> $SHA1"
-echo "BRANCH=$BRANCH"
-git -c advice.detachedHead=false checkout $SHA1
-cd $CWD
-BRANCHDIR=""
-if [ "$BRANCH" == "trunk" ]
+if [ "$BRANCH" != "" ]
then
- svn checkout -r$REV file://$SVNREPO/brlcad/trunk@$REV r$REV 1>/dev/null
2>/dev/null
- BRANCHDIR="r$REV"
+ SHA1=$(git log --all --grep="^svn:revision:$REV$" --pretty=format:"%H"
|head -n 1)
+ if [ "$SHA1" != "" ]
+ then
+ echo "$REV -> $SHA1"
+ echo "BRANCH=$BRANCH"
+ git -c advice.detachedHead=false checkout $SHA1
+ cd $CWD
+ BRANCHDIR=""
+ if [ "$BRANCH" == "trunk" ]
+ then
+ svn checkout -r$REV file://$SVNREPO/brlcad/trunk@$REV
r$REV 1>/dev/null 2>/dev/null
+ BRANCHDIR="r$REV"
+ else
+ svn checkout -r$REV
file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV 1>/dev/null 2>/dev/null
+ BRANCHDIR="r$REV/$BRANCH"
+ fi
+ DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision'
-I'$Header' -I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore"
--exclude ".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude
".svn" --exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR >
r$REV.diff)
+ if [ -s r$REV.diff ]
+ then
+ echo "$REV: difference found\n"
+ else
+ rm r$REV.diff
+ fi
+ rm -rf r$REV
+ else
+ cd $CWD
+ fi
else
- svn checkout -r$REV file://$SVNREPO/brlcad/branches/$BRANCH@$REV r$REV
1>/dev/null 2>/dev/null
- BRANCHDIR="r$REV/$BRANCH"
+ cd $CWD
fi
-DIFFSTATUS=$(diff --no-dereference -qrw -I '$Id' -I '$Revision' -I'$Header'
-I'$Sour ce' -I'$Date' -I'$Log' -I'$Locker' --exclude ".cvsignore" --exclude
".gitignore" --exclude "terra.dsp" --exclude ".git" --exclude ".svn"
--exclude "saxon65.jar" --exclude "xalan27.jar" g$REV $BRANCHDIR > r$REV.diff)
-if [ -s r$REV.diff ]
-then
- echo "$REV: difference found\n"
-else
- rm r$REV.diff
-fi
-rm -rf r$REV
rm -rf g$REV
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
