Merge branch 'main' into restore

Author: maelle

NAMESPACE

@@ -145,7 +145,6 @@ useDynLib(gert,R_git_remote_ls)
 useDynLib(gert,R_git_remote_push)
 useDynLib(gert,R_git_remote_refspecs)
 useDynLib(gert,R_git_remote_remove)
-useDynLib(gert,R_git_remote_set_pushurl)
 useDynLib(gert,R_git_remote_set_url)
 useDynLib(gert,R_git_repository_add)
 useDynLib(gert,R_git_repository_clone)

NEWS.md

@@ -1,6 +1,7 @@
 # gert (development version)
 
  - Add `git_restore()` function (#259)
+- `git_remote_set_pushurl()` gains an `add` argument to append push URLs instead of replacing them. (@robitalec, #128)
 - Fix `git_info()` for the case when no upstream is configured (@mpage, #263)
 - `git_branch_create()`: `force` now also applies to the checkout step, allowing branch creation even when local changes would be overwritten (@MichaelChirico, #177).
 - Improve manual pages (@olivroy, #227)

R/config.R

@@ -21,7 +21,7 @@
 #'   option is determined from global or local config.
 #' * `git_config_global()`: a `data.frame`, as for `git_config()`, except only
 #'   for global Git options.
-#' * `git_config_set()`, `git_config_global_set()`: The previous value of
+#' * `git_config_set()`, `git_config_global_set()`: The previous value(s) of
 #'   `name` in local or global config, respectively. If this option was
 #'   previously unset, returns `NULL`. Returns invisibly.
 #'
@@ -76,12 +76,18 @@ git_config_global <- function() {
 #' @param name Name of the option to set
 #' @param value Value to set. Must be a string, logical, number or `NULL` (to
 #'   unset).
-git_config_set <- function(name, value, repo = '.') {
+#' @param add if `TRUE`, append a new entry for `name` instead of replacing
+#'   existing one(s). Equivalent to `git config --add`. Only supported for
+#'   string values.
+git_config_set <- function(name, value, add = FALSE, repo = '.') {
+  if (!is.logical(add) || length(add) != 1) {
+    stop("Argument add must be a logical of length 1.", call. = FALSE)
+  }
   repo <- git_open(repo)
   name <- as.character(name)
   orig_cfg <- git_config(repo = repo)
   out <- orig_cfg$value[orig_cfg$name == name & orig_cfg$level == "local"]
-  .Call(R_git_config_set, repo, name, value)
+  .Call(R_git_config_set, repo, name, value, add)
   if (length(out) > 0) {
     invisible(out)
   } else {
@@ -91,10 +97,10 @@ git_config_set <- function(name, value, repo = '.') {
 
 #' @export
 #' @rdname git_config
-git_config_global_set <- function(name, value) {
+git_config_global_set <- function(name, value, add = FALSE) {
   orig_cfg <- git_config_global()
   out <- orig_cfg$value[orig_cfg$name == name]
-  .Call(R_git_config_set, NULL, name, value)
+  .Call(R_git_config_set, NULL, name, value, add)
   if (length(out) > 0) {
     invisible(out)
   } else {

R/remotes.R

@@ -68,16 +68,27 @@ git_remote_set_url <- function(url, remote = NULL, repo = '.') {
 
 #' @export
 #' @rdname git_remote
-#' @useDynLib gert R_git_remote_set_pushurl
-git_remote_set_pushurl <- function(url, remote = NULL, repo = '.') {
+#' @param add if `TRUE`, append the push URL instead of replacing it.
+#'   Equivalent to `git remote set-url --push --add`.
+git_remote_set_pushurl <- function(
+  url,
+  remote = NULL,
+  add = FALSE,
+  repo = '.'
+) {
   repo <- git_open(repo)
   remote <- as.character(remote)
   if (!length(remote)) {
     remote <- git_info(repo = repo)$remote
   }
   url <- as.character(url)
-  .Call(R_git_remote_set_pushurl, repo, remote, url)
-  invisible()
+
+  git_config_set(
+    paste0("remote.", remote, ".pushurl"),
+    url,
+    repo = repo,
+    add = add
+  )
 }
 
 #' @export

man/git_config.Rd

@@ -236,17 +236,7 @@ SEXP R_git_remote_set_url(SEXP ptr, SEXP name, SEXP url){
   return out;
 }
 
-SEXP R_git_remote_set_pushurl(SEXP ptr, SEXP name, SEXP url){
-  git_remote * remote = NULL;
-  const char *curl = Rf_length(url) ? CHAR(STRING_ELT(url, 0)) : NULL;
-  const char *cname = CHAR(STRING_ELT(name, 0));
-  git_repository *repo = get_git_repository(ptr);
-  bail_if(git_remote_lookup(&remote, repo, cname), "git_remote_lookup");
-  bail_if(git_remote_set_pushurl(repo, cname, curl), "git_remote_set_url");
-  SEXP out = safe_string(git_remote_pushurl(remote));
-  git_remote_free(remote);
-  return out;
-}
+
 
 SEXP R_git_remote_remove(SEXP ptr, SEXP name){
   const char *cname = CHAR(STRING_ELT(name, 0));

man/git_remote.Rd

@@ -67,33 +67,39 @@ SEXP R_git_config_list(SEXP ptr){
   return out;
 }
 
-SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value){
+SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value, SEXP add){
   git_config *cfg = NULL;
   const char *cname = CHAR(STRING_ELT(name, 0));
   if(Rf_isNull(ptr)) {
     bail_if(git_config_open_default(&cfg), "git_config_open_default");
   } else {
     bail_if(git_repository_config(&cfg, get_git_repository(ptr)),"git_repository_config");
   }
-  switch(TYPEOF(value)){
-    case STRSXP:
-      bail_if(git_config_set_string(cfg, cname, CHAR(STRING_ELT(value, 0))), "git_config_set_string");
-      break;
-    case LGLSXP:
-      bail_if(git_config_set_bool(cfg, cname, Rf_asLogical(value)), "git_config_set_bool");
-      break;
-    case INTSXP:
-      bail_if(git_config_set_int32(cfg, cname, Rf_asInteger(value)), "git_config_set_int32");
-      break;
-    case REALSXP:
-      //NB: gets stored as string anyway
-      bail_if(git_config_set_int64(cfg, cname, (int64_t) Rf_asReal(value)), "git_config_set_int64");
-      break;
-    case NILSXP:
-      bail_if(git_config_delete_entry(cfg, cname), "git_config_delete_entry");
-      break;
-    default:
-      Rf_error("Option value must be string, boolean, number, or NULL");
+  if(Rf_asLogical(add)) {
+    if(TYPEOF(value) != STRSXP)
+      Rf_error("add = TRUE only supported for string values");
+    bail_if(git_config_set_multivar(cfg, cname, "^$", CHAR(STRING_ELT(value, 0))), "git_config_set_multivar");
+  } else {
+    switch(TYPEOF(value)){
+      case STRSXP:
+        bail_if(git_config_set_string(cfg, cname, CHAR(STRING_ELT(value, 0))), "git_config_set_string");
+        break;
+      case LGLSXP:
+        bail_if(git_config_set_bool(cfg, cname, Rf_asLogical(value)), "git_config_set_bool");
+        break;
+      case INTSXP:
+        bail_if(git_config_set_int32(cfg, cname, Rf_asInteger(value)), "git_config_set_int32");
+        break;
+      case REALSXP:
+        //NB: gets stored as string anyway
+        bail_if(git_config_set_int64(cfg, cname, (int64_t) Rf_asReal(value)), "git_config_set_int64");
+        break;
+      case NILSXP:
+        bail_if(git_config_delete_entry(cfg, cname), "git_config_delete_entry");
+        break;
+      default:
+        Rf_error("Option value must be string, boolean, number, or NULL");
+    }
   }
   git_config_free(cfg);
   return R_NilValue;

src/branch.c

@@ -30,7 +30,7 @@ extern SEXP R_git_commit_info(SEXP, SEXP);
 extern SEXP R_git_commit_log(SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP R_git_commit_stats(SEXP, SEXP);
 extern SEXP R_git_config_list(SEXP);
-extern SEXP R_git_config_set(SEXP, SEXP, SEXP);
+extern SEXP R_git_config_set(SEXP, SEXP, SEXP, SEXP);
 extern SEXP R_git_conflict_list(SEXP);
 extern SEXP R_git_create_branch(SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP R_git_delete_branch(SEXP, SEXP);
@@ -51,7 +51,6 @@ extern SEXP R_git_remote_ls(SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP R_git_remote_push(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP R_git_remote_refspecs(SEXP, SEXP);
 extern SEXP R_git_remote_remove(SEXP, SEXP);
-extern SEXP R_git_remote_set_pushurl(SEXP, SEXP, SEXP);
 extern SEXP R_git_remote_set_url(SEXP, SEXP, SEXP);
 extern SEXP R_git_restore(SEXP, SEXP, SEXP);
 extern SEXP R_git_revert(SEXP, SEXP);
@@ -116,7 +115,7 @@ static const R_CallMethodDef CallEntries[] = {
   {"R_git_commit_log",          (DL_FUNC) &R_git_commit_log,          5},
   {"R_git_commit_stats",        (DL_FUNC) &R_git_commit_stats,        2},
   {"R_git_config_list",         (DL_FUNC) &R_git_config_list,         1},
-  {"R_git_config_set",          (DL_FUNC) &R_git_config_set,          3},
+  {"R_git_config_set",          (DL_FUNC) &R_git_config_set,          4},
   {"R_git_conflict_list",       (DL_FUNC) &R_git_conflict_list,       1},
   {"R_git_create_branch",       (DL_FUNC) &R_git_create_branch,       5},
   {"R_git_delete_branch",       (DL_FUNC) &R_git_delete_branch,       2},
@@ -137,7 +136,6 @@ static const R_CallMethodDef CallEntries[] = {
   {"R_git_remote_push",         (DL_FUNC) &R_git_remote_push,         6},
   {"R_git_remote_refspecs",     (DL_FUNC) &R_git_remote_refspecs,     2},
   {"R_git_remote_remove",       (DL_FUNC) &R_git_remote_remove,       2},
-  {"R_git_remote_set_pushurl",  (DL_FUNC) &R_git_remote_set_pushurl,  3},
   {"R_git_remote_set_url",      (DL_FUNC) &R_git_remote_set_url,      3},
   {"R_git_repository_add",      (DL_FUNC) &R_git_repository_add,      3},
   {"R_git_repository_clone",    (DL_FUNC) &R_git_repository_clone,    8},

src/config.c

@@ -2,12 +2,12 @@ test_that("local, custom config roundtrip", {
   repo <- git_init(tempfile("gert-tests-config"))
   on.exit(unlink(repo, recursive = TRUE))
 
-  orig <- git_config_set("aaa.bbb", "ccc", repo)
+  orig <- git_config_set("aaa.bbb", "ccc", repo = repo)
   expect_null(orig)
   cfg <- git_config(repo)
   expect_equal(cfg$value[cfg$name == "aaa.bbb"], "ccc")
 
-  orig <- git_config_set("aaa.bbb", NULL, repo)
+  orig <- git_config_set("aaa.bbb", NULL, repo = repo)
   expect_equal(orig, "ccc")
   cfg <- git_config(repo)
   expect_equal(cfg$value[cfg$name == "aaa.bbb"], character())