-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add exercise for "I committed to the wrong branch" (#12)
- Loading branch information
Showing
8 changed files
with
136 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#' "Oh shit, I accidentally committed to the wrong branch!" | ||
#' | ||
#' @description | ||
#' To go with <https://ohshitgit.com/#accidental-commit-wrong-branch> | ||
#' | ||
#' | ||
#' @inheritParams exo_one_small_change | ||
#' @section Git commands: | ||
#' `git cherry-pick`, `git reset`, `git checkout` | ||
#' | ||
#' @return The path to the new project | ||
#' @export | ||
#' | ||
#' @examplesIf interactive() | ||
#' parent_path <- withr::local_tempdir() | ||
#' path <- exo_committed_to_wrong(parent_path = parent_path) | ||
exo_committed_to_wrong <- function(parent_path) { | ||
|
||
path <- file.path(parent_path, "committed-to-wrong") | ||
|
||
withr::local_options(usethis.quiet = TRUE) | ||
|
||
dir_create(path) | ||
original_dir <- getwd() | ||
|
||
withr::local_dir(path) | ||
gert::git_init() | ||
|
||
file.copy( | ||
system.file("exo_committed_to_wrong-Rprofile.R", package = "saperlipopette"), | ||
".Rprofile" | ||
) | ||
|
||
create_project(path = getwd()) | ||
# Ignore Rproj that might otherwise get edited when we open the project | ||
rproj <- fs::dir_ls(glob = "*.Rproj") | ||
usethis::local_project(getwd(), force = TRUE) | ||
usethis::use_git_ignore(rproj) | ||
usethis::use_git_ignore(".Rprofile") | ||
gert::git_add("*") | ||
git_commit("First commit") | ||
|
||
gert::git_branch_create("feat-bla") | ||
gert::git_branch_checkout("main") | ||
|
||
gert::git_branch_create("hot-fix") | ||
brio::write_lines("lala", "fix.txt") | ||
gert::git_add("fix.txt") | ||
git_commit("fix things") | ||
|
||
fs::file_create("bla") | ||
brio::write_lines( | ||
text = c("thing 1", "thing 2"), | ||
path = "bla" | ||
) | ||
gert::git_add("bla") | ||
git_commit("feat: add bla") | ||
|
||
usethis::local_project(original_dir, force = TRUE) | ||
|
||
cli::cli_alert_info("Follow along in {path}!") | ||
|
||
return(path) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
if (file.exists("~/.Rprofile")) { | ||
base::sys.source("~/.Rprofile", envir = environment()) | ||
} | ||
|
||
cli::cli_alert_danger('"Oh shit, I accidentally committed to the wrong branch!"') | ||
cli::cli_alert_danger("I wanted my last commit, that created bla, to be on the feat-bla branch not hot-fix!") | ||
cli::cli_alert_info("See {.url https://ohshitgit.com/#accidental-commit-wrong-branch}") | ||
cli::cli_alert_info("For more help use {.run tip()}") | ||
|
||
tip <- function() { | ||
cli::cli_li( | ||
items = c( | ||
"Examine Git history.", | ||
"{.code git checkout feat-bla}", | ||
"{.code git cherry-pick hot-fix}", | ||
"{.code git checkout hot-fix}", | ||
"{.code git reset HEAD~ --hard}", | ||
"Examine Git history of the hot-fix and feat-bla branches." | ||
) | ||
) | ||
|
||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# exo_committed_to_wrong() works | ||
|
||
Code | ||
gert::git_log(repo = path)[["commit"]] | ||
Output | ||
[1] "83ee0e3cc5afed932cd9e3f2f34274c60bfe1166" | ||
[2] "e48ac924412914278ed7d3ee6e82d0fe3122741a" | ||
[3] "e227ecc55e421f70b6e30602e6a2eee02aad42e0" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
test_that("exo_committed_to_wrong() works", { | ||
rlang::local_options(cli.default_handler = function(msg) invisible(NULL)) | ||
parent_path <- withr::local_tempdir() | ||
path <- exo_committed_to_wrong(parent_path = parent_path) | ||
expect_equal(fs::path_file(path), "committed-to-wrong") | ||
expect_snapshot(gert::git_log(repo = path)[["commit"]]) | ||
}) |