Displays current branch when listing

Author: JohanMabille

src/subcommand/branch_subcommand.cpp

@@ -21,17 +21,21 @@ branch_subcommand::branch_subcommand(const libgit2_object&, CLI::App& app)
 void branch_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
     auto repo = repository_wrapper::open(directory);
 
     if (m_list_flag || m_branch_name.empty())
     {
-        git_branch_t type = m_all_flag ? GIT_BRANCH_ALL : (m_remote_flag ? GIT_BRANCH_REMOTE : GIT_BRANCH_LOCAL); 
+        auto head_name = repo.head().short_name();
+        std::cout << "* " << head_name << std::endl;
+        git_branch_t type = m_all_flag ? GIT_BRANCH_ALL : (m_remote_flag ? GIT_BRANCH_REMOTE : GIT_BRANCH_LOCAL);
         auto iter = repo.iterate_branches(type);
         auto br = iter.next();
         while (br)
         {
-            std::cout << br->name() << std::endl;
+            if (br->name() != head_name)
+            {
+                std::cout << "  " << br->name() << std::endl;
+            }
             br = iter.next();
         }
     }

src/subcommand/status_subcommand.cpp

@@ -186,7 +186,7 @@ void status_subcommand::run()
     auto bare = false;
     auto repo = repository_wrapper::init(directory, bare);
     auto sl = status_list_wrapper::status_list(repo);
-    auto branch_name = reference_wrapper::get_ref_name(repo);
+    auto branch_name = repo.head().short_name();
 
     std::set<std::string> tracked_dir_set{};
     std::set<std::string> untracked_dir_set{};

src/wrapper/refs_wrapper.cpp

@@ -1,16 +1,18 @@
 #include "../utils/git_exception.hpp"
 #include "../wrapper/refs_wrapper.hpp"
 
+reference_wrapper::reference_wrapper(git_reference* jaila_ref)
+    : base_type(jaila_ref)
+{
+}
 
 reference_wrapper::~reference_wrapper()
 {
     git_reference_free(p_resource);
     p_resource=nullptr;
 }
 
-std::string reference_wrapper::get_ref_name(const repository_wrapper& rw)
+std::string reference_wrapper::short_name() const
 {
-    reference_wrapper ref;
-    throwIfError(git_repository_head(&(ref.p_resource), rw));
-    return git_reference_shorthand(ref.p_resource);
+    return git_reference_shorthand(p_resource);
 }

src/wrapper/refs_wrapper.hpp

@@ -4,21 +4,24 @@
 
 #include <git2.h>
 
-#include "../wrapper/repository_wrapper.hpp"
 #include "../wrapper/wrapper_base.hpp"
 
 class reference_wrapper : public wrapper_base<git_reference>
 {
 public:
 
+    using base_type = wrapper_base<git_reference>;
+
     ~reference_wrapper();
 
     reference_wrapper(reference_wrapper&&) noexcept = default;
     reference_wrapper& operator=(reference_wrapper&&) noexcept = default;
 
-    static std::string get_ref_name(const repository_wrapper& repo);
+    std::string short_name() const;
 
 private:
 
-    reference_wrapper() = default;
+    reference_wrapper(git_reference* ref);
+
+    friend class repository_wrapper;
 };

src/wrapper/repository_wrapper.cpp

@@ -21,6 +21,13 @@ repository_wrapper repository_wrapper::init(const std::string& directory, bool b
     return rw;
 }
 
+reference_wrapper repository_wrapper::head() const
+{
+    git_reference* ref;
+    throwIfError(git_repository_head(&ref, *this));
+    return reference_wrapper(ref);
+}
+
 index_wrapper repository_wrapper::make_index()
 {
     index_wrapper index = index_wrapper::init(*this);

src/wrapper/repository_wrapper.hpp

@@ -7,6 +7,7 @@
 #include "../wrapper/branch_wrapper.hpp"
 #include "../wrapper/commit_wrapper.hpp"
 #include "../wrapper/index_wrapper.hpp"
+#include "../wrapper/refs_wrapper.hpp"
 #include "../wrapper/wrapper_base.hpp"
 
 class repository_wrapper : public wrapper_base<git_repository>
@@ -21,6 +22,8 @@ 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);
 
+    reference_wrapper head() const;
+
     index_wrapper make_index();
 
     branch_wrapper create_branch(const std::string& name, bool force);

test/test_branch.py

@@ -12,17 +12,17 @@ def rename_git():
 def test_branch_list(rename_git, git2cpp_path):
     cmd = [git2cpp_path, 'branch']
     p = subprocess.run(cmd, capture_output=True, cwd="test/data/status_data", text=True)
-    assert(p.stdout == 'main\n')
+    assert(p.stdout == '* main\n')
 
 def test_branch_create_delete(rename_git, git2cpp_path):
     create_cmd = [git2cpp_path, 'branch', 'foregone']
     subprocess.run(create_cmd, capture_output=True, cwd="test/data/status_data", text=True)
     list_cmd = [git2cpp_path, 'branch']
     p = subprocess.run(list_cmd, capture_output=True, cwd="test/data/status_data", text=True)
-    assert(p.stdout == 'foregone\nmain\n')
+    assert(p.stdout == '* main\n  foregone\n')
     del_cmd = [git2cpp_path, 'branch', '-d', 'foregone']
     subprocess.run(del_cmd, capture_output=True, cwd="test/data/status_data", text=True)
     p2 = subprocess.run(list_cmd, capture_output=True, cwd="test/data/status_data", text=True)
-    assert(p2.stdout == 'main\n')
+    assert(p2.stdout == '* main\n')