Revision: 73023
http://sourceforge.net/p/brlcad/code/73023
Author: starseeker
Date: 2019-05-08 11:01:17 +0000 (Wed, 08 May 2019)
Log Message:
-----------
This wasn't actually being used the way I originally thought - simplify.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/common_structs.h
brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/common_structs.h
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/common_structs.h 2019-05-08
06:23:33 UTC (rev 73022)
+++ brlcad/trunk/misc/repoconv/svnfexport/common_structs.h 2019-05-08
11:01:17 UTC (rev 73023)
@@ -102,8 +102,6 @@
/* Holds strings identifying all known projects in the svn repo */
std::set<std::string> valid_projects;
-std::set<long int> brlcad_revs;
-
std::map<std::string, std::string> branch_mappings;
std::map<std::string, std::string> tag_mappings;
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-08
06:23:33 UTC (rev 73022)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-08
11:01:17 UTC (rev 73023)
@@ -681,14 +681,9 @@
}
if (!nomerge && rev.merged_from.length()) {
- if (brlcad_revs.find(rev.merged_rev) != brlcad_revs.end()) {
- std::cout << "Revision " << rev.revision_number << " merged from: "
<< rev.merged_from << "(" << rev.merged_rev << "), id " <<
rev_to_gsha1[std::pair<std::string,long int>(rev.merged_from, rev.merged_rev)]
<< "\n";
- std::cout << "Revision " << rev.revision_number << " from: "
<< rbranch << "\n";
- outfile << "merge " << rev.merged_from << "," << rev.merged_rev <<
"\n";
- } else {
- std::cout << "Warning: merge info " << rev.merged_from << ", r" <<
rev.revision_number << " is referencing a commit id (" << rev.merged_rev << ")
that is not known to the merge information\n";
- outfile << "merge " << rev.merged_from << ",EEEEE\n";
- }
+ std::cout << "Revision " << rev.revision_number << " merged from: " <<
rev.merged_from << "(" << rev.merged_rev << "), id " <<
rev_to_gsha1[std::pair<std::string,long int>(rev.merged_from, rev.merged_rev)]
<< "\n";
+ std::cout << "Revision " << rev.revision_number << " from: " <<
rbranch << "\n";
+ outfile << "merge " << rev.merged_from << "," << rev.merged_rev << "\n";
}
}
@@ -918,8 +913,6 @@
coutfile.close();
}
- brlcad_revs.insert(rev.revision_number);
-
std::string tfi_file = std::to_string(rev.revision_number) +
std::string("-tree.fi");
fi_file = std::string("custom/") + tfi_file;
// Only make one if we don't alredy have a custom file
@@ -955,8 +948,6 @@
exit(1);
}
- brlcad_revs.insert(rev.revision_number);
-
std::string cfi_file = std::to_string(rev.revision_number) +
std::string("-commit.fi");
fi_file = std::string("custom/") + cfi_file;
// Only make one if we don't alredy have a custom file
@@ -1120,7 +1111,6 @@
edited_tag_minr = edited_tag_first_rev[node.tag];
edited_tag_maxr = edited_tag_max_rev[node.tag];
std::cout << node.tag << ": " << edited_tag_minr << " " <<
edited_tag_maxr << "\n";
- brlcad_revs.insert(rev.revision_number);
if (rev.revision_number < edited_tag_minr) {
std::string nbranch = std::string("refs/heads/") + node.tag;
@@ -1156,7 +1146,6 @@
rbranch = node.branch;
//git_changes = 1;
} else {
- brlcad_revs.insert(rev.revision_number);
std::cout << "Adding tag " << node.tag << " from " << bbpath <<
", r" << rev.revision_number << "\n";
std::string tfi_file = std::to_string(rev_num) +
std::string("-tag.fi");
std::ofstream toutfile(tfi_file.c_str(), std::ios::out |
std::ios::binary);
@@ -1180,7 +1169,6 @@
}
if (node.branch_add) {
- brlcad_revs.insert(rev.revision_number);
std::cout << "Processing revision " << rev.revision_number << "\n";
std::string ppath, bbpath, llpath, tpath;
int is_tag;
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
