[brlcad-commits] SF.net SVN: brlcad:[78380] brlcad/trunk/misc/repoconv/REPO.NOTES
Revision: 78380
http://sourceforge.net/p/brlcad/code/78380
Author: brlcad
Date: 2021-03-05 07:35:08 + (Fri, 05 Mar 2021)
Log Message:
---
updated scripts and tallies
Modified Paths:
--
brlcad/trunk/misc/repoconv/REPO.NOTES
Modified: brlcad/trunk/misc/repoconv/REPO.NOTES
===
--- brlcad/trunk/misc/repoconv/REPO.NOTES 2021-03-05 03:35:36 UTC (rev
78379)
+++ brlcad/trunk/misc/repoconv/REPO.NOTES 2021-03-05 07:35:08 UTC (rev
78380)
@@ -59,6 +59,7 @@
for i in `grep "^commit " git.log | awk '{print $2}'` ; do p="`cat parallel`"
; if test $p -lt 8 ; then git diff ${i}^! | grep "^[-+][^-+]" | sort | LC_ALL=C
sed 's/[[:space:]]*//g' | sort > diffs.git.sans/${i}.diff.new & ; else echo 0 >
parallel ; git diff ${i}^! | grep "^[-+][^-+]" | sort | LC_ALL=C sed
's/[[:space:]]*//g' | sort > diffs.git.sans/${i}.diff.new ; fi ; done
+for i in `cat diffs_to_redo | sed 's/.*\///g' | cut -d. -f1` ; do p="`cat
parallel`" ; if test $p -lt 8 ; then echo $i ; git diff ${i}^! | grep
"^[-+][^-+]" | sort | sed 's/[[:space:]]*//g' | sort > diffs.git.sans/${i}.diff
& ; else echo 0 > parallel ; git diff ${i}^! | grep "^[-+][^-+]" | sort | sed
's/[[:space:]]*//g' | sort > diffs.git.sans/${i}.diff ; fi ; done
CALCULATE GIT MD5
for i in `grep "^commit " git.log | cut -f2 -d' '` ; do echo $i log `md5
diffs.git.sans/$i.log` ; echo $i files `md5 diffs.git.sans/$i.files` ; echo $i
diff `md5 diffs.git.sans/$i.diff` ; done | tee git.md5
@@ -136,8 +137,8 @@
# DO THE COMPARISON
cat svn.md5 | ./compare_all.sh | tee svn.to.git2
cat svn.md5.16000 | ./compare_parallel.sh | tee svn.to.git3.16000
+cat svn.md5 | ./compare_parallel.sh | tee svn.to.git4
-
# CONVERT NON-SANS DIFFS TO SANS
cd diffs.svn.all ;; for i in *.diff ; do echo $i ; cat $i | LC_ALL=C sed
's/[[:space:]]*//g' > ../diffs.svn.all.sans/$i ; done ;; mv
../diffs.svn.all.sans/* . ;; rmdir ../diffs.svn.all.sans
tr
@@ -146,6 +147,8 @@
grep ":revision:" -C3 git.log > git.revision.log
log="`cat git.revision.log`" ; for i in `cat svn.commits2` ; do match="`echo
\"$log\" | grep \":revision:${i}$\" -C3`" ; if test "x$match" = "x" ; then echo
"$i REV:NOT:FOUND" ; else branch="`echo \"$match\" | grep :branch:`" ; if test
"x$branch" = "x" ; then echo "$i BRANCH:NOT:FOUND" ; else echo "$i $branch" ;
fi ; fi ; done | tee trunk_tags_in_git2.log
+for i in `cat svn.commits2` ; do gl="`grep \"revision:${i} \" git.1.log`"; if
test "x$gl" = "x" ; then echo "$i MISSING" ; else echo -n "$i" ; echo "$gl" |
while read line ; do echo -n " `echo $line | awk '{print $2}'`" ; done ; echo
"" ; fi ; done | tee svn.to.git5.trunk_mappings
+
# GET LIST OF MISSING COMMITS TO MULTIPLE BRANCHES
diff -u a commits.missing2 | grep '^+' | cut -f2 -d+ | while read rev; do if
test "x$rev" = "x" ; then continue ; fi ; echo -n "$rev " ; svn diff -c$rev
svn+ssh://brl...@svn.code.sf.net/p/brlcad/code 2>&1 | grep "^[-+][-+][-+] " |
grep -e "\(branches\|trunk\|tags\)" | cut -f2,3 -d/ | sed 's/trunk.*/trunk/g' |
sort | uniq | tr '\n' ' ' ; echo "" ; done | tee multiple_branches.log
@@ -154,11 +157,11 @@
rev=1 ; while test $rev -lt 78155 ; do echo -n "$rev " ; svn diff -c$rev
file:///Users/morrison/brlcad.github/svn.sfmirror/code | grep "^Index: " | sed
's/Index: //g' | cut -f1,2,3 -d/ | sed 's/trunk.*/trunk/g' | sort | uniq | tr
'\n' ' ' ; echo "" ; rev="`expr $rev + 1`" ; done | tee all_branches2.log
-cat svn.to.git3 | grep -E '[0-9]{1,5} '|wc
+cat svn.to.git3 | grep -E '[0-9]{1,5} '| cut -f1 -d' ' | sort | uniq | wc
cat svn.to.git3 | grep -E '[0-9]{1,5} '| grep -v PERFECT | grep -v "NOT FOUND"
| grep -v -i empty | less
cat svn.to.git3 | grep -v -i empty | grep -v PERFECT | grep -v " NOT FOUND" |
grep -v " LOG MATCH" | grep -v " FILE MATCH" | grep -v " LOG+FILE MATCH" | grep
-v " LOG+FILE+DIFF MATCH" | grep -v " LOG+DIFF MATCH" | grep -v "FILE+DIFF"
-78819 commits
+77564 unique commits
-6874 PERFECT MATCH
-
71945
@@ -178,3 +181,71 @@
0 DIFF MATCH
+# find multiple matches
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| cut -f1 -d' ' | sort | uniq -c | sort
-nr | awk '$1 > 1' | awk '{print $2}' | while read rev ; do grep "^$rev "
svn.to.git5 ; done > svn.to.git5.multiple_matches
+
+323 commits duplicated
+1188 duplicate lines
+
+# fixed multiline taggings, verified, counted number of unique commits
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| cut -f1 -d' ' | sort | uniq | wc
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| grep PERFECT | wc
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| grep -v PERFECT | grep "NOT FOUND" |
wc
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| grep -v PERFECT | grep -v "NOT FOUND"
| grep "EMPTY" | wc
+cat svn.to.git5 | grep -E '[0-9]{1,5} '| grep -v PERFECT | grep -v "NOT FOUND"
| grep -v "EMPTY" | grep "LOG+FILE+DIFF MATCH" | cut -f1 -d' ' | sort | uniq -c
| sort -nr | wc
+
+# unique matching log+file+diff
+cat svn.to.git5 |
[brlcad-commits] SF.net SVN: brlcad:[78379] brlcad/trunk/src/other/tk/CMakeLists.txt
Revision: 78379
http://sourceforge.net/p/brlcad/code/78379
Author: starseeker
Date: 2021-03-05 03:35:36 + (Fri, 05 Mar 2021)
Log Message:
---
User report that setting this flag caused a compilation failure, with RC
complaining about 'invalid usage'. Removing the definition produced a
successful build.
Modified Paths:
--
brlcad/trunk/src/other/tk/CMakeLists.txt
Modified: brlcad/trunk/src/other/tk/CMakeLists.txt
===
--- brlcad/trunk/src/other/tk/CMakeLists.txt2021-03-04 17:01:14 UTC (rev
78378)
+++ brlcad/trunk/src/other/tk/CMakeLists.txt2021-03-05 03:35:36 UTC (rev
78379)
@@ -670,7 +670,7 @@
if (MSVC)
set(TK_SRCS ${TK_SRCS} win/rc/tk.rc)
- set(CMAKE_RC_FLAGS /i${CMAKE_CURRENT_BINARY_DIR})
+ #set(CMAKE_RC_FLAGS /i${CMAKE_CURRENT_BINARY_DIR})
endif (MSVC)
if (X11_INCLUDE_DIR)
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
[brlcad-commits] SF.net SVN: brlcad:[78378] brlcad/trunk/CMakeLists.txt
Revision: 78378
http://sourceforge.net/p/brlcad/code/78378
Author: starseeker
Date: 2021-03-04 17:01:14 + (Thu, 04 Mar 2021)
Log Message:
---
Write out the CMake version in use to the configure history - we often want to
know this.
Modified Paths:
--
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===
--- brlcad/trunk/CMakeLists.txt 2021-03-04 16:32:48 UTC (rev 78377)
+++ brlcad/trunk/CMakeLists.txt 2021-03-04 17:01:14 UTC (rev 78378)
@@ -143,6 +143,11 @@
set(BRLCAD_PRINT_MSGS 0)
endif(NOT EXISTS ${BRLCAD_CNT_FILE})
+# Now that we know whether or not we're supposed to, print the CMake verison
+if(BRLCAD_PRINT_MSGS)
+ message(STATUS "CMake version: ${CMAKE_VERSION}")
+endif(BRLCAD_PRINT_MSGS)
+
#-
# Define an option to use OBJECT libraries. If we are building with object
# libraries, we need position independent code.
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
[brlcad-commits] SF.net SVN: brlcad:[78377] brlcad/trunk
Revision: 78377
http://sourceforge.net/p/brlcad/code/78377
Author: starseeker
Date: 2021-03-04 16:32:48 + (Thu, 04 Mar 2021)
Log Message:
---
Experiment with a 'gdal' type to force triggering of the gdal plugin.
Modified Paths:
--
brlcad/trunk/misc/mime_cad.types
brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
Modified: brlcad/trunk/misc/mime_cad.types
===
--- brlcad/trunk/misc/mime_cad.types2021-03-04 15:39:53 UTC (rev 78376)
+++ brlcad/trunk/misc/mime_cad.types2021-03-04 16:32:48 UTC (rev 78377)
@@ -41,3 +41,4 @@
model/vnd.gift cg comgeom
model/vnd.intaval tgf
model/vnd.rhino3dm
+model/vnd.gdal gdal dem dted tif tiff
Modified: brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp
===
--- brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2021-03-04 15:39:53 UTC
(rev 78376)
+++ brlcad/trunk/src/libgcv/plugins/gdal/gdal.cpp 2021-03-04 16:32:48 UTC
(rev 78377)
@@ -430,7 +430,7 @@
extern "C"
{
struct gcv_filter gcv_conv_gdal_read =
-{"GDAL Reader", GCV_FILTER_READ, BU_MIME_MODEL_AUTO, gdal_can_read,
gdal_read_create_opts, gdal_read_free_opts, gdal_read};
+{"GDAL Reader", GCV_FILTER_READ, BU_MIME_MODEL_VND_GDAL, gdal_can_read,
gdal_read_create_opts, gdal_read_free_opts, gdal_read};
static const struct gcv_filter * const filters[] = {_conv_gdal_read,
NULL};
const struct gcv_plugin gcv_plugin_info_s = { filters };
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
[brlcad-commits] SF.net SVN: brlcad:[78376] brlcad/trunk/misc/repoconv
Revision: 78376
http://sourceforge.net/p/brlcad/code/78376
Author: starseeker
Date: 2021-03-04 15:39:53 + (Thu, 04 Mar 2021)
Log Message:
---
Automate the setup for the final post-process, since there are now a fair
number of setup steps.
Added Paths:
---
brlcad/trunk/misc/repoconv/process.sh
brlcad/trunk/misc/repoconv/repowork_new_commmits/add/
brlcad/trunk/misc/repoconv/repowork_new_commmits/add/VendorARL_del.fi
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
brlcad/trunk/misc/repoconv/repowork_new_commmits/splices/
brlcad/trunk/misc/repoconv/repowork_new_commmits/splices/r66607_trunk.fi
Removed Paths:
-
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi
brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi
Added: brlcad/trunk/misc/repoconv/process.sh
===
--- brlcad/trunk/misc/repoconv/process.sh (rev 0)
+++ brlcad/trunk/misc/repoconv/process.sh 2021-03-04 15:39:53 UTC (rev
78376)
@@ -0,0 +1,20 @@
+#!/bin/bash
+rm -rf git_repo test.fi
+rm -rf add replace splices
+mkdir add && cp ../../repoconv/repowork_new_commmits/add/* add/
+mkdir replace && cp ../../repoconv/repowork_new_commmits/replace/* replace/
+mkdir splices && cp ../../repoconv/repowork_new_commmits/splices/* splices/
+cp ../../repoconv/cvs_svn_branches.txt .
+cp ../../repoconv/svn_rev_updates.txt .
+cp ../../repoconv/branch_corrections.txt .
+cat ../../repoconv/remove_commits.txt | awk -F"#" '{print $1}' | awk '{gsub(/[
]+$/,""); print $0}' |awk NF > remove_commits.txt
+cat ../../repoconv/tag_commits.txt | grep \^commit|awk '{print $2}' > tag_sha1s
+./repowork --svn-revs svn_rev_updates.txt --svn-branches cvs_svn_branches.txt
--svn-branches-to-tags tag_sha1s --correct-branches branch_corrections.txt
--remove-commits remove_commits.txt --splice-commits --replace-commits
--add-commits conv12.fi test.fi
+mkdir git_repo && cd git_repo && git init
+cat ../test.fi |git fast-import
+git checkout main
+git gc --aggressive
+git reflog expire --expire-unreachable=now --all
+git gc --prune=now
+cd ..
+
Property changes on: brlcad/trunk/misc/repoconv/process.sh
___
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/x-sh
\ No newline at end of property
Deleted:
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
===
---
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:27:20 UTC (rev 78375)
+++
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:39:53 UTC (rev 78376)
@@ -1,12 +0,0 @@
-commit refs/heads/cjohnson-mac-hack
-author Christopher Johnson 625826935 +
-committer Phillip Dykstra 625826935 +
-data 88
-Chris Johnson's Mac Hack
-
-svn:revision:3698
-cvs:branch:unlabeled-9.7.1
-cvs:account:phil
-from df207709f5474f88155bf37d91a9dd855ad02f53
-deleteall
-M 100644 8684ce993e973b87c057cb7bad43a84c71ffe704 libfb/if_X.c
Deleted: brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi
===
(Binary files differ)
Copied: brlcad/trunk/misc/repoconv/repowork_new_commmits/add/VendorARL_del.fi
(from rev 78375,
brlcad/trunk/misc/repoconv/repowork_new_commmits/VendorARL_del.fi)
===
(Binary files differ)
Deleted: brlcad/trunk/misc/repoconv/repowork_new_commmits/r66607_trunk.fi
===
(Binary files differ)
Copied:
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
(from rev 78375,
brlcad/trunk/misc/repoconv/repowork_new_commmits/7092929c41c2613c9bfe74eb8735ae87be9af3a2)
===
---
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
(rev 0)
+++
brlcad/trunk/misc/repoconv/repowork_new_commmits/replace/7092929c41c2613c9bfe74eb8735ae87be9af3a2
2021-03-04 15:39:53 UTC (rev 78376)
@@ -0,0 +1,12 @@
+commit refs/heads/cjohnson-mac-hack
+author Christopher Johnson 625826935 +
+committer Phillip Dykstra 625826935 +
+data 88
+Chris Johnson's Mac Hack
+
+svn:revision:3698
+cvs:branch:unlabeled-9.7.1
+cvs:account:phil
+from
[brlcad-commits] SF.net SVN: brlcad:[78375] brlcad/trunk/misc/repoconv/remove_commits.txt
Revision: 78375
http://sourceforge.net/p/brlcad/code/78375
Author: starseeker
Date: 2021-03-04 15:27:20 + (Thu, 04 Mar 2021)
Log Message:
---
Stash a scripting line that will process the commented remove_commits list to
prepare an input.
Modified Paths:
--
brlcad/trunk/misc/repoconv/remove_commits.txt
Modified: brlcad/trunk/misc/repoconv/remove_commits.txt
===
--- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 14:42:37 UTC
(rev 78374)
+++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 15:27:20 UTC
(rev 78375)
@@ -1,3 +1,5 @@
+# To prepare for processing:
+# cat remove_commits.txt | awk -F"#" '{print $1}' | awk '{gsub(/[ ]+$/,"");
print $0}' |awk NF
52036a8b4569b8ffe90e2e8fb0b43f5ed36ba040 # SVN property change
908505f8729b4ff7668d91680abc5a70f9c051e1 # No-op among similar commit msg
cvs-fast-export commits
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
[brlcad-commits] SF.net SVN: brlcad:[78374] brlcad/trunk/misc/repoconv/remove_commits.txt
Revision: 78374 http://sourceforge.net/p/brlcad/code/78374 Author: starseeker Date: 2021-03-04 14:42:37 + (Thu, 04 Mar 2021) Log Message: --- Working from list generated by Sean, identify a few Git commits that can be removed. Modified Paths: -- brlcad/trunk/misc/repoconv/remove_commits.txt Modified: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 02:32:32 UTC (rev 78373) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-03-04 14:42:37 UTC (rev 78374) @@ -57,7 +57,18 @@ 720f9b9b75588e35d3cce0f9f5b802abea2259ab d748c2ea214b699008563e18f5a7105de39faba9 +# Collapsed branches in Git conversion resulting in multiple semi-duplicate empty commits on single branch +68aeb784b3ee698c854878c190eb4b229b88e1fe +c0737a9252506872ce5ce6cd14207f7c375741da +# It looks like this was read as a branch delete and re-creation, so it got a branch delete +# commit. That's not how it works or displays in Git, which is actually cleaner - remove +# the empty branch delete commit +f828d1c0b1f6e68879a1bdecb2c58d1dc9a9207b + +# Spurious trunk branch empty commit associated with branch removal +797d0138514136e2e95b0dfa1cc7d2e774fef2ab + # The following are all empty commits of the form "file N was initially added on branch M" ea9c83e50fa49cdad8dc0bb114f618abb6f69f0c 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
