// Copyright 2020 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 test_case::test_case; use crate::common::strip_last_line;use crate::common::TestEnvironment; fn init_git_repo(git_repo_path: &Path, bare: bool) -> git2::Repository { init_git_repo_with_opts(git_repo_path, git2::RepositoryInitOptions::new().bare(bare))} fn init_git_repo_with_opts( git_repo_path: &Path, opts: &git2::RepositoryInitOptions,) -> git2::Repository { let git_repo = git2::Repository::init_opts(git_repo_path, opts).unwrap(); let git_blob_oid = git_repo.blob(b"some content").unwrap(); let mut git_tree_builder = git_repo.treebuilder(None).unwrap(); git_tree_builder .insert("some-file", git_blob_oid, 0o100644) .unwrap(); let git_tree_id = git_tree_builder.write().unwrap(); drop(git_tree_builder); let git_tree = git_repo.find_tree(git_tree_id).unwrap(); let git_signature = git2::Signature::new( "Git User", "git.user@example.com", &git2::Time::new(123, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/my-bookmark"), &git_signature, &git_signature, "My commit message", &git_tree, &[], ) .unwrap(); drop(git_tree); git_repo.set_head("refs/heads/my-bookmark").unwrap(); git_repo} fn get_bookmark_output(test_env: &TestEnvironment, repo_path: &Path) -> String { test_env.jj_cmd_success(repo_path, &["bookmark", "list", "--all-remotes"])} fn read_git_target(workspace_root: &Path) -> String { let mut path = workspace_root.to_path_buf(); path.extend([".jj", "repo", "store", "git_target"]); std::fs::read_to_string(path).unwrap()} #[test]fn test_init_git_internal() { let test_env = TestEnvironment::default(); let (stdout, stderr) = test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "repo" "###); let workspace_root = test_env.env_root().join("repo"); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root), "git");} #[test_case(false; "full")]#[test_case(true; "bare")]fn test_init_git_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); let (stdout, stderr) = test_env.jj_cmd_ok( test_env.env_root(), &[ "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Working copy now at: sqpuoqvx f6950fc1 (empty) (no description set) Parent commit : mwrttmos 8d698d4a my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "repo" "###); } let workspace_root = test_env.env_root().join("repo"); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root).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 let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "@-"]); insta::allow_duplicates! { insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); }} #[test]fn test_init_git_external_non_existent_directory() { let test_env = TestEnvironment::default(); let stderr = test_env.jj_cmd_failure( test_env.env_root(), &["init", "repo", "--git-repo", "non-existent"], ); insta::assert_snapshot!(strip_last_line(&stderr), @r###" Error: Failed to access the repository Caused by: 1: Cannot access $TEST_ENV/non-existent "###);} #[test]fn test_init_git_external_non_existent_git_directory() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["init", "repo", "--git-repo", "repo"]); insta::assert_snapshot!(&stderr, @r###" 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' "###); let jj_path = workspace_root.join(".jj"); assert!(!jj_path.exists());} #[test]fn test_init_git_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&workspace_root, false); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root) .replace('\\', "/") .ends_with("../../../.git")); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#);} #[test]fn test_init_git_colocated_gitlink() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); init_git_repo_with_opts( &git_repo_path, git2::RepositoryInitOptions::new().workdir_path(&workspace_root), ); assert!(workspace_root.join(".git").is_file()); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#);} #[cfg(unix)]#[test]fn test_init_git_colocated_symlink_directory() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&git_repo_path, false); std::fs::create_dir(&workspace_root).unwrap(); std::os::unix::fs::symlink(git_repo_path.join(".git"), workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#);} #[cfg(unix)]#[test]fn test_init_git_colocated_symlink_directory_without_bare_config() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo.git"); let workspace_root = test_env.env_root().join("repo"); // Set up git repo without core.bare set (as the "repo" tool would do.) // The core.bare config is deduced from the directory name. let git_repo = init_git_repo(&workspace_root, false); git_repo.config().unwrap().remove("core.bare").unwrap(); std::fs::rename(workspace_root.join(".git"), &git_repo_path).unwrap(); std::os::unix::fs::symlink(&git_repo_path, workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#);} #[cfg(unix)]#[test]fn test_init_git_colocated_symlink_gitlink() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_workdir_path>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let git_workdir_path = test_env.env_root().join("git-workdir"); let workspace_root = test_env.env_root().join("repo"); init_git_repo_with_opts( &git_repo_path, git2::RepositoryInitOptions::new().workdir_path(&git_workdir_path), ); assert!(git_workdir_path.join(".git").is_file()); std::fs::create_dir(&workspace_root).unwrap(); std::os::unix::fs::symlink(git_workdir_path.join(".git"), workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#);} #[test]fn test_init_git_colocated_imported_refs() { let test_env = TestEnvironment::default(); test_env.add_config("git.auto-local-bookmark = true"); // Set up remote refs test_env.jj_cmd_ok(test_env.env_root(), &["init", "remote", "--git"]); let remote_path = test_env.env_root().join("remote"); test_env.jj_cmd_ok( &remote_path, &["bookmark", "create", "local-remote", "remote-only"], ); test_env.jj_cmd_ok(&remote_path, &["new"]); test_env.jj_cmd_ok(&remote_path, &["git", "export"]); let remote_git_path = remote_path.join(PathBuf::from_iter([".jj", "repo", "store", "git"])); let set_up_local_repo = |local_path: &Path| { let git_repo = git2::Repository::clone(remote_git_path.to_str().unwrap(), local_path).unwrap(); let git_ref = git_repo .find_reference("refs/remotes/origin/local-remote") .unwrap(); git_repo .reference( "refs/heads/local-remote", git_ref.target().unwrap(), false, "", ) .unwrap(); }; // With git.auto-local-bookmark = true let local_path = test_env.env_root().join("local1"); set_up_local_repo(&local_path); let (_stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["init", "--git-repo=."]); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(get_bookmark_output(&test_env, &local_path), @r###" local-remote: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) @origin: vvkvtnvv 230dd059 (empty) (no description set) remote-only: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) @origin: vvkvtnvv 230dd059 (empty) (no description set) "###); // With git.auto-local-bookmark = false test_env.add_config("git.auto-local-bookmark = false"); let local_path = test_env.env_root().join("local2"); set_up_local_repo(&local_path); let (_stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["init", "--git-repo=."]); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Hint: The following remote bookmarks aren't associated with the existing local bookmarks: local-remote@origin Hint: Run `jj bookmark track local-remote@origin` to keep local bookmarks updated on future pulls. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(get_bookmark_output(&test_env, &local_path), @r###" local-remote: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) local-remote@origin: vvkvtnvv 230dd059 (empty) (no description set) remote-only@origin: vvkvtnvv 230dd059 (empty) (no description set) "###);} #[test]fn test_init_git_external_but_git_dir_exists() { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); git2::Repository::init(&git_repo_path).unwrap(); init_git_repo(&workspace_root, false); let (stdout, stderr) = test_env.jj_cmd_ok( &workspace_root, &["init", "--git-repo", git_repo_path.to_str().unwrap()], ); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); // The local ".git" repository is unrelated, so no commits should be imported let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" ◆ zzzzzzzz root() 00000000 "###); // Check that Git HEAD is not set because this isn't a colocated repo test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" ○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 │ (empty) (no description set) ~ "###);} #[test]fn test_init_git_internal_must_be_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&workspace_root, false); Lines 1–500 of 564. Load more
// Copyright 2020 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 test_case::test_case; use crate::common::strip_last_line; use crate::common::TestEnvironment; fn init_git_repo(git_repo_path: &Path, bare: bool) -> git2::Repository { init_git_repo_with_opts(git_repo_path, git2::RepositoryInitOptions::new().bare(bare)) } fn init_git_repo_with_opts( git_repo_path: &Path, opts: &git2::RepositoryInitOptions, ) -> git2::Repository { let git_repo = git2::Repository::init_opts(git_repo_path, opts).unwrap(); let git_blob_oid = git_repo.blob(b"some content").unwrap(); let mut git_tree_builder = git_repo.treebuilder(None).unwrap(); git_tree_builder .insert("some-file", git_blob_oid, 0o100644) .unwrap(); let git_tree_id = git_tree_builder.write().unwrap(); drop(git_tree_builder); let git_tree = git_repo.find_tree(git_tree_id).unwrap(); let git_signature = git2::Signature::new( "Git User", "git.user@example.com", &git2::Time::new(123, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/my-bookmark"), &git_signature, &git_signature, "My commit message", &git_tree, &[], ) .unwrap(); drop(git_tree); git_repo.set_head("refs/heads/my-bookmark").unwrap(); git_repo } fn get_bookmark_output(test_env: &TestEnvironment, repo_path: &Path) -> String { test_env.jj_cmd_success(repo_path, &["bookmark", "list", "--all-remotes"]) } fn read_git_target(workspace_root: &Path) -> String { let mut path = workspace_root.to_path_buf(); path.extend([".jj", "repo", "store", "git_target"]); std::fs::read_to_string(path).unwrap() } #[test] fn test_init_git_internal() { let test_env = TestEnvironment::default(); let (stdout, stderr) = test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "repo" "###); let workspace_root = test_env.env_root().join("repo"); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root), "git"); } #[test_case(false; "full")] #[test_case(true; "bare")] fn test_init_git_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); let (stdout, stderr) = test_env.jj_cmd_ok( test_env.env_root(), &[ "init", "repo", "--git-repo", git_repo_path.to_str().unwrap(), ], ); insta::allow_duplicates! { insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Working copy now at: sqpuoqvx f6950fc1 (empty) (no description set) Parent commit : mwrttmos 8d698d4a my-bookmark | My commit message Added 1 files, modified 0 files, removed 0 files Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "repo" "###); } let workspace_root = test_env.env_root().join("repo"); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root).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 let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "@-"]); insta::allow_duplicates! { insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); } } #[test] fn test_init_git_external_non_existent_directory() { let test_env = TestEnvironment::default(); let stderr = test_env.jj_cmd_failure( test_env.env_root(), &["init", "repo", "--git-repo", "non-existent"], ); insta::assert_snapshot!(strip_last_line(&stderr), @r###" Error: Failed to access the repository Caused by: 1: Cannot access $TEST_ENV/non-existent "###); } #[test] fn test_init_git_external_non_existent_git_directory() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["init", "repo", "--git-repo", "repo"]); insta::assert_snapshot!(&stderr, @r###" 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' "###); let jj_path = workspace_root.join(".jj"); assert!(!jj_path.exists()); } #[test] fn test_init_git_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&workspace_root, false); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); let jj_path = workspace_root.join(".jj"); let repo_path = jj_path.join("repo"); let store_path = repo_path.join("store"); assert!(workspace_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(&workspace_root) .replace('\\', "/") .ends_with("../../../.git")); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#); } #[test] fn test_init_git_colocated_gitlink() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); init_git_repo_with_opts( &git_repo_path, git2::RepositoryInitOptions::new().workdir_path(&workspace_root), ); assert!(workspace_root.join(".git").is_file()); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#); } #[cfg(unix)] #[test] fn test_init_git_colocated_symlink_directory() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&git_repo_path, false); std::fs::create_dir(&workspace_root).unwrap(); std::os::unix::fs::symlink(git_repo_path.join(".git"), workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#); } #[cfg(unix)] #[test] fn test_init_git_colocated_symlink_directory_without_bare_config() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo.git"); let workspace_root = test_env.env_root().join("repo"); // Set up git repo without core.bare set (as the "repo" tool would do.) // The core.bare config is deduced from the directory name. let git_repo = init_git_repo(&workspace_root, false); git_repo.config().unwrap().remove("core.bare").unwrap(); std::fs::rename(workspace_root.join(".git"), &git_repo_path).unwrap(); std::os::unix::fs::symlink(&git_repo_path, workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#); } #[cfg(unix)] #[test] fn test_init_git_colocated_symlink_gitlink() { let test_env = TestEnvironment::default(); // <workspace_root>/.git -> <git_workdir_path>/.git -> <git_repo_path> let git_repo_path = test_env.env_root().join("git-repo"); let git_workdir_path = test_env.env_root().join("git-workdir"); let workspace_root = test_env.env_root().join("repo"); init_git_repo_with_opts( &git_repo_path, git2::RepositoryInitOptions::new().workdir_path(&git_workdir_path), ); assert!(git_workdir_path.join(".git").is_file()); std::fs::create_dir(&workspace_root).unwrap(); std::os::unix::fs::symlink(git_workdir_path.join(".git"), workspace_root.join(".git")).unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["init", "--git-repo", "."]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(read_git_target(&workspace_root), @"../../../.git"); // Check that the Git repo's HEAD got checked out let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ mwrttmos git.user@example.com 1970-01-01 11:02:03 my-bookmark git_head() 8d698d4a │ My commit message ~ "#); // Check that the Git repo's HEAD moves test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r#" ○ sqpuoqvx test.user@example.com 2001-02-03 08:05:07 git_head() f61b77cd │ (no description set) ~ "#); } #[test] fn test_init_git_colocated_imported_refs() { let test_env = TestEnvironment::default(); test_env.add_config("git.auto-local-bookmark = true"); // Set up remote refs test_env.jj_cmd_ok(test_env.env_root(), &["init", "remote", "--git"]); let remote_path = test_env.env_root().join("remote"); test_env.jj_cmd_ok( &remote_path, &["bookmark", "create", "local-remote", "remote-only"], ); test_env.jj_cmd_ok(&remote_path, &["new"]); test_env.jj_cmd_ok(&remote_path, &["git", "export"]); let remote_git_path = remote_path.join(PathBuf::from_iter([".jj", "repo", "store", "git"])); let set_up_local_repo = |local_path: &Path| { let git_repo = git2::Repository::clone(remote_git_path.to_str().unwrap(), local_path).unwrap(); let git_ref = git_repo .find_reference("refs/remotes/origin/local-remote") .unwrap(); git_repo .reference( "refs/heads/local-remote", git_ref.target().unwrap(), false, "", ) .unwrap(); }; // With git.auto-local-bookmark = true let local_path = test_env.env_root().join("local1"); set_up_local_repo(&local_path); let (_stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["init", "--git-repo=."]); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(get_bookmark_output(&test_env, &local_path), @r###" local-remote: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) @origin: vvkvtnvv 230dd059 (empty) (no description set) remote-only: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) @origin: vvkvtnvv 230dd059 (empty) (no description set) "###); // With git.auto-local-bookmark = false test_env.add_config("git.auto-local-bookmark = false"); let local_path = test_env.env_root().join("local2"); set_up_local_repo(&local_path); let (_stdout, stderr) = test_env.jj_cmd_ok(&local_path, &["init", "--git-repo=."]); insta::assert_snapshot!(stderr, @r###" Done importing changes from the underlying Git repo. Hint: The following remote bookmarks aren't associated with the existing local bookmarks: local-remote@origin Hint: Run `jj bookmark track local-remote@origin` to keep local bookmarks updated on future pulls. Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); insta::assert_snapshot!(get_bookmark_output(&test_env, &local_path), @r###" local-remote: vvkvtnvv 230dd059 (empty) (no description set) @git: vvkvtnvv 230dd059 (empty) (no description set) local-remote@origin: vvkvtnvv 230dd059 (empty) (no description set) remote-only@origin: vvkvtnvv 230dd059 (empty) (no description set) "###); } #[test] fn test_init_git_external_but_git_dir_exists() { let test_env = TestEnvironment::default(); let git_repo_path = test_env.env_root().join("git-repo"); let workspace_root = test_env.env_root().join("repo"); git2::Repository::init(&git_repo_path).unwrap(); init_git_repo(&workspace_root, false); let (stdout, stderr) = test_env.jj_cmd_ok( &workspace_root, &["init", "--git-repo", git_repo_path.to_str().unwrap()], ); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Warning: `--git` and `--git-repo` are deprecated. Use `jj git init` instead Initialized repo in "." "###); // The local ".git" repository is unrelated, so no commits should be imported let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" ◆ zzzzzzzz root() 00000000 "###); // Check that Git HEAD is not set because this isn't a colocated repo test_env.jj_cmd_ok(&workspace_root, &["new"]); let stdout = test_env.jj_cmd_success(&workspace_root, &["log", "-r", "@-"]); insta::assert_snapshot!(stdout, @r###" ○ qpvuntsm test.user@example.com 2001-02-03 08:05:07 230dd059 │ (empty) (no description set) ~ "###); } #[test] fn test_init_git_internal_must_be_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); init_git_repo(&workspace_root, false);