bla

Author: SandrineP

src/subcommand/push_subcommand.cpp

@@ -5,9 +5,9 @@
 #include <git2/remote.h>
 #include <git2/types.h>
 
+#include "../utils/ansi_code.hpp"
 #include "../utils/credentials.hpp"
 #include "../utils/progress.hpp"
-#include "../utils/ansi_code.hpp"
 #include "../wrapper/repository_wrapper.hpp"
 
 push_subcommand::push_subcommand(const libgit2_object&, CLI::App& app)
@@ -17,7 +17,12 @@ push_subcommand::push_subcommand(const libgit2_object&, CLI::App& app)
     sub->add_option("<remote>", m_remote_name, "The remote to push to")->default_val("origin");
     sub->add_option("<branch>", m_branch_name, "The branch to push");
     sub->add_option("<refspec>", m_refspecs, "The refspec(s) to push");
-    sub->add_flag("--all,--branches", m_branches_flag, "Push all branches (i.e. refs under " + ansi_code::bold + "refs/heads/" + ansi_code::reset + "); cannot be used with other <refspec>.");
+    sub->add_flag(
+        "--all,--branches",
+        m_branches_flag,
+        "Push all branches (i.e. refs under " + ansi_code::bold + "refs/heads/" + ansi_code::reset
+            + "); cannot be used with other <refspec>."
+    );
 
 
     sub->callback(
@@ -36,6 +41,9 @@ void push_subcommand::run()
     std::string remote_name = m_remote_name.empty() ? "origin" : m_remote_name;
     auto remote = repo.find_remote(remote_name);
 
+    push_update_payload push_payload;
+    push_payload.url = remote.url();
+
     git_push_options push_opts = GIT_PUSH_OPTIONS_INIT;
     push_opts.callbacks.credentials = user_credentials;
     push_opts.callbacks.push_transfer_progress = push_transfer_progress;
@@ -80,5 +88,21 @@ void push_subcommand::run()
     refspecs_ptr = refspecs_wrapper;
 
     remote.push(refspecs_ptr, &push_opts);
-    std::cout << "Pushed to " << remote_name << std::endl;
+
+    std::cout << "To " << remote.url() << std::endl;
+    for (const auto& refspec : m_refspecs)
+    {
+        std::string_view ref_view(refspec);
+        std::string_view prefix = "refs/heads/";
+        std::string short_name;
+        if (ref_view.substr(0, prefix.size()) == prefix)
+        {
+            short_name = ref_view.substr(prefix.size());
+        }
+        else
+        {
+            short_name = refspec;
+        }
+        std::cout << " * " << short_name << " -> " << short_name << std::endl;
+    }
 }

src/utils/progress.cpp

@@ -139,11 +139,9 @@ int push_update_reference(const char* refname, const char* status, void*)
 {
     if (status)
     {
-        std::cout << "  " << refname << " " << status << std::endl;
-    }
-    else
-    {
-        std::cout << "  " << refname << std::endl;
+        std::cout << " ! [remote rejected] " << refname << " (" << status << ")" << std::endl;
+        return -1;
     }
+
     return 0;
 }

src/utils/progress.hpp

@@ -1,10 +1,19 @@
 #pragma once
 
+#include <string>
+
 #include <git2.h>
 
 int sideband_progress(const char* str, int len, void*);
 int fetch_progress(const git_indexer_progress* stats, void* payload);
 void checkout_progress(const char* path, size_t cur, size_t tot, void* payload);
 int update_refs(const char* refname, const git_oid* a, const git_oid* b, git_refspec*, void*);
 int push_transfer_progress(unsigned int current, unsigned int total, size_t bytes, void*);
+
+struct push_update_payload
+{
+    std::string url;
+    bool header_printed = false;
+};
+
 int push_update_reference(const char* refname, const char* status, void*);