write index

Author: SandrineP

src/subcommand/add_subcommand.cpp

@@ -31,9 +31,11 @@ void add_subcommand::run()
     if (m_all_flag)
     {
         index.add_all();
+        index.write();
     }
     else
     {
         index.add_entries(m_add_files);
+        index.write();
     }
 }

src/wrapper/index_wrapper.cpp

@@ -32,5 +32,17 @@ void index_wrapper::add_impl(std::vector<std::string> patterns)
 {
     git_strarray_wrapper array{patterns};
     throw_if_error(git_index_add_all(*this, array, 0, NULL, NULL));
+    // throw_if_error(git_index_write(*this));
+}
+
+void index_wrapper::write()
+{
     throw_if_error(git_index_write(*this));
 }
+
+git_oid index_wrapper::write_tree()
+{
+    git_oid tree_id;
+    throw_if_error(git_index_write_tree(&tree_id, *this));
+    return tree_id;
+}

src/wrapper/index_wrapper.hpp

@@ -20,6 +20,9 @@ class index_wrapper : public wrapper_base<git_index>
 
     static index_wrapper init(repository_wrapper& rw);
 
+    void write();
+    git_oid write_tree();
+
     void add_entries(std::vector<std::string> patterns);
     void add_all();
 

src/wrapper/object_wrapper.cpp

@@ -15,3 +15,8 @@ const git_oid& object_wrapper::oid() const
 {
     return *git_object_id(*this);
 }
+
+object_wrapper::operator git_commit*() const noexcept
+{
+     return reinterpret_cast<git_commit*>(p_resource);
+}

src/wrapper/repository_wrapper.cpp

@@ -1,5 +1,6 @@
 #include "../utils/git_exception.hpp"
-#include "object_wrapper.hpp"
+#include "../wrapper/index_wrapper.hpp"
+#include "../wrapper/object_wrapper.hpp"
 #include "../wrapper/repository_wrapper.hpp"
 
 repository_wrapper::~repository_wrapper()
@@ -111,7 +112,9 @@ commit_wrapper repository_wrapper::find_commit(const git_oid& id) const
 void repository_wrapper::create_commit(const signature_wrapper::author_committer_signatures& author_committer_signatures,
     const std::string& message)
 {
+    const char* message_encoding = "UTF-8";
     git_oid* commit_id;
+
     const char* update_ref = "ḦEAD";
     auto parent = revparse_single(update_ref);
     std::size_t parent_count = 0;
@@ -121,10 +124,18 @@ void repository_wrapper::create_commit(const signature_wrapper::author_committer
         parent_count = 1;
         parents[0] = *parent;
     }
-    const char* message_encoding = "UTF-8";
-    const git_tree* tree;
+
+    git_tree* tree;
+    index_wrapper index = this->make_index();
+    git_oid tree_id = index.write_tree();
+    index.write();
+
+    throw_if_error(git_tree_lookup(&tree, *this, &tree_id));
+
     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));
+
+    git_tree_free(tree);
 }
 
 annotated_commit_wrapper repository_wrapper::find_annotated_commit(const git_oid& id) const
@@ -153,5 +164,7 @@ void repository_wrapper::set_head_detached(const annotated_commit_wrapper& commi
 
 void repository_wrapper::reset(const object_wrapper& target, git_reset_t reset_type, const git_checkout_options& checkout_options)
 {
+    // TODO: gerer l'index
+
     throw_if_error(git_reset(*this, target, reset_type, &checkout_options));
 }

test/test_commit.py

@@ -31,6 +31,8 @@ def test_add(git2cpp_path, all_flag):
     os.remove("./test/mook_file.txt")
 
     # TODO: git reset
+    #
+    # run status + assert
 
     # undo the add, to leave the test directory at the end the same as it was at the start
     subprocess.run(cmd_add, capture_output=True, text=True)