more

Author: lorenzwalthert

R/release.R

@@ -18,7 +18,7 @@
 #'
 #' @section CRAN release:
 #' If `is_cran` is `TRUE`, the workflow is changed slightly:
-#' - push to release branch, not master.
+#' - push to release branch, not main.
 #' - doesn't run [release_complete()]. This must be done manually after accepted
 #'   on CRAN.
 #' @keywords internal
@@ -27,7 +27,7 @@ release_gh <- function(bump = "dev", is_cran = bump != "dev") {
   new_dsc$write()
   git_branch_set(is_cran)
   if (!is_cran) {
-    on.exit(sys_call("git", c("checkout", "master")), add = TRUE)
+    on.exit(sys_call("git", c("checkout", "main")), add = TRUE)
   }
 
   # if we fail, must reset version, if we succeed, it's not stage
@@ -78,12 +78,12 @@ release_gh <- function(bump = "dev", is_cran = bump != "dev") {
 #' @param tag The tag to push. `NULL` will derive the tag from `DESCRIPTION`.
 #' @keywords internal
 release_complete <- function(ask = TRUE, is_cran = ask, tag = NULL) {
-  if (git_branch_get() != "master") {
-    rlang::abort("Must be on master to complete the release.")
+  if (git_branch_get() != "main") {
+    rlang::abort("Must be on main to complete the release.")
   }
   if (ask) {
-    abort_if_not_yes("Did you merge the release branch into master?")
-    abort_if_not_yes("Did you pull the latest master from origin?")
+    abort_if_not_yes("Did you merge the release branch into main?")
+    abort_if_not_yes("Did you pull the latest main from origin?")
   }
   if (is_cran) {
     if (is.null(tag)) {
@@ -94,7 +94,7 @@ release_complete <- function(ask = TRUE, is_cran = ask, tag = NULL) {
     }
     sys_call("git", glue::glue("push origin {tag}"))
   }
-  precommit::autoupdate() # only updates if tag is on the master branch
+  precommit::autoupdate() # only updates if tag is on the main branch
   desc::desc_bump_version("dev")
   cli::cli_alert_success("Bumped version to dev")
   sys_call("git", glue::glue('commit DESCRIPTION .pre-commit-config.yaml -m "use latest release"'),
@@ -184,9 +184,9 @@ git_branch_set <- function(is_cran) {
     )
     cli::cli_alert_success("Checked out branch {branch_name} for CRAN release process.")
   } else {
-    if (git_branch_get() != "master") {
+    if (git_branch_get() != "main") {
       rlang::abort(paste(
-        "Need to be on branch 'master' to create a release, otherwise autoudate",
+        "Need to be on branch 'main' to create a release, otherwise autoudate",
         "won't use the new ref."
       ))
     }
@@ -196,9 +196,9 @@ git_branch_set <- function(is_cran) {
 
 git_assert_even_with_origin <- function() {
   tmp <- tempfile()
-  system2("git", "diff HEAD..origin/master", stdout = tmp)
+  system2("git", "diff HEAD..origin/main", stdout = tmp)
   if (length(readLines(tmp) > 0)) {
-    rlang::abort("remote master must be even with local master before release process can start.")
+    rlang::abort("remote main must be even with local main before release process can start.")
   }
 }