Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Include file names in challenge_uncommited_changes() #2001

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

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

Include file names in challenge_uncommited_changes() #2001

Changes from 1 commit
Commits
Show all changes
13 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
eec87e6
Merge branch 'r-lib:main' into challenge-uncommited-tweaks
olivroy Oct 2, 2024
37def27
tweak + address test failures
olivroy Oct 2, 2024
0e95811
Fix trailing comma
olivroy Oct 5, 2024
f20c5f4
Merge branch 'r-lib:main' into challenge-uncommited-tweaks
olivroy Nov 26, 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
Prev Previous commit
Next Next commit
Tweak message to make it shorter.
  • Loading branch information
@olivroy
olivroy committed Jun 9, 2024
commit 70e17a247955f4cb7252833fd818a239baf5a8cd
25 changes: 16 additions & 9 deletions R/utils-git.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,22 @@ challenge_uncommitted_changes <- function(
rstudioapi::documentSaveAll()
}

default_msg <- "
There are uncommitted changes, which may cause problems or be lost when \\
we {.or {which}}"
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.", call = NULL)
Expand Down