cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-16 12:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove obsolete helpers

Browse Source
This commit is contained in:
Emily 2025-03-15 20:39:35 +00:00
parent e942744f84
commit 2fec09ac60
5 changed files with 99 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/tests/common/test_environment.rs
View File

@ -198,12 +198,6 @@ impl TestEnvironment {
self.env_vars.insert(key.into(), val.into());
}
// TODO: Remove with the `git.subprocess` setting.
pub fn with_git_subprocess(self, subprocess: bool) -> Self {
assert!(subprocess);
self
}
/// Sets up the fake editor to read an edit script from the returned path
/// Also sets up the fake editor as a merge tool named "fake-editor"
pub fn set_up_fake_editor(&mut self) -> PathBuf {

28
cli/tests/test_git_clone.rs
View File

@ -41,7 +41,7 @@ fn set_up_git_repo_with_file(git_repo: &gix::Repository, filename: &str) {
#[test]
fn test_git_clone() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
test_env.add_config("git.auto-local-bookmark = true");
let git_repo_path = test_env.env_root().join("source");
@ -199,7 +199,7 @@ fn test_git_clone() {
#[test]
fn test_git_clone_bad_source() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let output = root_dir.run_jj(["git", "clone", "", "dest"]);
@ -227,7 +227,7 @@ fn test_git_clone_bad_source() {
#[test]
fn test_git_clone_colocate() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
test_env.add_config("git.auto-local-bookmark = true");
let git_repo_path = test_env.env_root().join("source");
@ -457,7 +457,7 @@ fn test_git_clone_colocate() {
#[test]
fn test_git_clone_remote_default_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path.clone());
@ -578,7 +578,7 @@ fn test_git_clone_remote_default_bookmark() {
#[cfg(unix)]
#[test]
fn test_git_clone_remote_default_bookmark_with_escape() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -621,7 +621,7 @@ fn test_git_clone_remote_default_bookmark_with_escape() {
#[test]
fn test_git_clone_ignore_working_copy() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -666,7 +666,7 @@ fn test_git_clone_ignore_working_copy() {
#[test]
fn test_git_clone_at_operation() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -685,7 +685,7 @@ fn test_git_clone_at_operation() {
#[test]
fn test_git_clone_with_remote_name() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
test_env.add_config("git.auto-local-bookmark = true");
let git_repo_path = test_env.env_root().join("source");
@ -710,7 +710,7 @@ fn test_git_clone_with_remote_name() {
#[test]
fn test_git_clone_with_remote_named_git() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
git::init(git_repo_path);
@ -728,7 +728,7 @@ fn test_git_clone_with_remote_named_git() {
#[test]
fn test_git_clone_with_remote_with_slashes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
git::init(git_repo_path);
@ -746,7 +746,7 @@ fn test_git_clone_with_remote_with_slashes() {
#[test]
fn test_git_clone_trunk_deleted() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -917,7 +917,7 @@ fn test_git_clone_with_depth_subprocess() {
#[test]
fn test_git_clone_invalid_immutable_heads() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -946,7 +946,7 @@ fn test_git_clone_invalid_immutable_heads() {
#[test]
fn test_git_clone_malformed() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
let root_dir = test_env.work_dir("");
let git_repo_path = test_env.env_root().join("source");
let git_repo = git::init(git_repo_path);
@ -1011,7 +1011,7 @@ fn test_git_clone_malformed() {
#[test]
fn test_git_clone_with_global_git_remote_config() {
let mut test_env = TestEnvironment::default().with_git_subprocess(true);
let mut test_env = TestEnvironment::default();
test_env.work_dir("").write_file(
"git-config",
indoc! {r#"

64
cli/tests/test_git_fetch.rs
View File

@ -98,7 +98,7 @@ fn clone_git_remote_into(
#[test]
fn test_git_fetch_with_default_config() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "origin");
@ -114,7 +114,7 @@ fn test_git_fetch_with_default_config() {
#[test]
fn test_git_fetch_default_remote() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -132,7 +132,7 @@ fn test_git_fetch_default_remote() {
#[test]
fn test_git_fetch_single_remote() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -158,7 +158,7 @@ fn test_git_fetch_single_remote() {
#[test]
fn test_git_fetch_single_remote_all_remotes_flag() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -176,7 +176,7 @@ fn test_git_fetch_single_remote_all_remotes_flag() {
#[test]
fn test_git_fetch_single_remote_from_arg() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -196,7 +196,7 @@ fn test_git_fetch_single_remote_from_arg() {
#[test]
fn test_git_fetch_single_remote_from_config() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -215,7 +215,7 @@ fn test_git_fetch_single_remote_from_config() {
#[test]
fn test_git_fetch_multiple_remotes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -238,7 +238,7 @@ fn test_git_fetch_multiple_remotes() {
#[test]
fn test_git_fetch_with_glob() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "rem1");
@ -257,7 +257,7 @@ fn test_git_fetch_with_glob() {
#[test]
fn test_git_fetch_with_glob_and_exact_match() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "rem1");
@ -280,7 +280,7 @@ fn test_git_fetch_with_glob_and_exact_match() {
#[test]
fn test_git_fetch_with_glob_from_config() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config(r#"git.fetch = "glob:rem*""#);
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -301,7 +301,7 @@ fn test_git_fetch_with_glob_from_config() {
#[test]
fn test_git_fetch_with_glob_with_no_matching_remotes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "upstream");
@ -324,7 +324,7 @@ fn test_git_fetch_with_glob_with_no_matching_remotes() {
#[test]
fn test_git_fetch_all_remotes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -353,7 +353,7 @@ fn test_git_fetch_all_remotes() {
#[test]
fn test_git_fetch_multiple_remotes_from_config() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -375,7 +375,7 @@ fn test_git_fetch_multiple_remotes_from_config() {
#[test]
fn test_git_fetch_no_matching_remote() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -396,7 +396,7 @@ fn test_git_fetch_no_matching_remote() {
#[test]
fn test_git_fetch_nonexistent_remote() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "rem1");
@ -420,7 +420,7 @@ fn test_git_fetch_nonexistent_remote() {
#[test]
fn test_git_fetch_nonexistent_remote_from_config() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
add_git_remote(&test_env, &work_dir, "rem1");
@ -445,7 +445,7 @@ fn test_git_fetch_nonexistent_remote_from_config() {
#[test]
fn test_git_fetch_from_remote_named_git() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let work_dir = test_env.work_dir("repo");
init_git_remote(&test_env, "git");
@ -523,7 +523,7 @@ fn test_git_fetch_from_remote_named_git() {
#[test]
fn test_git_fetch_from_remote_with_slashes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let work_dir = test_env.work_dir("repo");
init_git_remote(&test_env, "source");
@ -549,7 +549,7 @@ fn test_git_fetch_from_remote_with_slashes() {
#[test]
fn test_git_fetch_prune_before_updating_tips() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -588,7 +588,7 @@ fn test_git_fetch_prune_before_updating_tips() {
#[test]
fn test_git_fetch_conflicting_bookmarks() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -623,7 +623,7 @@ fn test_git_fetch_conflicting_bookmarks() {
#[test]
fn test_git_fetch_conflicting_bookmarks_colocated() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let work_dir = test_env.work_dir("repo");
git::init(work_dir.root());
@ -698,7 +698,7 @@ fn create_trunk2_and_rebase_bookmarks(work_dir: &TestWorkDir) -> String {
#[test]
fn test_git_fetch_all() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
let source_dir = test_env.work_dir("source");
@ -882,7 +882,7 @@ fn test_git_fetch_all() {
#[test]
fn test_git_fetch_some_of_many_bookmarks() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
let source_dir = test_env.work_dir("source");
@ -1145,7 +1145,7 @@ fn test_git_fetch_some_of_many_bookmarks() {
#[test]
fn test_git_fetch_bookmarks_some_missing() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -1289,7 +1289,7 @@ fn test_git_fetch_bookmarks_missing_with_subprocess_localized_message() {
// of the same bookmarks for various kinds of undo.
#[test]
fn test_git_fetch_undo() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let source_dir = test_env.work_dir("source");
git::init(source_dir.root());
@ -1384,7 +1384,7 @@ fn test_git_fetch_undo() {
// TODO: Explain why these behaviors are useful
#[test]
fn test_fetch_undo_what() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let source_dir = test_env.work_dir("source");
git::init(source_dir.root());
@ -1507,7 +1507,7 @@ fn test_fetch_undo_what() {
#[test]
fn test_git_fetch_remove_fetch() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -1572,7 +1572,7 @@ fn test_git_fetch_remove_fetch() {
#[test]
fn test_git_fetch_rename_fetch() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -1625,7 +1625,7 @@ fn test_git_fetch_rename_fetch() {
#[test]
fn test_git_fetch_removed_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let source_dir = test_env.work_dir("source");
git::init(source_dir.root());
@ -1739,7 +1739,7 @@ fn test_git_fetch_removed_bookmark() {
#[test]
fn test_git_fetch_removed_parent_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
let source_dir = test_env.work_dir("source");
git::init(source_dir.root());
@ -1835,7 +1835,7 @@ fn test_git_fetch_removed_parent_bookmark() {
#[test]
fn test_git_fetch_remote_only_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
@ -1903,7 +1903,7 @@ fn test_git_fetch_remote_only_bookmark() {
#[test]
fn test_git_fetch_preserve_commits_across_repos() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
test_env.add_config("git.auto-local-bookmark = true");
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");

70
cli/tests/test_git_push.rs
View File

@ -62,7 +62,7 @@ fn set_up(test_env: &TestEnvironment) {
#[test]
fn test_git_push_nothing() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
// Show the setup. `insta` has trouble if this is done inside `set_up()`
@ -88,7 +88,7 @@ fn test_git_push_nothing() {
#[test]
fn test_git_push_current_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
@ -185,7 +185,7 @@ fn test_git_push_current_bookmark() {
#[test]
fn test_git_push_parent_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
@ -210,7 +210,7 @@ fn test_git_push_parent_bookmark() {
#[test]
fn test_git_push_no_matching_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["new"]).success();
@ -227,7 +227,7 @@ fn test_git_push_no_matching_bookmark() {
#[test]
fn test_git_push_matching_bookmark_unchanged() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["new", "bookmark1"]).success();
@ -247,7 +247,7 @@ fn test_git_push_matching_bookmark_unchanged() {
/// (`remote_bookmarks(remote=<remote>)..@` vs. `remote_bookmarks()..@`).
#[test]
fn test_git_push_other_remote_has_bookmark() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
test_env.add_config(r#"revset-aliases."immutable_heads()" = "none()""#);
@ -311,7 +311,7 @@ fn test_git_push_other_remote_has_bookmark() {
#[test]
fn test_git_push_forward_unexpectedly_moved() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -364,7 +364,7 @@ fn test_git_push_forward_unexpectedly_moved() {
#[test]
fn test_git_push_sideways_unexpectedly_moved() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -436,7 +436,7 @@ fn test_git_push_sideways_unexpectedly_moved() {
// positions.
#[test]
fn test_git_push_deletion_unexpectedly_moved() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -504,7 +504,7 @@ fn test_git_push_deletion_unexpectedly_moved() {
#[test]
fn test_git_push_unexpectedly_deleted() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -611,7 +611,7 @@ fn test_git_push_unexpectedly_deleted() {
#[test]
fn test_git_push_creation_unexpectedly_already_exists() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -667,7 +667,7 @@ fn test_git_push_creation_unexpectedly_already_exists() {
#[test]
fn test_git_push_locally_created_and_rewritten() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
// Ensure that remote bookmarks aren't tracked automatically
@ -736,7 +736,7 @@ fn test_git_push_locally_created_and_rewritten() {
#[test]
fn test_git_push_multiple() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir
@ -910,7 +910,7 @@ fn test_git_push_multiple() {
#[test]
fn test_git_push_changes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["describe", "-m", "foo"]).success();
@ -1041,7 +1041,7 @@ fn test_git_push_changes() {
#[test]
fn test_git_push_changes_with_name() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["describe", "-m", "foo"]).success();
@ -1173,7 +1173,7 @@ fn test_git_push_changes_with_name() {
#[test]
fn test_git_push_changes_with_name_deleted_tracked() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
// Unset immutable_heads so that untracking branches does not move the working
// copy
@ -1286,7 +1286,7 @@ fn test_git_push_changes_with_name_deleted_tracked() {
#[test]
fn test_git_push_changes_with_name_untracked_or_forgotten() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
// Unset immutable_heads so that untracking branches does not move the working
@ -1446,7 +1446,7 @@ fn test_git_push_changes_with_name_untracked_or_forgotten() {
#[test]
fn test_git_push_revisions() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["describe", "-m", "foo"]).success();
@ -1535,7 +1535,7 @@ fn test_git_push_revisions() {
#[test]
fn test_git_push_mixed() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["describe", "-m", "foo"]).success();
@ -1597,7 +1597,7 @@ fn test_git_push_mixed() {
#[test]
fn test_git_push_unsnapshotted_change() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.run_jj(["describe", "-m", "foo"]).success();
@ -1609,7 +1609,7 @@ fn test_git_push_unsnapshotted_change() {
#[test]
fn test_git_push_conflict() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir.write_file("file", "first");
@ -1638,7 +1638,7 @@ fn test_git_push_conflict() {
#[test]
fn test_git_push_no_description() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir
@ -1669,7 +1669,7 @@ fn test_git_push_no_description() {
#[test]
fn test_git_push_no_description_in_immutable() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir
@ -1720,7 +1720,7 @@ fn test_git_push_no_description_in_immutable() {
#[test]
fn test_git_push_missing_author() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let run_without_var = |var: &str, args: &[&str]| {
@ -1756,7 +1756,7 @@ fn test_git_push_missing_author() {
#[test]
fn test_git_push_missing_author_in_immutable() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let run_without_var = |var: &str, args: &[&str]| {
@ -1813,7 +1813,7 @@ fn test_git_push_missing_author_in_immutable() {
#[test]
fn test_git_push_missing_committer() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let run_without_var = |var: &str, args: &[&str]| {
@ -1868,7 +1868,7 @@ fn test_git_push_missing_committer() {
#[test]
fn test_git_push_missing_committer_in_immutable() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let run_without_var = |var: &str, args: &[&str]| {
@ -1926,7 +1926,7 @@ fn test_git_push_missing_committer_in_immutable() {
#[test]
fn test_git_push_deleted() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -1967,7 +1967,7 @@ fn test_git_push_deleted() {
#[test]
fn test_git_push_conflicting_bookmarks() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
test_env.add_config("git.auto-local-bookmark = true");
@ -2065,7 +2065,7 @@ fn test_git_push_conflicting_bookmarks() {
#[test]
fn test_git_push_deleted_untracked() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -2098,7 +2098,7 @@ fn test_git_push_deleted_untracked() {
#[test]
fn test_git_push_tracked_vs_all() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
work_dir
@ -2209,7 +2209,7 @@ fn test_git_push_tracked_vs_all() {
#[test]
fn test_git_push_moved_forward_untracked() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -2236,7 +2236,7 @@ fn test_git_push_moved_forward_untracked() {
#[test]
fn test_git_push_moved_sideways_untracked() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
@ -2263,7 +2263,7 @@ fn test_git_push_moved_sideways_untracked() {
#[test]
fn test_git_push_to_remote_named_git() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let git_repo_path = {
@ -2290,7 +2290,7 @@ fn test_git_push_to_remote_named_git() {
#[test]
fn test_git_push_to_remote_with_slashes() {
let test_env = TestEnvironment::default().with_git_subprocess(true);
let test_env = TestEnvironment::default();
set_up(&test_env);
let work_dir = test_env.work_dir("local");
let git_repo_path = {

43
lib/tests/test_git.rs
View File

@ -135,13 +135,6 @@ fn get_git_repo(repo: &Arc<ReadonlyRepo>) -> gix::Repository {
get_git_backend(repo).git_repo()
}
fn get_git_settings(subprocess: bool) -> GitSettings {
assert!(subprocess);
GitSettings {
..Default::default()
}
}
fn git_fetch(
mut_repo: &mut MutableRepo,
remote_name: &RemoteName,
@ -2839,7 +2832,7 @@ fn test_init() {
#[test]
fn test_fetch_empty_repo() {
let test_data = GitRepoData::create();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let mut tx = test_data.repo.start_transaction();
let stats = git_fetch(
@ -2861,7 +2854,7 @@ fn test_fetch_initial_commit_head_is_not_set() {
let test_data = GitRepoData::create();
let git_settings = GitSettings {
auto_local_bookmark: true,
..get_git_settings(true)
..GitSettings::default()
};
let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
@ -2909,7 +2902,7 @@ fn test_fetch_initial_commit_head_is_set() {
let test_data = GitRepoData::create();
let git_settings = GitSettings {
auto_local_bookmark: true,
..get_git_settings(true)
..GitSettings::default()
};
let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
testutils::git::set_symbolic_reference(&test_data.origin_repo, "HEAD", "refs/heads/main");
@ -2946,7 +2939,7 @@ fn test_fetch_success() {
let mut test_data = GitRepoData::create();
let git_settings = GitSettings {
auto_local_bookmark: true,
..get_git_settings(true)
..GitSettings::default()
};
let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
@ -3027,7 +3020,7 @@ fn test_fetch_prune_deleted_ref() {
let test_data = GitRepoData::create();
let git_settings = GitSettings {
auto_local_bookmark: true,
..get_git_settings(true)
..GitSettings::default()
};
let commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
@ -3073,7 +3066,7 @@ fn test_fetch_no_default_branch() {
let test_data = GitRepoData::create();
let git_settings = GitSettings {
auto_local_bookmark: true,
..get_git_settings(true)
..GitSettings::default()
};
let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
@ -3110,7 +3103,7 @@ fn test_fetch_no_default_branch() {
#[test]
fn test_fetch_empty_refspecs() {
let test_data = GitRepoData::create();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]);
// Base refspecs shouldn't be respected
@ -3131,7 +3124,7 @@ fn test_fetch_empty_refspecs() {
#[test]
fn test_fetch_no_such_remote() {
let test_data = GitRepoData::create();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let mut tx = test_data.repo.start_transaction();
let result = git_fetch(
tx.repo_mut(),
@ -3274,7 +3267,7 @@ fn test_push_bookmarks_success() {
let mut setup = set_up_push_repos(&settings, &temp_dir);
let clone_repo = get_git_repo(&setup.jj_repo);
let mut tx = setup.jj_repo.start_transaction();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let targets = GitBranchPushTargets {
branch_updates: vec![(
@ -3342,7 +3335,7 @@ fn test_push_bookmarks_deletion() {
let mut setup = set_up_push_repos(&settings, &temp_dir);
let clone_repo = get_git_repo(&setup.jj_repo);
let mut tx = setup.jj_repo.start_transaction();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let source_repo = testutils::git::open(&setup.source_repo_dir);
// Test the setup
@ -3404,7 +3397,7 @@ fn test_push_bookmarks_mixed_deletion_and_addition() {
let temp_dir = testutils::new_temp_dir();
let mut setup = set_up_push_repos(&settings, &temp_dir);
let mut tx = setup.jj_repo.start_transaction();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let targets = GitBranchPushTargets {
branch_updates: vec![
@ -3483,7 +3476,7 @@ fn test_push_bookmarks_not_fast_forward() {
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let mut tx = setup.jj_repo.start_transaction();
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let targets = GitBranchPushTargets {
branch_updates: vec![(
@ -3524,7 +3517,7 @@ fn test_push_updates_unexpectedly_moved_sideways_on_remote() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
// The main bookmark is actually at `main_commit` on the remote. If we expect
// it to be at `sideways_commit`, it unexpectedly moved sideways from our
@ -3600,7 +3593,7 @@ fn test_push_updates_unexpectedly_moved_forward_on_remote() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
// The main bookmark is actually at `main_commit` on the remote. If we
// expected it to be at `parent_of_commit`, it unexpectedly moved forward
@ -3681,7 +3674,7 @@ fn test_push_updates_unexpectedly_exists_on_remote() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
// The main bookmark is actually at `main_commit` on the remote. In this test,
// we expect it to not exist on the remote at all.
@ -3741,7 +3734,7 @@ fn test_push_updates_success() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let clone_repo = get_git_repo(&setup.jj_repo);
let result = git::push_updates(
setup.jj_repo.as_ref(),
@ -3782,7 +3775,7 @@ fn test_push_updates_no_such_remote() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let result = git::push_updates(
setup.jj_repo.as_ref(),
&git_settings,
@ -3802,7 +3795,7 @@ fn test_push_updates_invalid_remote() {
let settings = testutils::user_settings();
let temp_dir = testutils::new_temp_dir();
let setup = set_up_push_repos(&settings, &temp_dir);
let git_settings = get_git_settings(true);
let git_settings = GitSettings::default();
let result = git::push_updates(
setup.jj_repo.as_ref(),
&git_settings,