Revision: 76538
http://sourceforge.net/p/brlcad/code/76538
Author: starseeker
Date: 2020-07-28 01:32:07 +0000 (Tue, 28 Jul 2020)
Log Message:
-----------
Put the branch query in with the slow portion of the code - diff checking - so
we can iterate faster.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/verify/verify.cpp
Modified: brlcad/trunk/misc/repoconv/verify/verify.cpp
===================================================================
--- brlcad/trunk/misc/repoconv/verify/verify.cpp 2020-07-27 23:39:52 UTC
(rev 76537)
+++ brlcad/trunk/misc/repoconv/verify/verify.cpp 2020-07-28 01:32:07 UTC
(rev 76538)
@@ -224,7 +224,7 @@
exit(1);
}
if (std::system(cvs_cmd.c_str())) {
- std::cerr << "cvs checkout failed!\n";
+ std::cerr << "cvs checkout failed: " << cvs_cmd << "\n";
if (std::system(cleanup_cmd.c_str())) {
std::cerr << "verify cleanup failed!\n";
}
@@ -408,9 +408,15 @@
int cnt = 0;
std::set<std::string> b;
std::regex dregex(".*detached.*");
+ std::regex mregex(".*master$");
while (std::getline(infile, line)) {
if (!line.length()) continue;
if (std::regex_match(line, dregex)) continue;
+ if (std::regex_match(line, dregex)) {
+ b.insert(std::string("master"));
+ cnt++;
+ continue;
+ }
wtrim(line);
b.insert(line);
cnt++;
@@ -578,15 +584,7 @@
continue;
}
- if (commits[i].timestamp < cvs_maxtime) {
- get_branches(commits[i].branches, commits[i].sha1, git_repo);
- if (!commits[i].branches.size()) {
- std::cout << "Couldn't identify branches, skipping verification
of " << commits[i].sha1 << "\n";
- continue;
- }
- }
-
timestamp_to_cmp.insert(std::make_pair(commits[i].timestamp, i));
if (commits[i].svn_rev) {
std::cout << "Queueing revision " << commits[i].rev << "\n";
@@ -621,6 +619,14 @@
std::cout << "Checking non-SVN commit, timestamp " << r_it->first
<< "\n";
}
+ if (info.timestamp < cvs_maxtime) {
+ get_branches(info.branches, info.sha1, git_repo);
+ if (!info.branches.size()) {
+ std::cout << "Couldn't identify branches, skipping verification
of " << info.sha1 << "\n";
+ continue;
+ }
+ }
+
// Git checkout
std::string git_checkout = std::string("cd ") + git_repo +
std::string(" && git checkout --quiet ") + info.sha1 + std::string(" && cd ..");
info.git_check_cmds.append(git_checkout);
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
