[brlcad-commits] SF.net SVN: brlcad:[78322] brlcad/trunk/misc/repoconv/verify2/NOTES
Revision: 78322 http://sourceforge.net/p/brlcad/code/78322 Author: starseeker Date: 2021-02-25 05:03:18 + (Thu, 25 Feb 2021) Log Message: --- Using 'git log --follow --full-history -- file/path' to identify early commits associated with early unmapped revisions. Modified Paths: -- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 04:29:18 UTC (rev 78321) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 05:03:18 UTC (rev 78322) @@ -51,3 +51,39 @@ corresponds to the commit on trunk. Resolution - leave as is. + + + + +d8f7e1e55093bd388a674fd3c6dd28ad8a6bdb22;705 - messages matches this commit, change may match c037a5e3 +0a01f682e650fb09d465363fc9028300124feaa0;706 +df5a981a54d93aec7322503c0ce322eb157bf538;714 +5477169081053dc2f8627ed6362d4b56ae2f7c58;714 +e8eb301a7dba29f519014119d6493455a81a5b35;715 +c6905c73bcd1aeca073da226d89a9383bcf6a4f0;715 +eaf6fa82fc04156a5b072e5b2adc2b7b0ce5530a;715 +e764a16df4995881b2f307d895c8ce1cd371a040;718 +6be112ca4be1bc71e885360b1bc860c2a32df6ee;718 +0792d9fa77bb3bc87e1f87c27b24ef8eba4a34a8;718 +8163445c0df487d14a7c9411fb030fdc02627513;726 +ff342ccfcc68c00766ff86445aca51a25d426e62;732 +eeef8db219039bfbfe469dbe3bebc36a6c83980d;732 +d87fc5ce2deae2d6a31e681e0dfbd2364f1ae911;732 +41acf5fc4bd9b0691c92486e93074d885e1d355a;732 +6bd625123b64fcaa485a3fc1509bc0707486debb;732 +8f4bc8ee13442728a6bb2d8e67754f85d3f10e98;732 + + +0a152eb9ba9356733ce0364c8a543ba386900aca;733 +5471d9ee205333a06fda7ae5017a1640d17bd0e4;747 + + + + + + + + + + + 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:[78321] brlcad/trunk/misc/repoconv
Revision: 78321 http://sourceforge.net/p/brlcad/code/78321 Author: starseeker Date: 2021-02-25 04:29:18 + (Thu, 25 Feb 2021) Log Message: --- Add some notes inspecting various commits, as well as one identified update. Modified Paths: -- brlcad/trunk/misc/repoconv/svn_rev_updates.txt Added Paths: --- brlcad/trunk/misc/repoconv/verify2/NOTES Modified: brlcad/trunk/misc/repoconv/svn_rev_updates.txt === --- brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-25 03:52:30 UTC (rev 78320) +++ brlcad/trunk/misc/repoconv/svn_rev_updates.txt 2021-02-25 04:29:18 UTC (rev 78321) @@ -135,3 +135,5 @@ a098425430db227021617976961e6b51ce5569cb; e6417be98f27d570d863744f566f5aaf738abbe6; 11077485329842c81213eab68006fe5d58b5925f; + +67c46ada661fdab789632885c34bf77a277962db;18892 Added: brlcad/trunk/misc/repoconv/verify2/NOTES === --- brlcad/trunk/misc/repoconv/verify2/NOTES(rev 0) +++ brlcad/trunk/misc/repoconv/verify2/NOTES2021-02-25 04:29:18 UTC (rev 78321) @@ -0,0 +1,53 @@ +Checking into some commit quirks flagged by this logic: + +14807 - the commit date and message match 6d6d9077d96b7c851b9d98271aeaa1daeb2b34d2, which is where the +SVN label is currently set. The contents, however, do not match what SVN reports. (They do match +73d4caa899113a2e28b401b616d1d44832a0bd52, which also matches - and is assigned r14726.) + +Resolution - leaving as is + + + +18992 - unassigned in git. The commit that looks like it has these contents is tagged as 18993 +(67c46ada661fdab789632885c34bf77a277962db). However, 18993 in SVN is a properties commit. + +Resolution - update 67c46ada661 to 18992 + + +19261 - unassigned in git. In SVN this is a "manufactured" commit. The commit identified as being +a content match for 19261 is 06c6b8ddb02c633f596585538b708924d75c6f0b, which is labeled with r19275. +r19275 has the "libtclhooks" commit message in SVN. + +Resolution - leaving as is + + +19762 - unassigned in git. Commit with matching content is identified as 19763, which appears to be +the same patch. + +Resolution - leaving as is - this looks like it may be the result of a cvs-fast-export processing difference. + + +19936 - This commit in SVN adds a file. The corresponding Git commit adding the file is +b5e3e3f1b3fff8b526b80295b8deea35712afc79, which is tagged as 19937. In SVN 19937 is a property change, +and 19936 is a generated commit to create a branch. + +Resolution - leaving as is - Git output is functionally equivalent and looks cleaner. + + +4737 - flagged as being a match for 4072c1d01d61f24eb4045225a86b6f80d613aea1, which is tagged as 4829. +4737 is a cvs2svn generated commit adding the file, and 4829 is an SVN property change. + +Resolution - leaving as is. + + +4800 - The Git diff and the SVN diff do the same thing in different ways - no issue. + + +4984 - The Git diff and the SVN diff do the same thing in different ways - no issue. + + +7879 - Adds a file to a branch. Git commit b5f00fd6639a1f11aa28c5e4dbcb628499b8d467 has the change, +with a better commit message, which apparently serves for trunk and the branch. Tagged as r7878, which +corresponds to the commit on trunk. + +Resolution - leave as is. Property changes on: brlcad/trunk/misc/repoconv/verify2/NOTES ___ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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:[78320] brlcad/trunk/misc/repoconv
Revision: 78320
http://sourceforge.net/p/brlcad/code/78320
Author: starseeker
Date: 2021-02-25 03:52:30 + (Thu, 25 Feb 2021)
Log Message:
---
Stash some experiments with content based introspection into the repositories.
Added Paths:
---
brlcad/trunk/misc/repoconv/verify2/
brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
brlcad/trunk/misc/repoconv/verify2/git_info.sh
brlcad/trunk/misc/repoconv/verify2/git_svn_map.sh
brlcad/trunk/misc/repoconv/verify2/maps.cxx
brlcad/trunk/misc/repoconv/verify2/svn_diffs.sh
brlcad/trunk/misc/repoconv/verify2/svn_logs.sh
brlcad/trunk/misc/repoconv/verify2/svn_noncad.sh
Added: brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
===
--- brlcad/trunk/misc/repoconv/verify2/approximate_check.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/approximate_check.sh 2021-02-25
03:52:30 UTC (rev 78320)
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+# Note - ssdeep needs files >=4k. For smaller files, we just use
https://superuser.com/a/459121
+# to get a sense of shared lines, unless/until something better turns up...
+
+CWD=$(pwd)
+
+if [ "$#" -ne "3" ]
+then
+echo "ssdeepcheck SVN_REPO GIT_REPO input_file"
+exit 1
+fi
+SVNREPO=$1
+GITREPO=$2
+input_file=$CWD/$3
+
+if [ ! -d $SVNREPO ]
+then
+echo "$SVNREPO does not exist"
+exit 1
+fi
+if [ ! -d $GITREPO ]
+then
+echo "$GITREPO does not exist"
+exit 1
+fi
+if [ ! -f $input_file ]
+then
+input_file=$3
+if [ ! -f $input_file ]
+then
+echo "$input_file does not exist"
+exit 1
+fi
+fi
+
+cat $input_file |sort -n > intmp
+mv intmp $input_file
+
+while read p; do
+ REV=$(echo "$p" | awk -F'[;]' '{print $1}')
+ SHA1=$(echo "$p" | awk -F'[;]' '{print $2}')
+
+ echo ""
+ echo "$REV -> $SHA1 :"
+
+ svn diff --ignore-properties -c$REV file://$SVNREPO |grep
"^[-+].*"|grep -v "[-][-][-]" | grep -v "+++" |grep -v "^[-]$"|grep -v "^+$" >
svndiff
+ cd $GITREPO && git diff $SHA1^! ':(exclude).gitignore' |grep
"^[-+].*"|grep -v "[-][-][-]" | grep -v "+++" | grep -v "^[-]$"|grep -v "^+$" >
$CWD/gitdiff
+ cd $CWD
+ if [ -s svndiff ]
+ then
+ if [ -s gitdiff ]
+ then
+ ssdeep -b svndiff 2>/dev/null > svndiff.hash
+ SCORE=$(ssdeep -bm svndiff.hash gitdiff 2>/dev/null|cut
-c 37-)
+ 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
+ else
+ echo "DIFFERENCE: Non-empty SVN diff but empty git diff"
+ fi
+ else
+ if [ -s gitdiff ]
+ then
+ echo "DIFFERENCE: Empty svn diff but non empty git diff"
+ else
+ echo "both diffs empty"
+ fi
+ fi
+done < $input_file
+
Property changes on: brlcad/trunk/misc/repoconv/verify2/approximate_check.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
Added: brlcad/trunk/misc/repoconv/verify2/git_info.sh
===
--- brlcad/trunk/misc/repoconv/verify2/git_info.sh
(rev 0)
+++ brlcad/trunk/misc/repoconv/verify2/git_info.sh 2021-02-25 03:52:30 UTC
(rev 78320)
@@ -0,0 +1,11 @@
+#!/bin/bash
+rm -f git_diffs.txt git_logs.txt
+git log --all --pretty=format:"%H" > sha1.txt
+while read i; do
+ SHA1=$i
+ LOGMSGMD5=$(git log -1 --pretty=format:"%B" $SHA1 |grep -v '^cvs:' |
grep -v '^svn:' | perl -0777 -pe 's/[-[:space:]]*//g' | md5sum| awk '{print
$1}')
+ DIFFMD5=$(git diff $SHA1^! ':(exclude).gitignore' |grep "^[-+].*"|grep
-v "[-][-][-]" | grep -v "+++" | grep -v
[brlcad-commits] SF.net SVN: brlcad:[78319] brlcad/trunk/misc
Revision: 78319 http://sourceforge.net/p/brlcad/code/78319 Author: starseeker Date: 2021-02-24 19:39:22 + (Wed, 24 Feb 2021) Log Message: --- Reviewing the CVS era empty commits, some of these have no uniquely useful messages. Deliberately leaving some empties that either have a commit message or appear related to a branch in some fashion, and not altering the SVN era empties (many of which document branch additions/deletions) but we should be able to clean these up. Modified Paths: -- brlcad/trunk/misc/CMakeLists.txt Added Paths: --- brlcad/trunk/misc/repoconv/remove_commits.txt Modified: brlcad/trunk/misc/CMakeLists.txt === --- brlcad/trunk/misc/CMakeLists.txt2021-02-24 18:20:21 UTC (rev 78318) +++ brlcad/trunk/misc/CMakeLists.txt2021-02-24 19:39:22 UTC (rev 78319) @@ -249,6 +249,7 @@ repoconv/svn_msgs.cxx repoconv/svn_rev_updates.txt repoconv/branch_corrections.txt + repoconv/remove_commits.txt repoconv/svnfexport.cxx repoconv/svnfexport_git.cxx repoconv/svnfexport_svn.cxx Added: brlcad/trunk/misc/repoconv/remove_commits.txt === --- brlcad/trunk/misc/repoconv/remove_commits.txt (rev 0) +++ brlcad/trunk/misc/repoconv/remove_commits.txt 2021-02-24 19:39:22 UTC (rev 78319) @@ -0,0 +1,171 @@ + +52036a8b4569b8ffe90e2e8fb0b43f5ed36ba040 # SVN property change +908505f8729b4ff7668d91680abc5a70f9c051e1 # No-op among similar commit msg cvs-fast-export commits +52ce70a73df181ca19e683e3b23321ab87312294 # No-op among similar commit msg cvs-fast-export commits +607c2b5e3a6a5270778c40266ab7ea3d7e49affc # No-op among similar commit msg cvs-fast-export commits +6ae14458f214924da4a66e950543b3f5d03b1871 # No-op among similar commit msg cvs-fast-export commits +3540105f0c2836d4111f5fc031e595eede1f60aa # No-op among similar commit msg cvs-fast-export commits +98c65896c973e957249e875f32439460a1f9d39d # No-op among similar commit msg cvs-fast-export commits +4e3176d6051918ac3267e6624f3fb3a5fa16bf87 # No-op among similar commit msg cvs-fast-export commits +4b7fb1d0bcb47269564725a52eb6d8ed67eb89ec # No-op among similar commit msg cvs-fast-export commits +ba29664ad729dca912a42c009d67b788cde2 # No-op among similar commit msg cvs-fast-export commits +a8ff19d9f34c233b6905d21a993916fd5cc732b9 # No-op among similar commit msg cvs-fast-export commits +1399705608569f244bc7ae8f2690a25bc588672d # No-op among similar commit msg cvs-fast-export commits +d0e70965fc4a50a14c0ac5ee4edcf914403a0dfc # No-op among similar commit msg cvs-fast-export commits +4ab1cc49d2f9b609cabb463fa2481cf8a0ea7701 # No-op among similar commit msg cvs-fast-export commits +e6f62fd2447945302ccffa359de62a86885c59f8 # No-op among similar commit msg cvs-fast-export commits +396ca751d121e38f6f6199d19f7d5c2ac661cad0 # No-op among similar commit msg cvs-fast-export commits +bf32a7d39a6a52e3ec34e45b5cb42ff78d91efcd # No-op among similar commit msg cvs-fast-export commits +9beadcf34aee1d55d3e4d7048c6f7e8c408e8058 # No-op among similar commit msg cvs-fast-export commits +d26a41cd13c73d6b10300f2b0481fa0c5ab07628 # No-op among similar commit msg cvs-fast-export commits +f5e3f58b08d8b7818bbd112d767c6f4d4119eb9a # No-op +0bcb9564e791f43ee6222827a7ebbab8828c43cd # No-op +c794b2431dc7a1641021e02d2cef84716f46add1 # No-op +22336a6ff944d8c35f4eaac9efa258d4f8302ba8 # No-op +c2cc13991e3671730a828c7041772993d838695a # No-op among similar commit msg cvs-fast-export commits +eec96cfadde20486e7f8656d7bb9b2c39ea85cc6 # No-op among similar commit msg cvs-fast-export commits +96c4f80011381a6e609ac6f9bae491978c161630 # No-op among similar commit msg cvs-fast-export commits +e4b80f631e291bef42dec688d267d42ff9c06891 # No-op among similar commit msg cvs-fast-export commits +65c7c093d88c10fde81efa45111da7251d0fc5cb # No-op among similar commit msg cvs-fast-export commits +7bf0316295c7a6d6e622806e860ee549419af610 # No-op among similar commit msg cvs-fast-export commits +20df719e3f54fcfe76593cfb823dbe0ba947fcd6 # SVN property change +80f4fd1d39815cdaf00c27ab6e3f6b575342e6e3 # SVN property change +a8a88dbfeb5f1d5dff573151bcc7b580aa300d8a # SVN property change +91b5745ba9a54f14c5394cea6d4dc060121b41b0 # SVN property change +55ac4729471d0ab74140bcf82b98df0311df50e5 # SVN property change +ae03f832b24e11e6e5fea152f3f05494f316535f # SVN property change +19d63a3fe6011f31d5ad6251c0b3db34d23410cf # SVN property change +646499cecb037e97c382839d253bc72ecffd7a54 # SVN property change +a92aa295fbae0fe8575c4d2bf21ef2dc66e8215e # SVN property change +42c761e6f179e9bdd609c5078c1bbdbb8625 # SVN property change +24d6d39015164be76d2092054b952a30ce27a88d # SVN property change +c8b16c8005cdd73209b876e24526120be9ac70c8 # SVN property change +b491cb60d6cb1d35b9b03919a6f1c052f13a7b9f # No-op among similar commit msg cvs-fast-export
[brlcad-commits] SF.net SVN: brlcad:[78318] rt^3/trunk/src/coreInterface/MemoryDatabase.cpp
Revision: 78318
http://sourceforge.net/p/brlcad/code/78318
Author: d_rossberg
Date: 2021-02-24 18:20:21 + (Wed, 24 Feb 2021)
Log Message:
---
clean-up database before filling it with new content
Modified Paths:
--
rt^3/trunk/src/coreInterface/MemoryDatabase.cpp
Modified: rt^3/trunk/src/coreInterface/MemoryDatabase.cpp
===
--- rt^3/trunk/src/coreInterface/MemoryDatabase.cpp 2021-02-24 18:11:55 UTC
(rev 78317)
+++ rt^3/trunk/src/coreInterface/MemoryDatabase.cpp 2021-02-24 18:20:21 UTC
(rev 78318)
@@ -45,9 +45,6 @@
dbip = db_create_inmem();
RT_CK_DBI(dbip);
}
-else {
-BU_UNSETJUMP;
-}
BU_UNSETJUMP;
@@ -80,6 +77,26 @@
rt_i* source = rt_dirbuild(fileName, 0, 0);
if (source != 0) {
+// free old database
+if (m_wdbp != 0) {
+wdb_close(m_wdbp);
+m_wdbp = 0;
+}
+
+if (m_rtip != 0) {
+rt_free_rti(m_rtip);
+m_rtip = 0;
+}
+
+// build new database
+db_i* dbip = db_open_inmem();
+RT_CK_DBI(dbip);
+
+m_rtip = rt_new_rti(dbip);
+rt_init_resource(m_resp, 0, m_rtip);
+m_wdbp = dbip->dbi_wdbp;
+
+// fill database
ret = (db_dump(m_wdbp, source->rti_dbip) == 0);
assert(m_wdbp->dbip == m_rtip->rti_dbip);
@@ -106,6 +123,26 @@
rt_i* source = rt_dirbuild_inmem(data, dataSize, 0, 0);
if (source != 0) {
+// free old database
+if (m_wdbp != 0) {
+wdb_close(m_wdbp);
+m_wdbp = 0;
+}
+
+if (m_rtip != 0) {
+rt_free_rti(m_rtip);
+m_rtip = 0;
+}
+
+// build new database
+db_i* dbip = db_open_inmem();
+RT_CK_DBI(dbip);
+
+m_rtip = rt_new_rti(dbip);
+rt_init_resource(m_resp, 0, m_rtip);
+m_wdbp = dbip->dbi_wdbp;
+
+// fill database
ret = (db_dump(m_wdbp, source->rti_dbip) == 0);
assert(m_wdbp->dbip == m_rtip->rti_dbip);
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:[78317] brlcad/trunk
Revision: 78317
http://sourceforge.net/p/brlcad/code/78317
Author: starseeker
Date: 2021-02-24 18:11:55 + (Wed, 24 Feb 2021)
Log Message:
---
If we're switching back and forth between full and object searches, the UNIQ_DB
flag may be set incorrectly. Make sure the flag for unique path returns is
unset before invoking a full path db_search. Reported by Sean.
Modified Paths:
--
brlcad/trunk/NEWS
brlcad/trunk/src/libged/search/search.c
Modified: brlcad/trunk/NEWS
===
--- brlcad/trunk/NEWS 2021-02-24 16:45:51 UTC (rev 78316)
+++ brlcad/trunk/NEWS 2021-02-24 18:11:55 UTC (rev 78317)
@@ -13,6 +13,7 @@
--- 2021-XX-XX Release 7.32.4 ---
--
+* fixed mixing object and full path searches in MGED - Cliff Yapp
* fixed launching of ISST graphical viewer - Cliff Yapp
* updated stepcode to latest upstream version - Cliff Yapp
Modified: brlcad/trunk/src/libged/search/search.c
===
--- brlcad/trunk/src/libged/search/search.c 2021-02-24 16:45:51 UTC (rev
78316)
+++ brlcad/trunk/src/libged/search/search.c 2021-02-24 18:11:55 UTC (rev
78317)
@@ -579,6 +579,7 @@
switch (search->search_type) {
case 0:
+ flags &= ~DB_SEARCH_RETURN_UNIQ_DP;
(void)db_search(search_results, flags,
bu_vls_addr(_string), 1, _path, gedp->ged_wdbp->dbip, ctx);
sr_len = j = BU_PTBL_LEN(search_results);
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:[78316] brlcad/trunk/doc/docbook/system/mann/search.xml
Revision: 78316 http://sourceforge.net/p/brlcad/code/78316 Author: starseeker Date: 2021-02-24 16:45:51 + (Wed, 24 Feb 2021) Log Message: --- Add a search example finding regions contining a specific object included using a specific boolean operation. Modified Paths: -- brlcad/trunk/doc/docbook/system/mann/search.xml Modified: brlcad/trunk/doc/docbook/system/mann/search.xml === --- brlcad/trunk/doc/docbook/system/mann/search.xml 2021-02-23 23:04:16 UTC (rev 78315) +++ brlcad/trunk/doc/docbook/system/mann/search.xml 2021-02-24 16:45:51 UTC (rev 78316) @@ -924,6 +924,17 @@ +Finding all regions containing an intersection of obj2 + + + search |/ -maxdepth 0 -type region -above ( -name obj2 -bool + ) + + + Prints all regions immediately above obj2 where obj2 is included using an intersection + operation. + + + Finding all Plate-Mode BoT Objects 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
