add add subcommand

Author: SandrineP

src/main.cpp

@@ -4,6 +4,7 @@
 
 #include "utils/git_exception.hpp"
 #include "version.hpp"
+#include "subcommand/add_subcommand.hpp"
 #include "subcommand/init_subcommand.hpp"
 #include "subcommand/status_subcommand.hpp"
 
@@ -21,6 +22,7 @@ int main(int argc, char** argv)
         // Sub commands
         init_subcommand init(lg2_obj, app);
         status_subcommand status(lg2_obj, app);
+        add_subcommand add(lg2_obj, app);
 
         app.parse(argc, argv);
 

src/subcommand/add_subcommand.cpp

@@ -0,0 +1,36 @@
+#include <git2.h>
+
+#include "add_subcommand.hpp"
+#include "../wrapper/index_wrapper.hpp"
+#include "../wrapper/repository_wrapper.hpp"
+
+
+add_subcommand::add_subcommand(const libgit2_object&, CLI::App& app)
+{
+    auto *sub = app.add_subcommand("add", "Add file contents to the index");
+
+    sub->add_flag("-A,--all,--no-ignore-removal", all_flag, "");
+    // sub->add_flag("-n,--dryrun", dryrun_flag, "");
+    // sub->add_flag("-u,--update", update_flag, "");
+    // sub->add_flag("-v,--verbose", verbose_flag, "");
+
+    sub->callback([this]() { this->run(); });
+};
+
+void add_subcommand::run()
+{
+    auto directory = get_current_git_path();
+    auto bare = false;
+    auto repo = repository_wrapper::init(directory, bare);
+
+    index_wrapper index = repo.get_index();
+
+    if (all_flag)
+    {
+        index.add_all();
+    }
+    // else
+    // {
+    //     index.add_entry();
+    // }
+}

src/subcommand/add_subcommand.hpp

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <CLI/CLI.hpp>
+
+#include "../utils/common.hpp"
+
+class add_subcommand
+{
+public:
+
+    explicit add_subcommand(const libgit2_object&, CLI::App& app);
+    void run();
+
+private:
+    bool all_flag = false;
+};

src/subcommand/status_subcommand.cpp

@@ -13,11 +13,6 @@
 status_subcommand::status_subcommand(const libgit2_object&, CLI::App& app)
 {
     auto *sub = app.add_subcommand("status", "Show modified files in working directory, staged for your next commit");
-    // Displays paths that have differences between the index file and the current HEAD commit,
-    // paths that have differences between the working tree and the index file, and paths in the
-    // working tree that are not tracked by Git (and are not ignored by gitignore[5]).
-    // The first are what you would commit by running git commit;
-    // the second and third are what you could commit by running git add before running git commit.
 
     sub->add_flag("-s,--short", short_flag, "Give the output in the short-format.");
     sub->add_flag("--long", long_flag, "Give the output in the long-format. This is the default.");
@@ -152,7 +147,7 @@ void print_entries(std::vector<print_entry> entries_to_print)
     }
 }
 
-void print_not_tracked(std::vector<print_entry> entries_to_print, const std::set<std::string>& tracked_dir_set,
+void print_not_tracked(const std::vector<print_entry>& entries_to_print, const std::set<std::string>& tracked_dir_set,
         std::set<std::string>& untracked_dir_set)
 {
     std::vector<print_entry> not_tracked_entries_to_print{};

src/version.hpp

@@ -2,7 +2,7 @@
 
 #define GIT2CPP_VERSION_MAJOR 0
 #define GIT2CPP_VERSION_MINOR 0
-#define GIT2CPP_VERSION_PATCH 1
+#define GIT2CPP_VERSION_PATCH 2
 
 // e.g. ".rc0"
 #define GIT2CPP_VERSION_SUFFIX

src/wrapper/index_wrapper.cpp

@@ -0,0 +1,29 @@
+#include "index_wrapper.hpp"
+#include "../utils/git_exception.hpp"
+#include "../wrapper/repository_wrapper.hpp"
+
+index_wrapper::~index_wrapper()
+{
+    git_index_free(p_resource);
+    p_resource=nullptr;
+}
+
+index_wrapper index_wrapper::init(repository_wrapper& rw)
+{
+    index_wrapper index;
+    throwIfError(git_repository_index(&(index.p_resource), rw));
+    return index;
+}
+
+void index_wrapper::add_entry(const git_index_entry* entry)
+{
+    index_wrapper index;
+    throwIfError(git_index_add(index, entry));
+}
+
+void index_wrapper::add_all()
+{
+    index_wrapper index;
+    git_strarray array = {0};   // array of strings, array of path patterns
+    throwIfError(git_index_add_all(index, &array, 0, NULL, NULL));
+}

src/wrapper/index_wrapper.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <git2.h>
+
+#include "../utils/common.hpp"
+
+class repository_wrapper;
+
+class index_wrapper : public wrapper_base<git_index>
+{
+public:
+
+    ~index_wrapper();
+
+    index_wrapper(index_wrapper&&) = default;
+    index_wrapper& operator=(index_wrapper&&) = default;
+
+    static index_wrapper init(repository_wrapper& rw);
+
+    void add_entry(const git_index_entry* entry);
+    void add_all();
+
+
+private:
+
+    index_wrapper() = default;
+};

src/wrapper/repository_wrapper.cpp

@@ -1,6 +1,5 @@
-#include "../utils/git_exception.hpp"
 #include "repository_wrapper.hpp"
-
+#include "../utils/git_exception.hpp"
 
 repository_wrapper::~repository_wrapper()
 {
@@ -21,3 +20,9 @@ repository_wrapper repository_wrapper::init(const std::string& directory, bool b
     throwIfError(git_repository_init(&(rw.p_resource), directory.c_str(), bare));
     return rw;
 }
+
+index_wrapper repository_wrapper::get_index() const
+{
+    repository_wrapper rw;
+    index_wrapper::init(rw);
+}

src/wrapper/repository_wrapper.hpp

@@ -5,6 +5,7 @@
 #include <git2.h>
 
 #include "../utils/common.hpp"
+#include "../wrapper/index_wrapper.hpp"
 
 class repository_wrapper : public wrapper_base<git_repository>
 {
@@ -17,6 +18,7 @@ class repository_wrapper : public wrapper_base<git_repository>
 
     static repository_wrapper init(const std::string& directory, bool bare);
     static repository_wrapper open(const std::string& directory);
+    index_wrapper get_index() const;
 
 private: