Simplify things

Author: jeroen

DESCRIPTION

@@ -32,6 +32,6 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.3.9000
 SystemRequirements: libgit2 (>= 1.0): libgit2-devel (rpm) or libgit2-dev (deb)
 Language: en-US
+Config/roxygen2/version: 8.0.0

R/config.R

@@ -151,38 +151,16 @@ git_config_global_set <- function(name, value, add = FALSE) {
 #' @export
 #' @rdname git_config
 #' @useDynLib gert R_git_config_unset
-#' @param pattern Regular expression matching values to unset. Note: the regular
-#'   expressions engine used depends on the libgit2 installation; you can check
-#'   this using `libgit2_config()$regex_backend`
-#'   (`"`\code{\Sexpr[stage=render,results=rd]{gert::libgit2_config()$regex_backend}}`"`
-#'   for this installation).
-#' @param fixed If `TRUE`, only unset values that match `pattern` entirely and
-#'   as-is.
-git_config_unset <- function(name, pattern, fixed = FALSE, repo = '.')
-{
-  git_config_unset_impl(
-    name, pattern, fixed, git_open(repo),
-    function() git_config_local_get(name, repo = repo)
-  )
+#' @param pattern optional regular expression, for matching values to unset in
+#' case of multiple values
+git_config_unset <- function(name, pattern = NULL, repo = '.'){
+  .Call(R_git_config_unset, git_open(repo), name, pattern)
 }
 
 #' @export
 #' @rdname git_config
-git_config_global_unset <- function(name, pattern, fixed = FALSE)
-{
-  git_config_unset_impl(
-    name, pattern, fixed, NULL,
-    function() git_config_global_get(name)
-  )
-}
-
-git_config_unset_impl <- function(name, pattern, fixed, repo, get_val_cb) {
-  if (fixed) pattern <- fixed_regex(pattern)
-  prev <- (get_val_cb)()
-  .Call(R_git_config_unset, repo, name, pattern)
-  post <- (get_val_cb)()
-  out <- setdiff(prev, post)
-  invisible(out)
+git_config_global_unset <- function(name, pattern = NULL){
+  .Call(R_git_config_unset, NULL, name, pattern)
 }
 
 #' Show libgit2 version and capabilities
@@ -200,15 +178,6 @@ libgit2_config <- function() {
   res
 }
 
-# helper used in git_config_unset()
-fixed_regex <- function(string) {
-  metachars <- c(".", "\\", "|", "(", ")", "[", "]", "{", "}", "^", "$", "*", "+", "?")
-  for (metachar in metachars) {
-    string <- gsub(metachar, paste0("\\", metachar), string, fixed = TRUE)
-  }
-  paste0("^", string, "$")
-}
-
 # helpers used in tests
 configure_local_user <- function(repo = ".") {
   git_config_set('user.name', "Jerry Johnson", repo = repo)

man/git_config.Rd

@@ -108,13 +108,17 @@ SEXP R_git_config_set(SEXP ptr, SEXP name, SEXP value, SEXP add){
 SEXP R_git_config_unset(SEXP ptr, SEXP name, SEXP pattern){
   git_config *cfg = NULL;
   const char *cname = CHAR(STRING_ELT(name, 0));
-  const char *cpattern = CHAR(STRING_ELT(pattern, 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");
   }
-  bail_if(git_config_delete_multivar(cfg, cname, cpattern), "git_config_delete_multivar");
+  if(Rf_length(pattern)){
+    const char *cpattern = CHAR(STRING_ELT(pattern, 0));
+    bail_if(git_config_delete_multivar(cfg, cname, cpattern), "git_config_delete_multivar");
+  } else {
+    bail_if(git_config_delete_entry(cfg, cname), "git_config_delete_entry");
+  }
   git_config_free(cfg);
   return R_NilValue;
 }

src/config.c

@@ -23,7 +23,7 @@ git_strarray *files_to_array(SEXP files);
 
 #define build_tibble(...) list_to_tibble(build_list( __VA_ARGS__))
 
-#define AT_LEAST_LIBGIT2(x,y) (LIBGIT2_VER_MAJOR > x || (LIBGIT2_VER_MAJOR >= x && LIBGIT2_VER_MINOR >= y))
+#define AT_LEAST_LIBGIT2(x,y) (LIBGIT2_VER_MAJOR > x || (LIBGIT2_VER_MAJOR == x && LIBGIT2_VER_MINOR >= y))
 
 /* Workaround for API change in 1.8.0 and 1.8.1 only: https://github.com/libgit2/libgit2/issues/6793 */
 #if LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 8 && LIBGIT2_VER_REVISION < 2

src/utils.h

@@ -25,13 +25,6 @@ SEXP R_libgit2_config(void){
   SEXP ssh = PROTECT(Rf_ScalarLogical(features & GIT_FEATURE_SSH));
   SEXP https = PROTECT(Rf_ScalarLogical(features & GIT_FEATURE_HTTPS));
   SEXP threads = PROTECT(Rf_ScalarLogical(features & GIT_FEATURE_THREADS));
-  const char* c_regex_backend;
-#if AT_LEAST_LIBGIT2(1, 9)
-  c_regex_backend = git_libgit2_feature_backend(GIT_FEATURE_REGEX);
-#else
-  c_regex_backend = "unknown";
-#endif
-  SEXP regex_backend = PROTECT(safe_string(c_regex_backend));
   git_buf buf = {0};
   git_config_find_global(&buf);
   SEXP config_global = PROTECT(safe_string(buf.ptr));
@@ -42,10 +35,9 @@ SEXP R_libgit2_config(void){
   git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, &buf);
   SEXP config_search_path = PROTECT(safe_string(buf.ptr));
   git_buf_free(&buf);
-  SEXP out = build_list(8, "version", version, "ssh", ssh, "https", https, "threads", threads,
-                    "regex_backend", regex_backend,
+  SEXP out = build_list(7, "version", version, "ssh", ssh, "https", https, "threads", threads,
                     "config.global", config_global, "config.system", config_system,
                     "config.home", config_search_path);
-  UNPROTECT(8);
+  UNPROTECT(7);
   return out;
 }

src/version.c

@@ -44,14 +44,13 @@ test_that("git_config_unset() works for multivar options", {
   on.exit(unlink(repo, recursive = TRUE))
 
   git_config_set("aaa.bbb", "ccc", add = TRUE, repo = repo)
-  git_config_set("aaa.bbb", "cccc", add = TRUE, repo = repo)
+  git_config_set("aaa.bbb", "ccccc", add = TRUE, repo = repo)
   git_config_set("aaa.bbb", "ddd", add = TRUE, repo = repo)
+  git_config_set("aaa.bbb", "eee", add = TRUE, repo = repo)
 
-  removed <- git_config_unset("aaa.bbb", "ccc", fixed = TRUE, repo = repo)
-  expect_equal(removed, "ccc")
-  expect_equal(git_config_get("aaa.bbb", repo = repo), c("cccc", "ddd"))
+  git_config_unset("aaa.bbb", "ccc", repo = repo)
+  expect_equal(git_config_get("aaa.bbb", repo = repo), c("ddd", "eee"))
 
-  wildcard_removed <- git_config_unset("aaa.bbb", ".*", repo = repo)
-  expect_equal(wildcard_removed, c("cccc", "ddd"))
+  git_config_unset("aaa.bbb", repo = repo)
   expect_null(git_config_get("aaa.bbb", repo = repo))
 })