void RevertDialog::on_chapter_changed()
{
// Load the revisions.
listview_clear_strings(treeviewrevisions, store);
ustring chapterdirectory = project_data_directory_chapter(project, book_get(), chapter_get());
ustring path = project_data_filename_chapter(project, book_get(), chapter_get(), false);
path = gw_path_get_basename(path);
seconds = snapshots_get_seconds (project, book_get(), chapter_get());
vector <ustring> lines;
for (unsigned int i = 0; i < seconds.size(); i++) {
lines.push_back(date_time_seconds_human_readable(seconds[i], false));
}
listview_set_strings(treeviewrevisions, store, lines);
// Autosize columns.
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(treeviewrevisions));
// No revision loaded yet.
revisionloaded = false;
// Take action defined by radio button.
on_radiobutton (NULL);
}
void WindowMerge::merge_edited_into_master(bool approve)
// This merges the edited data into the master data, and does error checking.
{
// Bail out if there's nothing to merge.
if (main_project_data == edited_project_data) {
gtkw_dialog_info(NULL, _("Both the chapters already are the same"));
return;
}
// Get the available snapshots of the master and edited projects.
vector <unsigned int> masterseconds = snapshots_get_seconds (current_master_project, book, chapter);
vector <unsigned int> editedseconds = snapshots_get_seconds (current_edited_project, book, chapter);
// We need to look for the common ancestor.
// It needs a fast routine that goes through the history as little as possible.
// Make a combined set of the times and flags.
vector <bool> combinedflags;
vector <unsigned int> combinedseconds;
for (unsigned int i = 0; i < masterseconds.size(); i++) {
combinedflags.push_back (true);
combinedseconds.push_back (masterseconds[i]);
}
for (unsigned int i = 0; i < editedseconds.size(); i++) {
combinedflags.push_back (false);
combinedseconds.push_back (editedseconds[i]);
}
// Sort the combined set on the time, most recent ones first.
quick_sort (combinedseconds, combinedflags, 0, combinedseconds.size());
{
vector <bool> flags = combinedflags;
vector <unsigned int> seconds = combinedseconds;
combinedflags.clear();
combinedseconds.clear();
for (int i = flags.size() - 1; i >= 0; i--) {
combinedflags.push_back (flags[i]);
combinedseconds.push_back (seconds[i]);
}
}
// Go through the history of both projects, extract the state in history,
// and compare them in order to find the common ancestor.
vector <ustring> mastertexts;
vector <ustring> editedtexts;
ustring common_ancestor;
for (unsigned int i = 0; i < combinedseconds.size(); i++) {
unsigned int second = combinedseconds[i];
bool master = combinedflags[i];
if (master) {
mastertexts.push_back(snapshots_get_chapter(current_master_project, book, chapter, second));
} else {
editedtexts.push_back(snapshots_get_chapter(current_edited_project, book, chapter, second));
}
for (unsigned int m = 0; m < mastertexts.size(); m++) {
for (unsigned int e = 0; e < editedtexts.size(); e++) {
if (common_ancestor.empty()) {
if (mastertexts[m] == editedtexts[e]) {
common_ancestor = mastertexts[m];
}
}
}
}
if (!common_ancestor.empty()) {
break;
}
}
// If no common ancestor was found, give message and bail out.
if (common_ancestor.empty()) {
gtkw_dialog_error(NULL, _("Can't merge because a common ancestor was not found"));
return;
}
// Do the merge in a temporal directory.
workingdirectory = gw_build_filename(Directories->get_temp(), "merge");
unix_rmdir(workingdirectory);
gw_mkdir_with_parents(workingdirectory);
/*
Merge works with file1, file2 and file3.
merge [ options ] file1 file2 file3
merge incorporates all changes that lead from file2 to file3 into file1.
The result ordinarily goes into file1.
merge is useful for combining separate changes to an original.
Suppose file2 is the original, and both file1 and file3 are modifications of file2.
Then merge combines both changes.
*/
ustring file1 = gw_build_filename(workingdirectory, "file1");
ustring file2 = gw_build_filename(workingdirectory, "file2");
ustring file3 = gw_build_filename(workingdirectory, "file3");
/*
merge has problems when two consecutive lines are changed,
one line in one file and the other line in the other file.
Therefore data is going to be cut on the spaces,
so that there is one word per line.
Each new line is indicated too so as to facilitate joining the loose bits again.
Another advantage of this is that the merge operation becomes finer grained.
*/
// Write the data for the common ancestor.
g_file_set_contents(file2.c_str(), merge_split_data(common_ancestor).c_str(), -1, NULL);
// Write the data for the main project.
g_file_set_contents(file1.c_str(), merge_split_data(main_project_data).c_str(), -1, NULL);
// Write the data for the edited project.
g_file_set_contents(file3.c_str(), merge_split_data(edited_project_data).c_str(), -1, NULL);
// Do the three-way merge.
{
GwSpawn spawn("merge");
spawn.workingdirectory(workingdirectory);
spawn.arg(file1);
spawn.arg(file2);
spawn.arg(file3);
spawn.run();
}
// Read the result of the merge.
ustring merge_result;
{
gchar *contents;
g_file_get_contents(file1.c_str(), &contents, NULL, NULL);
if (contents) {
merge_result = contents;
g_free(contents);
}
}
// Make conflicts human readable.
merge_result = merge_conflicts_2_human_readable_text(merge_result);
// Join the bits again.
merge_result = merge_join_data(merge_result);
// If there are conflicts, resolve them.
if (merge_result.find(merge_conflict_markup(1)) != string::npos) {
MergeDialog dialog(merge_result);
if (dialog.run() == GTK_RESPONSE_OK) {
merge_result = dialog.reconciled_text;
}
}
// If there are still conflicts, give a message and bail out.
if (merge_result.find(merge_conflict_markup(1)) != string::npos) {
gtkw_dialog_error(NULL, _("The chapters were not merged"));
return;
}
if (approve) {
// Setup the approval system.
approval_setup(main_project_data, merge_result);
} else {
// Store the merge result in both chapters.
ParseLine parseline(merge_result);
CategorizeChapterVerse ccv(parseline.lines);
project_store_chapter(current_master_project, book, ccv);
project_store_chapter(current_edited_project, book, ccv);
// A normal snapshot may be removed over time, so we need a persistent one to enable future merges.
snapshots_shoot_chapter (current_master_project, book, chapter, 0, true);
snapshots_shoot_chapter (current_edited_project, book, chapter, 0, true);
// Message ok.
gtkw_dialog_info(NULL, _("The chapters were successfully merged"));
}
}
