merging with upstream/main

R/deps.R

@@ -128,7 +128,8 @@ local_package_deps <- function(pkgdir = ".", dependencies = NA) {
 dev_package_deps <- function(pkgdir = ".", dependencies = NA,
                              repos = getOption("repos"),
                              type = getOption("pkgType"),
-                             git = c("auto", "git2r", "external")) {
+                             git = c("auto", "git2r", "external"),
+                             remote_precedence = TRUE) {
 
   pkg <- load_pkg_description(pkgdir)
   repos <- c(repos, parse_additional_repositories(pkg))
@@ -147,7 +148,9 @@ dev_package_deps <- function(pkgdir = ".", dependencies = NA,
   cran_deps <- package_deps(deps, repos = repos, type = type)
 
   git <- match.arg(git)
-  res <- combine_remote_deps(cran_deps, extra_deps(pkg, "remotes", git = git))
+  res <- combine_remote_deps(cran_deps,
+                             extra_deps(pkg, "remotes", git = git),
+                             remote_precedence)
 
   res <- do.call(rbind, c(list(res), lapply(get_extra_deps(pkg, dependencies),
                                             extra_deps, pkg = pkg, git = git),
@@ -173,7 +176,7 @@ combine_remote_deps <- function(cran_deps, remote_deps, remote_precedence) {
   } else {
     remote_deps <- remote_deps[!(remote_deps$package %in% cran_deps$package), ]
   }
-  
+
 
   rbind(remote_deps, cran_deps)
 }