Handle renamed structures, enums and values in libgit2 v0.99

stewid · stewid · commit e55f435cb3d2 · 2020-04-19T14:28:14.000+02:00
Several structures, enums and values have been renamed in libgit version 0.99.0. The former names are deprecated. See https://github.com/libgit2/libgit2/releases/tag/v0.99.0 Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>
diff --git a/src/git2r_blob.c b/src/git2r_blob.c
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2019 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -100,7 +100,7 @@ SEXP git2r_blob_create_fromdisk(SEXP repo, SEXP path)
             git_blob *blob = NULL;
             SEXP item;
 
-            error = git_blob_create_fromdisk(
+            error = GIT2R_BLOB_CREATE_FROM_DISK(
                 &oid,
                 repository,
                 CHAR(STRING_ELT(path, i)));
@@ -167,7 +167,7 @@ SEXP git2r_blob_create_fromworkdir(SEXP repo, SEXP relative_path)
             git_blob *blob = NULL;
             SEXP item;
 
-            error = git_blob_create_fromworkdir(
+            error = GIT2R_BLOB_CREATE_FROM_WORKDIR(
                 &oid,
                 repository,
                 CHAR(STRING_ELT(relative_path, i)));
diff --git a/src/git2r_clone.c b/src/git2r_clone.c
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2019 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -34,7 +34,7 @@
  * @return 0
  */
 static int git2r_clone_progress(
-    const git_transfer_progress *progress,
+    const GIT2R_INDEXER_PROGRESS *progress,
     void *payload)
 {
     int kbytes = progress->received_bytes / 1024;
diff --git a/src/git2r_cred.c b/src/git2r_cred.c
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2019 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -35,6 +35,7 @@
 
 #include "git2r_arg.h"
 #include "git2r_cred.h"
+#include "git2r_deprecated.h"
 #include "git2r_S3.h"
 #include "git2r_transfer.h"
 
@@ -78,12 +79,12 @@ static int git2r_getenv(char **out, SEXP obj, const char *slot)
  * @return 0 on success, else -1.
  */
 static int git2r_cred_ssh_key(
-    git_cred **cred,
+    GIT2R_CREDENTIAL **cred,
     const char *username_from_url,
     unsigned int allowed_types,
     SEXP credentials)
 {
-    if (GIT_CREDTYPE_SSH_KEY & allowed_types) {
+    if (GIT2R_CREDENTIAL_SSH_KEY & allowed_types) {
         SEXP elem;
         const char *publickey;
         const char *privatekey = NULL;
@@ -96,7 +97,7 @@ static int git2r_cred_ssh_key(
         if (Rf_length(elem) && (NA_STRING != STRING_ELT(elem, 0)))
             passphrase = CHAR(STRING_ELT(elem, 0));
 
-        if (git_cred_ssh_key_new(
+        if (GIT2R_CREDENTIAL_SSH_KEY_NEW(
                 cred, username_from_url, publickey, privatekey, passphrase))
             return -1;
 
@@ -115,11 +116,11 @@ static int git2r_cred_ssh_key(
  * @return 0 on success, else -1.
  */
 static int git2r_cred_env(
-    git_cred **cred,
+    GIT2R_CREDENTIAL **cred,
     unsigned int allowed_types,
     SEXP credentials)
 {
-    if (GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) {
+    if (GIT2R_CREDENTIAL_USERPASS_PLAINTEXT & allowed_types) {
         int error;
         char *username = NULL;
         char *password = NULL;
@@ -134,7 +135,8 @@ static int git2r_cred_env(
         if (error)
             goto cleanup;
 
-        error = git_cred_userpass_plaintext_new(cred, username, password);
+        error = GIT2R_CREDENTIAL_USERPASS_PLAINTEXT_NEW(
+            cred, username, password);
 
     cleanup:
         free(username);
@@ -158,11 +160,11 @@ static int git2r_cred_env(
  * @return 0 on success, else -1.
  */
 static int git2r_cred_token(
-    git_cred **cred,
+    GIT2R_CREDENTIAL **cred,
     unsigned int allowed_types,
     SEXP credentials)
 {
-    if (GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) {
+    if (GIT2R_CREDENTIAL_USERPASS_PLAINTEXT & allowed_types) {
         int error;
         char *token = NULL;
 
@@ -172,7 +174,7 @@ static int git2r_cred_token(
         if (error)
             goto cleanup;
 
-        error = git_cred_userpass_plaintext_new(cred, " ", token);
+        error = GIT2R_CREDENTIAL_USERPASS_PLAINTEXT_NEW(cred, " ", token);
 
     cleanup:
         free(token);
@@ -195,17 +197,17 @@ static int git2r_cred_token(
  * @return 0 on success, else -1.
  */
 static int git2r_cred_user_pass(
-    git_cred **cred,
+    GIT2R_CREDENTIAL **cred,
     unsigned int allowed_types,
     SEXP credentials)
 {
-    if (GIT_CREDTYPE_USERPASS_PLAINTEXT & allowed_types) {
+    if (GIT2R_CREDENTIAL_USERPASS_PLAINTEXT & allowed_types) {
         const char *username;
         const char *password;
 
         username = CHAR(STRING_ELT(git2r_get_list_element(credentials, "username"), 0));
         password = CHAR(STRING_ELT(git2r_get_list_element(credentials, "password"), 0));
-        if (git_cred_userpass_plaintext_new(cred, username, password))
+        if (GIT2R_CREDENTIAL_USERPASS_PLAINTEXT_NEW(cred, username, password))
             return -1;
 
         return 0;
@@ -347,7 +349,7 @@ static int git2r_cred_user_pass(
 /* } */
 
 /* static int git2r_cred_default_ssh_key( */
-/*     git_cred **cred, */
+/*     GIT2R_CREDENTIAL **cred, */
 /*     const char *username_from_url) */
 /* { */
 /* #ifdef WIN32 */
@@ -431,7 +433,7 @@ static int git2r_cred_user_pass(
  * @return 0 on success, else -1.
  */
 int git2r_cred_acquire_cb(
-    git_cred **cred,
+    GIT2R_CREDENTIAL **cred,
     const char *url,
     const char *username_from_url,
     unsigned int allowed_types,
@@ -448,11 +450,11 @@ int git2r_cred_acquire_cb(
     td = (git2r_transfer_data*)payload;
     credentials = td->credentials;
     if (Rf_isNull(credentials)) {
-        if (GIT_CREDTYPE_SSH_KEY & allowed_types) {
+        if (GIT2R_CREDENTIAL_SSH_KEY & allowed_types) {
 	    if (td->use_ssh_agent) {
                 /* Try to get credentials from the ssh-agent. */
                 td->use_ssh_agent = 0;
-                if (git_cred_ssh_key_from_agent(cred, username_from_url) == 0)
+                if (GIT2R_CREDENTIAL_SSH_KEY_FROM_AGENT(cred, username_from_url) == 0)
                     return 0;
             }
 
diff --git a/src/git2r_cred.h b/src/git2r_cred.h
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2015 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -20,9 +20,10 @@
 #define INCLUDE_git2r_cred_h
 
 #include <git2.h>
+#include "git2r_deprecated.h"
 
 int git2r_cred_acquire_cb(
-    git_cred **out,
+    GIT2R_CREDENTIAL **out,
     const char *url,
     const char *username_from_url,
     unsigned int allowed_types,
diff --git a/src/git2r_deprecated.h b/src/git2r_deprecated.h
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2019 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -70,4 +70,28 @@
 # define GIT2R_OBJECT_T git_otype
 #endif
 
+#if defined(GIT2R_LIBGIT2_V0_99_0_RENAMES)
+# define GIT2R_CREDENTIAL git_credential
+# define GIT2R_CREDENTIAL_SSH_KEY GIT_CREDENTIAL_SSH_KEY
+# define GIT2R_CREDENTIAL_SSH_KEY_NEW git_credential_ssh_key_new
+# define GIT2R_CREDENTIAL_USERPASS_PLAINTEXT_NEW git_credential_userpass_plaintext_new
+# define GIT2R_CREDENTIAL_SSH_KEY_FROM_AGENT git_credential_ssh_key_from_agent
+# define GIT2R_CREDENTIAL_USERPASS_PLAINTEXT GIT_CREDENTIAL_USERPASS_PLAINTEXT
+# define GIT2R_INDEXER_PROGRESS git_indexer_progress
+# define GIT2R_OID_IS_ZERO git_oid_is_zero
+# define GIT2R_BLOB_CREATE_FROM_DISK git_blob_create_from_disk
+# define GIT2R_BLOB_CREATE_FROM_WORKDIR git_blob_create_from_workdir
+#else
+# define GIT2R_CREDENTIAL git_cred
+# define GIT2R_CREDENTIAL_SSH_KEY GIT_CREDTYPE_SSH_KEY
+# define GIT2R_CREDENTIAL_SSH_KEY_NEW git_cred_ssh_key_new
+# define GIT2R_CREDENTIAL_USERPASS_PLAINTEXT_NEW git_cred_userpass_plaintext_new
+# define GIT2R_CREDENTIAL_SSH_KEY_FROM_AGENT git_cred_ssh_key_from_agent
+# define GIT2R_CREDENTIAL_USERPASS_PLAINTEXT GIT_CREDTYPE_USERPASS_PLAINTEXT
+# define GIT2R_INDEXER_PROGRESS git_transfer_progress
+# define GIT2R_OID_IS_ZERO git_oid_iszero
+# define GIT2R_BLOB_CREATE_FROM_DISK git_blob_create_fromdisk
+# define GIT2R_BLOB_CREATE_FROM_WORKDIR git_blob_create_fromworkdir
+#endif
+
 #endif
diff --git a/src/git2r_remote.c b/src/git2r_remote.c
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2019 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -95,7 +95,7 @@ static int git2r_update_tips_cb(
         git_oid_fmt(b_str, b);
         b_str[GIT_OID_HEXSZ] = '\0';
 
-        if (git_oid_iszero(a)) {
+        if (GIT2R_OID_IS_ZERO(a)) {
             Rprintf("[new]     %.20s %s\n", b_str, refname);
         } else {
             char a_str[GIT_OID_HEXSZ + 1];
@@ -130,7 +130,7 @@ SEXP git2r_remote_fetch(
 {
     int error, nprotect = 0;
     SEXP result = R_NilValue;
-    const git_transfer_progress *stats;
+    const GIT2R_INDEXER_PROGRESS *stats;
     git_remote *remote = NULL;
     git_repository *repository = NULL;
     git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT;
diff --git a/src/git2r_transfer.c b/src/git2r_transfer.c
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2018 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -16,18 +16,19 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "git2r_deprecated.h"
 #include "git2r_S3.h"
 #include "git2r_transfer.h"
 
 /**
  * Init slots in S3 class git_transfer_progress
  *
- * @param source A git_transfer_progress object
+ * @param source A GIT2R_INDEXER_PROGRESS object
  * @param dest S3 class git_transfer_progress to initialize
  * @return void
  */
 void git2r_transfer_progress_init(
-    const git_transfer_progress *source,
+    const GIT2R_INDEXER_PROGRESS *source,
     SEXP dest)
 {
     SET_VECTOR_ELT(
diff --git a/src/git2r_transfer.h b/src/git2r_transfer.h
@@ -1,6 +1,6 @@
 /*
  *  git2r, R bindings to the libgit2 library.
- *  Copyright (C) 2013-2018 The git2r contributors
+ *  Copyright (C) 2013-2020 The git2r contributors
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License, version 2,
@@ -22,6 +22,7 @@
 #include <R.h>
 #include <Rinternals.h>
 #include <git2.h>
+#include "git2r_deprecated.h"
 
 /**
  * Data structure to hold information when performing a clone, fetch
@@ -54,7 +55,7 @@ typedef struct {
 #endif
 
 void git2r_transfer_progress_init(
-    const git_transfer_progress *source,
+    const GIT2R_INDEXER_PROGRESS *source,
     SEXP dest);
 
 #endif
