add commit subcommand

Author: SandrineP

CMakeLists.txt

@@ -47,6 +47,8 @@ set(GIT2CPP_SRC
     ${GIT2CPP_SOURCE_DIR}/subcommand/checkout_subcommand.hpp
     ${GIT2CPP_SOURCE_DIR}/subcommand/clone_subcommand.cpp
     ${GIT2CPP_SOURCE_DIR}/subcommand/clone_subcommand.hpp
+    ${GIT2CPP_SOURCE_DIR}/subcommand/commit_subcommand.cpp
+    ${GIT2CPP_SOURCE_DIR}/subcommand/commit_subcommand.hpp
     ${GIT2CPP_SOURCE_DIR}/subcommand/init_subcommand.cpp
     ${GIT2CPP_SOURCE_DIR}/subcommand/init_subcommand.hpp
     ${GIT2CPP_SOURCE_DIR}/subcommand/status_subcommand.cpp
@@ -69,6 +71,8 @@ set(GIT2CPP_SRC
     ${GIT2CPP_SOURCE_DIR}/wrapper/refs_wrapper.hpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/repository_wrapper.cpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/repository_wrapper.hpp
+    ${GIT2CPP_SOURCE_DIR}/wrapper/signature_wrapper.cpp
+    ${GIT2CPP_SOURCE_DIR}/wrapper/signature_wrapper.hpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.cpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.hpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/wrapper_base.hpp

src/subcommand/commit_subcommand.cpp

@@ -0,0 +1,36 @@
+#include <git2.h>
+#include <unistd.h>
+
+#include "commit_subcommand.hpp"
+#include "../wrapper/index_wrapper.hpp"
+#include "../wrapper/repository_wrapper.hpp"
+
+
+commit_subcommand::commit_subcommand(const libgit2_object&, CLI::App& app)
+{
+    auto *sub = app.add_subcommand("commit", "Record changes to the repository");
+
+    sub->add_option("message", m_message, "Commit message");
+
+    sub->add_flag("-m,--message", m_message_flag, "");
+
+    sub->callback([this]() { this->run(); });
+};
+
+
+void commit_subcommand::run()
+{
+    auto directory = get_current_git_path();
+    auto bare = false;
+    auto repo = repository_wrapper::init(directory, bare);
+    auto author_committer_signatures =  signature_wrapper::get_default_signature_from_env(repo);
+
+    if (!m_message_flag)
+    {
+        std::cout << "Please provide a message using the -m flag." << std::endl;
+    }
+    else
+    {
+        repo.create_commit(author_committer_signatures, m_message);
+    }
+}

src/subcommand/commit_subcommand.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <CLI/CLI.hpp>
+
+#include "../utils/common.hpp"
+
+class commit_subcommand
+{
+public:
+
+    explicit commit_subcommand(const libgit2_object&, CLI::App& app);
+    void run();
+
+private:
+    bool m_message_flag = true;   // TODO: change to false when a message can be provided if the "-m" flag is not provided
+    std::string m_message;
+};

src/wrapper/commit_wrapper.cpp

@@ -20,4 +20,3 @@ const git_oid& commit_wrapper::oid() const
 {
     return *git_commit_id(p_resource);
 }
-

src/wrapper/commit_wrapper.hpp

@@ -2,6 +2,7 @@
 
 #include <git2.h>
 
+#include "../wrapper/repository_wrapper.hpp"
 #include "../wrapper/wrapper_base.hpp"
 
 class commit_wrapper : public wrapper_base<git_commit>

src/wrapper/object_wrapper.hpp

@@ -17,6 +17,8 @@ class object_wrapper : public wrapper_base<git_object>
 
     const git_oid& oid() const;
 
+    operator git_commit*() const noexcept;
+
 private:
 
     object_wrapper(git_object* obj);

src/wrapper/repository_wrapper.cpp

@@ -107,6 +107,25 @@ commit_wrapper repository_wrapper::find_commit(const git_oid& id) const
     return commit_wrapper(commit);
 }
 
+void repository_wrapper::create_commit(const signature_wrapper::author_committer_signatures& author_committer_signatures,
+    const std::string& message)
+{
+    git_oid* commit_id;
+    const char* update_ref = "ḦEAD";
+    auto parent = revparse_single(update_ref);
+    std::size_t parent_count = 0;
+    const git_commit* parents[1] = {nullptr};
+    if (parent)
+    {
+        parent_count = 1;
+        parents[0] = *parent;
+    }
+    const char* message_encoding = "UTF-8";
+    const git_tree* tree;
+    throw_if_error(git_commit_create(commit_id, *this, update_ref, author_committer_signatures.first, author_committer_signatures.second,
+        message_encoding, message.c_str(), tree, parent_count, parents));
+}
+
 annotated_commit_wrapper repository_wrapper::find_annotated_commit(const git_oid& id) const
 {
     git_annotated_commit* commit;

src/wrapper/repository_wrapper.hpp

@@ -13,6 +13,7 @@
 #include "../wrapper/index_wrapper.hpp"
 #include "../wrapper/object_wrapper.hpp"
 #include "../wrapper/refs_wrapper.hpp"
+#include "../wrapper/signature_wrapper.hpp"
 #include "../wrapper/wrapper_base.hpp"
 
 class repository_wrapper : public wrapper_base<git_repository>
@@ -50,6 +51,7 @@ class repository_wrapper : public wrapper_base<git_repository>
     // Commits
     commit_wrapper find_commit(std::string_view ref_name = "HEAD") const;
     commit_wrapper find_commit(const git_oid& id) const;
+    void create_commit(const signature_wrapper::author_committer_signatures&, const std::string&);
 
     // Annotated commits
     annotated_commit_wrapper find_annotated_commit(const git_oid& id) const;

src/wrapper/signature_wrapper.cpp

@@ -0,0 +1,17 @@
+#include "../wrapper/repository_wrapper.hpp"
+#include "../wrapper/signature_wrapper.hpp"
+#include "../utils/git_exception.hpp"
+
+signature_wrapper::~signature_wrapper()
+{
+    git_signature_free(p_resource);
+    p_resource=nullptr;
+}
+
+signature_wrapper::author_committer_signatures signature_wrapper::get_default_signature_from_env(repository_wrapper& rw)
+{
+    signature_wrapper author;
+    signature_wrapper committer;
+    throw_if_error(git_signature_default_from_env(&(author.p_resource), &(committer.p_resource), rw));
+    return {std::move(author), std::move(committer)};
+}

src/wrapper/signature_wrapper.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <utility>
+
+#include <git2.h>
+
+#include "../wrapper/wrapper_base.hpp"
+
+class repository_wrapper;
+
+class signature_wrapper : public wrapper_base<git_signature>
+{
+public:
+    using author_committer_signatures = std::pair<signature_wrapper, signature_wrapper>;
+
+    ~signature_wrapper();
+
+    signature_wrapper(signature_wrapper&&) = default;
+    signature_wrapper& operator=(signature_wrapper&&) = default;
+
+    static author_committer_signatures get_default_signature_from_env(repository_wrapper&);
+
+private:
+
+    signature_wrapper() = default;
+};