Add unset argument to git_config_set()

Author: iofarm

R/config.R

@@ -119,14 +119,19 @@ git_config_global_get <- function(name) {
 #' @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)
-  }
+#' @param unset if `TRUE`, delete all entries for `name` matching the regular
+#'   expression `value`, equivalent `git config --unset`. If `TRUE` and
+#'   `value == NULL`, delete all entries for `name`, equivalent to
+#'   `git config --unset-all`.
+git_config_set <- function(
+  name, value,
+  add = FALSE, unset = FALSE,
+  repo = '.'
+) {
   repo <- git_open(repo)
   name <- as.character(name)
   out <- git_config_local_get(name, repo = repo)
-  .Call(R_git_config_set, repo, name, value, add)
+  git_config_set_impl(name, value, repo, add, unset)
   if (length(out) > 0) {
     invisible(out)
   } else {
@@ -136,16 +141,30 @@ git_config_set <- function(name, value, add = FALSE, repo = '.') {
 
 #' @export
 #' @rdname git_config
-git_config_global_set <- function(name, value, add = FALSE) {
+git_config_global_set <- function(name, value, add = FALSE, unset = FALSE) {
   out <- git_config_global_get(name)
-  .Call(R_git_config_set, NULL, name, value, add)
+  git_config_set_impl(name, value, repo = NULL, add, unset)
   if (length(out) > 0) {
     invisible(out)
   } else {
     invisible(NULL)
   }
 }
 
+git_config_set_impl <- function(name, value, repo, add, unset) {
+  if (!is.logical(add) || length(add) != 1) {
+    stop("Argument add must be a logical of length 1.", call. = FALSE)
+  }
+  if (!is.logical(unset) || length(unset) != 1) {
+    stop("Argument unset must be a logical of length 1.", call. = FALSE)
+  }
+  if (add && unset) {
+    stop("Arguments 'add' and 'unset' cannot both be TRUE.", call. = FALSE)
+  }
+  name <- as.character(name)
+  .Call(R_git_config_set, repo, name, value, add, unset)
+}
+
 #' Show libgit2 version and capabilities
 #'
 #' `libgit2_config()` reveals which version of libgit2 gert is using and which

man/git_config.Rd

@@ -67,7 +67,7 @@ SEXP R_git_config_list(SEXP ptr){
   return out;
 }
 
-SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value, SEXP add){
+SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value, SEXP add, SEXP unset){
   git_config *cfg = NULL;
   const char *cname = CHAR(STRING_ELT(name, 0));
   if(Rf_isNull(ptr)) {
@@ -79,6 +79,11 @@ SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value, SEXP 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 if(Rf_asLogical(unset)) {
+    if(TYPEOF(value) != STRSXP)
+      Rf_error("unset = TRUE only supported for string values");
+    const char *cvalue = Rf_isNull(value) ? "^.*$" : CHAR(STRING_ELT(value, 0));
+    bail_if(git_config_delete_multivar(cfg, cname, cvalue), "git_config_delete_multivar");
   } else {
     switch(TYPEOF(value)){
       case STRSXP:

src/config.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, SEXP);
+extern SEXP R_git_config_set(SEXP, 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);
@@ -115,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,          4},
+  {"R_git_config_set",          (DL_FUNC) &R_git_config_set,          5},
   {"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},

src/init.c

@@ -38,3 +38,22 @@ test_that("local, custom config roundtrip", {
   expect_equal(orig, "ccc")
   expect_null(git_config_get("aaa.bbb", repo = repo))
 })
+
+test_that("multivar, local, custom config roundtrip", {
+  repo <- git_init(tempfile("gert-tests-config-multivar"))
+  on.exit(unlink(repo, recursive = TRUE))
+
+  git_config_set("aaa.bbb", "ccc", repo = repo, add = TRUE)
+  git_config_set("aaa.bbb", "ddd", repo = repo, add = TRUE)
+  git_config_set("aaa.bbb", "eee", repo = repo, add = TRUE)
+  cfg <- git_config(repo)
+  expect_equal(cfg$value[cfg$name == "aaa.bbb"], c("ccc", "ddd", "eee"))
+
+  git_config_set("aaa.bbb", "ddd", repo = repo, unset = TRUE)
+  cfg <- git_config(repo)
+  expect_equal(cfg$value[cfg$name == "aaa.bbb"], c("ccc", "eee"))
+
+  git_config_set("aaa.bbb", "^[a-z]{3}$", repo = repo, unset = TRUE)
+  cfg <- git_config(repo)
+  expect_equal(cfg$value[cfg$name == "aaa.bbb"], character())
+})