Revision: 76367
http://sourceforge.net/p/brlcad/code/76367
Author: starseeker
Date: 2020-07-17 18:04:55 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
Merge trunk changes through r76366
Modified Paths:
--------------
brlcad/branches/bioh/misc/CMakeLists.txt
brlcad/branches/bioh/misc/repoconv/NOTES
brlcad/branches/bioh/misc/repoconv/account-map
Added Paths:
-----------
brlcad/branches/bioh/misc/repoconv/svn_git_diff.cxx
Property Changed:
----------------
brlcad/branches/bioh/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-07-17 17:59:33 UTC (rev 76366)
+++ brlcad/branches/bioh 2020-07-17 18:04:55 UTC (rev 76367)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75720-76157,76160-76353
\ No newline at end of property
+/brlcad/trunk:75720-76157,76160-76365
\ No newline at end of property
Modified: brlcad/branches/bioh/misc/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/misc/CMakeLists.txt 2020-07-17 17:59:33 UTC (rev
76366)
+++ brlcad/branches/bioh/misc/CMakeLists.txt 2020-07-17 18:04:55 UTC (rev
76367)
@@ -243,6 +243,7 @@
repoconv/svn_date.cxx
repoconv/svn_date.h
repoconv/svn_de-rcs.cxx
+ repoconv/svn_git_diff.cxx
repoconv/svn_map_commit_revs.cxx
repoconv/svn_msgs.cxx
repoconv/svnfexport.cxx
Modified: brlcad/branches/bioh/misc/repoconv/NOTES
===================================================================
--- brlcad/branches/bioh/misc/repoconv/NOTES 2020-07-17 17:59:33 UTC (rev
76366)
+++ brlcad/branches/bioh/misc/repoconv/NOTES 2020-07-17 18:04:55 UTC (rev
76367)
@@ -267,3 +267,32 @@
version, so what we really want is our own openNURBS project generating
artifacts per-change that our main build workflow then grabs and installs as
needed...)
+
+##################################################################################
+If we want a "straighter" presentation of the statistics of our git history
than
+those of Github (which bases its reporting only on commit ids linkable to
github
+accounts and skips reporting any others) the best tool I've found thus far
+looks to be gitstats:
+
+https://github.com/tomgi/git_stats
+
+After installing, statistics pages can be generated by running:
+
+git_stats generate
+
+in a clone of the repository.
+
+
+
+Note - on Ubuntu, per https://github.com/rails/rails/issues/34822 I had to add
the line:
+
+gem 'bigdecimal', '1.4.2'
+
+to the git_stats file
+
+/var/lib/gems/2.7.0/gems/git_stats-1.0.17/bin/git_stats
+
+and install the older version of bigdecimal (per
https://stackoverflow.com/a/17026442):
+
+gem install bigdecimal -v 1.4.2
+
Modified: brlcad/branches/bioh/misc/repoconv/account-map
===================================================================
--- brlcad/branches/bioh/misc/repoconv/account-map 2020-07-17 17:59:33 UTC
(rev 76366)
+++ brlcad/branches/bioh/misc/repoconv/account-map 2020-07-17 18:04:55 UTC
(rev 76367)
@@ -16,7 +16,7 @@
cnuzman Carl Nuzman <[email protected]>
cprecup Cristina Precup <[email protected]>
crdueck Chris Dueck <[email protected]>
-d_rossberg Daniel Rossberg <[email protected]>
+d_rossberg Daniel Rossberg <[email protected]>
davidloman David Loman <[email protected]>
ddreeves70 David Reeves <[email protected]>
dgodbey David Godbey <[email protected]>
Copied: brlcad/branches/bioh/misc/repoconv/svn_git_diff.cxx (from rev 76365,
brlcad/trunk/misc/repoconv/svn_git_diff.cxx)
===================================================================
--- brlcad/branches/bioh/misc/repoconv/svn_git_diff.cxx
(rev 0)
+++ brlcad/branches/bioh/misc/repoconv/svn_git_diff.cxx 2020-07-17 18:04:55 UTC
(rev 76367)
@@ -0,0 +1,290 @@
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <set>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <locale>
+#include <iomanip>
+
+std::map<std::string,long int> svn_msg_to_rev;
+std::map<long int,std::string> svn_rev_to_msg;
+std::map<std::string,std::string> git_msg_to_sha1;
+std::map<std::string,std::string> git_sha1_to_msg;
+std::map<std::string,long int> git_sha1_to_time;
+std::set<std::string> svn_msg_non_unique;
+
+std::map<std::string,long int> svn_msg_to_time;
+std::map<std::string,long int> git_msg_to_time;
+std::map<long int,std::string> svn_time_to_msg;
+std::map<long int,long int> svn_time_to_rev;
+std::map<long int,std::string> git_time_to_msg;
+std::map<long int,std::set<std::string>> git_time_to_msg_nonuniq;
+std::map<long int,std::string> git_time_to_sha1;
+std::set<long int> git_time_nonuniq;
+
+std::set<std::string> git_msg_non_unique;
+
+std::map<std::pair<std::string, long int>,long int> svn_msgtime_to_rev;
+std::map<std::pair<std::string, long int>,std::string> git_msgtime_to_sha1;
+
+// Generate input file with ./svn_msgs brlcad.dump
+// For a general comparison be sure to remove the logic that limits
+// the msg outputs to commits less than r29886
+void
+read_svn_info()
+{
+ std::ifstream infile("svn_msgs.txt");
+ if (!infile.good()) exit(1);
+ std::string line;
+ while (std::getline(infile, line)) {
+ size_t spos = line.find_first_of(",");
+ std::string rev_str = line.substr(0, spos);
+ long int rev = std::stol(rev_str);
+ line = line.substr(spos + 1, std::string::npos);
+ spos = line.find_first_of(",");
+ std::string timestamp = line.substr(0, spos);
+ long int tstp = std::stol(timestamp);
+ std::string cmsg = line.substr(spos+1, std::string::npos);
+ svn_time_to_msg[tstp] = cmsg;
+ svn_time_to_rev[tstp] = rev;
+ svn_rev_to_msg[rev] = cmsg;
+ if (svn_msg_to_rev.find(cmsg) == svn_msg_to_rev.end()) {
+ svn_msg_to_rev[cmsg] = rev;
+ svn_msg_to_time[cmsg] = tstp;
+ } else {
+ svn_msg_to_rev.erase(cmsg);
+ svn_msg_to_time.erase(cmsg);
+ svn_msg_non_unique.insert(cmsg);
+ }
+ svn_msgtime_to_rev[std::pair<std::string,long int>(cmsg, tstp)] = rev;
+ }
+ infile.close();
+}
+
+void
+read_git_line(std::string &line)
+{
+ size_t spos = line.find_first_of(",");
+ std::string sha1 = line.substr(0, spos);
+ line = line.substr(spos + 1, std::string::npos);
+ spos = line.find_first_of(",");
+ std::string timestamp = line.substr(0, spos);
+ std::string trimstr(" +0000");
+ {
+ size_t spos2 = timestamp.find(trimstr);
+ if (spos2 != std::string::npos) {
+ timestamp.erase(spos2, trimstr.length());
+ }
+ }
+ long int tstp = std::stol(timestamp);
+ std::string cmsg = line.substr(spos+1, std::string::npos);
+
+ git_sha1_to_msg[sha1] = cmsg;
+ git_sha1_to_time[sha1] = tstp;
+ git_time_to_msg[tstp] = cmsg;
+ git_time_to_msg_nonuniq[tstp].insert(cmsg);
+ if (git_time_to_sha1.find(tstp) != git_time_to_sha1.end()) {
+ git_time_nonuniq.insert(tstp);
+ }
+ git_time_to_sha1[tstp] = sha1;
+ if (git_msg_to_sha1.find(cmsg) == git_msg_to_sha1.end()) {
+ git_msg_to_sha1[cmsg] = sha1;
+ git_msg_to_time[cmsg] = tstp;
+ } else {
+ git_msg_to_sha1.erase(cmsg);
+ git_msg_to_time.erase(cmsg);
+ git_msg_non_unique.insert(cmsg);
+ }
+
+ git_msgtime_to_sha1[std::pair<std::string,long int>(cmsg, tstp)] = sha1;
+}
+
+// Generate input file with:
+//
+// git log --all --pretty=format:"GITMSG%n%H,%ct +0000,%B%nGITMSGEND%n" >
../git.log
+void
+read_git_info()
+{
+ std::string line;
+ std::string newline;
+ std::string bstr("GITMSG");
+ std::string estr("GITMSGEND");
+
+ std::ifstream infile("git.log");
+ if (!infile.good()) exit(-1);
+
+ while (std::getline(infile, line)) {
+ if (!line.length()) continue;
+ if (line == bstr) {
+ newline = std::string("");
+ continue;
+ }
+
+ if (line == estr) {
+ read_git_line(newline);
+ continue;
+ } else {
+ newline.append(line);
+ }
+ }
+ infile.close();
+}
+
+#if 0
+void write_note(long int rev, std::string gsha1, long int commit_time)
+{
+ std::string fi_file = std::to_string(rev) + std::string("-note.fi");
+ std::ofstream outfile(fi_file.c_str(), std::ios::out | std::ios::binary);
+ std::string svn_id_str = std::string("svn:revision:") +
std::to_string(rev);
+
+ outfile << "blob" << "\n";
+ outfile << "mark :1" << "\n";
+ outfile << "data " << svn_id_str.length() << "\n";
+ outfile << svn_id_str << "\n";
+ outfile << "commit refs/notes/commits" << "\n";
+ outfile << "committer CVS_SVN_GIT Mapper <cvs_svn_git> " << commit_time
<< " +0000\n";
+
+ std::string svn_id_commit_msg = std::string("Note SVN revision ") +
std::to_string(rev);
+ outfile << "data " << svn_id_commit_msg.length() << "\n";
+ outfile << svn_id_commit_msg << "\n";
+
+
+ std::string git_sha1_cmd = std::string("cd brlcad_cvs_git && git show-ref
refs/notes/commits > ../nsha1.txt && cd ..");
+ if (std::system(git_sha1_cmd.c_str())) {
+ std::cout << "git_sha1_cmd failed: refs/notes/commits\n";
+ exit(1);
+ }
+ std::ifstream hfile("nsha1.txt");
+ if (!hfile.good()) {
+ std::cout << "couldn't open nsha1.txt\n";
+ exit(1);
+ }
+ std::string line;
+ std::getline(hfile, line);
+ size_t spos = line.find_first_of(" ");
+ std::string nsha1 = line.substr(0, spos);
+
+ outfile << "from " << nsha1 << "\n";
+ outfile << "N :1 " << gsha1 << "\n";
+ outfile.close();
+
+ std::string git_fi = std::string("cd brlcad_cvs_git && cat ../") + fi_file
+ std::string(" | git fast-import && git reset --hard HEAD && cd ..");
+ if (std::system(git_fi.c_str())) {
+ std::cout << "Fatal - could not apply fi file to working repo " <<
fi_file << "\n";
+ exit(1);
+ }
+
+}
+#endif
+int main(int argc, const char **argv)
+{
+ read_svn_info();
+ read_git_info();
+ std::ofstream svnunmapped("svn_unmapped.txt", std::ios::out |
std::ios::binary);
+
+ std::map<std::pair<std::string, long int>,long int>::iterator s_it;
+ for (s_it = svn_msgtime_to_rev.begin(); s_it != svn_msgtime_to_rev.end();
s_it++) {
+ std::map<std::pair<std::string, long int>,std::string>::iterator g_it;
+ g_it = git_msgtime_to_sha1.find((*s_it).first);
+ if (g_it != git_msgtime_to_sha1.end()) {
+ // Unique time,message mapping
+ continue;
+ //svnunmapped << (*smsg_it).first << " " << (*smsg_it).second <<
"\n";
+ } else {
+ std::string cmsg = (*s_it).first.first;
+ if (svn_msg_non_unique.find(cmsg) == svn_msg_non_unique.end() &&
+ git_msg_non_unique.find(cmsg) == git_msg_non_unique.end()) {
+ // Unique message
+ std::map<std::string,long int>::iterator r_it =
svn_msg_to_rev.find(cmsg);
+ std::map<std::string,std::string>::iterator g2_it =
git_msg_to_sha1.find(cmsg);
+ if (r_it != svn_msg_to_rev.end() && g2_it !=
git_msg_to_sha1.end()) {
+ // Unique msg has matching revision, but not matching time
+ continue;
+ } else {
+ if (git_time_to_msg.find((*s_it).first.second) !=
git_time_to_msg.end()) {
+ // Unique msg is unmapped, but there is a matching
timestamp in the git history
+ long int timestamp = (*s_it).first.second;
+
+ if (git_time_nonuniq.find(timestamp) !=
git_time_nonuniq.end()) {
+ std::cerr << (*s_it).first.second << " " <<
(*s_it).second << " [unique, unmapped, timestamp not unique in git] : " << cmsg
<< "\n";
+ }
+
+ // There are two timestamp ranges where SVN is known to
be out of wack - in those ranges,
+ // a timestamp match is not enough. Otherwise, assume
a match
+
+ if ((timestamp > 524275754) && (timestamp < 625839678))
{
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [unique, unmapped, timestamp in unreliable range] : " <<
cmsg << "\n";
+ } else {
+ continue;
+ }
+ } else {
+ // Unique msg is unmapped, and there is no matching
timestamp in the git history
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [unique, unmapped] : " << cmsg << "\n";
+ }
+ }
+ } else {
+ // Non-unique message
+ if (git_time_to_msg.find((*s_it).first.second) !=
git_time_to_msg.end()) {
+ // Have a timestamp match, even though the non-unique git
message doesn't match
+ long int timestamp = (*s_it).first.second;
+
+ if (cmsg == std::string("Initial revision")) {
+ if ((timestamp > 524275754) && (timestamp < 625839678))
{
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [\"Initial revision\" timestamp match, timestamp in
unreliable range]: " << cmsg << "\n";
+ } else {
+ continue;
+ }
+ } else {
+ if ((timestamp > 524275754) && (timestamp < 625839678))
{
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [non-unique, has exact timestamp match, timestamp in
unreliable range] : " << cmsg << " -> [" <<
git_time_to_sha1[(*s_it).first.second] << "] " <<
git_time_to_msg[(*s_it).first.second] << "\n";
+ } else {
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [non-unique, has exact timestamp match] : " << cmsg << " ->
[" << git_time_to_sha1[(*s_it).first.second] << "] " <<
git_time_to_msg[(*s_it).first.second] << "\n";
+ }
+ }
+ } else {
+ svnunmapped << (*s_it).first.second << " " <<
(*s_it).second << " [non-unique,no exact timestamp match] : " << cmsg << "\n";
+ }
+ }
+ }
+ }
+ svnunmapped.close();
+
+ std::ofstream gitunmapped("git_unmapped.txt", std::ios::out |
std::ios::binary);
+
+ std::map<std::string,std::string>::iterator m_it;
+ for (m_it = git_sha1_to_msg.begin(); m_it != git_sha1_to_msg.end();
m_it++) {
+ std::map<std::string,long int>::iterator sm_it;
+ sm_it = svn_msg_to_rev.find((*m_it).second);
+ if (sm_it != svn_msg_to_rev.end()) {
+ // Unique message mapping
+ continue;
+ }
+
+ std::map<std::pair<std::string, long int>,long int>::iterator mr_it;
+ long timestamp = git_sha1_to_time[(*m_it).first];
+ mr_it = svn_msgtime_to_rev.find(std::make_pair((*m_it).second,
timestamp));
+ if (mr_it != svn_msgtime_to_rev.end()) {
+ // Unique + timestamp mapping
+ continue;
+ }
+
+ gitunmapped << timestamp << " " << (*m_it).first << " " <<
(*m_it).second << "\n";
+ }
+
+ gitunmapped.close();
+
+ return 0;
+}
+
+
+// Local Variables:
+// tab-width: 8
+// mode: C++
+// c-basic-offset: 4
+// indent-tabs-mode: t
+// c-file-style: "stroustrup"
+// End:
+// ex: shiftwidth=4 tabstop=8
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
