Revision: 78330
http://sourceforge.net/p/brlcad/code/78330
Author: starseeker
Date: 2021-02-26 00:28:04 +0000 (Fri, 26 Feb 2021)
Log Message:
-----------
The comm context is actually useful even with the ssdeep metric.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
Modified: brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
===================================================================
--- brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-26
00:27:11 UTC (rev 78329)
+++ brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-26
00:28:04 UTC (rev 78330)
@@ -53,21 +53,19 @@
then
ssdeep -b svndiff 2>/dev/null > svndiff.hash
SCORE=$(ssdeep -bm svndiff.hash gitdiff 2>/dev/null|cut
-c 37-)
- if [ "$SCORE" == "" ]
+ if [ "$SCORE" != "" ]
then
- cat svndiff | sort > svndiffsort
- cat gitdiff | sort > gitdiffsort
- mv svndiffsort svndiff
- mv gitdiffsort gitdiff
- comm -12 svndiff gitdiff > commonlines
- SVNWC=$(wc -c svndiff|awk '{print $1}')
- GITWC=$(wc -c gitdiff|awk '{print $1}')
- COMMWC=$(wc -c commonlines|awk '{print $1}')
- echo "ssdeep check failed, using line
comparison fallback..."
- echo "SVN:Git:common line counts:
$SVNWC:$GITWC:$COMMWC"
- else
echo "Similarity score (100->0):$SCORE"
fi
+ cat svndiff | sort > svndiffsort
+ cat gitdiff | sort > gitdiffsort
+ mv svndiffsort svndiff
+ mv gitdiffsort gitdiff
+ comm -12 svndiff gitdiff > commonlines
+ SVNWC=$(wc -c svndiff|awk '{print $1}')
+ GITWC=$(wc -c gitdiff|awk '{print $1}')
+ COMMWC=$(wc -c commonlines|awk '{print $1}')
+ echo "SVN:Git:common line counts: $SVNWC:$GITWC:$COMMWC"
else
echo "DIFFERENCE: Non-empty SVN diff but empty git diff"
fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
