1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636
|
#' Get or set the default Git branch
#'
#' @description
#' The `git_default_branch*()` functions put some structure around the somewhat
#' fuzzy (but definitely real) concept of the default branch. In particular,
#' they support new conventions around the Git default branch name, globally or
#' in a specific project / Git repository.
#'
#' @section Background on the default branch:
#'
#' Technically, Git has no official concept of the default branch. But in
#' reality, almost all Git repos have an *effective default branch*. If there's
#' only one branch, this is it! It is the branch that most bug fixes and
#' features get merged in to. It is the branch you see when you first visit a
#' repo on a site such as GitHub. On a Git remote, it is the branch that `HEAD`
#' points to.
#'
#' Historically, `master` has been the most common name for the default branch,
#' but `main` is an increasingly popular choice.
#'
#' @section `git_default_branch_configure()`:
#' This configures `init.defaultBranch` at the global (a.k.a user) level. This
#' setting determines the name of the branch that gets created when you make the
#' first commit in a new Git repo. `init.defaultBranch` only affects the local
#' Git repos you create in the future.
#'
#' @section `git_default_branch()`:
#' This figures out the default branch of the current Git repo, integrating
#' information from the local repo and, if applicable, the `upstream` or
#' `origin` remote. If there is a local vs. remote mismatch,
#' `git_default_branch()` throws an error with advice to call
#' `git_default_branch_rediscover()` to repair the situation.
#'
#' For a remote repo, the default branch is the branch that `HEAD` points to.
#'
#' For the local repo, if there is only one branch, that must be the default!
#' Otherwise we try to identify the relevant local branch by looking for
#' specific branch names, in this order:
#' * whatever the default branch of `upstream` or `origin` is, if applicable
#' * `main`
#' * `master`
#' * the value of the Git option `init.defaultBranch`, with the usual deal where
#' a local value, if present, takes precedence over a global (a.k.a.
#' user-level) value
#'
#' @section `git_default_branch_rediscover()`:
#' This consults an external authority -- specifically, the remote **source
#' repo** on GitHub -- to learn the default branch of the current project /
#' repo. If that doesn't match the apparent local default branch (for example,
#' the project switched from `master` to `main`), we do the corresponding branch
#' renaming in your local repo and, if relevant, in your fork.
#'
#' See <https://happygitwithr.com/common-remote-setups.html> for more about
#' GitHub remote configurations and, e.g., what we mean by the source repo. This
#' function works for the configurations `"ours"`, `"fork"`, and `"theirs"`.
#' @section `git_default_branch_rename()`:
#' Note: this only works for a repo that you effectively own. In terms of
#' GitHub, you must own the **source repo** personally or, if
#' organization-owned, you must have `admin` permission on the **source repo**.
#'
#' This renames the default branch in the **source repo** on GitHub and then
#' calls `git_default_branch_rediscover()`, to make any necessary changes in the
#' local repo and, if relevant, in your personal fork.
#'
#' See <https://happygitwithr.com/common-remote-setups.html> for more about
#' GitHub remote configurations and, e.g., what we mean by the source repo. This
#' function works for the configurations `"ours"`, `"fork"`, and `"no_github"`.
#'
#' Regarding `"no_github"`: Of course, this function does what you expect for a
#' local repo with no GitHub remotes, but that is not the primary use case.
#' @return Name of the default branch.
#' @name git-default-branch
NULL
#' @export
#' @rdname git-default-branch
#' @examples
#' \dontrun{
#' git_default_branch()
#' }
git_default_branch <- function() {
git_default_branch_(github_remote_config())
}
# If config is available, we can use it to avoid an additional lookup
# on the GitHub API
git_default_branch_ <- function(cfg) {
repo <- git_repo()
upstream <- git_default_branch_remote(cfg, "upstream")
if (is.na(upstream$default_branch)) {
origin <- git_default_branch_remote(cfg, "origin")
if (is.na(origin$default_branch)) {
db_source <- list()
} else {
db_source <- origin
}
} else {
db_source <- upstream
}
db_local_with_source <- tryCatch(
guess_local_default_branch(db_source$default_branch),
error = function(e) NA_character_
)
# these error sub-classes and error data are for the benefit of git_sitrep()
if (is.na(db_local_with_source) ) {
if (length(db_source)) {
ui_abort(c(
"x" = "Default branch mismatch between local repo and remote.",
"i" = "The default branch of the {.val {db_source$name}} remote is
{.val {db_source$default_branch}}.",
" " = "But the local repo has no branch named
{.val {db_source$default_branch}}.",
"_" = "Call {.run [git_default_branch_rediscover()](usethis::git_default_branch_rediscover())} to resolve this."
),
class = "error_default_branch",
db_source = db_source
)
} else {
ui_abort(
"Can't determine the local repo's default branch.",
class = "error_default_branch"
)
}
}
# we learned a default branch from the local repo
if (is.null(db_source$default_branch) ||
is.na(db_source$default_branch) ||
identical(db_local_with_source, db_source$default_branch)) {
return(db_local_with_source)
}
# we learned a default branch from the source repo and it doesn't match
# the local default branch
ui_abort(c(
"x" = "Default branch mismatch between local repo and remote.",
"i" = "The default branch of the {.val {db_source$name}} remote is
{.val {db_source$default_branch}}.",
" " = "But the default branch of the local repo appears to be
{.val {db_local_with_source}}.",
"_" = "Call {.run [git_default_branch_rediscover()](usethis::git_default_branch_rediscover())} to resolve this."
),
class = "error_default_branch",
db_source = db_source, db_local = db_local_with_source
)
}
# returns a whole data structure, because the caller needs the surrounding
# context to produce a helpful error message
git_default_branch_remote <- function(cfg, remote = "origin") {
repo <- git_repo()
out <- list(
name = remote,
is_configured = NA,
url = NA_character_,
repo_spec = NA_character_,
default_branch = NA_character_
)
cfg_remote <- cfg[[remote]]
if (!cfg_remote$is_configured) {
out$is_configured <- FALSE
return(out)
}
out$is_configured <- TRUE
out$url <- cfg_remote$url
if (!is.na(cfg_remote$default_branch)) {
out$repo_spec <- cfg_remote$repo_spec
out$default_branch <- cfg_remote$default_branch
return(out)
}
# Fall back to pure git based approach
out$default_branch <- tryCatch(
{
gert::git_fetch(remote = remote, repo = repo, verbose = FALSE)
res <- gert::git_remote_ls(remote = remote, verbose = FALSE, repo = repo)
path_file(res$symref[res$ref == "HEAD"])
},
error = function(e) NA_character_
)
out
}
default_branch_candidates <- function() {
c(
"main",
"master",
# we use `where = "de_facto"` so that one can configure init.defaultBranch
# *locally* (which is unusual, but possible) in a repo that uses an
# unconventional default branch name
git_cfg_get("init.defaultBranch", where = "de_facto")
)
}
# `prefer` is available if you want to inject external information, such as
# the default branch of a remote
guess_local_default_branch <- function(prefer = NULL, verbose = FALSE) {
repo <- git_repo()
gb <- gert::git_branch_list(local = TRUE, repo = repo)[["name"]]
if (length(gb) == 0) {
ui_abort(c(
"x" = "Can't find any local branches.",
" " = "Do you need to make your first commit?"
))
}
candidates <- c(prefer, default_branch_candidates())
first_matched <- function(x, table) table[min(match(x, table), na.rm = TRUE)]
if (length(gb) == 1) {
db <- gb
} else if (any(gb %in% candidates)) {
db <- first_matched(gb, candidates)
} else {
# TODO: perhaps this should be classed, so I can catch it and distinguish
# from the ui_abort() above, where there are no local branches.
ui_abort("
Unable to guess which existing local branch plays the role of the default.")
}
if (verbose) {
ui_bullets(c(
"i" = "Local branch {.val {db}} appears to play the role of the default
branch."
))
}
db
}
#' @export
#' @rdname git-default-branch
#' @param name Default name for the initial branch in new Git repositories.
#' @examples
#' \dontrun{
#' git_default_branch_configure()
#' }
git_default_branch_configure <- function(name = "main") {
check_string(name)
ui_bullets(c(
"v" = "Configuring {.field init.defaultBranch} as {.val {name}}.",
"i" = "Remember: this only affects repos you create in the future!"
))
use_git_config(scope = "user", `init.defaultBranch` = name)
invisible(name)
}
#' @export
#' @rdname git-default-branch
#' @param current_local_default Name of the local branch that is currently
#' functioning as the default branch. If unspecified, this can often be
#' inferred.
#' @examples
#' \dontrun{
#' git_default_branch_rediscover()
#'
#' # you can always explicitly specify the local branch that's been playing the
#' # role of the default
#' git_default_branch_rediscover("unconventional_default_branch_name")
#' }
git_default_branch_rediscover <- function(current_local_default = NULL) {
rediscover_default_branch(old_name = current_local_default)
}
#' @export
#' @rdname git-default-branch
#' @param from Name of the branch that is currently functioning as the default
#' branch.
#' @param to New name for the default branch.
#' @examples
#' \dontrun{
#' git_default_branch_rename()
#'
#' # you can always explicitly specify one or both branch names
#' git_default_branch_rename(from = "this", to = "that")
#' }
git_default_branch_rename <- function(from = NULL, to = "main") {
repo <- git_repo()
maybe_name(from)
check_name(to)
if (!is.null(from) &&
!gert::git_branch_exists(from, local = TRUE, repo = repo)) {
ui_abort("Can't find existing branch named {.val {from}}.")
}
cfg <- github_remote_config(github_get = TRUE)
check_for_config(cfg, ok_configs = c("ours", "fork", "no_github"))
if (cfg$type == "no_github") {
from <- from %||% guess_local_default_branch(verbose = TRUE)
if (from == to) {
ui_bullets(c(
"i" = "Local repo already has {.val {from}} as its default branch."
))
} else {
ui_bullets(c(
"v" = "Moving local {.val {from}} branch to {.val {to}}."
))
gert::git_branch_move(branch = from, new_branch = to, repo = repo)
rstudio_git_tickle()
report_fishy_files(old_name = from, new_name = to)
}
return(invisible(to))
}
# cfg is now either fork or ours
tr <- target_repo(cfg, role = "source", ask = FALSE)
old_source_db <- tr$default_branch
if (!isTRUE(tr$can_admin)) {
ui_abort("
You don't seem to have {.field admin} permissions for the source repo
{.val {tr$repo_spec}}, which is required to rename the default branch.")
}
old_local_db <- from %||%
guess_local_default_branch(old_source_db, verbose = FALSE)
if (old_local_db != old_source_db) {
ui_bullets(c(
"!" = "It's weird that the current default branch for your local repo and
the source repo are different:",
" " = "{.val {old_local_db}} (local) != {.val {old_source_db}} (source)"
))
if (ui_nah(
"Are you sure you want to proceed?",
yes = "yes", no = "no", shuffle = FALSE)) {
ui_bullets(c("x" = "Cancelling."))
return(invisible())
}
}
source_update <- old_source_db != to
if (source_update) {
gh <- gh_tr(tr)
gh(
"POST /repos/{owner}/{repo}/branches/{from}/rename",
from = old_source_db,
new_name = to
)
}
if (source_update) {
ui_bullets(c(
"v" = "Default branch of the source repo {.val {tr$repo_spec}} has moved:",
" " = "{.val {old_source_db}} {cli::symbol$arrow_right} {.val {to}}"
))
} else {
ui_bullets(c(
"i" = "Default branch of source repo {.val {tr$repo_spec}} is
{.val {to}}. Nothing to be done."
))
}
report_fishy_files(old_name = old_local_db, new_name = to)
rediscover_default_branch(old_name = old_local_db, report_on_source = FALSE)
}
rediscover_default_branch <- function(old_name = NULL, report_on_source = TRUE) {
maybe_name(old_name)
# GitHub's official TODOs re: manually updating local environments
# after a source repo renames the default branch:
# git branch -m OLD-BRANCH-NAME NEW-BRANCH-NAME
# git fetch origin
# git branch -u origin/NEW-BRANCH-NAME NEW-BRANCH-NAME
# git remote set-head origin -a
# optionally
# git remote prune origin
# Note: they are assuming the relevant repo is known as origin, but it could
# just as easily be, e.g., upstream.
repo <- git_repo()
if (!is.null(old_name) &&
!gert::git_branch_exists(old_name, local = TRUE, repo = repo)) {
ui_abort("Can't find existing local branch named {.val {old_name}}.")
}
cfg <- github_remote_config(github_get = TRUE)
check_for_config(cfg)
tr <- target_repo(cfg, role = "source", ask = FALSE)
db <- tr$default_branch
# goal, in Git-speak: git remote set-head <remote> -a
# goal, for humans: learn and record the default branch (i.e. the target of
# the symbolic-ref refs/remotes/<remote>/HEAD) for the named remote
# https://git-scm.com/docs/git-remote#Documentation/git-remote.txt-emset-headem
# for very stale repos, a fetch is a necessary pre-requisite
# I provide `refspec = db` to avoid fetching all refs, which can be VERY slow
# for a repo like ggplot2 (several minutes, with no progress reporting)
gert::git_fetch(remote = tr$name, refspec = db, verbose = FALSE, repo = repo)
gert::git_remote_ls(remote = tr$name, verbose = FALSE, repo = repo)
old_name <- old_name %||% guess_local_default_branch(db, verbose = FALSE)
local_update <- old_name != db
if (local_update) {
# goal, in Git-speak: git branch -m <old_name> <db>
gert::git_branch_move(branch = old_name, new_branch = db, repo = repo)
rstudio_git_tickle()
}
# goal, in Git-speak: git branch -u <remote>/<db> <db>
gert::git_branch_set_upstream(
branch = db,
upstream = glue("{tr$name}/{db}"),
repo = repo
)
# goal: get rid of old remote tracking branch, e.g. origin/master
# goal, in Git-speak: git remote prune origin
# I provide a refspec to avoid fetching all refs, which can be VERY slow
# for a repo like ggplot2 (several minutes, with no progress reporting)
gert::git_fetch(
remote = tr$name,
refspec = glue("refs/heads/{old_name}:refs/remotes/{tr$name}/{old_name}"),
verbose = FALSE, repo = repo, prune = TRUE
)
# for "ours" and "theirs", the source repo is the only remote on our radar and
# we're done ingesting the default branch from the source repo
# but for "fork", we also need to update
# the fork = the user's primary repo = the remote known as origin
if (cfg$type == "fork") {
old_name_fork <- cfg$origin$default_branch
fork_update <- old_name_fork != db
if (fork_update) {
gh <- gh_tr(cfg$origin)
gh(
"POST /repos/{owner}/{repo}/branches/{from}/rename",
from = old_name_fork,
new_name = db
)
gert::git_fetch(remote = "origin", refspec = db, verbose = FALSE, repo = repo)
gert::git_remote_ls(remote = "origin", verbose = FALSE, repo = repo)
gert::git_fetch(
remote = "origin",
refspec = glue("refs/heads/{old_name}:refs/remotes/origin/{old_name}"),
verbose = FALSE, repo = repo, prune = TRUE
)
}
}
if (report_on_source) {
ui_bullets(c(
"i" = "Default branch of the source repo {.val {tr$repo_spec}} is
{.val {db}}."
))
}
if (local_update) {
ui_bullets(c(
"v" = "Default branch of local repo has moved:
{.val {old_name}} {cli::symbol$arrow_right} {.val {db}}"
))
} else {
ui_bullets(c(
"i" = "Default branch of local repo is {.val {db}}. Nothing to be done."
))
}
if (cfg$type == "fork") {
if (fork_update) {
ui_bullets(c(
"v" = "Default branch of your fork has moved:
{.val {old_name_fork}} {cli::symbol$arrow_right} {.val {db}}"
))
} else {
ui_bullets(c(
"i" = "Default branch of your fork is {.val {db}}. Nothing to be done."
))
}
}
invisible(db)
}
challenge_non_default_branch <- function(details = "Are you sure you want to proceed?",
default_branch = NULL) {
actual <- git_branch()
default_branch <- default_branch %||% git_default_branch()
if (actual != default_branch) {
if (ui_nah(c(
"!" = "Current branch ({.val {actual}}) is not repo's default branch
({.val {default_branch}}).",
" " = details
))) {
ui_abort("Cancelling. Not on desired branch.")
}
}
invisible()
}
report_fishy_files <- function(old_name = "master", new_name = "main") {
ui_bullets(c(
"_" = "Be sure to update files that refer to the default branch by name.",
" " = "Consider searching within your project for {.val {old_name}}."
))
# I don't want failure of a fishy file check to EVER cause
# git_default_branch_rename() to fail and prevent the call to
# git_default_branch_rediscover()
# using a simple try() wrapper because these hints are just "nice to have"
try(fishy_github_actions(new_name = new_name), silent = TRUE)
try(fishy_badges(old_name = old_name), silent = TRUE)
try(fishy_bookdown_config(old_name = old_name), silent = TRUE)
}
# good test cases: downlit, purrr, pkgbuild, zealot, glue, bench,
# textshaping, scales
fishy_github_actions <- function(new_name = "main") {
if (!uses_github_actions()) {
return(invisible(character()))
}
workflow_dir <- proj_path(".github", "workflows")
workflows <- dir_ls(workflow_dir, regexp = "[.]ya?ml$")
f <- function(pth, new_name) {
x <- yaml::read_yaml(pth)
x_unlisted <- unlist(x)
locs <- grep("branches", re_match(names(x_unlisted), "[^//.]+$")$.match)
branches <- x_unlisted[locs]
length(branches) == 0 || new_name %in% branches
}
includes_branch_name <- map_lgl(workflows, f, new_name = new_name)
paths <- proj_rel_path(workflows[!includes_branch_name])
if (length(paths) == 0) {
return(invisible(character()))
}
paths <- sort(paths)
ui_paths <- map_chr(paths, ui_path_impl)
# TODO: the ui_paths used to be a nested bullet list
# if that ever becomes possible/easier with cli, go back to that
ui_bullets(c(
"x" = "{cli::qty(length(ui_paths))}{?No/This/These} GitHub Action file{?s}
{?/doesn't/don't} mention the new default branch {.val {new_name}}:",
" " = "{.path {ui_paths}}"
))
invisible(paths)
}
fishy_badges <- function(old_name = "master") {
path <- find_readme()
if (is.null(path)) {
return(invisible(character()))
}
readme_lines <- read_utf8(path)
badge_lines_range <- block_find(
readme_lines,
block_start = badge_start,
block_end = badge_end
)
if (length(badge_lines_range) != 2) {
return(invisible(character()))
}
badge_lines <- readme_lines[badge_lines_range[1]:badge_lines_range[2]]
if (!any(grepl(old_name, badge_lines))) {
return(invisible(character()))
}
ui_bullets(c(
"x" = "Some badges appear to refer to the old default branch
{.val {old_name}}.",
"_" = "Check and correct, if needed, in this file: {.path {pth(path)}}"
))
invisible(path)
}
fishy_bookdown_config <- function(old_name = "master") {
# https://github.com/dncamp/shift/blob/a12a3fb0cd30ae864525f7a9f1f907a05f15f9a3/_bookdown.yml
# https://github.com/Jattan08/Wonderland/blob/b9e7ddc694871d1d13a2a02abe2d3b4a944c4653/_bookdown.yml
# edit: https://github.com/dncamp/shift/edit/master/%s
# view: https://github.com/dncamp/shift/blob/master/%s
# history: https://github.com/YOUR GITHUB USERNAME/YOUR REPO NAME/commits/master/%s
bookdown_config <- dir_ls(
proj_get(),
regexp = "_bookdown[.]ya?ml$",
recurse = TRUE
)
if (length(bookdown_config) == 0) {
return(invisible(character()))
}
# I am (very weakly) worried about more than 1 match, hence the [[1]]
bookdown_config <- purrr::discard(bookdown_config, ~ grepl("revdep", .x))[[1]]
bookdown_config_lines <- read_utf8(bookdown_config)
linky_lines <- grep("^(edit|view|history)", bookdown_config_lines, value = TRUE)
if (!any(grepl(old_name, linky_lines))) {
return(invisible(character()))
}
ui_bullets(c(
"x" = "The bookdown configuration file may refer to the old default branch
{.val {old_name}}.",
"_" = "Check and correct, if needed, in this file:
{.path {pth(bookdown_config)}}"
))
invisible(path)
}
|