Revision: 73190
http://sourceforge.net/p/brlcad/code/73190
Author: starseeker
Date: 2019-05-26 23:47:37 +0000 (Sun, 26 May 2019)
Log Message:
-----------
Will need an actual repo checkout for this form of the tree rebuild.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/common_structs.h
brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
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-26
23:44:37 UTC (rev 73189)
+++ brlcad/trunk/misc/repoconv/svnfexport/common_structs.h 2019-05-26
23:47:37 UTC (rev 73190)
@@ -82,6 +82,7 @@
std::map<std::string, std::map<long int, std::set<struct svn_node *>
*>>::iterator ps_it;
std::set<long int> rebuild_revs;
+std::string repo_checkout_path;
/* Branches */
std::set<std::string> branches;
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-05-26
23:44:37 UTC (rev 73189)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport.cxx 2019-05-26
23:47:37 UTC (rev 73190)
@@ -44,11 +44,13 @@
std::string cleanup_cmd = std::string("rm -rf cvs_git_working");
int i = 0;
- if (argc < 3) {
- std::cerr << "svnfexport dumpfile author_map\n";
+ if (argc < 4) {
+ std::cerr << "svnfexport dumpfile author_map repo_checkout_path \n";
return 1;
}
+ repo_checkout_path = std::string(argv[3]);
+
load_branches_list();
starting_rev = get_starting_rev();
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-26
23:44:37 UTC (rev 73189)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-26
23:47:37 UTC (rev 73190)
@@ -159,9 +159,9 @@
std::string tree_cmd;
if (std::string(branch) == std::string("master")) {
- tree_cmd = std::string("cd custom && ../sync_commit_trunk.sh ") +
std::string(svn_repo) + std::string(" ") + std::to_string(rev) + std::string("
&& cd ..");
+ tree_cmd = std::string("./sync_commit_trunk.sh ") +
std::string(svn_repo) + std::string(" ") + std::to_string(rev);
} else {
- tree_cmd = std::string("cd custom && ../sync_commit_trunk.sh ") +
std::string(svn_repo) + std::string(" ") + std::string(branch) + std::string("
") + std::to_string(rev) + std::string(" && cd ..");
+ tree_cmd = std::string("./sync_commit.sh ") + std::string(svn_repo) +
std::string(" ") + std::string(branch) + std::string(" ") + std::to_string(rev);
}
if (std::system(tree_cmd.c_str())) {
std::cerr << "Error running tree command: " << tree_cmd << "\n";
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
