Remote craete_options

Author: p-ranav

README.md

@@ -1239,9 +1239,9 @@ The project is available under the [MIT](https://opensource.org/licenses/MIT) li
 | `git_remote_create` | `repository::create_remote` |
 | `git_remote_create_anonymous` | `repository::create_anonymous_remote` |
 | `git_remote_create_detached` | `remote::create_detached_remote` |
-| `git_remote_create_options_init` | |
+| `git_remote_create_options_init` | `remote::create_options::create_options` |
 | `git_remote_create_with_fetchspec` | `repository::create_remote` |
-| `git_remote_create_with_opts` | |
+| `git_remote_create_with_opts` | `remote::create_remote` |
 | `git_remote_default_branch` | `remote::default_branch` |
 | `git_remote_delete` | `repository::delete_remote` |
 | `git_remote_disconnect` | `remote::disconnect` |

include/cppgit2/remote.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <cppgit2/bitmask_operators.hpp>
 #include <cppgit2/data_buffer.hpp>
 #include <cppgit2/fetch.hpp>
 #include <cppgit2/indexer.hpp>
@@ -30,6 +31,56 @@ class remote : public libgit2_api {
   // is connected to the remote host.
   bool is_connected() const;
 
+  // Remote creation options flags
+  enum class create_flag {
+    // Ignore the repository apply.insteadOf configuration
+    skip_insteadof = (1 << 0),
+    // Don't build a fetchspec from the name if none is set
+    default_fetchspec = (1 << 1)
+  };
+
+  class create_options : public libgit2_api {
+  public:
+    create_options() : c_ptr_(nullptr) {
+      auto ret =
+          git_remote_create_init_options(&default_options_, GIT_REMOTE_CREATE_OPTIONS_VERSION);
+      c_ptr_ = &default_options_;
+      if (ret != 0)
+        throw git_exception();
+    }
+
+    create_options(git_remote_create_options *c_ptr) : c_ptr_(c_ptr) {}
+
+    // Version
+    unsigned int version() const { return c_ptr_->version; }
+    void set_version(unsigned int version) { c_ptr_->version = version; }
+
+    // Repository
+    class repository repository() const;
+    void set_repository(const class repository &repo);
+
+    // Name
+    std::string name() const { return c_ptr_->name ? std::string(c_ptr_->name) : ""; }
+    void set_name(const std::string &name) { c_ptr_->name = name.c_str(); }
+
+    // Fetchspec
+    std::string fetchspec() const { return c_ptr_->fetchspec ? std::string(c_ptr_->fetchspec) : ""; }
+    void set_fetchspec(const std::string &fetchspec) { c_ptr_->fetchspec = fetchspec.c_str(); }
+
+    // Flags
+    create_flag flags() const { return static_cast<create_flag>(c_ptr_->flags); }
+    void set_flags(const create_flag &flags) {
+      c_ptr_->flags = static_cast<unsigned int>(flags);
+    }
+
+    // Access libgit2 C ptr
+    const git_remote_create_options *c_ptr() const { return c_ptr_; }
+
+  private:
+    git_remote_create_options *c_ptr_;
+    git_remote_create_options default_options_;
+  };
+
   // Create a copy of an existing remote.
   // All internal strings are also duplicated.
   // Callbacks are not duplicated.
@@ -43,6 +94,11 @@ class remote : public libgit2_api {
   // values (such as instead of url substitutions).
   static remote create_detached_remote(const std::string &url);
 
+  // Create a remote, with options.
+  // This function allows more fine-grained control over the remote creation.
+  static remote create_remote(const std::string &url, 
+    const create_options &options = create_options());
+
   // Retrieve the name of the remote's default branch
   // This function must only be called after connecting.
   data_buffer default_branch() const;
@@ -117,5 +173,6 @@ class remote : public libgit2_api {
   ownership owner_;
   git_remote *c_ptr_;
 };
+ENABLE_BITMASK_OPERATORS(remote::create_flag);
 
 } // namespace cppgit2

include/cppgit2/repository.hpp

@@ -1396,6 +1396,7 @@ class repository : public libgit2_api {
 private:
   friend class index;
   friend class pathspec;
+  friend class remote;
   friend class submodule;
   friend class tree_builder;
   git_repository *c_ptr_;

src/remote.cpp

@@ -17,6 +17,14 @@ fetch::options::autotag remote::autotag_option() {
 
 bool remote::is_connected() const { return git_remote_connected(c_ptr_); }
 
+cppgit2::repository remote::create_options::repository() const {
+  return cppgit2::repository(c_ptr_->repository);
+}
+
+void remote::create_options::set_repository(const cppgit2::repository &repo) {
+  c_ptr_->repository = repo.c_ptr_;
+}
+
 remote remote::copy() const {
   remote result;
   if (git_remote_dup(&result.c_ptr_, c_ptr_))
@@ -31,6 +39,13 @@ remote remote::create_detached_remote(const std::string &url) {
   return result;
 }
 
+remote remote::create_remote(const std::string &url, const create_options &options) {
+  remote result;
+  if (git_remote_create_with_opts(&result.c_ptr_, url.c_str(), options.c_ptr()))
+    throw git_exception();
+  return result;
+}
+
 data_buffer remote::default_branch() const {
   data_buffer result;
   if (git_remote_default_branch(result.c_ptr(), c_ptr_))