Including merge info

Author: Sebastian Schleemilch

include/git_repo.hpp

@@ -23,6 +23,8 @@ class GitRepo {
 
     std::string repo_root;
 
+    bool in_merge;
+
 private:
     static bool init(git_repository*, std::string);
     git_repository* repo;

include/unicode_symbols.hpp

@@ -26,7 +26,9 @@ class UnicodeSymbols {
         TRIANGLE_RIGHT,
         QUADRANT_UPPER_LEFT,
         QUADRANT_LOWER_RIGHT,
-        SQUARE
+        SQUARE,
+        BRANCH,
+        RECYCLE
     };
     static std::string getString(SYMBOL);
 };

src/git_repo.cpp

@@ -1,5 +1,6 @@
 #include "git_repo.hpp"
 #include <iostream>
+#include <sys/stat.h>
 
 GitRepo::GitRepo() {
     git_libgit2_init();
@@ -9,6 +10,7 @@ GitRepo::GitRepo() {
     wt_changes = 0;
     wt_added = 0;
     repo_root = "";
+    in_merge = false;
 }
 GitRepo::~GitRepo() {}
 
@@ -48,6 +50,12 @@ void GitRepo::set_head_infos() {
     } else {
         commit_id = "UNKNOWN";
     }
+
+    const std::string merge_head_file = repo_root + "MERGE_HEAD";
+    struct stat buffer;
+    if (stat (merge_head_file.c_str(), &buffer) == 0) {
+        in_merge = true;
+    }
 }
 
 void GitRepo::set_remote_infos() {

src/help_functions.cpp

@@ -1,6 +1,7 @@
 #include "help_functions.hpp"
 #include <sstream>
 #include <iostream>
+
 std::string get_cwd_string(std::string cwd, std::string home) {
     std::string pathString = cwd;
 

src/main.cpp

@@ -47,10 +47,11 @@ void print_head_infos(GitRepo& repo, bool show_status) {
         if (!show_status) {
             bg_color = BashColor::COLOR::YELLOW;
             to_print += UnicodeSymbols::getString(UnicodeSymbols::SYMBOL::DELTA) + "?" + " ";
-        }
-        if (repo.index_changes > 0 || repo.wt_changes > 0 || repo.wt_added > 0) {
+        } else if (repo.index_changes > 0 || repo.wt_changes > 0 || repo.wt_added > 0) {
             bg_color = BashColor::COLOR::YELLOW;
             to_print += UnicodeSymbols::getString(UnicodeSymbols::SYMBOL::DELTA) + " ";
+        } else {
+            to_print += UnicodeSymbols::getString(UnicodeSymbols::SYMBOL::SUN) + " ";
         }
         to_print += repo.branch + " ";
         to_print += "(" + repo.commit_id + ") ";
@@ -134,6 +135,18 @@ void print_status_infos(GitRepo& repo){
     }
 }
 
+void print_merge_info(GitRepo& repo) {
+    if (repo.in_merge) {
+        std::string to_print = " ";
+        to_print += UnicodeSymbols::getString(UnicodeSymbols::SYMBOL::RECYCLE);
+        to_print += " MERGE ";
+        BashColor::print(to_print,
+            BashColor::COLOR::BLACK,
+            BashColor::COLOR::PINK,
+            false);
+    }
+}
+
 int main(int argc, char** argv) {
     bool show_status = true;
     std::string no_status_flag = "--no-status";
@@ -163,6 +176,7 @@ int main(int argc, char** argv) {
             print_status_infos(repo);
         }
         print_remote_infos(repo);
+        print_merge_info(repo);
     }
     int lastCommandState = 0;
     try {

src/unicode_symbols.cpp

@@ -47,6 +47,10 @@ std::string UnicodeSymbols::getString(SYMBOL s) {
             return "\\u259F";
         case SYMBOL::SQUARE:
             return "\\u25AA";
+        case SYMBOL::BRANCH:
+            return "\\u2442";
+        case SYMBOL::RECYCLE:
+            return "\\u267A";
     }
     return std::string();
 }