Add merge commit (draft)

Author: SandrineP

src/subcommand/merge_subcommand.cpp

@@ -2,14 +2,17 @@
 #include <git2/types.h>
 
 #include "merge_subcommand.hpp"
-// #include "../wrapper/repository_wrapper.hpp"
+#include <iostream>
 
 
 merge_subcommand::merge_subcommand(const libgit2_object&, CLI::App& app)
 {
     auto *sub = app.add_subcommand("merge", "Join two or more development histories together");
 
     sub->add_option("<branch>", m_branches_to_merge, "Branch(es) to merge");
+    sub->add_flag("--no-ff", m_no_ff, "");
+    sub->add_flag("--commit", m_commit, "Perform the merge and commit the result. This option can be used to override --no-commit.");
+    sub->add_flag("--no-commit", m_no_commit, "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing. \nNote that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit.");
 
     sub->callback([this]() { this->run(); });
 }
@@ -54,6 +57,60 @@ void perform_fastforward(repository_wrapper& repo, const git_oid target_oid, int
     target_ref.write_new_ref(target_oid);
 }
 
+static void create_merge_commit(repository_wrapper repo, index_wrapper index, std::vector<std::string> m_branches_to_merge,
+    annotated_commit_list_wrapper commits_to_merge, size_t num_commits_to_merge)  // std::vector<annotated_commit_wrapper> commits_to_merge
+{
+    auto head_ref = repo.head();
+    auto merge_ref = repo.find_reference_dwim(m_branches_to_merge.front());
+    // if (ref)
+    // {
+    //     auto merge_ref = std::move(ref).value();
+    // }
+    auto merge_commit = repo.resolve_local_ref(m_branches_to_merge.front()).value();
+
+    std::vector<commit_wrapper> parents_list;
+    parents_list.reserve(num_commits_to_merge + 1);
+    parents_list.push_back(std::move(head_ref.peel<commit_wrapper>()));
+    for (size_t i=0; i<num_commits_to_merge; ++i)
+    {
+        std::cout << commits_to_merge[i];
+        parents_list.push_back(repo.find_commit(commits_to_merge[i]->oid()));
+    }
+    auto parents = commit_list_wrapper(std::move(parents_list));
+
+    auto author_committer_sign = signature_wrapper::get_default_signature_from_env(repo);
+    std::string author_name;
+    author_name = author_committer_sign.first.name();
+    std::string author_email;
+    author_email = author_committer_sign.first.email();
+    auto author_committer_sign_now = signature_wrapper::signature_now(author_name, author_email, author_name, author_email);
+
+    std::string msg_target = NULL;
+    if (merge_ref)
+    {
+        msg_target = merge_ref->short_name();
+    }
+    else
+    {
+        msg_target = git_oid_tostr_s(&(merge_commit.oid()));
+    }
+
+	std::string msg;
+	msg = "Merge ";
+	if (merge_ref)
+	{
+	    msg.append("branch ");
+	}
+	else
+	{
+	    msg.append("commit ");
+	}
+	msg.append(msg_target);
+	std::cout << msg << std::endl;
+
+	repo.create_commit(author_committer_sign_now, msg, std::optional<commit_list_wrapper>(std::move(parents)));
+}
+
 void merge_subcommand::run()
 {
     auto directory = get_current_git_path();
@@ -97,4 +154,41 @@ void merge_subcommand::run()
         assert(num_commits_to_merge == 1);
         perform_fastforward(repo, target_oid, (analysis & GIT_MERGE_ANALYSIS_UNBORN));
     }
+    else if (analysis & GIT_MERGE_ANALYSIS_NORMAL)
+    {
+        std::cout << "OR THERE ?" << std::endl;
+        git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
+		git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
+
+		merge_opts.flags = 0;
+		merge_opts.file_flags = GIT_MERGE_FILE_STYLE_DIFF3;
+
+		checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE|GIT_CHECKOUT_ALLOW_CONFLICTS;
+
+		if (preference & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY)
+		{
+			std::cout << "Fast-forward is preferred, but only a merge is possible\n" << std::endl;
+		}
+
+		throw_if_error(git_merge(repo,
+		                         (const git_annotated_commit**)c_commits_to_merge,
+								 num_commits_to_merge,
+	                             &merge_opts,
+								 &checkout_opts));
+    }
+
+    index_wrapper index = repo.make_index();
+
+    if (git_index_has_conflicts(index))
+    {
+        std::cout << "WAAAAAAAAAAAARRRRRR !!!!!!!!!" << std::endl;
+        /* Handle conflicts */
+		// output_conflicts(index);
+	}
+	else if (!m_no_commit)
+	{
+	    std::cout << "???" << std::endl;
+		create_merge_commit(repo, index, m_branches_to_merge, commits_to_merge, num_commits_to_merge);
+		printf("Merge made\n");
+	}
 }

src/subcommand/merge_subcommand.hpp

@@ -17,4 +17,7 @@ class merge_subcommand
     annotated_commit_list_wrapper resolve_heads(const repository_wrapper& repo);
 
     std::vector<std::string> m_branches_to_merge;
+    bool m_no_ff = false;
+    bool m_commit = false;
+    bool m_no_commit = false;
 };