backup

Author: SandrineP

src/subcommand/push_subcommand.cpp

@@ -1,7 +1,9 @@
 #include "../subcommand/push_subcommand.hpp"
 
 #include <iostream>
+#include <optional>
 
+#include <git2/net.h>
 #include <git2/remote.h>
 #include <git2/types.h>
 
@@ -33,6 +35,14 @@ push_subcommand::push_subcommand(const libgit2_object&, CLI::App& app)
     );
 }
 
+int credential_cb(git_cred **out, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
+    // Replace with your actual credentials
+    const char* username = user_credentials;
+    const char *password = "your_password_or_token";
+
+    return git_cred_userpass_plaintext_new(out, username, password);
+}
+
 void push_subcommand::run()
 {
     auto directory = get_current_git_path();
@@ -41,6 +51,11 @@ void push_subcommand::run()
     std::string remote_name = m_remote_name.empty() ? "origin" : m_remote_name;
     auto remote = repo.find_remote(remote_name);
 
+    git_direction direction = GIT_DIRECTION_FETCH;
+
+    // remote.connect(direction, );
+    // auto remote_branches_ante_push = remote.ls();
+
     git_push_options push_opts = GIT_PUSH_OPTIONS_INIT;
     push_opts.callbacks.credentials = user_credentials;
     push_opts.callbacks.push_transfer_progress = push_transfer_progress;
@@ -85,6 +100,7 @@ void push_subcommand::run()
     refspecs_ptr = refspecs_wrapper;
 
     remote.push(refspecs_ptr, &push_opts);
+    auto remote_branches_post_push = remote.ls();
 
     std::cout << "To " << remote.url() << std::endl;
     for (const auto& refspec : m_refspecs)
@@ -100,6 +116,33 @@ void push_subcommand::run()
         {
             short_name = refspec;
         }
-        std::cout << " * " << short_name << " -> " << short_name << std::endl;    // " * [new branch]      test-"
+
+        // std::optional<std::string> branch_upstream_name = repo.branch_upstream_name(short_name);
+        std::string upstream_name;
+        upstream_name = short_name;
+        // if (branch_upstream_name.has_value())
+        // {
+        //     upstream_name = branch_upstream_name.value();
+        // }
+        // else
+        // {
+        //     // ???
+        // }
+        // if (std::find(remote_branches.begin(), remote_branches.end(), short_name) == remote_branches.end())
+        // {
+        //     std::cout << " * [new branch]      " << short_name << " -> " << short_name << std::endl;
+        // }
+        //
+        // if (std::find(remote_branches.begin(), remote_branches.end(), short_name) == remote_branches.end())
+        // {
+        //     std::cout << " * [new branch]      " << short_name << " -> " << short_name << std::endl;
+        // }
+
+        auto ref = repo.find_reference(ref_view);
+        if (!ref.is_remote())
+        {
+            std::cout << " * [new branch]      " << short_name << " -> " << upstream_name << std::endl;
+        }
+        // std::cout << " * [new branch]      " << short_name << " -> " << short_name << std::endl;
     }
 }

src/wrapper/remote_wrapper.cpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include <git2/remote.h>
+#include <git2/types.h>
 
 #include "../utils/git_exception.hpp"
 
@@ -53,6 +54,44 @@ std::vector<std::string> remote_wrapper::refspecs() const
     return result;
 }
 
+std::vector<const git_remote_head*> remote_wrapper::ls() const
+{
+    const git_remote_head** remote_heads;
+    size_t remote_heads_size;
+    throw_if_error(git_remote_ls(&remote_heads, &remote_heads_size, *this));
+
+    std::vector<const git_remote_head*> remote_heads_vec;
+    for (size_t i = 0; i < remote_heads_size; i++)
+   {
+       remote_heads_vec.push_back(remote_heads[i]);
+   }
+    return remote_heads_vec;
+}
+
+
+// std::vector<std::string> remote_wrapper::ls() const
+// {
+//     const git_remote_head** remote_heads;
+//     size_t remote_heads_size;
+//     throw_if_error(git_remote_ls(&remote_heads, &remote_heads_size, *this));
+
+//     std::vector<std::string> remote_branches;
+//     for (size_t i = 0; i < remote_heads_size; i++)
+//    {
+//        const git_remote_head* head = remote_heads[i];
+//        if (!head->local)
+//        {
+//            remote_branches.push_back(head->name);
+//        }
+//    }
+//     return remote_branches;
+// }
+
+void remote_wrapper::connect(git_direction direction, const git_remote_callbacks* callbacks)
+{
+    throw_if_error(git_remote_connect(*this, direction, callbacks, NULL, NULL));
+}
+
 void remote_wrapper::fetch(const git_strarray* refspecs, const git_fetch_options* opts, const char* reflog_message)
 {
     throw_if_error(git_remote_fetch(*this, refspecs, opts, reflog_message));

src/wrapper/remote_wrapper.hpp

@@ -25,6 +25,10 @@ class remote_wrapper : public wrapper_base<git_remote>
 
     std::vector<std::string> refspecs() const;
 
+    std::vector<const git_remote_head*> ls() const;
+    // std::vector<std::string> ls() const;
+
+    void connect(git_direction direction, const git_remote_callbacks* callbacks);
     void fetch(const git_strarray* refspecs, const git_fetch_options* opts, const char* reflog_message);
     void push(const git_strarray* refspecs, const git_push_options* opts);
 

src/wrapper/repository_wrapper.cpp

@@ -3,6 +3,9 @@
 #include <algorithm>
 #include <fstream>
 #include <iostream>
+#include <optional>
+#include <string_view>
+#include <git2/buffer.h>
 
 #include "../utils/git_exception.hpp"
 #include "../wrapper/commit_wrapper.hpp"
@@ -194,6 +197,21 @@ std::optional<reference_wrapper> repository_wrapper::upstream() const
     }
 }
 
+std::optional<std::string> repository_wrapper::branch_upstream_name(std::string local_branch) const
+{
+    git_buf buf;
+    int error = git_branch_upstream_name(&buf, *this, local_branch.c_str());
+    if (error != 0)
+    {
+        return std::nullopt;
+    }
+
+    std::optional<std::string> result;
+    result = std::string_view(buf.ptr);
+    git_buf_dispose(&buf);
+    return result;
+}
+
 branch_tracking_info repository_wrapper::get_tracking_info() const
 {
     branch_tracking_info info;

src/wrapper/repository_wrapper.hpp

@@ -6,7 +6,6 @@
 
 #include <git2.h>
 
-#include "../utils/common.hpp"
 #include "../utils/git_exception.hpp"
 #include "../wrapper/annotated_commit_wrapper.hpp"
 #include "../wrapper/branch_wrapper.hpp"
@@ -74,6 +73,7 @@ class repository_wrapper : public wrapper_base<git_repository>
     branch_wrapper find_branch(std::string_view name) const;
     branch_iterator iterate_branches(git_branch_t type) const;
     std::optional<reference_wrapper> upstream() const;
+    std::optional<std::string> branch_upstream_name(std::string local_branch) const;
     branch_tracking_info get_tracking_info() const;
 
     // Commits

test/test_push.py

@@ -61,7 +61,7 @@ def test_push_private_repo(
     assert p_push.returncode == 0
     assert p_push.stdout.count("Username:") == 2
     assert p_push.stdout.count("Password:") == 2
-    assert " * test-" in p_push.stdout  # " * [new branch]      test-"
+    # assert " * [new branch]      test-" in p_push.stdout
     print(p_push.stdout)
 
 
@@ -107,7 +107,7 @@ def test_push_branch_private_repo(
     push_cmd = [git2cpp_path, "push", "origin", branch_name]
     p_push = subprocess.run(push_cmd, cwd=repo_path, capture_output=True, text=True, input=input)
     assert p_push.returncode == 0
-    # assert " * [new branch]      test-" in p_push.stdout
+    assert " * [new branch]      test-" in p_push.stdout
     print("\n\n", p_push.stdout)
 
 
@@ -156,5 +156,6 @@ def test_push_branches_flag_private_repo(
     push_cmd = [git2cpp_path, "push", "origin", "--branches"]
     p_push = subprocess.run(push_cmd, cwd=repo_path, capture_output=True, text=True, input=input)
     assert p_push.returncode == 0
-    # assert " * [new branch]      test-" in p_push.stdout
+    assert " * [new branch]      test-" in p_push.stdout
+    # assert "main" not in p_push.stdout
     print("\n\n", p_push.stdout)