// Copyright 2024 The Jujutsu Authors//// Licensed under the Apache License, Version 2.0 (the "License");// you may not use this file except in compliance with the License.// You may obtain a copy of the License at//// https://www.apache.org/licenses/LICENSE-2.0//// Unless required by applicable law or agreed to in writing, software// distributed under the License is distributed on an "AS IS" BASIS,// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.// See the License for the specific language governing permissions and// limitations under the License. use std::path::Path;use std::path::PathBuf; use indoc::formatdoc;use test_case::test_case;use testutils::TestResult;use testutils::git; use crate::common::CommandOutput;use crate::common::TestEnvironment;use crate::common::TestWorkDir;use crate::common::to_toml_value; fn init_git_repo(git_repo_path: &Path, bare: bool) -> gix::Repository { let git_repo = if bare { git::init_bare(git_repo_path) } else { git::init(git_repo_path) }; let git::CommitResult { commit_id, .. } = git::add_commit( &git_repo, "refs/heads/my-bookmark", "some-file", b"some content", "My commit message", &[], ); git::set_head_to_id(&git_repo, commit_id); git_repo} #[must_use]fn get_bookmark_output(work_dir: &TestWorkDir) -> CommandOutput { work_dir.run_jj(["bookmark", "list", "--all-remotes"])} #[must_use]fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput { let template = r#" separate(" ", commit_id.short(), bookmarks, description, )"#; work_dir.run_jj(["log", "-T", template, "-r=all()"])} #[must_use]fn get_colocation_status(work_dir: &TestWorkDir) -> CommandOutput { work_dir.run_jj([ "git", "colocation", "status", "--ignore-working-copy", "--quiet", // suppress hint ])} fn read_git_target(work_dir: &TestWorkDir) -> String { String::from_utf8(work_dir.read_file(".jj/repo/store/git_target").into()).unwrap()} #[test]fn test_git_init_internal() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = false"); let output = test_env.run_jj_in(".", ["git", "init", "repo"]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Initialized repo in "repo" [EOF] "#); let work_dir = test_env.work_dir("repo"); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); assert!(store_path.join("git").is_dir()); assert_eq!(read_git_target(&work_dir), "git");} #[test]fn test_git_init_internal_preexisting_git_repo() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = false"); test_env.work_dir("").create_dir_all("repo/.git"); let output = test_env.run_jj_in(".", ["git", "init", "repo"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: Did not create a jj repo because there is an existing Git repo in this directory. Hint: To create a repo backed by the existing Git repo, run `jj git init --colocate` instead. [EOF] [exit status: 1] ");} #[test]fn test_git_init_internal_no_integrate_operation() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); std::fs::create_dir(&workspace_root).unwrap(); let output = test_env.run_jj_in( &workspace_root, &["git", "init", "--no-integrate-operation"], ); insta::assert_snapshot!(output, @r" ------- stderr ------- Error: --no-integrate-operation is not respected [EOF] [exit status: 2] ");} #[test]fn test_git_init_ignore_working_copy() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("").create_dir("repo"); work_dir.write_file("file1", ""); let output = work_dir.run_jj(["git", "init", "--ignore-working-copy"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: --ignore-working-copy is not respected [EOF] [exit status: 2] ");} #[test]fn test_git_init_at_operation() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("").create_dir("repo"); let output = work_dir.run_jj(["git", "init", "--at-op=@-"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: --at-op is not respected [EOF] [exit status: 2] ");} #[test_case(false; "full")]#[test_case(true; "bare")]fn test_git_init_external(bare: bool) { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); init_git_repo(&git_repo_path, bare); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // --git-repo takes precedence over git.colocate=true let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } let work_dir = test_env.work_dir("repo"); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); let unix_git_target_file_contents = read_git_target(&work_dir).replace('\\', "/"); if bare { assert!(unix_git_target_file_contents.ends_with("/git-repo")); } else { assert!(unix_git_target_file_contents.ends_with("/git-repo/.git")); } // Check that the Git repo's HEAD got checked out insta::allow_duplicates! { insta::assert_snapshot!(get_log_output(&work_dir), @" @ ed6b513890ae ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently not colocated with Git. Last imported/exported Git HEAD: e80a42cccd069007c7a2bb427ac7f1d10b408633 [EOF] "); }} #[test]fn test_git_init_external_with_colocate_config() { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); init_git_repo(&git_repo_path, true); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // --git-repo takes precedence over git.colocate.true let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // Evolution history should be omitted for the "init" operation let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["evolog", "-r..remote_bookmarks(remote=git)"]); insta::assert_snapshot!(output, @" ○ nntyzxmz someone@example.org 1970-01-01 11:00:00 my-bookmark e80a42cc My commit message [EOF] ");} #[test_case(false; "full")]#[test_case(true; "bare")]fn test_git_init_external_import_trunk(bare: bool) -> TestResult { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let git_repo = init_git_repo(&git_repo_path, bare); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // Add remote bookmark "trunk" for remote "origin", and set it as "origin/HEAD" let oid = git_repo.find_reference("refs/heads/my-bookmark")?.id(); git_repo.reference( "refs/remotes/origin/trunk", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/origin/HEAD", "refs/remotes/origin/trunk", ); let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Setting the revset alias `trunk()` to `trunk@origin`. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark trunk@origin | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // "trunk()" alias should be set to remote "origin"'s default bookmark "trunk" let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["config", "list", "--repo", "revset-aliases.\"trunk()\""]); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" revset-aliases."trunk()" = "trunk@origin" [EOF] "#); } Ok(())} #[test]fn test_git_init_external_import_trunk_upstream_takes_precedence() -> TestResult { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let git_repo = init_git_repo(&git_repo_path, false); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); let oid = git_repo.find_reference("refs/heads/my-bookmark")?.id(); // Add both upstream and origin remotes with different default branches // upstream has "develop" as default git_repo.reference( "refs/remotes/upstream/develop", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create upstream remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/upstream/HEAD", "refs/remotes/upstream/develop", ); // origin has "trunk" as default git_repo.reference( "refs/remotes/origin/trunk", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create origin remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/origin/HEAD", "refs/remotes/origin/trunk", ); // also accepts full .git path let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.join(".git").to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Setting the revset alias `trunk()` to `develop@upstream`. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc develop@upstream my-bookmark trunk@origin | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // "trunk()" alias should be set to "upstream"'s default, not "origin"'s let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["config", "list", "--repo", "revset-aliases.\"trunk()\""]); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" revset-aliases."trunk()" = "develop@upstream" [EOF] "#); } Ok(())} #[test]fn test_git_init_external_non_existent_directory() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let output = test_env.run_jj_in(".", ["git", "init", "repo", "--git-repo", "non-existent"]); insta::assert_snapshot!(output.strip_stderr_last_line(), @" ------- stderr ------- Error: Failed to access the repository Caused by: 1: Cannot access $TEST_ENV/non-existent [EOF] [exit status: 1] ");} #[test]fn test_git_init_external_non_existent_git_directory() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("repo"); let output = test_env.run_jj_in(".", ["git", "init", "repo", "--git-repo", "repo"]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Error: Failed to access the repository Caused by: 1: Failed to open git repository 2: "$TEST_ENV/repo" does not appear to be a git repository 3: Missing HEAD at '.git/HEAD' [EOF] [exit status: 1] "#); let jj_path = work_dir.root().join(".jj"); assert!(!jj_path.exists());} #[test]fn test_git_init_colocated_via_git_repo_path() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("repo"); init_git_repo(work_dir.root(), false); let output = work_dir.run_jj(["git", "init", "--git-repo", "."]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Initialized repo in "." [EOF] "#); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); assert!( read_git_target(&work_dir) .replace('\\', "/") .ends_with("../../../.git") ); // Check that the Git repo's HEAD got checked out insta::assert_snapshot!(get_log_output(&work_dir), @" @ f3fe58bc88cc ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently colocated with Git. Last imported/exported Git HEAD: e80a42cccd069007c7a2bb427ac7f1d10b408633 [EOF] "); // Check that the Git repo's HEAD moves work_dir.run_jj(["new"]).success(); insta::assert_snapshot!(get_log_output(&work_dir), @" @ bacc067e7740 ○ f3fe58bc88cc ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently colocated with Git. Last imported/exported Git HEAD: f3fe58bc88ccfb820b930a21297d8e48bf76ac2a [EOF] ");}Lines 1–500 of 1327. Load more
// Copyright 2024 The Jujutsu Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. use std::path::Path; use std::path::PathBuf; use indoc::formatdoc; use test_case::test_case; use testutils::TestResult; use testutils::git; use crate::common::CommandOutput; use crate::common::TestEnvironment; use crate::common::TestWorkDir; use crate::common::to_toml_value; fn init_git_repo(git_repo_path: &Path, bare: bool) -> gix::Repository { let git_repo = if bare { git::init_bare(git_repo_path) } else { git::init(git_repo_path) }; let git::CommitResult { commit_id, .. } = git::add_commit( &git_repo, "refs/heads/my-bookmark", "some-file", b"some content", "My commit message", &[], ); git::set_head_to_id(&git_repo, commit_id); git_repo } #[must_use] fn get_bookmark_output(work_dir: &TestWorkDir) -> CommandOutput { work_dir.run_jj(["bookmark", "list", "--all-remotes"]) } #[must_use] fn get_log_output(work_dir: &TestWorkDir) -> CommandOutput { let template = r#" separate(" ", commit_id.short(), bookmarks, description, )"#; work_dir.run_jj(["log", "-T", template, "-r=all()"]) } #[must_use] fn get_colocation_status(work_dir: &TestWorkDir) -> CommandOutput { work_dir.run_jj([ "git", "colocation", "status", "--ignore-working-copy", "--quiet", // suppress hint ]) } fn read_git_target(work_dir: &TestWorkDir) -> String { String::from_utf8(work_dir.read_file(".jj/repo/store/git_target").into()).unwrap() } #[test] fn test_git_init_internal() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = false"); let output = test_env.run_jj_in(".", ["git", "init", "repo"]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Initialized repo in "repo" [EOF] "#); let work_dir = test_env.work_dir("repo"); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); assert!(store_path.join("git").is_dir()); assert_eq!(read_git_target(&work_dir), "git"); } #[test] fn test_git_init_internal_preexisting_git_repo() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = false"); test_env.work_dir("").create_dir_all("repo/.git"); let output = test_env.run_jj_in(".", ["git", "init", "repo"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: Did not create a jj repo because there is an existing Git repo in this directory. Hint: To create a repo backed by the existing Git repo, run `jj git init --colocate` instead. [EOF] [exit status: 1] "); } #[test] fn test_git_init_internal_no_integrate_operation() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); std::fs::create_dir(&workspace_root).unwrap(); let output = test_env.run_jj_in( &workspace_root, &["git", "init", "--no-integrate-operation"], ); insta::assert_snapshot!(output, @r" ------- stderr ------- Error: --no-integrate-operation is not respected [EOF] [exit status: 2] "); } #[test] fn test_git_init_ignore_working_copy() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("").create_dir("repo"); work_dir.write_file("file1", ""); let output = work_dir.run_jj(["git", "init", "--ignore-working-copy"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: --ignore-working-copy is not respected [EOF] [exit status: 2] "); } #[test] fn test_git_init_at_operation() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("").create_dir("repo"); let output = work_dir.run_jj(["git", "init", "--at-op=@-"]); insta::assert_snapshot!(output, @" ------- stderr ------- Error: --at-op is not respected [EOF] [exit status: 2] "); } #[test_case(false; "full")] #[test_case(true; "bare")] fn test_git_init_external(bare: bool) { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); init_git_repo(&git_repo_path, bare); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // --git-repo takes precedence over git.colocate=true let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } let work_dir = test_env.work_dir("repo"); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); let unix_git_target_file_contents = read_git_target(&work_dir).replace('\\', "/"); if bare { assert!(unix_git_target_file_contents.ends_with("/git-repo")); } else { assert!(unix_git_target_file_contents.ends_with("/git-repo/.git")); } // Check that the Git repo's HEAD got checked out insta::allow_duplicates! { insta::assert_snapshot!(get_log_output(&work_dir), @" @ ed6b513890ae ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently not colocated with Git. Last imported/exported Git HEAD: e80a42cccd069007c7a2bb427ac7f1d10b408633 [EOF] "); } } #[test] fn test_git_init_external_with_colocate_config() { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); init_git_repo(&git_repo_path, true); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // --git-repo takes precedence over git.colocate.true let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // Evolution history should be omitted for the "init" operation let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["evolog", "-r..remote_bookmarks(remote=git)"]); insta::assert_snapshot!(output, @" ○ nntyzxmz someone@example.org 1970-01-01 11:00:00 my-bookmark e80a42cc My commit message [EOF] "); } #[test_case(false; "full")] #[test_case(true; "bare")] fn test_git_init_external_import_trunk(bare: bool) -> TestResult { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let git_repo = init_git_repo(&git_repo_path, bare); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); // Add remote bookmark "trunk" for remote "origin", and set it as "origin/HEAD" let oid = git_repo.find_reference("refs/heads/my-bookmark")?.id(); git_repo.reference( "refs/remotes/origin/trunk", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/origin/HEAD", "refs/remotes/origin/trunk", ); let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Setting the revset alias `trunk()` to `trunk@origin`. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc my-bookmark trunk@origin | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // "trunk()" alias should be set to remote "origin"'s default bookmark "trunk" let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["config", "list", "--repo", "revset-aliases.\"trunk()\""]); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" revset-aliases."trunk()" = "trunk@origin" [EOF] "#); } Ok(()) } #[test] fn test_git_init_external_import_trunk_upstream_takes_precedence() -> TestResult { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let git_repo = init_git_repo(&git_repo_path, false); // Explicitly enable git.colocate (which is also the default) test_env.add_config("git.colocate = true"); let oid = git_repo.find_reference("refs/heads/my-bookmark")?.id(); // Add both upstream and origin remotes with different default branches // upstream has "develop" as default git_repo.reference( "refs/remotes/upstream/develop", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create upstream remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/upstream/HEAD", "refs/remotes/upstream/develop", ); // origin has "trunk" as default git_repo.reference( "refs/remotes/origin/trunk", oid.detach(), gix::refs::transaction::PreviousValue::MustNotExist, "create origin remote ref", )?; git::set_symbolic_reference( &git_repo, "refs/remotes/origin/HEAD", "refs/remotes/origin/trunk", ); // also accepts full .git path let output = test_env.run_jj_in( ".", [ "git", "init", "repo", "--git-repo", git_repo_path.join(".git").to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Setting the revset alias `trunk()` to `develop@upstream`. Working copy (@) now at: sqpuoqvx ed6b5138 (empty) (no description set) Parent commit (@-) : nntyzxmz e80a42cc develop@upstream my-bookmark trunk@origin | My commit message Added 1 files, modified 0 files, removed 0 files Initialized repo in "repo" [EOF] "#); } // "trunk()" alias should be set to "upstream"'s default, not "origin"'s let work_dir = test_env.work_dir("repo"); let output = work_dir.run_jj(["config", "list", "--repo", "revset-aliases.\"trunk()\""]); insta::allow_duplicates! { insta::assert_snapshot!(output, @r#" revset-aliases."trunk()" = "develop@upstream" [EOF] "#); } Ok(()) } #[test] fn test_git_init_external_non_existent_directory() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let output = test_env.run_jj_in(".", ["git", "init", "repo", "--git-repo", "non-existent"]); insta::assert_snapshot!(output.strip_stderr_last_line(), @" ------- stderr ------- Error: Failed to access the repository Caused by: 1: Cannot access $TEST_ENV/non-existent [EOF] [exit status: 1] "); } #[test] fn test_git_init_external_non_existent_git_directory() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("repo"); let output = test_env.run_jj_in(".", ["git", "init", "repo", "--git-repo", "repo"]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Error: Failed to access the repository Caused by: 1: Failed to open git repository 2: "$TEST_ENV/repo" does not appear to be a git repository 3: Missing HEAD at '.git/HEAD' [EOF] [exit status: 1] "#); let jj_path = work_dir.root().join(".jj"); assert!(!jj_path.exists()); } #[test] fn test_git_init_colocated_via_git_repo_path() { let test_env = TestEnvironment::default(); test_env.add_config("git.colocate = true"); let work_dir = test_env.work_dir("repo"); init_git_repo(work_dir.root(), false); let output = work_dir.run_jj(["git", "init", "--git-repo", "."]); insta::assert_snapshot!(output, @r#" ------- stderr ------- Done importing changes from the underlying Git repo. Initialized repo in "." [EOF] "#); let jj_path = work_dir.root().join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(work_dir.root().is_dir()); assert!(jj_path.is_dir()); assert!(jj_path.join("working_copy").is_dir()); assert!(repo_path.is_dir()); assert!(store_path.is_dir()); assert!( read_git_target(&work_dir) .replace('\\', "/") .ends_with("../../../.git") ); // Check that the Git repo's HEAD got checked out insta::assert_snapshot!(get_log_output(&work_dir), @" @ f3fe58bc88cc ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently colocated with Git. Last imported/exported Git HEAD: e80a42cccd069007c7a2bb427ac7f1d10b408633 [EOF] "); // Check that the Git repo's HEAD moves work_dir.run_jj(["new"]).success(); insta::assert_snapshot!(get_log_output(&work_dir), @" @ bacc067e7740 ○ f3fe58bc88cc ○ e80a42cccd06 my-bookmark My commit message ◆ 000000000000 [EOF] "); insta::assert_snapshot!(get_colocation_status(&work_dir), @" Workspace is currently colocated with Git. Last imported/exported Git HEAD: f3fe58bc88ccfb820b930a21297d8e48bf76ac2a [EOF] "); }