add committer option

Author: SandrineP

src/subcommand/log_subcommand.cpp

@@ -19,7 +19,8 @@ log_subcommand::log_subcommand(const libgit2_object&, CLI::App& app)
 {
     auto *sub = app.add_subcommand("log", "Shows commit logs");
 
-    sub->add_flag("-n,--max-count", m_max_count_flag, "Limit the output to <number> commits.");
+    sub->add_flag("--format", m_format_flag, "Pretty-print the contents of the commit logs in a given format, where <format> can be one of full and fuller");
+    // sub->add_flag("-n,--max-count", m_max_count_flag, "Limit the output to <number> commits.");
     // sub->add_flag("--oneline", m_oneline_flag, "This is a shorthand for --pretty=oneline --abbrev-commit used together.");
 
     sub->callback([this]() { this->run(); });
@@ -51,7 +52,7 @@ void print_time(git_time intime, const char *prefix)
 	printf("%s%s %c%02d%02d\n", prefix, out, sign, hours, minutes);
 }
 
-void print_commit(const commit_wrapper& commit)
+void print_commit(const commit_wrapper& commit, std::string m_format_flag)
 {
     // TODO: put in commit_wrapper ?
     char buf[GIT_OID_SHA1_HEXSIZE + 1];
@@ -61,10 +62,24 @@ void print_commit(const commit_wrapper& commit)
     // TODO end
 
     signature_wrapper author = signature_wrapper::get_commit_author(commit);
+    signature_wrapper committer = signature_wrapper::get_commit_committer(commit);
 
-    std::cout << "commit " << buf << std::endl;
+    std::cout << "\033[0;33m" << "commit " << buf << "\033[0m" << std::endl;
     std::cout << "Author:\t" <<  author.name() << " " << author.email() << std::endl;
-    print_time(author.when(), "Date:\t");
+    if (m_format_flag=="full")
+    {
+        std::cout << "Commit:\t" <<  committer.name() << " " << committer.email() << std::endl;
+    }
+    else if (m_format_flag=="fuller")
+    {
+        print_time(author.when(), "AuthorDate:\t");
+        std::cout << "Commit:\t" <<  committer.name() << " " << committer.email() << std::endl;
+        print_time(committer.when(), "CommitDate:\t");
+    }
+    else
+    {
+        print_time(author.when(), "Date:\t");
+    }
     std::cout << git_commit_message(commit) << "\n" << std::endl;
 }
 
@@ -83,6 +98,6 @@ void log_subcommand::run()
     while (!git_revwalk_next(&commit_oid, walker))
     {
         commit_wrapper commit = repo.find_commit(commit_oid);
-        print_commit(commit);
+        print_commit(commit, m_format_flag);
     }
 }

src/subcommand/log_subcommand.hpp

@@ -13,6 +13,7 @@ class log_subcommand
     void run();
 
 private:
-    int m_max_count_flag;
+    std::string m_format_flag;
+    // int m_max_count_flag;
     // bool m_oneline_flag = false;
 };