change of plan

Author: SandrineP

src/subcommand/push_subcommand.cpp

@@ -1,8 +1,9 @@
 #include "../subcommand/push_subcommand.hpp"
 
+#include <algorithm>
 #include <iostream>
 #include <optional>
-#include <unordered_map>
+#include <string>
 #include <string_view>
 
 #include <git2.h>
@@ -17,7 +18,6 @@ push_subcommand::push_subcommand(const libgit2_object&, CLI::App& app)
     auto* sub = app.add_subcommand("push", "Update remote refs along with associated objects");
 
     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",
@@ -71,22 +71,15 @@ void push_subcommand::run()
     else if (m_refspecs.empty())
     {
         std::string branch;
-        if (!m_branch_name.empty())
+        try
         {
-            branch = m_branch_name;
+            auto head_ref = repo.head();
+            branch = head_ref.short_name();
         }
-        else
+        catch (...)
         {
-            try
-            {
-                auto head_ref = repo.head();
-                branch = head_ref.short_name();
-            }
-            catch (...)
-            {
-                std::cerr << "Could not determine current branch to push." << std::endl;
-                return;
-            }
+            std::cerr << "Could not determine current branch to push." << std::endl;
+            return;
         }
         std::string refspec = "refs/heads/" + branch;
         m_refspecs.push_back(refspec);
@@ -95,20 +88,34 @@ void push_subcommand::run()
     git_strarray* refspecs_ptr = nullptr;
     refspecs_ptr = refspecs_wrapper;
 
-    // Take a snapshot of remote branches to check which ones are new after push
-    git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
-    callbacks.credentials = user_credentials;
-    credentials_payload creds_payload;
-    callbacks.payload = &creds_payload;
-    push_opts.callbacks.payload = &creds_payload;
-
-    auto remote_heads = remote.list_heads(&callbacks);
+    // // Take a snapshot of remote branches to check which ones are new after push
+    // git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+    // callbacks.credentials = user_credentials;
+    // credentials_payload creds_payload;
+    // callbacks.payload = &creds_payload;
+    // push_opts.callbacks.payload = &creds_payload;
 
+    // auto remote_heads = remote.list_heads(&callbacks);
+    //
+    //
     // Map with names of branches and their oids before push
-    std::unordered_map<std::string, git_oid> remote_heads_map;
-    for (const auto& h : remote_heads)
+    // std::unordered_map<std::string, git_oid> remote_heads_map;
+    // for (const auto& h : remote_heads)
+    // {
+    //     remote_heads_map.emplace(h.name, h.oid);
+    // }
+
+    // Take a snapshot of repo's references to check which ones are new after push
+    auto repo_refs = repo.reference_list();
+    std::vector<std::string> repo_refs_remote;
+    for (int i = 0; i < repo_refs.size(); ++i)
     {
-        remote_heads_map.emplace(h.name, h.oid);
+        std::string prefix_remote = "refs/remote/";
+        if (repo_refs[i].substr(0, prefix_remote.size()) == prefix_remote)
+        {
+            std::string remote_short_name = repo_refs[i].substr(prefix_remote.size());
+            repo_refs_remote.push_back(remote_short_name);
+        }
     }
 
     remote.push(refspecs_ptr, &push_opts);
@@ -117,11 +124,11 @@ void push_subcommand::run()
     for (const auto& refspec : m_refspecs)
     {
         std::string_view ref_view(refspec);
-        std::string_view prefix = "refs/heads/";
+        std::string_view prefix_local = "refs/heads/";
         std::string local_short_name;
-        if (ref_view.substr(0, prefix.size()) == prefix)
+        if (ref_view.substr(0, prefix_local.size()) == prefix_local)
         {
-            local_short_name = ref_view.substr(prefix.size());
+            local_short_name = ref_view.substr(prefix_local.size());
         }
         else
         {
@@ -148,14 +155,14 @@ void push_subcommand::run()
             }
         }
 
-        auto iter = remote_heads_map.find(remote_ref);
-        if (iter == remote_heads_map.end())
+        auto iter = std::find(repo_refs_remote.begin(), repo_refs_remote.end(), remote_ref);
+        if (iter == repo_refs_remote.end())
         {
             std::cout << " * [new branch]      " << local_short_name << " -> " << remote_branch << std::endl;
             continue;
         }
 
-        git_oid remote_oid = iter->second;
+        git_oid remote_oid = repo.ref_name_to_id(*iter);
 
         std::optional<git_oid> local_oid_opt;
         if (auto ref_opt = repo.find_reference_dwim(("refs/heads/" + local_short_name)))

src/subcommand/push_subcommand.hpp

@@ -17,7 +17,6 @@ class push_subcommand
 private:
 
     std::string m_remote_name;
-    std::string m_branch_name;
     std::vector<std::string> m_refspecs;
     bool m_branches_flag = false;
 };

src/utils/credentials.cpp

@@ -15,53 +15,25 @@ int user_credentials(
     void* payload
 )
 {
-    credentials_payload* cached = payload ? static_cast<credentials_payload*>(payload) : nullptr;
-
     // Check for cached credentials here, if desired.
     // It might be necessary to make this function stateful to avoid repeating unnecessary checks.
 
     *out = nullptr;
 
     if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT)
     {
-        std::string username;
-        if (username_from_url && username_from_url[0] != '\0')
-        {
-            username = username_from_url;
-        }
-        else if (cached && cached->username.has_value())
-        {
-            username = *cached->username;
-        }
-        else
+        std::string username = username_from_url ? username_from_url : "";
+        if (username.empty())
         {
             username = prompt_input("Username: ");
-            if (cached && !username.empty())
-            {
-                cached->username = username;
-            }
         }
-
         if (username.empty())
         {
             giterr_set_str(GIT_ERROR_HTTP, "No username specified");
             return GIT_EAUTH;
         }
 
         std::string password = prompt_input("Password: ", false);
-        if (cached && cached->password.has_value())
-        {
-            password = *cached->password;
-        }
-        else
-        {
-            password = prompt_input("Password: ", false);
-            if (cached && !password.empty())
-            {
-                cached->password = password;
-            }
-        }
-
         if (password.empty())
         {
             giterr_set_str(GIT_ERROR_HTTP, "No password specified");

src/utils/credentials.hpp

@@ -1,16 +1,7 @@
 #pragma once
 
-#include <optional>
-#include <string>
-
 #include <git2/credential.h>
 
-struct credentials_payload
-{
-    std::optional<std::string> username;
-    std::optional<std::string> password;
-};
-
 // Libgit2 callback of type git_credential_acquire_cb to obtain user credentials
 // (username and password) to authenticate remote https access.
 int user_credentials(

src/wrapper/repository_wrapper.cpp

@@ -6,6 +6,10 @@
 #include <optional>
 #include <string_view>
 #include <git2/buffer.h>
+#include <git2/oid.h>
+#include <git2/refs.h>
+#include <git2/strarray.h>
+#include <git2/types.h>
 
 #include "../utils/git_exception.hpp"
 #include "../wrapper/commit_wrapper.hpp"
@@ -137,6 +141,26 @@ std::optional<reference_wrapper> repository_wrapper::find_reference_dwim(std::st
     return rc == 0 ? std::make_optional(reference_wrapper(ref)) : std::nullopt;
 }
 
+std::vector<std::string> repository_wrapper::reference_list() const
+{
+    git_strarray* array;
+    throw_if_error(git_reference_list(array, *this));
+    std::vector<std::string> result;
+    for (size_t i = 0; i < array->count; ++i)
+    {
+        result.push_back(array->strings[i]);
+    }
+    git_strarray_free(array);
+    return result;
+}
+
+const git_oid& repository_wrapper::ref_name_to_id(std::string ref_name) const
+{
+    git_oid* ref_id;
+    throw_if_error(git_reference_name_to_id(ref_id, *this, ref_name.c_str()));
+    return *ref_id;
+}
+
 // Index
 
 index_wrapper repository_wrapper::make_index()

src/wrapper/repository_wrapper.hpp

@@ -62,6 +62,8 @@ class repository_wrapper : public wrapper_base<git_repository>
     // References
     reference_wrapper find_reference(std::string_view ref_name) const;
     std::optional<reference_wrapper> find_reference_dwim(std::string_view ref_name) const;
+    std::vector<std::string> reference_list() const;
+    const git_oid& ref_name_to_id(std::string ref_name) const;
 
     // Index
     index_wrapper make_index();