Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include file names in challenge_uncommited_changes() #2001

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Include file names in challenge_uncommited_changes() #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a0835db
Make some git messages less wordy.
olivroy Jun 9, 2024
70e17a2
Tweak message to make it shorter.
olivroy Jun 9, 2024
386aec3
More tweaks
olivroy Jun 9, 2024
b9794fa
Merge branch 'r-lib:main' into challenge-uncommited-tweaks
olivroy Jun 26, 2024
af2f01b
Merged upstream/main into olivroy-challenge-uncommited-tweaks
olivroy Jul 25, 2024
5958d4a
Use more precise wording.
olivroy Jul 25, 2024
2e59179
Merged upstream/main into olivroy-challenge-uncommited-tweaks
olivroy Jul 26, 2024
9841741
Merged upstream/main into olivroy-challenge-uncommited-tweaks
olivroy Aug 15, 2024
54e13c1
Merged upstream/main into olivroy-challenge-uncommited-tweaks
olivroy Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions R/pr.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ pr_init <- function(branch) {
if (!is.na(remref)) {
comparison <- git_branch_compare(current_branch, remref)
if (comparison$remote_only > 0) {
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = c("pull", "switch branches"))
}
ui_bullets(c("v" = "Pulling changes from {.val {remref}}."))
git_pull(remref = remref, verbose = FALSE)
Expand Down Expand Up @@ -258,7 +258,7 @@ pr_resume <- function(branch = NULL) {
))
}

challenge_uncommitted_changes()
challenge_uncommitted_changes(which = c("pull", "switch", "compare branches"))

ui_bullets(c("v" = "Switching to branch {.val {branch}}."))
gert::git_branch_checkout(branch, repo = repo)
Expand All @@ -283,7 +283,7 @@ pr_resume <- function(branch = NULL) {
pr_fetch <- function(number = NULL, target = c("source", "primary")) {
repo <- git_repo()
tr <- target_repo(github_get = NA, role = target, ask = FALSE)
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = c("pull", "switch branches"))

if (is.null(number)) {
ui_bullets(c("i" = "No PR specified ... looking up open PRs."))
Expand Down Expand Up @@ -377,7 +377,7 @@ pr_push <- function() {
check_for_config(cfg, ok_configs = c("ours", "fork"))
default_branch <- git_default_branch()
check_pr_branch(default_branch)
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = "push")

branch <- git_branch()
remref <- git_branch_tracking(branch)
Expand Down Expand Up @@ -425,7 +425,7 @@ pr_pull <- function() {
check_for_config(cfg)
default_branch <- git_default_branch()
check_pr_branch(default_branch)
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = "pull")

git_pull()

Expand All @@ -440,7 +440,7 @@ pr_pull <- function() {
#' @rdname pull-requests
pr_merge_main <- function() {
tr <- target_repo(github_get = TRUE, ask = FALSE)
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = "pull")
remref <- glue("{tr$remote}/{tr$default_branch}")
ui_bullets(c("v" = "Pulling changes from {.val {remref}}."))
git_pull(remref, verbose = FALSE)
Expand Down Expand Up @@ -503,7 +503,7 @@ pr_pause <- function() {
))
return(invisible())
}
challenge_uncommitted_changes()
challenge_uncommitted_changes(which = "switch branches")
# TODO: what happens here if offline?
check_branch_pulled(use = "pr_pull()")

Expand Down
35 changes: 24 additions & 11 deletions R/utils-git.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ git_uncommitted <- function(untracked = FALSE) {
nrow(git_status(untracked)) > 0
}

challenge_uncommitted_changes <- function(untracked = FALSE, msg = NULL) {
challenge_uncommitted_changes <- function(
untracked = FALSE,
msg = NULL,
which = c("push", "pull", "switch", "compare branches")) {
if (!uses_git()) {
return(invisible())
}
Expand All @@ -190,18 +193,28 @@ challenge_uncommitted_changes <- function(untracked = FALSE, msg = NULL) {
rstudioapi::documentSaveAll()
}

default_msg <- "
There are uncommitted changes, which may cause problems or be lost when \\
we push, pull, switch, or compare branches"
msg <- glue(msg %||% default_msg)
if (git_uncommitted(untracked = untracked)) {
if (ui_yep(c(
"!" = msg,
" " = "Do you want to proceed anyway?"
))) {
default_msg <-
"Uncommitted changes may cause problems or be lost when we {.or {which}}."
msg <- cli::format_inline(msg %||% default_msg)

uncommited <- git_status(untracked)
if (nrow(uncommited) > 0) {
choice <- utils::menu(
c(
"I want to proceed anyway.",
cli::format_inline(
"I want to take a closer look at {.file {uncommited$file}} first."
)
),
title = msg
)
if (choice == 1) {
return(invisible())
} else {
ui_abort("Uncommitted changes. Please commit before continuing.")
ui_abort(
"Uncommitted changes. Please commit before continuing.",
call = caller_env()
)
}
}
}
Expand Down
Loading