// Copyright 2022 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 git2::Oid; use crate::common::TestEnvironment; #[test]fn test_git_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); // Create an initial commit in Git std::fs::write(workspace_root.join("file"), "contents").unwrap(); git_repo .index() .unwrap() .add_path(Path::new("file")) .unwrap(); let tree1_oid = git_repo.index().unwrap().write_tree().unwrap(); let tree1 = git_repo.find_tree(tree1_oid).unwrap(); let signature = git2::Signature::new( "Someone", "someone@example.com", &git2::Time::new(1234567890, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/master"), &signature, &signature, "initial", &tree1, &[], ) .unwrap(); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Import the repo test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 3e9369cd54227eb88455e1834dbc08aad6a16ac4 ○ e61b6729ff4292870702f2f72b2a60165679ef37 master git_head() initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Modify the working copy. The working-copy commit should changed, but the Git // HEAD commit should not std::fs::write(workspace_root.join("file"), "modified").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 4f546c80f30abc0803fb83e5032a4d49fede4d68 ○ e61b6729ff4292870702f2f72b2a60165679ef37 master git_head() initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Create a new change from jj and check that it's reflected in Git test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 0e2301a42b288b9568344e32cfdd8c76d1e56a83 ○ 4f546c80f30abc0803fb83e5032a4d49fede4d68 git_head() ○ e61b6729ff4292870702f2f72b2a60165679ef37 master initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().target().unwrap().to_string(), @"4f546c80f30abc0803fb83e5032a4d49fede4d68" );} #[test]fn test_git_colocated_unborn_bookmark() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); let add_file_to_index = |name: &str, data: &str| { std::fs::write(workspace_root.join(name), data).unwrap(); let mut index = git_repo.index().unwrap(); index.add_path(Path::new(name)).unwrap(); index.write().unwrap(); }; let checkout_index = || { let mut index = git_repo.index().unwrap(); index.read(true).unwrap(); // discard in-memory cache git_repo.checkout_index(Some(&mut index), None).unwrap(); }; // Initially, HEAD isn't set. test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); assert!(git_repo.head().is_err()); assert_eq!( git_repo.find_reference("HEAD").unwrap().symbolic_target(), Some("refs/heads/master") ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ◆ 0000000000000000000000000000000000000000 "###); // Stage some change, and check out root. This shouldn't clobber the HEAD. add_file_to_index("file0", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new", "root()"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: kkmpptxz fcdbbd73 (empty) (no description set) Parent commit : zzzzzzzz 00000000 (empty) (no description set) Added 0 files, modified 0 files, removed 1 files "###); assert!(git_repo.head().is_err()); assert_eq!( git_repo.find_reference("HEAD").unwrap().symbolic_target(), Some("refs/heads/master") ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ fcdbbd731496cae17161cd6be9b6cf1f759655a8 │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "###); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : kkmpptxz fcdbbd73 (empty) (no description set) Parent commit: zzzzzzzz 00000000 (empty) (no description set) "###); // Stage some change, and create new HEAD. This shouldn't move the default // bookmark. add_file_to_index("file1", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: royxmykx 0e146103 (empty) (no description set) Parent commit : kkmpptxz e3e01407 (no description set) "###); assert!(git_repo.head().unwrap().symbolic_target().is_none()); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e3e01407bd3539722ae4ffff077700d97c60cb11" ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 0e14610343ef50775f5c44db5aeef19aee45d9ad ○ e3e01407bd3539722ae4ffff077700d97c60cb11 git_head() │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "#); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : royxmykx 0e146103 (empty) (no description set) Parent commit: kkmpptxz e3e01407 (no description set) "###); // Assign the default bookmark. The bookmark is no longer "unborn". test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "-r@-", "master"]); // Stage some change, and check out root again. This should unset the HEAD. // https://github.com/martinvonz/jj/issues/1495 add_file_to_index("file2", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new", "root()"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: znkkpsqq 10dd328b (empty) (no description set) Parent commit : zzzzzzzz 00000000 (empty) (no description set) Added 0 files, modified 0 files, removed 2 files "###); assert!(git_repo.head().is_err()); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 10dd328bb906e15890e55047740eab2812a3b2f7 │ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6 │ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master ├─╯ │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "###); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : znkkpsqq 10dd328b (empty) (no description set) Parent commit: zzzzzzzz 00000000 (empty) (no description set) "###); // New snapshot and commit can be created after the HEAD got unset. std::fs::write(workspace_root.join("file3"), "").unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: wqnwkozp 101e2723 (empty) (no description set) Parent commit : znkkpsqq fc8af934 (no description set) "###); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 101e272377a9daff75358f10dbd078df922fe68c ○ fc8af9345b0830dcb14716e04cd2af26e2d19f63 git_head() │ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6 │ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master ├─╯ │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "#);} #[test]fn test_git_colocated_export_bookmarks_on_snapshot() { // Checks that we export bookmarks that were changed only because the working // copy was snapshotted let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Create bookmark pointing to the initial commit std::fs::write(workspace_root.join("file"), "initial").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "foo"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ b15ef4cdd277d2c63cce6d67c1916f53a36141f7 foo ◆ 0000000000000000000000000000000000000000 "###); // The bookmark gets updated when we modify the working copy, and it should get // exported to Git without requiring any other changes std::fs::write(workspace_root.join("file"), "modified").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf foo ◆ 0000000000000000000000000000000000000000 "###); insta::assert_snapshot!(git_repo .find_reference("refs/heads/foo") .unwrap() .target() .unwrap() .to_string(), @"4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf");} #[test]fn test_git_colocated_rebase_on_import() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Make some changes in jj and check that they're reflected in git std::fs::write(workspace_root.join("file"), "contents").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "add a file"]); std::fs::write(workspace_root.join("file"), "modified").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "master"]); test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "modify a file"]); // TODO: We shouldn't need this command here to trigger an import of the // refs/heads/master we just exported test_env.jj_cmd_ok(&workspace_root, &["st"]); // Move `master` backwards, which should result in commit2 getting hidden, // and the working-copy commit rebased. let commit2_oid = git_repo .find_branch("master", git2::BranchType::Local) .unwrap() .get() .target() .unwrap(); let commit2 = git_repo.find_commit(commit2_oid).unwrap(); let commit1 = commit2.parents().next().unwrap(); git_repo.branch("master", &commit1, true).unwrap(); let (stdout, stderr) = get_log_output_with_stderr(&test_env, &workspace_root); insta::assert_snapshot!(stdout, @r#" @ 15b1d70c5e33b5d2b18383292b85324d5153ffed ○ 47fe984daf66f7bf3ebf31b9cb3513c995afb857 master git_head() add a file ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(stderr, @r###" Abandoned 1 commits that are no longer reachable. Rebased 1 descendant commits off of commits rewritten from git Working copy now at: zsuskuln 15b1d70c (empty) (no description set) Parent commit : qpvuntsm 47fe984d master | add a file Added 0 files, modified 1 files, removed 0 files Done importing changes from the underlying Git repo. "###);} #[test]fn test_git_colocated_bookmarks() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "foo"]); test_env.jj_cmd_ok(&workspace_root, &["new", "@-", "-m", "bar"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 3560559274ab431feea00b7b7e0b9250ecce951f bar │ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda foo ├─╯ ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); // Create a bookmark in jj. It should be exported to Git even though it points // to the working- copy commit. test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "master"]); insta::assert_snapshot!( git_repo.find_reference("refs/heads/master").unwrap().target().unwrap().to_string(), @"3560559274ab431feea00b7b7e0b9250ecce951f" ); insta::assert_snapshot!( git_repo.head().unwrap().target().unwrap().to_string(), @"230dd059e1b059aefc0da06a2e5a7dbf22362f22" ); // Update the bookmark in Git let target_id = test_env.jj_cmd_success( &workspace_root, &["log", "--no-graph", "-T=commit_id", "-r=description(foo)"], ); git_repo .reference( "refs/heads/master", Oid::from_str(&target_id).unwrap(), true, "test", ) .unwrap(); let (stdout, stderr) = get_log_output_with_stderr(&test_env, &workspace_root); insta::assert_snapshot!(stdout, @r#" @ 096dc80da67094fbaa6683e2a205dddffa31f9a8 │ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda master foo ├─╯ ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(stderr, @r###" Abandoned 1 commits that are no longer reachable. Working copy now at: yqosqzyt 096dc80d (empty) (no description set) Parent commit : qpvuntsm 230dd059 (empty) (no description set) Done importing changes from the underlying Git repo. "###);} #[test]fn test_git_colocated_bookmark_forget() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let _git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["new"]); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "foo"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 65b6b74e08973b88d38404430f119c8c79465250 foo ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(get_bookmark_output(&test_env, &workspace_root), @r###" foo: rlvkpnrz 65b6b74e (empty) (no description set) @git: rlvkpnrz 65b6b74e (empty) (no description set) "###); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["bookmark", "forget", "foo"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Forgot 1 bookmarks. "###); // A forgotten bookmark is deleted in the git repo. For a detailed demo // explaining this, see `test_bookmark_forget_export` in // `test_bookmark_command.rs`. insta::assert_snapshot!(get_bookmark_output(&test_env, &workspace_root), @"");} #[test]fn test_git_colocated_bookmark_at_root() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "--colocate", "repo"]); let repo_path = test_env.env_root().join("repo"); let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "foo", "-r=root()"]); insta::assert_snapshot!(stderr, @r###" Created 1 bookmarks pointing to zzzzzzzz 00000000 foo | (empty) (no description set) Warning: Failed to export some bookmarks: foo: Ref cannot point to the root commit in Git "###); let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["bookmark", "move", "foo"]); insta::assert_snapshot!(stderr, @r###" Moved 1 bookmarks to qpvuntsm 230dd059 foo | (empty) (no description set) "###); let (_stdout, stderr) = test_env.jj_cmd_ok( &repo_path, &[ "bookmark", "move", "foo", "--allow-backwards", "--to=root()", ], ); insta::assert_snapshot!(stderr, @r###" Moved 1 bookmarks to zzzzzzzz 00000000 foo* | (empty) (no description set) Warning: Failed to export some bookmarks: foo: Ref cannot point to the root commit in Git "###);} #[test]fn test_git_colocated_conflicting_git_refs() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "main"]); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "main/sub"]); insta::assert_snapshot!(stdout, @""); insta::with_settings!({filters => vec![("Failed to set: .*", "Failed to set: ...")]}, { insta::assert_snapshot!(stderr, @r###" Created 1 bookmarks pointing to qpvuntsm 230dd059 main main/sub | (empty) (no description set) Warning: Failed to export some bookmarks: main/sub: Failed to set: ... Hint: Git doesn't allow a branch name that looks like a parent directory of another (e.g. `foo` and `foo/bar`). Try to rename the bookmarks that failed to export or their "parent" bookmarks. "###); });} #[test]fn test_git_colocated_checkout_non_empty_working_copy() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Create an initial commit in Git // We use this to set HEAD to master std::fs::write(workspace_root.join("file"), "contents").unwrap(); git_repo .index() .unwrap() .add_path(Path::new("file")) .unwrap(); let tree1_oid = git_repo.index().unwrap().write_tree().unwrap(); let tree1 = git_repo.find_tree(tree1_oid).unwrap(); let signature = git2::Signature::new( "Someone", "someone@example.com", &git2::Time::new(1234567890, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/master"), &signature, &signature, "initial", &tree1, &[], ) .unwrap(); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); std::fs::write(workspace_root.join("two"), "y").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "two"]); test_env.jj_cmd_ok(&workspace_root, &["new", "@-"]); let (_, stderr) = test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "new"]); insta::assert_snapshot!(stderr, @r###" Working copy now at: kkmpptxz 149cc31c (empty) new Parent commit : lnksqltp e61b6729 master | initial "###);Lines 1–500 of 1037. Load more
// Copyright 2022 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 git2::Oid; use crate::common::TestEnvironment; #[test] fn test_git_colocated() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); // Create an initial commit in Git std::fs::write(workspace_root.join("file"), "contents").unwrap(); git_repo .index() .unwrap() .add_path(Path::new("file")) .unwrap(); let tree1_oid = git_repo.index().unwrap().write_tree().unwrap(); let tree1 = git_repo.find_tree(tree1_oid).unwrap(); let signature = git2::Signature::new( "Someone", "someone@example.com", &git2::Time::new(1234567890, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/master"), &signature, &signature, "initial", &tree1, &[], ) .unwrap(); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Import the repo test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 3e9369cd54227eb88455e1834dbc08aad6a16ac4 ○ e61b6729ff4292870702f2f72b2a60165679ef37 master git_head() initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Modify the working copy. The working-copy commit should changed, but the Git // HEAD commit should not std::fs::write(workspace_root.join("file"), "modified").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 4f546c80f30abc0803fb83e5032a4d49fede4d68 ○ e61b6729ff4292870702f2f72b2a60165679ef37 master git_head() initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); // Create a new change from jj and check that it's reflected in Git test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 0e2301a42b288b9568344e32cfdd8c76d1e56a83 ○ 4f546c80f30abc0803fb83e5032a4d49fede4d68 git_head() ○ e61b6729ff4292870702f2f72b2a60165679ef37 master initial ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!( git_repo.head().unwrap().target().unwrap().to_string(), @"4f546c80f30abc0803fb83e5032a4d49fede4d68" ); } #[test] fn test_git_colocated_unborn_bookmark() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); let add_file_to_index = |name: &str, data: &str| { std::fs::write(workspace_root.join(name), data).unwrap(); let mut index = git_repo.index().unwrap(); index.add_path(Path::new(name)).unwrap(); index.write().unwrap(); }; let checkout_index = || { let mut index = git_repo.index().unwrap(); index.read(true).unwrap(); // discard in-memory cache git_repo.checkout_index(Some(&mut index), None).unwrap(); }; // Initially, HEAD isn't set. test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); assert!(git_repo.head().is_err()); assert_eq!( git_repo.find_reference("HEAD").unwrap().symbolic_target(), Some("refs/heads/master") ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 ◆ 0000000000000000000000000000000000000000 "###); // Stage some change, and check out root. This shouldn't clobber the HEAD. add_file_to_index("file0", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new", "root()"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: kkmpptxz fcdbbd73 (empty) (no description set) Parent commit : zzzzzzzz 00000000 (empty) (no description set) Added 0 files, modified 0 files, removed 1 files "###); assert!(git_repo.head().is_err()); assert_eq!( git_repo.find_reference("HEAD").unwrap().symbolic_target(), Some("refs/heads/master") ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ fcdbbd731496cae17161cd6be9b6cf1f759655a8 │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "###); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : kkmpptxz fcdbbd73 (empty) (no description set) Parent commit: zzzzzzzz 00000000 (empty) (no description set) "###); // Stage some change, and create new HEAD. This shouldn't move the default // bookmark. add_file_to_index("file1", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: royxmykx 0e146103 (empty) (no description set) Parent commit : kkmpptxz e3e01407 (no description set) "###); assert!(git_repo.head().unwrap().symbolic_target().is_none()); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e3e01407bd3539722ae4ffff077700d97c60cb11" ); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 0e14610343ef50775f5c44db5aeef19aee45d9ad ○ e3e01407bd3539722ae4ffff077700d97c60cb11 git_head() │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "#); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : royxmykx 0e146103 (empty) (no description set) Parent commit: kkmpptxz e3e01407 (no description set) "###); // Assign the default bookmark. The bookmark is no longer "unborn". test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "-r@-", "master"]); // Stage some change, and check out root again. This should unset the HEAD. // https://github.com/martinvonz/jj/issues/1495 add_file_to_index("file2", ""); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new", "root()"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: znkkpsqq 10dd328b (empty) (no description set) Parent commit : zzzzzzzz 00000000 (empty) (no description set) Added 0 files, modified 0 files, removed 2 files "###); assert!(git_repo.head().is_err()); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 10dd328bb906e15890e55047740eab2812a3b2f7 │ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6 │ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master ├─╯ │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "###); // Staged change shouldn't persist. checkout_index(); insta::assert_snapshot!(test_env.jj_cmd_success(&workspace_root, &["status"]), @r###" The working copy is clean Working copy : znkkpsqq 10dd328b (empty) (no description set) Parent commit: zzzzzzzz 00000000 (empty) (no description set) "###); // New snapshot and commit can be created after the HEAD got unset. std::fs::write(workspace_root.join("file3"), "").unwrap(); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["new"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Working copy now at: wqnwkozp 101e2723 (empty) (no description set) Parent commit : znkkpsqq fc8af934 (no description set) "###); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 101e272377a9daff75358f10dbd078df922fe68c ○ fc8af9345b0830dcb14716e04cd2af26e2d19f63 git_head() │ ○ ef75c0b0dcc9b080e00226908c21316acaa84dc6 │ ○ e3e01407bd3539722ae4ffff077700d97c60cb11 master ├─╯ │ ○ 993600f1189571af5bbeb492cf657dc7d0fde48a ├─╯ ◆ 0000000000000000000000000000000000000000 "#); } #[test] fn test_git_colocated_export_bookmarks_on_snapshot() { // Checks that we export bookmarks that were changed only because the working // copy was snapshotted let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Create bookmark pointing to the initial commit std::fs::write(workspace_root.join("file"), "initial").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "foo"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ b15ef4cdd277d2c63cce6d67c1916f53a36141f7 foo ◆ 0000000000000000000000000000000000000000 "###); // The bookmark gets updated when we modify the working copy, and it should get // exported to Git without requiring any other changes std::fs::write(workspace_root.join("file"), "modified").unwrap(); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r###" @ 4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf foo ◆ 0000000000000000000000000000000000000000 "###); insta::assert_snapshot!(git_repo .find_reference("refs/heads/foo") .unwrap() .target() .unwrap() .to_string(), @"4d2c49a8f8e2f1ba61f48ba79e5f4a5faa6512cf"); } #[test] fn test_git_colocated_rebase_on_import() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Make some changes in jj and check that they're reflected in git std::fs::write(workspace_root.join("file"), "contents").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "add a file"]); std::fs::write(workspace_root.join("file"), "modified").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "master"]); test_env.jj_cmd_ok(&workspace_root, &["commit", "-m", "modify a file"]); // TODO: We shouldn't need this command here to trigger an import of the // refs/heads/master we just exported test_env.jj_cmd_ok(&workspace_root, &["st"]); // Move `master` backwards, which should result in commit2 getting hidden, // and the working-copy commit rebased. let commit2_oid = git_repo .find_branch("master", git2::BranchType::Local) .unwrap() .get() .target() .unwrap(); let commit2 = git_repo.find_commit(commit2_oid).unwrap(); let commit1 = commit2.parents().next().unwrap(); git_repo.branch("master", &commit1, true).unwrap(); let (stdout, stderr) = get_log_output_with_stderr(&test_env, &workspace_root); insta::assert_snapshot!(stdout, @r#" @ 15b1d70c5e33b5d2b18383292b85324d5153ffed ○ 47fe984daf66f7bf3ebf31b9cb3513c995afb857 master git_head() add a file ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(stderr, @r###" Abandoned 1 commits that are no longer reachable. Rebased 1 descendant commits off of commits rewritten from git Working copy now at: zsuskuln 15b1d70c (empty) (no description set) Parent commit : qpvuntsm 47fe984d master | add a file Added 0 files, modified 1 files, removed 0 files Done importing changes from the underlying Git repo. "###); } #[test] fn test_git_colocated_bookmarks() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["new", "-m", "foo"]); test_env.jj_cmd_ok(&workspace_root, &["new", "@-", "-m", "bar"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 3560559274ab431feea00b7b7e0b9250ecce951f bar │ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda foo ├─╯ ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); // Create a bookmark in jj. It should be exported to Git even though it points // to the working- copy commit. test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "master"]); insta::assert_snapshot!( git_repo.find_reference("refs/heads/master").unwrap().target().unwrap().to_string(), @"3560559274ab431feea00b7b7e0b9250ecce951f" ); insta::assert_snapshot!( git_repo.head().unwrap().target().unwrap().to_string(), @"230dd059e1b059aefc0da06a2e5a7dbf22362f22" ); // Update the bookmark in Git let target_id = test_env.jj_cmd_success( &workspace_root, &["log", "--no-graph", "-T=commit_id", "-r=description(foo)"], ); git_repo .reference( "refs/heads/master", Oid::from_str(&target_id).unwrap(), true, "test", ) .unwrap(); let (stdout, stderr) = get_log_output_with_stderr(&test_env, &workspace_root); insta::assert_snapshot!(stdout, @r#" @ 096dc80da67094fbaa6683e2a205dddffa31f9a8 │ ○ 1e6f0b403ed2ff9713b5d6b1dc601e4804250cda master foo ├─╯ ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(stderr, @r###" Abandoned 1 commits that are no longer reachable. Working copy now at: yqosqzyt 096dc80d (empty) (no description set) Parent commit : qpvuntsm 230dd059 (empty) (no description set) Done importing changes from the underlying Git repo. "###); } #[test] fn test_git_colocated_bookmark_forget() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let _git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["new"]); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "foo"]); insta::assert_snapshot!(get_log_output(&test_env, &workspace_root), @r#" @ 65b6b74e08973b88d38404430f119c8c79465250 foo ○ 230dd059e1b059aefc0da06a2e5a7dbf22362f22 git_head() ◆ 0000000000000000000000000000000000000000 "#); insta::assert_snapshot!(get_bookmark_output(&test_env, &workspace_root), @r###" foo: rlvkpnrz 65b6b74e (empty) (no description set) @git: rlvkpnrz 65b6b74e (empty) (no description set) "###); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["bookmark", "forget", "foo"]); insta::assert_snapshot!(stdout, @""); insta::assert_snapshot!(stderr, @r###" Forgot 1 bookmarks. "###); // A forgotten bookmark is deleted in the git repo. For a detailed demo // explaining this, see `test_bookmark_forget_export` in // `test_bookmark_command.rs`. insta::assert_snapshot!(get_bookmark_output(&test_env, &workspace_root), @""); } #[test] fn test_git_colocated_bookmark_at_root() { let test_env = TestEnvironment::default(); test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "--colocate", "repo"]); let repo_path = test_env.env_root().join("repo"); let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["bookmark", "create", "foo", "-r=root()"]); insta::assert_snapshot!(stderr, @r###" Created 1 bookmarks pointing to zzzzzzzz 00000000 foo | (empty) (no description set) Warning: Failed to export some bookmarks: foo: Ref cannot point to the root commit in Git "###); let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["bookmark", "move", "foo"]); insta::assert_snapshot!(stderr, @r###" Moved 1 bookmarks to qpvuntsm 230dd059 foo | (empty) (no description set) "###); let (_stdout, stderr) = test_env.jj_cmd_ok( &repo_path, &[ "bookmark", "move", "foo", "--allow-backwards", "--to=root()", ], ); insta::assert_snapshot!(stderr, @r###" Moved 1 bookmarks to zzzzzzzz 00000000 foo* | (empty) (no description set) Warning: Failed to export some bookmarks: foo: Ref cannot point to the root commit in Git "###); } #[test] fn test_git_colocated_conflicting_git_refs() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "main"]); let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_root, &["bookmark", "create", "main/sub"]); insta::assert_snapshot!(stdout, @""); insta::with_settings!({filters => vec![("Failed to set: .*", "Failed to set: ...")]}, { insta::assert_snapshot!(stderr, @r###" Created 1 bookmarks pointing to qpvuntsm 230dd059 main main/sub | (empty) (no description set) Warning: Failed to export some bookmarks: main/sub: Failed to set: ... Hint: Git doesn't allow a branch name that looks like a parent directory of another (e.g. `foo` and `foo/bar`). Try to rename the bookmarks that failed to export or their "parent" bookmarks. "###); }); } #[test] fn test_git_colocated_checkout_non_empty_working_copy() { let test_env = TestEnvironment::default(); let workspace_root = test_env.env_root().join("repo"); let git_repo = git2::Repository::init(&workspace_root).unwrap(); test_env.jj_cmd_ok(&workspace_root, &["git", "init", "--git-repo", "."]); // Create an initial commit in Git // We use this to set HEAD to master std::fs::write(workspace_root.join("file"), "contents").unwrap(); git_repo .index() .unwrap() .add_path(Path::new("file")) .unwrap(); let tree1_oid = git_repo.index().unwrap().write_tree().unwrap(); let tree1 = git_repo.find_tree(tree1_oid).unwrap(); let signature = git2::Signature::new( "Someone", "someone@example.com", &git2::Time::new(1234567890, 60), ) .unwrap(); git_repo .commit( Some("refs/heads/master"), &signature, &signature, "initial", &tree1, &[], ) .unwrap(); insta::assert_snapshot!( git_repo.head().unwrap().peel_to_commit().unwrap().id().to_string(), @"e61b6729ff4292870702f2f72b2a60165679ef37" ); std::fs::write(workspace_root.join("two"), "y").unwrap(); test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "two"]); test_env.jj_cmd_ok(&workspace_root, &["new", "@-"]); let (_, stderr) = test_env.jj_cmd_ok(&workspace_root, &["describe", "-m", "new"]); insta::assert_snapshot!(stderr, @r###" Working copy now at: kkmpptxz 149cc31c (empty) new Parent commit : lnksqltp e61b6729 master | initial "###);