Revision: 72257
http://sourceforge.net/p/brlcad/code/72257
Author: starseeker
Date: 2019-01-24 00:28:11 +0000 (Thu, 24 Jan 2019)
Log Message:
-----------
Tweak RCS regex expressions, initialize vars to zero rather than -1 to avoid
messing up totals.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/cvs2git/README.sh
brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx
Modified: brlcad/trunk/misc/repoconv/cvs2git/README.sh
===================================================================
--- brlcad/trunk/misc/repoconv/cvs2git/README.sh 2019-01-23 20:31:25 UTC
(rev 72256)
+++ brlcad/trunk/misc/repoconv/cvs2git/README.sh 2019-01-24 00:28:11 UTC
(rev 72257)
@@ -16,15 +16,15 @@
cp ../../repaired/sphflake.pix,v pix/
# RCS headers introduce unnecessary file differences, which are poison pills
# for git log --follow
-find . -type f -exec sed -i 's/$Date:[^$]*/$Date:/' {} \;
-find . -type f -exec sed -i 's/$Header:[^$]*/$Header:/' {} \;
-find . -type f -exec sed -i 's/$Id:[^$]*/$Id:/' {} \;
-find . -type f -exec sed -i 's/$Log:[^$]*/$Log:/' {} \;
-find . -type f -exec sed -i 's/$Revision:[^$]*/$Revision:/' {} \;
-find . -type f -exec sed -i 's/$Source:[^$]*/$Source:/' {} \;
-sed -i 's/$Author:[^$]*/$Author:/' misc/Attic/cvs2cl.pl,v
-sed -i 's/$Author:[^$]*/$Author:/' sh/Attic/cvs2cl.pl,v
-sed -i 's/$Locker:[^$]*/$Locker:/' src/other/URToolkit/tools/mallocNd.c,v
+find . -type f -exec sed -i 's/$Date:[^$;"]*/$Date:/' {} \;
+find . -type f -exec sed -i 's/$Header:[^$;"]*/$Header:/' {} \;
+find . -type f -exec sed -i 's/$Id:[^$;"]*/$Id:/' {} \;
+find . -type f -exec sed -i 's/$Log:[^$;"]*/$Log:/' {} \;
+find . -type f -exec sed -i 's/$Revision:[^$;"]*/$Revision:/' {} \;
+find . -type f -exec sed -i 's/$Source:[^$;"]*/$Source:/' {} \;
+sed -i 's/$Author:[^$;"]*/$Author:/' misc/Attic/cvs2cl.pl,v
+sed -i 's/$Author:[^$;"]*/$Author:/' sh/Attic/cvs2cl.pl,v
+sed -i 's/$Locker:[^$;"]*/$Locker:/' src/other/URToolkit/tools/mallocNd.c,v
find . | cvs-fast-export -A ../../authormap > ../../brlcad_cvs_git.fi
cd ../
rm -f ../cvs_all_fast_export_audit.txt
Modified: brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx 2019-01-23 20:31:25 UTC
(rev 72256)
+++ brlcad/trunk/misc/repoconv/dercs/svn_de-rcs.cxx 2019-01-24 00:28:11 UTC
(rev 72257)
@@ -38,14 +38,14 @@
std::string de_rcs(const char *cstr, int len)
{
- std::regex rcs_date("\\$Date:[^\\$\n\r]*");
- std::regex rcs_header("\\$Header:[^\\$\n\r]*");
- std::regex rcs_id("\\$Id:[^\\$\n\r]*");
- std::regex rcs_log("\\$Log:[^\\$\n\r]*");
- std::regex rcs_revision("\\$Revision:[^\\$\n\r]*");
- std::regex rcs_source("\\$Source:[^\\$\n\r]*");
- std::regex rcs_author("\\$Author:[^\\$\n\r]*");
- std::regex rcs_locker("\\$Locker:[^\\$\n\r]*");
+ std::regex rcs_date("\\$Date:[^\\$;\"\n\r]*");
+ std::regex rcs_header("\\$Header:[^\\$;\"\n\r]*");
+ std::regex rcs_id("\\$Id:[^\\$;\"\n\r]*");
+ std::regex rcs_log("\\$Log:[^\\$;\"\n\r]*");
+ std::regex rcs_revision("\\$Revision:[^\\$;\"\n\r]*");
+ std::regex rcs_source("\\$Source:[^\\$;\"\n\r]*");
+ std::regex rcs_author("\\$Author:[^\\$;\"\n\r]*");
+ std::regex rcs_locker("\\$Locker:[^\\$;\"\n\r]*");
std::string buff01;
buff01.assign(cstr, len);
@@ -141,9 +141,9 @@
std::string text_copy_source_sha1;
std::string text_content_md5;
std::string text_content_sha1;
- long int text_content_length = -1;
- long int prop_content_length = -1;
- long int content_length = -1;
+ long int text_content_length = 0;
+ long int prop_content_length = 0;
+ long int content_length = 0;
std::string npath;
std::string rkey("Revision-number: ");
std::string npkey("Node-path: ");
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
