Revision: 73187
http://sourceforge.net/p/brlcad/code/73187
Author: starseeker
Date: 2019-05-26 16:37:32 +0000 (Sun, 26 May 2019)
Log Message:
-----------
move_only_commit may not actually generate a file - provide a return value
accordingly and use it.
Modified Paths:
--------------
brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
Modified: brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx
===================================================================
--- brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-26
16:23:22 UTC (rev 73186)
+++ brlcad/trunk/misc/repoconv/svnfexport/svnfexport_git.cxx 2019-05-26
16:37:32 UTC (rev 73187)
@@ -754,7 +754,7 @@
}
}
-void move_only_commit(struct svn_revision &rev, std::string &rbranch)
+int move_only_commit(struct svn_revision &rev, std::string &rbranch)
{
struct stat buffer;
std::string cfi_file = std::string("custom/") +
std::to_string(rev.revision_number) + std::string("-mvonly.fi");
@@ -761,7 +761,7 @@
// Skip if we already have a custom file
if (file_exists(cfi_file.c_str())) {
- return;
+ return 1;
}
if (author_map.find(rev.author) == author_map.end()) {
@@ -784,7 +784,7 @@
}
if (!have_real_rename) {
- return;
+ return 0;
}
std::string fi_file = std::to_string(rev.revision_number) +
std::string("-mvonly.fi");
@@ -816,6 +816,7 @@
}
outfile.close();
+ return 1;
}
void write_git_node(std::ofstream &toutfile, struct svn_revision &rev, struct
svn_node &node)
@@ -1406,8 +1407,8 @@
}
if (rev.move_edit) {
- move_only_commit(rev, rbranch);
- standard_commit(rev, rbranch, 1);
+ int have_mvonly = move_only_commit(rev, rbranch);
+ standard_commit(rev, rbranch, have_mvonly);
} else {
standard_commit(rev, rbranch, 0);
}
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
