fix log colour

Author: SandrineP

src/subcommand/log_subcommand.cpp

@@ -4,6 +4,8 @@
 #include <git2/types.h>
 #include <string_view>
 
+#include <termcolor/termcolor.hpp>
+
 #include "log_subcommand.hpp"
 #include "../wrapper/repository_wrapper.hpp"
 #include "../wrapper/commit_wrapper.hpp"
@@ -54,7 +56,8 @@ void print_commit(const commit_wrapper& commit, std::string m_format_flag)
     signature_wrapper author = signature_wrapper::get_commit_author(commit);
     signature_wrapper committer = signature_wrapper::get_commit_committer(commit);
 
-    std::cout << message_colour.at("yellow") << "commit " << buf << message_colour.at("colour_close") << std::endl;
+    stream_colour_fn colour = termcolor::yellow;
+    std::cout << colour << "commit " << buf << termcolor::reset << std::endl;
     if (m_format_flag=="fuller")
     {
         std::cout << "Author:\t    " <<  author.name() << " " << author.email() << std::endl;

src/subcommand/status_subcommand.cpp

@@ -140,9 +140,7 @@ std::vector<print_entry> get_entries_to_print(git_status_t status, status_list_w
     return entries_to_print;
 }
 
-using str_colour_fn = std::ostream& (*)(std::ostream&);
-
-void print_entries(std::vector<print_entry> entries_to_print, bool is_long, str_colour_fn colour)
+void print_entries(std::vector<print_entry> entries_to_print, bool is_long, stream_colour_fn colour)
 {
     for (auto e: entries_to_print)
     {
@@ -158,7 +156,7 @@ void print_entries(std::vector<print_entry> entries_to_print, bool is_long, str_
 }
 
 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, bool is_long, str_colour_fn colour)
+        std::set<std::string>& untracked_dir_set, bool is_long, stream_colour_fn colour)
 {
     std::vector<print_entry> not_tracked_entries_to_print{};
     for (auto e: entries_to_print)
@@ -233,7 +231,7 @@ void status_subcommand::run()
 
     if (sl.has_tobecommited_header())
     {
-        str_colour_fn colour =  termcolor::green;
+        stream_colour_fn colour =  termcolor::green;
         if (is_long)
         {
             std::cout << tobecommited_header;
@@ -251,7 +249,7 @@ void status_subcommand::run()
 
     if (sl.has_notstagged_header())
     {
-        str_colour_fn colour = termcolor::red;
+        stream_colour_fn colour = termcolor::red;
         if (is_long)
         {
             std::cout << notstagged_header;
@@ -268,7 +266,7 @@ void status_subcommand::run()
 
     if (sl.has_untracked_header())
     {
-        str_colour_fn colour = termcolor::red;
+        stream_colour_fn colour = termcolor::red;
         if (is_long)
         {
             std::cout << untracked_header;
@@ -282,7 +280,7 @@ void status_subcommand::run()
 
     // if (sl.has_ignored_header())
     // {
-    //     str_colour_fn colour = termcolor::red;
+    //     stream_colour_fn colour = termcolor::red;
     //     if (is_long)
     //     {
     //         std::cout << ignored_header;

src/utils/common.hpp

@@ -29,6 +29,8 @@ class libgit2_object : private noncopyable_nonmovable
 
 std::string get_current_git_path();
 
+using stream_colour_fn = std::ostream& (*)(std::ostream&);
+
 class git_strarray_wrapper
 {
 public: