// 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::collections::BTreeMap; use std::collections::HashSet; use std::fs; use std::io::Write as _; use std::iter; use std::path::Path; use std::path::PathBuf; use std::sync::mpsc; use std::sync::Arc; use std::sync::Barrier; use std::thread; use assert_matches::assert_matches; use itertools::Itertools as _; use jj_lib::backend::BackendError; use jj_lib::backend::ChangeId; use jj_lib::backend::CommitId; use jj_lib::backend::MergedTreeId; use jj_lib::backend::MillisSinceEpoch; use jj_lib::backend::Signature; use jj_lib::backend::Timestamp; use jj_lib::backend::TreeValue; use jj_lib::commit::Commit; use jj_lib::commit_builder::CommitBuilder; use jj_lib::git; use jj_lib::git::FailedRefExportReason; use jj_lib::git::GitBranchPushTargets; use jj_lib::git::GitFetch; use jj_lib::git::GitFetchError; use jj_lib::git::GitImportError; use jj_lib::git::GitPushError; use jj_lib::git::GitPushStats; use jj_lib::git::GitRefKind; use jj_lib::git::GitRefUpdate; use jj_lib::git::GitResetHeadError; use jj_lib::git_backend::GitBackend; use jj_lib::object_id::ObjectId as _; use jj_lib::op_store::BookmarkTarget; use jj_lib::op_store::RefTarget; use jj_lib::op_store::RemoteRef; use jj_lib::op_store::RemoteRefState; use jj_lib::ref_name::GitRefNameBuf; use jj_lib::ref_name::RefName; use jj_lib::ref_name::RefNameBuf; use jj_lib::ref_name::RemoteName; use jj_lib::ref_name::RemoteRefSymbol; use jj_lib::refs::BookmarkPushUpdate; use jj_lib::repo::MutableRepo; use jj_lib::repo::ReadonlyRepo; use jj_lib::repo::Repo as _; use jj_lib::repo_path::RepoPath; use jj_lib::repo_path::RepoPathBuf; use jj_lib::settings::GitSettings; use jj_lib::settings::UserSettings; use jj_lib::signing::Signer; use jj_lib::str_util::StringPattern; use jj_lib::tree_builder::TreeBuilder; use jj_lib::workspace::Workspace; use maplit::btreemap; use maplit::hashset; use tempfile::TempDir; use test_case::test_case; use testutils::commit_transactions; use testutils::create_random_commit; use testutils::write_random_commit; use testutils::CommitGraphBuilder; use testutils::TestRepo; use testutils::TestRepoBackend; /// Describes successful `fetch()` result. #[derive(Clone, Debug, Eq, PartialEq, Default)] struct GitFetchStats { /// Remote's default branch. pub default_branch: Option, /// Changes made by the import. pub import_stats: git::GitImportStats, } fn empty_git_commit( git_repo: &gix::Repository, ref_name: &str, parents: &[gix::ObjectId], ) -> gix::ObjectId { let empty_tree_id = git_repo.empty_tree().id().detach(); testutils::git::write_commit( git_repo, ref_name, empty_tree_id, &format!("random commit {}", rand::random::()), parents, ) } fn jj_id(id: gix::ObjectId) -> CommitId { CommitId::from_bytes(id.as_bytes()) } fn git_id(commit: &Commit) -> gix::ObjectId { gix::ObjectId::from_bytes_or_panic(commit.id().as_bytes()) } fn remote_symbol<'a, N, M>(name: &'a N, remote: &'a M) -> RemoteRefSymbol<'a> where N: AsRef + ?Sized, M: AsRef + ?Sized, { RemoteRefSymbol { name: name.as_ref(), remote: remote.as_ref(), } } fn get_git_backend(repo: &Arc) -> &GitBackend { repo.store() .backend_impl() .downcast_ref::() .unwrap() } fn get_git_repo(repo: &Arc) -> gix::Repository { get_git_backend(repo).git_repo() } fn get_git_settings(subprocess: bool) -> GitSettings { #[cfg(not(feature = "git2"))] assert!(subprocess); GitSettings { #[cfg(feature = "git2")] subprocess, ..Default::default() } } fn git_fetch( mut_repo: &mut MutableRepo, remote_name: &RemoteName, branch_names: &[StringPattern], git_settings: &GitSettings, ) -> Result { let mut git_fetch = GitFetch::new(mut_repo, git_settings).unwrap(); git_fetch.fetch( remote_name, branch_names, git::RemoteCallbacks::default(), None, )?; let default_branch = git_fetch.get_default_branch(remote_name, git::RemoteCallbacks::default())?; let import_stats = git_fetch.import_refs().unwrap(); let stats = GitFetchStats { default_branch, import_stats, }; Ok(stats) } fn push_status_rejected_references(push_stats: GitPushStats) -> Vec { assert!(push_stats.pushed.is_empty()); assert!(push_stats.remote_rejected.is_empty()); push_stats .rejected .into_iter() .map(|(reference, _)| reference) .collect() } #[test] fn test_import_refs() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); git_ref(&git_repo, "refs/remotes/origin/main", commit1); let commit2 = empty_git_commit(&git_repo, "refs/heads/main", &[commit1]); let commit3 = empty_git_commit(&git_repo, "refs/heads/feature1", &[commit2]); let commit4 = empty_git_commit(&git_repo, "refs/heads/feature2", &[commit2]); let commit5 = empty_git_commit(&git_repo, "refs/tags/v1.0", &[commit1]); let commit6 = empty_git_commit(&git_repo, "refs/remotes/origin/feature3", &[commit1]); // Should not be imported empty_git_commit(&git_repo, "refs/notes/x", &[commit2]); empty_git_commit(&git_repo, "refs/remotes/origin/HEAD", &[commit2]); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/main"); let mut tx = repo.start_transaction(); git::import_head(tx.repo_mut()).unwrap(); let stats = git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert!(stats.abandoned_commits.is_empty()); let expected_heads = hashset! { jj_id(commit3), jj_id(commit4), jj_id(commit5), jj_id(commit6), }; assert_eq!(*view.heads(), expected_heads); assert_eq!(view.bookmarks().count(), 4); assert_eq!( view.get_local_bookmark("main".as_ref()), &RefTarget::normal(jj_id(commit2)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("main", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit2)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit1)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_local_bookmark("feature1".as_ref()), &RefTarget::normal(jj_id(commit3)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature1", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit3)), state: RemoteRefState::Tracked, }, ); assert!(view .get_remote_bookmark(remote_symbol("feature1", "origin")) .is_absent()); assert_eq!( view.get_local_bookmark("feature2".as_ref()), &RefTarget::normal(jj_id(commit4)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature2", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit4)), state: RemoteRefState::Tracked, }, ); assert!(view .get_remote_bookmark(remote_symbol("feature2", "origin")) .is_absent()); assert_eq!( view.get_local_bookmark("feature3".as_ref()), &RefTarget::normal(jj_id(commit6)) ); assert!(view .get_remote_bookmark(remote_symbol("feature3", "git")) .is_absent()); assert_eq!( view.get_remote_bookmark(remote_symbol("feature3", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit6)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_tag("v1.0".as_ref()), &RefTarget::normal(jj_id(commit5)) ); assert_eq!(view.git_refs().len(), 6); assert_eq!( view.get_git_ref("refs/heads/main".as_ref()), &RefTarget::normal(jj_id(commit2)) ); assert_eq!( view.get_git_ref("refs/heads/feature1".as_ref()), &RefTarget::normal(jj_id(commit3)) ); assert_eq!( view.get_git_ref("refs/heads/feature2".as_ref()), &RefTarget::normal(jj_id(commit4)) ); assert_eq!( view.get_git_ref("refs/remotes/origin/main".as_ref()), &RefTarget::normal(jj_id(commit1)) ); assert_eq!( view.get_git_ref("refs/remotes/origin/feature3".as_ref()), &RefTarget::normal(jj_id(commit6)) ); assert_eq!( view.get_git_ref("refs/tags/v1.0".as_ref()), &RefTarget::normal(jj_id(commit5)) ); assert_eq!(view.git_head(), &RefTarget::normal(jj_id(commit2))); } #[test] fn test_import_refs_reimport() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); git_ref(&git_repo, "refs/remotes/origin/main", commit1); let commit2 = empty_git_commit(&git_repo, "refs/heads/main", &[commit1]); let commit3 = empty_git_commit(&git_repo, "refs/heads/feature1", &[commit2]); let commit4 = empty_git_commit(&git_repo, "refs/heads/feature2", &[commit2]); let pgp_key_oid = git_repo.write_blob(b"my PGP key").unwrap().detach(); git_repo .reference( "refs/tags/my-gpg-key", pgp_key_oid, gix::refs::transaction::PreviousValue::MustNotExist, "", ) .unwrap(); let mut tx = repo.start_transaction(); let stats = git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); assert!(stats.abandoned_commits.is_empty()); let expected_heads = hashset! { jj_id(commit3), jj_id(commit4), }; let view = repo.view(); assert_eq!(*view.heads(), expected_heads); // Delete feature1 and rewrite feature2 delete_git_ref(&git_repo, "refs/heads/feature1"); delete_git_ref(&git_repo, "refs/heads/feature2"); let commit5 = empty_git_commit(&git_repo, "refs/heads/feature2", &[commit2]); // Also modify feature2 on the jj side let mut tx = repo.start_transaction(); let commit6 = create_random_commit(tx.repo_mut()) .set_parents(vec![jj_id(commit2)]) .write() .unwrap(); tx.repo_mut() .set_local_bookmark_target("feature2".as_ref(), RefTarget::normal(commit6.id().clone())); let repo = tx.commit("test").unwrap(); let mut tx = repo.start_transaction(); let stats = git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); assert_eq!( // The order is unstable just because we import heads from Git repo. HashSet::from_iter(stats.abandoned_commits), hashset! { jj_id(commit4), jj_id(commit3), }, ); let view = repo.view(); let expected_heads = hashset! { jj_id(commit5), commit6.id().clone(), }; assert_eq!(*view.heads(), expected_heads); assert_eq!(view.bookmarks().count(), 2); let commit1_target = RefTarget::normal(jj_id(commit1)); let commit2_target = RefTarget::normal(jj_id(commit2)); assert_eq!( view.get_local_bookmark("main".as_ref()), &RefTarget::normal(jj_id(commit2)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("main", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit2)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: commit1_target.clone(), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_local_bookmark("feature2".as_ref()), &RefTarget::from_legacy_form([jj_id(commit4)], [commit6.id().clone(), jj_id(commit5)]) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature2", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit5)), state: RemoteRefState::Tracked, }, ); assert!(view .get_remote_bookmark(remote_symbol("feature2", "origin")) .is_absent()); assert!(view.tags().is_empty()); assert_eq!(view.git_refs().len(), 3); assert_eq!( view.get_git_ref("refs/heads/main".as_ref()), &commit2_target ); assert_eq!( view.get_git_ref("refs/remotes/origin/main".as_ref()), &commit1_target ); let commit5_target = RefTarget::normal(jj_id(commit5)); assert_eq!( view.get_git_ref("refs/heads/feature2".as_ref()), &commit5_target ); } #[test] fn test_import_refs_reimport_head_removed() { // Test that re-importing refs doesn't cause a deleted head to come back let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let commit_id = jj_id(commit); // Test the setup assert!(tx.repo().view().heads().contains(&commit_id)); // Remove the head and re-import tx.repo_mut().remove_head(&commit_id); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(!tx.repo().view().heads().contains(&commit_id)); } #[test] fn test_import_refs_reimport_git_head_does_not_count() { // Test that if a bookmark is removed, the corresponding commit is abandoned // no matter if the Git HEAD points to the commit (or a descendant of it.) let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); testutils::git::set_head_to_id(&git_repo, commit); let mut tx = repo.start_transaction(); git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); // Delete the bookmark and re-import. The commit should still be there since // HEAD points to it git_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(!tx.repo().view().heads().contains(&jj_id(commit))); } #[test] fn test_import_refs_reimport_git_head_without_ref() { // Simulate external `git checkout` in colocated repo, from anonymous bookmark. let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); // First, HEAD points to commit1. let mut tx = repo.start_transaction(); let commit1 = write_random_commit(tx.repo_mut()); let commit2 = write_random_commit(tx.repo_mut()); testutils::git::set_head_to_id(&git_repo, git_id(&commit1)); // Import HEAD. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); // Move HEAD to commit2 (by e.g. `git checkout` command) testutils::git::set_head_to_id(&git_repo, git_id(&commit2)); // Reimport HEAD, which doesn't abandon the old HEAD branch because jj thinks it // would be moved by `git checkout` command. This isn't always true because the // detached HEAD commit could be rewritten by e.g. `git commit --amend` command, // but it should be safer than abandoning old checkout branch. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); } #[test] fn test_import_refs_reimport_git_head_with_moved_ref() { // Simulate external history rewriting in colocated repo. let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); // First, both HEAD and main point to commit1. let mut tx = repo.start_transaction(); let commit1 = write_random_commit(tx.repo_mut()); let commit2 = write_random_commit(tx.repo_mut()); git_repo .reference( "refs/heads/main", git_id(&commit1), gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); testutils::git::set_head_to_id(&git_repo, git_id(&commit1)); // Import HEAD and main. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); // Move both HEAD and main to commit2 (by e.g. `git commit --amend` command) git_repo .reference( "refs/heads/main", git_id(&commit2), gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); testutils::git::set_head_to_id(&git_repo, git_id(&commit2)); // Reimport HEAD and main, which abandons the old main branch. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(!tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); // Reimport HEAD and main, which abandons the old main bookmark. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(!tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); } #[test] fn test_import_refs_reimport_with_deleted_remote_ref() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); let commit_base = empty_git_commit(&git_repo, "refs/heads/main", &[]); let commit_main = empty_git_commit(&git_repo, "refs/heads/main", &[commit_base]); let commit_remote_only = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-only", &[commit_base], ); let commit_remote_and_local = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-and-local", &[commit_base], ); git_ref( &git_repo, "refs/heads/feature-remote-and-local", commit_remote_and_local, ); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let expected_heads = hashset! { jj_id(commit_main), jj_id(commit_remote_only), jj_id(commit_remote_and_local), }; let view = repo.view(); assert_eq!(*view.heads(), expected_heads); assert_eq!(view.bookmarks().count(), 3); // Even though the git repo does not have a local bookmark for // `feature-remote-only`, jj creates one. This follows the model explained // in docs/bookmarks.md. assert_eq!( view.get_local_bookmark("feature-remote-only".as_ref()), &RefTarget::normal(jj_id(commit_remote_only)) ); assert!(view .get_remote_bookmark(remote_symbol("feature-remote-only", "git")) .is_absent()); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-only", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_only)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_local_bookmark("feature-remote-and-local".as_ref()), &RefTarget::normal(jj_id(commit_remote_and_local)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert!(view.get_local_bookmark("main".as_ref()).is_present()); // bookmark #3 of 3 // Simulate fetching from a remote where feature-remote-only and // feature-remote-and-local bookmarks were deleted. This leads to the // following import deleting the corresponding local bookmarks. delete_git_ref(&git_repo, "refs/remotes/origin/feature-remote-only"); delete_git_ref(&git_repo, "refs/remotes/origin/feature-remote-and-local"); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); // The local bookmarks were indeed deleted assert_eq!(view.bookmarks().count(), 2); assert!(view.get_local_bookmark("main".as_ref()).is_present()); assert!(view .get_local_bookmark("feature-remote-only".as_ref()) .is_absent()); assert!(view .get_remote_bookmark(remote_symbol("feature-remote-only", "origin")) .is_absent()); assert!(view .get_local_bookmark("feature-remote-and-local".as_ref()) .is_absent()); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert!(view .get_remote_bookmark(remote_symbol("feature-remote-and-local", "origin")) .is_absent()); let expected_heads = hashset! { jj_id(commit_main), // Neither commit_remote_only nor commit_remote_and_local should be // listed as a head. commit_remote_only was never affected by #864, // but commit_remote_and_local was. }; assert_eq!(*view.heads(), expected_heads); } /// This test is nearly identical to the previous one, except the bookmarks are /// moved sideways instead of being deleted. #[test] fn test_import_refs_reimport_with_moved_remote_ref() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); let commit_base = empty_git_commit(&git_repo, "refs/heads/main", &[]); let commit_main = empty_git_commit(&git_repo, "refs/heads/main", &[commit_base]); let commit_remote_only = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-only", &[commit_base], ); let commit_remote_and_local = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-and-local", &[commit_base], ); git_ref( &git_repo, "refs/heads/feature-remote-and-local", commit_remote_and_local, ); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let expected_heads = hashset! { jj_id(commit_main), jj_id(dbg!(commit_remote_only)), jj_id(dbg!(commit_remote_and_local)), }; let view = repo.view(); assert_eq!(*view.heads(), expected_heads); assert_eq!(view.bookmarks().count(), 3); // Even though the git repo does not have a local bookmark for // `feature-remote-only`, jj creates one. This follows the model explained // in docs/bookmarks.md. assert_eq!( view.get_local_bookmark("feature-remote-only".as_ref()), &RefTarget::normal(jj_id(commit_remote_only)) ); assert!(view .get_remote_bookmark(remote_symbol("feature-remote-only", "git")) .is_absent()); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-only", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_only)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_local_bookmark("feature-remote-and-local".as_ref()), &RefTarget::normal(jj_id(commit_remote_and_local)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert!(view.get_local_bookmark("main".as_ref()).is_present()); // bookmark #3 of 3 // Simulate fetching from a remote where feature-remote-only and // feature-remote-and-local bookmarks were moved. This leads to the // following import moving the corresponding local bookmarks. delete_git_ref(&git_repo, "refs/remotes/origin/feature-remote-only"); delete_git_ref(&git_repo, "refs/remotes/origin/feature-remote-and-local"); let new_commit_remote_only = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-only", &[commit_base], ); let new_commit_remote_and_local = empty_git_commit( &git_repo, "refs/remotes/origin/feature-remote-and-local", &[commit_base], ); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert_eq!(view.bookmarks().count(), 3); // The local bookmarks are moved assert_eq!( view.get_local_bookmark("feature-remote-only".as_ref()), &RefTarget::normal(jj_id(new_commit_remote_only)) ); assert!(view .get_remote_bookmark(remote_symbol("feature-remote-only", "git")) .is_absent()); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-only", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(new_commit_remote_only)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_local_bookmark("feature-remote-and-local".as_ref()), &RefTarget::normal(jj_id(new_commit_remote_and_local)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "git")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-remote-and-local", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(new_commit_remote_and_local)), state: RemoteRefState::Tracked, }, ); assert!(view.get_local_bookmark("main".as_ref()).is_present()); // bookmark #3 of 3 let expected_heads = hashset! { jj_id(commit_main), jj_id(new_commit_remote_and_local), jj_id(new_commit_remote_only), // Neither commit_remote_only nor commit_remote_and_local should be // listed as a head. commit_remote_only was never affected by #864, // but commit_remote_and_local was. }; assert_eq!(*view.heads(), expected_heads); } #[test] fn test_import_refs_reimport_with_moved_untracked_remote_ref() { let git_settings = GitSettings { auto_local_bookmark: false, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); // The base commit doesn't have a reference. let remote_ref_name = "refs/remotes/origin/feature"; let commit_base = empty_git_commit(&git_repo, remote_ref_name, &[]); let commit_remote_t0 = empty_git_commit(&git_repo, remote_ref_name, &[commit_base]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_t0) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 1); assert_eq!( view.get_remote_bookmark(remote_symbol("feature", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_t0)), state: RemoteRefState::New, }, ); // Move the reference remotely and fetch the changes. delete_git_ref(&git_repo, remote_ref_name); let commit_remote_t1 = empty_git_commit(&git_repo, remote_ref_name, &[commit_base]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); // commit_remote_t0 should be abandoned, but commit_base shouldn't because // it's the ancestor of commit_remote_t1. assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_t1) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 1); assert_eq!( view.get_remote_bookmark(remote_symbol("feature", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_t1)), state: RemoteRefState::New, }, ); } #[test] fn test_import_refs_reimport_with_deleted_untracked_intermediate_remote_ref() { let git_settings = GitSettings { auto_local_bookmark: false, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); // Set up linear graph: // o feature-b@origin // o feature-a@origin let remote_ref_name_a = "refs/remotes/origin/feature-a"; let remote_ref_name_b = "refs/remotes/origin/feature-b"; let commit_remote_a = empty_git_commit(&git_repo, remote_ref_name_a, &[]); let commit_remote_b = empty_git_commit(&git_repo, remote_ref_name_b, &[commit_remote_a]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_b) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 2); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-a", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_a)), state: RemoteRefState::New, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-b", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_b)), state: RemoteRefState::New, }, ); // Delete feature-a remotely and fetch the changes. delete_git_ref(&git_repo, remote_ref_name_a); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); // No commits should be abandoned because feature-a is pinned by feature-b. // Otherwise, feature-b would have to be rebased locally even though the // user haven't made any modifications to these commits yet. assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_b) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 1); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-b", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_b)), state: RemoteRefState::New, }, ); } #[test] fn test_import_refs_reimport_with_deleted_abandoned_untracked_remote_ref() { let git_settings = GitSettings { auto_local_bookmark: false, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); // Set up linear graph: // o feature-b@origin // o feature-a@origin let remote_ref_name_a = "refs/remotes/origin/feature-a"; let remote_ref_name_b = "refs/remotes/origin/feature-b"; let commit_remote_a = empty_git_commit(&git_repo, remote_ref_name_a, &[]); let commit_remote_b = empty_git_commit(&git_repo, remote_ref_name_b, &[commit_remote_a]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_b) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 2); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-a", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_a)), state: RemoteRefState::New, }, ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-b", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_b)), state: RemoteRefState::New, }, ); // Abandon feature-b locally: // x feature-b@origin (hidden) // o feature-a@origin let mut tx = repo.start_transaction(); let jj_commit_remote_b = tx .repo() .store() .get_commit(&jj_id(commit_remote_b)) .unwrap(); tx.repo_mut().record_abandoned_commit(&jj_commit_remote_b); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); assert_eq!(*view.heads(), hashset! { jj_id(commit_remote_a) }); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 2); // Delete feature-a remotely and fetch the changes. delete_git_ref(&git_repo, remote_ref_name_a); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let view = repo.view(); // The feature-a commit should be abandoned. Since feature-b has already // been abandoned, there are no descendant commits to be rebased. assert_eq!( *view.heads(), hashset! { repo.store().root_commit_id().clone() } ); assert_eq!(view.local_bookmarks().count(), 0); assert_eq!(view.all_remote_bookmarks().count(), 1); assert_eq!( view.get_remote_bookmark(remote_symbol("feature-b", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_remote_b)), state: RemoteRefState::New, }, ); } #[test] fn test_import_refs_reimport_git_head_with_fixed_ref() { // Simulate external `git checkout` in colocated repo, from named bookmark. let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); // First, both HEAD and main point to commit1. let mut tx = repo.start_transaction(); let commit1 = write_random_commit(tx.repo_mut()); let commit2 = write_random_commit(tx.repo_mut()); git_repo .reference( "refs/heads/main", git_id(&commit1), gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); testutils::git::set_head_to_id(&git_repo, git_id(&commit1)); // Import HEAD and main. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); // Move only HEAD to commit2 (by e.g. `git checkout` command) testutils::git::set_head_to_id(&git_repo, git_id(&commit2)); // Reimport HEAD, which shouldn't abandon the old HEAD branch. git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(commit1.id())); assert!(tx.repo().view().heads().contains(commit2.id())); } #[test] fn test_import_refs_reimport_all_from_root_removed() { // Test that if a chain of commits all the way from the root gets unreferenced, // we abandon the whole stack, but not including the root commit. let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); // Test the setup assert!(tx.repo().view().heads().contains(&jj_id(commit))); // Remove all git refs and re-import git_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(!tx.repo().view().heads().contains(&jj_id(commit))); } #[test] fn test_import_refs_reimport_abandoning_disabled() { // Test that we don't abandoned unreachable commits if configured not to let git_settings = GitSettings { abandon_unreachable_commits: false, ..Default::default() }; let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); let commit2 = empty_git_commit(&git_repo, "refs/heads/delete-me", &[commit1]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); // Test the setup assert!(tx.repo().view().heads().contains(&jj_id(commit2))); // Remove the `delete-me` bookmark and re-import git_repo .find_reference("refs/heads/delete-me") .unwrap() .delete() .unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); assert!(tx.repo().view().heads().contains(&jj_id(commit2))); } #[test] fn test_import_refs_reimport_conflicted_remote_bookmark() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let commit1 = empty_git_commit(&git_repo, "refs/heads/commit1", &[]); git_ref(&git_repo, "refs/remotes/origin/main", commit1); let mut tx1 = repo.start_transaction(); git::import_refs(tx1.repo_mut(), &git_settings).unwrap(); let commit2 = empty_git_commit(&git_repo, "refs/heads/commit2", &[]); git_ref(&git_repo, "refs/remotes/origin/main", commit2); let mut tx2 = repo.start_transaction(); git::import_refs(tx2.repo_mut(), &git_settings).unwrap(); // Remote bookmark can diverge by divergent operations (like `jj git fetch`) let repo = commit_transactions(vec![tx1, tx2]); assert_eq!( repo.view().get_git_ref("refs/remotes/origin/main".as_ref()), &RefTarget::from_legacy_form([], [jj_id(commit1), jj_id(commit2)]), ); assert_eq!( repo.view() .get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::from_legacy_form([], [jj_id(commit1), jj_id(commit2)]), state: RemoteRefState::Tracked, }, ); // The conflict can be resolved by importing the current Git state let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); let repo = tx.commit("test").unwrap(); assert_eq!( repo.view().get_git_ref("refs/remotes/origin/main".as_ref()), &RefTarget::normal(jj_id(commit2)), ); assert_eq!( repo.view() .get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit2)), state: RemoteRefState::Tracked, }, ); } #[test] fn test_import_refs_reserved_remote_name() { let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); empty_git_commit(&git_repo, "refs/remotes/git/main", &[]); empty_git_commit(&git_repo, "refs/remotes/gita/main", &[]); let mut tx = repo.start_transaction(); let stats = git::import_refs(tx.repo_mut(), &git_settings).unwrap(); assert_eq!(stats.failed_ref_names, ["refs/remotes/git/main"]); let view = tx.repo().view(); assert_eq!( view.git_refs().keys().collect_vec(), ["refs/remotes/gita/main"] ); assert_eq!( view.all_remote_bookmarks() .map(|(symbol, _)| symbol) .collect_vec(), [remote_symbol("main", "gita")] ); } #[test] fn test_import_some_refs() { let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); let commit_main = empty_git_commit(&git_repo, "refs/remotes/origin/main", &[]); let commit_feat1 = empty_git_commit(&git_repo, "refs/remotes/origin/feature1", &[commit_main]); let commit_feat2 = empty_git_commit(&git_repo, "refs/remotes/origin/feature2", &[commit_feat1]); let commit_feat3 = empty_git_commit(&git_repo, "refs/remotes/origin/feature3", &[commit_feat1]); let commit_feat4 = empty_git_commit(&git_repo, "refs/remotes/origin/feature4", &[commit_feat3]); let commit_ign = empty_git_commit(&git_repo, "refs/remotes/origin/ignored", &[]); // Import bookmarks feature1, feature2, and feature3. let mut tx = repo.start_transaction(); git::import_some_refs(tx.repo_mut(), &git_settings, |kind, symbol| { kind == GitRefKind::Bookmark && symbol.remote == "origin" && symbol.name.as_str().starts_with("feature") }) .unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); // There are two heads, feature2 and feature4. let view = repo.view(); let expected_heads = hashset! { jj_id(commit_feat2), jj_id(commit_feat4), }; assert_eq!(*view.heads(), expected_heads); // Check that bookmarks feature[1-4] have been locally imported and are known to // be present on origin as well. assert_eq!(view.bookmarks().count(), 4); let commit_feat1_remote_ref = RemoteRef { target: RefTarget::normal(jj_id(commit_feat1)), state: RemoteRefState::Tracked, }; let commit_feat2_remote_ref = RemoteRef { target: RefTarget::normal(jj_id(commit_feat2)), state: RemoteRefState::Tracked, }; let commit_feat3_remote_ref = RemoteRef { target: RefTarget::normal(jj_id(commit_feat3)), state: RemoteRefState::Tracked, }; let commit_feat4_remote_ref = RemoteRef { target: RefTarget::normal(jj_id(commit_feat4)), state: RemoteRefState::Tracked, }; assert_eq!( view.get_local_bookmark("feature1".as_ref()), &RefTarget::normal(jj_id(commit_feat1)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature1", "origin")), &commit_feat1_remote_ref ); assert_eq!( view.get_local_bookmark("feature2".as_ref()), &RefTarget::normal(jj_id(commit_feat2)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature2", "origin")), &commit_feat2_remote_ref ); assert_eq!( view.get_local_bookmark("feature3".as_ref()), &RefTarget::normal(jj_id(commit_feat3)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature3", "origin")), &commit_feat3_remote_ref ); assert_eq!( view.get_local_bookmark("feature4".as_ref()), &RefTarget::normal(jj_id(commit_feat4)) ); assert_eq!( view.get_remote_bookmark(remote_symbol("feature4", "origin")), &commit_feat4_remote_ref ); assert!(view.get_local_bookmark("main".as_ref()).is_absent()); assert!(view .get_remote_bookmark(remote_symbol("main", "git")) .is_absent()); assert!(view .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); assert!(!view.heads().contains(&jj_id(commit_main))); assert!(view.get_local_bookmark("ignored".as_ref()).is_absent()); assert!(view .get_remote_bookmark(remote_symbol("ignored", "git")) .is_absent()); assert!(view .get_remote_bookmark(remote_symbol("ignored", "origin")) .is_absent()); assert!(!view.heads().contains(&jj_id(commit_ign))); // Delete bookmark feature1, feature3 and feature4 in git repository and import // bookmark feature2 only. That should have no impact on the jj repository. delete_git_ref(&git_repo, "refs/remotes/origin/feature1"); delete_git_ref(&git_repo, "refs/remotes/origin/feature3"); delete_git_ref(&git_repo, "refs/remotes/origin/feature4"); let mut tx = repo.start_transaction(); git::import_some_refs(tx.repo_mut(), &git_settings, |kind, symbol| { kind == GitRefKind::Bookmark && symbol.remote == "origin" && symbol.name == "feature2" }) .unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); // feature2 and feature4 will still be heads, and all four bookmarks should be // present. let view = repo.view(); assert_eq!(view.bookmarks().count(), 4); assert_eq!(*view.heads(), expected_heads); // Import feature1: this should cause the bookmark to be deleted, but the // corresponding commit should stay because it is reachable from feature2. let mut tx = repo.start_transaction(); git::import_some_refs(tx.repo_mut(), &git_settings, |kind, symbol| { kind == GitRefKind::Bookmark && symbol.remote == "origin" && symbol.name == "feature1" }) .unwrap(); // No descendant should be rewritten. assert_eq!(tx.repo_mut().rebase_descendants().unwrap(), 0); let repo = tx.commit("test").unwrap(); // feature2 and feature4 should still be the heads, and all three bookmarks // feature2, feature3, and feature3 should exist. let view = repo.view(); assert_eq!(view.bookmarks().count(), 3); assert_eq!(*view.heads(), expected_heads); // Import feature3: this should cause the bookmark to be deleted, but // feature4 should be left alone even though it is no longer in git. let mut tx = repo.start_transaction(); git::import_some_refs(tx.repo_mut(), &git_settings, |kind, symbol| { kind == GitRefKind::Bookmark && symbol.remote == "origin" && symbol.name == "feature3" }) .unwrap(); // No descendant should be rewritten assert_eq!(tx.repo_mut().rebase_descendants().unwrap(), 0); let repo = tx.commit("test").unwrap(); // feature2 and feature4 should still be the heads, and both bookmarks // should exist. let view = repo.view(); assert_eq!(view.bookmarks().count(), 2); assert_eq!(*view.heads(), expected_heads); // Import feature4: both the head and the bookmark will disappear. let mut tx = repo.start_transaction(); git::import_some_refs(tx.repo_mut(), &git_settings, |kind, symbol| { kind == GitRefKind::Bookmark && symbol.remote == "origin" && symbol.name == "feature4" }) .unwrap(); // No descendant should be rewritten assert_eq!(tx.repo_mut().rebase_descendants().unwrap(), 0); let repo = tx.commit("test").unwrap(); // feature2 should now be the only head and only bookmark. let view = repo.view(); assert_eq!(view.bookmarks().count(), 1); let expected_heads = hashset! { jj_id(commit_feat2), }; assert_eq!(*view.heads(), expected_heads); } fn git_ref(git_repo: &gix::Repository, name: &str, target: gix::ObjectId) { git_repo .reference(name, target, gix::refs::transaction::PreviousValue::Any, "") .unwrap(); } fn delete_git_ref(git_repo: &gix::Repository, name: &str) { git_repo.find_reference(name).unwrap().delete().unwrap(); } struct GitRepoData { _temp_dir: TempDir, origin_repo: gix::Repository, git_repo: gix::Repository, repo: Arc, } impl GitRepoData { fn create() -> Self { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let origin_repo_dir = temp_dir.path().join("source"); let origin_repo = testutils::git::init_bare(&origin_repo_dir); let git_repo_dir = temp_dir.path().join("git"); let git_repo = testutils::git::clone(&git_repo_dir, origin_repo_dir.to_str().unwrap(), None); let jj_repo_dir = temp_dir.path().join("jj"); std::fs::create_dir(&jj_repo_dir).unwrap(); let repo = ReadonlyRepo::init( &settings, &jj_repo_dir, &|settings, store_path| { Ok(Box::new(GitBackend::init_external( settings, store_path, git_repo.path(), )?)) }, Signer::from_settings(&settings).unwrap(), ReadonlyRepo::default_op_store_initializer(), ReadonlyRepo::default_op_heads_store_initializer(), ReadonlyRepo::default_index_store_initializer(), ReadonlyRepo::default_submodule_store_initializer(), ) .unwrap(); Self { _temp_dir: temp_dir, origin_repo, git_repo, repo, } } } #[test] fn test_import_refs_empty_git_repo() { let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let heads_before = test_data.repo.view().heads().clone(); let mut tx = test_data.repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); assert_eq!(*repo.view().heads(), heads_before); assert_eq!(repo.view().bookmarks().count(), 0); assert_eq!(repo.view().tags().len(), 0); assert_eq!(repo.view().git_refs().len(), 0); assert_eq!(repo.view().git_head(), RefTarget::absent_ref()); } #[test] fn test_import_refs_missing_git_commit() { let git_settings = GitSettings::default(); let test_workspace = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_workspace.repo; let git_repo = get_git_repo(repo); let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); let commit2 = empty_git_commit(&git_repo, "refs/heads/main", &[commit1]); let shard = hex::encode(&commit1.as_bytes()[..1]); let object_basename = hex::encode(&commit1.as_bytes()[1..]); let object_store_path = git_repo.path().join("objects"); let object_file = object_store_path.join(&shard).join(object_basename); let backup_object_file = object_store_path.join(&shard).join("backup"); assert!(object_file.exists()); // Missing commit is ancestor of ref testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/unborn"); fs::rename(&object_file, &backup_object_file).unwrap(); let mut tx = repo.start_transaction(); let result = git::import_refs(tx.repo_mut(), &git_settings); assert_matches!( result, Err(GitImportError::MissingRefAncestor { symbol, err: BackendError::ObjectNotFound { .. } }) if symbol == remote_symbol("main", "git") ); // Missing commit is ancestor of HEAD git_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); testutils::git::set_head_to_id(&git_repo, commit2); let mut tx = repo.start_transaction(); let result = git::import_head(tx.repo_mut()); assert_matches!( result, Err(GitImportError::MissingHeadTarget { id, err: BackendError::ObjectNotFound { .. } }) if id == jj_id(commit2) ); // Missing commit is pointed to by ref: the ref is ignored as we don't know // if the missing object is a commit or not. fs::rename(&backup_object_file, &object_file).unwrap(); git_repo .reference( "refs/heads/main", commit1, gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/unborn"); fs::rename(&object_file, &backup_object_file).unwrap(); let mut tx = repo.start_transaction(); let result = git::import_refs(tx.repo_mut(), &git_settings); assert!(result.is_ok()); // Missing commit is pointed to by HEAD: the ref is ignored as we don't know // if the missing object is a commit or not. fs::rename(&backup_object_file, &object_file).unwrap(); git_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); testutils::git::set_head_to_id(&git_repo, commit1); fs::rename(&object_file, &backup_object_file).unwrap(); let mut tx = repo.start_transaction(); let result = git::import_head(tx.repo_mut()); assert!(result.is_ok()); } #[test] fn test_import_refs_detached_head() { let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let commit1 = empty_git_commit(&test_data.git_repo, "refs/heads/main", &[]); // Delete the reference. Check that the detached HEAD commit still gets added to // the set of heads test_data .git_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); testutils::git::set_head_to_id(&test_data.git_repo, commit1); let mut tx = test_data.repo.start_transaction(); git::import_head(tx.repo_mut()).unwrap(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let expected_heads = hashset! { jj_id(commit1) }; assert_eq!(*repo.view().heads(), expected_heads); assert_eq!(repo.view().git_refs().len(), 0); assert_eq!(repo.view().git_head(), &RefTarget::normal(jj_id(commit1))); } #[test] fn test_export_refs_no_detach() { // When exporting the bookmark that's current checked out, don't detach HEAD if // the target already matches let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let git_repo = test_data.git_repo; let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/main"); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); git::import_head(mut_repo).unwrap(); git::import_refs(mut_repo, &git_settings).unwrap(); mut_repo.rebase_descendants().unwrap(); // Do an initial export to make sure `main` is considered let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(jj_id(commit1)) ); assert_eq!( git_repo.head_name().unwrap().unwrap().as_bstr(), b"refs/heads/main" ); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .target() .id(), commit1 ); } #[test] fn test_export_refs_bookmark_changed() { // We can export a change to a bookmark let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let git_repo = test_data.git_repo; let commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); git_repo .reference( "refs/heads/feature", commit, gix::refs::transaction::PreviousValue::MustNotExist, "test", ) .unwrap(); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/feature"); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); git::import_head(mut_repo).unwrap(); git::import_refs(mut_repo, &git_settings).unwrap(); mut_repo.rebase_descendants().unwrap(); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); let new_commit = create_random_commit(mut_repo) .set_parents(vec![jj_id(commit)]) .write() .unwrap(); mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(new_commit.id().clone())); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(new_commit.id().clone()) ); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .peel_to_commit() .unwrap() .id(), git_id(&new_commit) ); // HEAD should be unchanged since its target bookmark didn't change assert_eq!( git_repo.head_name().unwrap().unwrap().as_bstr(), b"refs/heads/feature" ); } #[test] fn test_export_refs_current_bookmark_changed() { // If we update a bookmark that is checked out in the git repo, HEAD gets // detached let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let git_repo = test_data.git_repo; let commit1 = empty_git_commit(&git_repo, "refs/heads/main", &[]); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/main"); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); git::import_head(mut_repo).unwrap(); git::import_refs(mut_repo, &git_settings).unwrap(); mut_repo.rebase_descendants().unwrap(); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); let new_commit = create_random_commit(mut_repo) .set_parents(vec![jj_id(commit1)]) .write() .unwrap(); mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(new_commit.id().clone())); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(new_commit.id().clone()) ); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .peel_to_commit() .unwrap() .id() .detach(), git_id(&new_commit) ); assert!(git_repo.head().unwrap().is_detached(), "HEAD is detached"); } #[test_case(false; "without moved placeholder ref")] #[test_case(true; "with moved placeholder ref")] fn test_export_refs_unborn_git_bookmark(move_placeholder_ref: bool) { // Can export to an empty Git repo (we can handle Git's "unborn bookmark" state) let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let git_repo = test_data.git_repo; testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/main"); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); git::import_head(mut_repo).unwrap(); git::import_refs(mut_repo, &git_settings).unwrap(); mut_repo.rebase_descendants().unwrap(); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert!(git_repo.head().unwrap().is_unborn(), "HEAD is unborn"); let new_commit = write_random_commit(mut_repo); mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(new_commit.id().clone())); if move_placeholder_ref { git_repo .reference( "refs/jj/root", git_id(&new_commit), gix::refs::transaction::PreviousValue::MustNotExist, "", ) .unwrap(); } let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(new_commit.id().clone()) ); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .peel_to_commit() .unwrap() .id(), git_id(&new_commit) ); // HEAD should no longer point to refs/heads/main assert!(git_repo.head().unwrap().is_unborn(), "HEAD is unborn"); // The placeholder ref should be deleted if any assert!(git_repo.find_reference("refs/jj/root").is_err()); } #[test] fn test_export_import_sequence() { // Import a bookmark pointing to A, modify it in jj to point to B, export it, // modify it in git to point to C, then import it again. There should be no // conflict. let test_data = GitRepoData::create(); let git_settings = GitSettings::default(); let git_repo = test_data.git_repo; let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); let commit_a = write_random_commit(mut_repo); let commit_b = write_random_commit(mut_repo); let commit_c = write_random_commit(mut_repo); // Import the bookmark pointing to A git_repo .reference( "refs/heads/main", git_id(&commit_a), gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); git::import_refs(mut_repo, &git_settings).unwrap(); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(commit_a.id().clone()) ); // Modify the bookmark in jj to point to B mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(commit_b.id().clone())); // Export the bookmark to git let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(commit_b.id().clone()) ); // Modify the bookmark in git to point to C git_repo .reference( "refs/heads/main", git_id(&commit_c), gix::refs::transaction::PreviousValue::Any, "test", ) .unwrap(); // Import from git git::import_refs(mut_repo, &git_settings).unwrap(); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::normal(commit_c.id().clone()) ); assert_eq!( mut_repo.view().get_local_bookmark("main".as_ref()), &RefTarget::normal(commit_c.id().clone()) ); } #[test] fn test_import_export_non_tracking_bookmark() { // Import a remote tracking bookmark and export it. We should not create a git // bookmark. let test_data = GitRepoData::create(); let mut git_settings = GitSettings { auto_local_bookmark: false, ..Default::default() }; let git_repo = test_data.git_repo; let commit_main_t0 = empty_git_commit(&git_repo, "refs/remotes/origin/main", &[]); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); git::import_refs(mut_repo, &git_settings).unwrap(); assert!(mut_repo .view() .get_local_bookmark("main".as_ref()) .is_absent()); assert_eq!( mut_repo .view() .get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_main_t0)), state: RemoteRefState::New, }, ); assert_eq!( mut_repo.get_git_ref("refs/remotes/origin/main".as_ref()), RefTarget::normal(jj_id(commit_main_t0)) ); // Export the bookmark to git let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( mut_repo.get_git_ref("refs/heads/main".as_ref()), RefTarget::absent() ); // Reimport with auto-local-bookmark on. Local bookmark shouldn't be created for // the known bookmark "main". let commit_main_t1 = empty_git_commit(&git_repo, "refs/remotes/origin/main", &[commit_main_t0]); let commit_feat_t1 = empty_git_commit(&git_repo, "refs/remotes/origin/feat", &[]); git_settings.auto_local_bookmark = true; git::import_refs(mut_repo, &git_settings).unwrap(); assert!(mut_repo .view() .get_local_bookmark("main".as_ref()) .is_absent()); assert_eq!( mut_repo.view().get_local_bookmark("feat".as_ref()), &RefTarget::normal(jj_id(commit_feat_t1)) ); assert_eq!( mut_repo .view() .get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_main_t1)), state: RemoteRefState::New, }, ); assert_eq!( mut_repo .view() .get_remote_bookmark(remote_symbol("feat", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_feat_t1)), state: RemoteRefState::Tracked, }, ); // Reimport with auto-local-bookmark off. Tracking bookmark should be imported. let commit_main_t2 = empty_git_commit(&git_repo, "refs/remotes/origin/main", &[commit_main_t1]); let commit_feat_t2 = empty_git_commit(&git_repo, "refs/remotes/origin/feat", &[commit_feat_t1]); git_settings.auto_local_bookmark = false; git::import_refs(mut_repo, &git_settings).unwrap(); assert!(mut_repo .view() .get_local_bookmark("main".as_ref()) .is_absent()); assert_eq!( mut_repo.view().get_local_bookmark("feat".as_ref()), &RefTarget::normal(jj_id(commit_feat_t2)) ); assert_eq!( mut_repo .view() .get_remote_bookmark(remote_symbol("main", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_main_t2)), state: RemoteRefState::New, }, ); assert_eq!( mut_repo .view() .get_remote_bookmark(remote_symbol("feat", "origin")), &RemoteRef { target: RefTarget::normal(jj_id(commit_feat_t2)), state: RemoteRefState::Tracked, }, ); } #[test] fn test_export_conflicts() { // We skip export of conflicted bookmarks let test_data = GitRepoData::create(); let git_repo = test_data.git_repo; let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); let commit_a = write_random_commit(mut_repo); let commit_b = write_random_commit(mut_repo); let commit_c = write_random_commit(mut_repo); mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(commit_a.id().clone())); mut_repo .set_local_bookmark_target("feature".as_ref(), RefTarget::normal(commit_a.id().clone())); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); // Create a conflict and export. It should not be exported, but other changes // should be. mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::normal(commit_b.id().clone())); mut_repo.set_local_bookmark_target( "feature".as_ref(), RefTarget::from_legacy_form( [commit_a.id().clone()], [commit_b.id().clone(), commit_c.id().clone()], ), ); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( git_repo .find_reference("refs/heads/feature") .unwrap() .target() .id(), git_id(&commit_a) ); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .target() .id(), git_id(&commit_b) ); // Conflicted bookmarks shouldn't be copied to the "git" remote assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("feature", "git")), RemoteRef { target: RefTarget::normal(commit_a.id().clone()), state: RemoteRefState::Tracked, }, ); assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("main", "git")), RemoteRef { target: RefTarget::normal(commit_b.id().clone()), state: RemoteRefState::Tracked, }, ); } #[test] fn test_export_bookmark_on_root_commit() { // We skip export of bookmarks pointing to the root commit let test_data = GitRepoData::create(); let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); mut_repo.set_local_bookmark_target( "on_root".as_ref(), RefTarget::normal(mut_repo.store().root_commit_id().clone()), ); let stats = git::export_refs(mut_repo).unwrap(); assert_eq!(stats.failed_bookmarks.len(), 1); assert_eq!( stats.failed_bookmarks[0].0.as_ref(), remote_symbol("on_root", "git") ); assert_matches!( stats.failed_bookmarks[0].1, FailedRefExportReason::OnRootCommit ); } #[test] fn test_export_partial_failure() { // Check that we skip bookmarks that fail to export let test_data = GitRepoData::create(); let git_repo = test_data.git_repo; let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); let commit_a = write_random_commit(mut_repo); let target = RefTarget::normal(commit_a.id().clone()); // Empty string is disallowed by Git mut_repo.set_local_bookmark_target("".as_ref(), target.clone()); // Branch named HEAD is disallowed by Git CLI mut_repo.set_local_bookmark_target("HEAD".as_ref(), target.clone()); mut_repo.set_local_bookmark_target("main".as_ref(), target.clone()); // `main/sub` will conflict with `main` in Git, at least when using loose ref // storage mut_repo.set_local_bookmark_target("main/sub".as_ref(), target.clone()); let stats = git::export_refs(mut_repo).unwrap(); assert_eq!(stats.failed_bookmarks.len(), 3); assert_eq!( stats.failed_bookmarks[0].0.as_ref(), remote_symbol("", "git") ); assert_matches!( stats.failed_bookmarks[0].1, FailedRefExportReason::InvalidGitName ); assert_eq!( stats.failed_bookmarks[1].0.as_ref(), remote_symbol("HEAD", "git") ); assert_matches!( stats.failed_bookmarks[1].1, FailedRefExportReason::InvalidGitName ); assert_eq!( stats.failed_bookmarks[2].0.as_ref(), remote_symbol("main/sub", "git") ); assert_matches!( stats.failed_bookmarks[2].1, FailedRefExportReason::FailedToSet(_) ); // The `main` bookmark should have succeeded but the other should have failed assert!(git_repo.find_reference("refs/heads/").is_err()); assert!(git_repo.find_reference("refs/heads/HEAD").is_err()); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .target() .id(), git_id(&commit_a) ); assert!(git_repo.find_reference("refs/heads/main/sub").is_err()); // Failed bookmarks shouldn't be copied to the "git" remote assert!(mut_repo .get_remote_bookmark(remote_symbol("", "git")) .is_absent()); assert!(mut_repo .get_remote_bookmark(remote_symbol("HEAD", "git")) .is_absent()); assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("main", "git")), RemoteRef { target: target.clone(), state: RemoteRefState::Tracked, }, ); assert!(mut_repo .get_remote_bookmark(remote_symbol("main/sub", "git")) .is_absent()); // Now remove the `main` bookmark and make sure that the `main/sub` gets // exported even though it didn't change mut_repo.set_local_bookmark_target("main".as_ref(), RefTarget::absent()); let stats = git::export_refs(mut_repo).unwrap(); assert_eq!(stats.failed_bookmarks.len(), 2); assert_eq!( stats.failed_bookmarks[0].0.as_ref(), remote_symbol("", "git") ); assert_matches!( stats.failed_bookmarks[0].1, FailedRefExportReason::InvalidGitName ); assert_eq!( stats.failed_bookmarks[1].0.as_ref(), remote_symbol("HEAD", "git") ); assert_matches!( stats.failed_bookmarks[1].1, FailedRefExportReason::InvalidGitName ); assert!(git_repo.find_reference("refs/heads/").is_err()); assert!(git_repo.find_reference("refs/heads/HEAD").is_err()); assert!(git_repo.find_reference("refs/heads/main").is_err()); assert_eq!( git_repo .find_reference("refs/heads/main/sub") .unwrap() .target() .id(), git_id(&commit_a) ); // Failed bookmarks shouldn't be copied to the "git" remote assert!(mut_repo .get_remote_bookmark(remote_symbol("", "git")) .is_absent()); assert!(mut_repo .get_remote_bookmark(remote_symbol("HEAD", "git")) .is_absent()); assert!(mut_repo .get_remote_bookmark(remote_symbol("main", "git")) .is_absent()); assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("main/sub", "git")), RemoteRef { target: target.clone(), state: RemoteRefState::Tracked, }, ); } #[test] fn test_export_reexport_transitions() { // Test exporting after making changes on the jj side, or the git side, or both let test_data = GitRepoData::create(); let git_repo = test_data.git_repo; let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); let commit_a = write_random_commit(mut_repo); let commit_b = write_random_commit(mut_repo); let commit_c = write_random_commit(mut_repo); // Create a few bookmarks whose names indicate how they change in jj in git. The // first letter represents the bookmark's target in the last export. The second // letter represents the bookmark's target in jj. The third letter represents // the bookmark's target in git. "X" means that the bookmark doesn't exist. // "A", "B", or "C" means that the bookmark points to that commit. // // AAB: Branch modified in git // AAX: Branch deleted in git // ABA: Branch modified in jj // ABB: Branch modified in both jj and git, pointing to same target // ABC: Branch modified in both jj and git, pointing to different targets // ABX: Branch modified in jj, deleted in git // AXA: Branch deleted in jj // AXB: Branch deleted in jj, modified in git // AXX: Branch deleted in both jj and git // XAA: Branch added in both jj and git, pointing to same target // XAB: Branch added in both jj and git, pointing to different targets // XAX: Branch added in jj // XXA: Branch added in git // Create initial state and export it for bookmark in [ "AAB", "AAX", "ABA", "ABB", "ABC", "ABX", "AXA", "AXB", "AXX", ] { mut_repo .set_local_bookmark_target(bookmark.as_ref(), RefTarget::normal(commit_a.id().clone())); } let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); // Make changes on the jj side for bookmark in ["AXA", "AXB", "AXX"] { mut_repo.set_local_bookmark_target(bookmark.as_ref(), RefTarget::absent()); } for bookmark in ["XAA", "XAB", "XAX"] { mut_repo .set_local_bookmark_target(bookmark.as_ref(), RefTarget::normal(commit_a.id().clone())); } for bookmark in ["ABA", "ABB", "ABC", "ABX"] { mut_repo .set_local_bookmark_target(bookmark.as_ref(), RefTarget::normal(commit_b.id().clone())); } // Make changes on the git side for bookmark in ["AAX", "ABX", "AXX"] { git_repo .find_reference(&format!("refs/heads/{bookmark}")) .unwrap() .delete() .unwrap(); } for bookmark in ["XAA", "XXA"] { git_repo .reference( format!("refs/heads/{bookmark}"), git_id(&commit_a), gix::refs::transaction::PreviousValue::Any, "", ) .unwrap(); } for bookmark in ["AAB", "ABB", "AXB", "XAB"] { git_repo .reference( format!("refs/heads/{bookmark}"), git_id(&commit_b), gix::refs::transaction::PreviousValue::Any, "", ) .unwrap(); } let bookmark = "ABC"; git_repo .reference( format!("refs/heads/{bookmark}"), git_id(&commit_c), gix::refs::transaction::PreviousValue::Any, "", ) .unwrap(); // TODO: The bookmarks that we made conflicting changes to should have failed to // export. They should have been unchanged in git and in // mut_repo.view().git_refs(). let stats = git::export_refs(mut_repo).unwrap(); assert_eq!( stats .failed_bookmarks .into_iter() .map(|(symbol, _)| symbol) .collect_vec(), vec!["ABC", "ABX", "AXB", "XAB"] .into_iter() .map(|s| remote_symbol(s, "git").to_owned()) .collect_vec() ); for bookmark in ["AAX", "ABX", "AXA", "AXX"] { assert!( git_repo .find_reference(&format!("refs/heads/{bookmark}")) .is_err(), "{bookmark} should not exist" ); } for bookmark in ["XAA", "XAX", "XXA"] { assert_eq!( git_repo .find_reference(&format!("refs/heads/{bookmark}")) .unwrap() .target() .id(), git_id(&commit_a), "{bookmark} should point to commit A" ); } for bookmark in ["AAB", "ABA", "AAB", "ABB", "AXB", "XAB"] { assert_eq!( git_repo .find_reference(&format!("refs/heads/{bookmark}")) .unwrap() .target() .id(), git_id(&commit_b), "{bookmark} should point to commit B" ); } let bookmark = "ABC"; assert_eq!( git_repo .find_reference(&format!("refs/heads/{bookmark}")) .unwrap() .target() .id(), git_id(&commit_c), "{bookmark} should point to commit C" ); assert_eq!( *mut_repo.view().git_refs(), btreemap! { "refs/heads/AAX".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/AAB".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/ABA".into() => RefTarget::normal(commit_b.id().clone()), "refs/heads/ABB".into() => RefTarget::normal(commit_b.id().clone()), "refs/heads/ABC".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/ABX".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/AXB".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/XAA".into() => RefTarget::normal(commit_a.id().clone()), "refs/heads/XAX".into() => RefTarget::normal(commit_a.id().clone()), } ); } #[test] fn test_export_undo_reexport() { let test_data = GitRepoData::create(); let git_repo = test_data.git_repo; let mut tx = test_data.repo.start_transaction(); let mut_repo = tx.repo_mut(); // Initial export let commit_a = write_random_commit(mut_repo); let target_a = RefTarget::normal(commit_a.id().clone()); mut_repo.set_local_bookmark_target("main".as_ref(), target_a.clone()); let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .target() .id(), git_id(&commit_a) ); assert_eq!(mut_repo.get_git_ref("refs/heads/main".as_ref()), target_a); assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("main", "git")), RemoteRef { target: target_a.clone(), state: RemoteRefState::Tracked, }, ); // Undo remote changes only mut_repo.set_remote_bookmark(remote_symbol("main", "git"), RemoteRef::absent()); // Reexport should update the Git-tracking bookmark let stats = git::export_refs(mut_repo).unwrap(); assert!(stats.failed_bookmarks.is_empty()); assert_eq!( git_repo .find_reference("refs/heads/main") .unwrap() .target() .id(), git_id(&commit_a) ); assert_eq!(mut_repo.get_git_ref("refs/heads/main".as_ref()), target_a); assert_eq!( mut_repo.get_remote_bookmark(remote_symbol("main", "git")), RemoteRef { target: target_a.clone(), state: RemoteRefState::Tracked, }, ); } #[test] fn test_reset_head_to_root() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); let git_repo = testutils::git::init(&workspace_root); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); let mut_repo = tx.repo_mut(); let root_commit_id = repo.store().root_commit_id(); let tree_id = repo.store().empty_merged_tree_id(); let commit1 = mut_repo .new_commit(vec![root_commit_id.clone()], tree_id.clone()) .write() .unwrap(); let commit2 = mut_repo .new_commit(vec![commit1.id().clone()], tree_id.clone()) .write() .unwrap(); // Set Git HEAD to commit2's parent (i.e. commit1) git::reset_head(tx.repo_mut(), &commit2).unwrap(); assert!(git_repo.head().unwrap().is_detached(), "HEAD is detached"); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit1.id().clone()) ); // Set Git HEAD back to root git::reset_head(tx.repo_mut(), &commit1).unwrap(); assert!(git_repo.head().unwrap().is_unborn(), "HEAD is unborn"); assert!(tx.repo().git_head().is_absent()); // Move placeholder ref as if new commit were created by git git_repo .reference( "refs/jj/root", git_id(&commit1), gix::refs::transaction::PreviousValue::MustNotExist, "", ) .unwrap(); git::reset_head(tx.repo_mut(), &commit2).unwrap(); assert!(git_repo.head_id().is_ok()); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit1.id().clone()) ); assert!(git_repo.find_reference("refs/jj/root").is_ok()); // Set Git HEAD back to root git::reset_head(tx.repo_mut(), &commit1).unwrap(); assert!(git_repo.head().unwrap().is_unborn(), "HEAD is unborn"); assert!(tx.repo().git_head().is_absent()); // The placeholder ref should be deleted assert!(git_repo.find_reference("refs/jj/root").is_err()); } #[test] fn test_reset_head_detached_out_of_sync() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); let git_repo = testutils::git::init(&workspace_root); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); // 4 // | // 2 3 // |/ // 1 5 // |/ // root let mut graph_builder = CommitGraphBuilder::new(tx.repo_mut()); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit1]); let commit4 = graph_builder.commit_with_parents(&[&commit3]); let commit5 = graph_builder.initial_commit(); // unborn -> commit1 (= commit2's parent) git::reset_head(tx.repo_mut(), &commit2).unwrap(); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit1.id().clone()) ); // External process updates HEAD to point to commit5 testutils::git::set_head_to_id( &git_repo, gix::ObjectId::from_bytes_or_panic(commit5.id().as_bytes()), ); // {expected: commit1, actual: commit5} -> commit1 (= commit3's parent): // works because the expected HEAD is unchanged. git::reset_head(tx.repo_mut(), &commit3).unwrap(); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit1.id().clone()) ); // {expected: commit1, actual: commit5} -> commit3 (= commit4's parent) assert_matches!( git::reset_head(tx.repo_mut(), &commit4), Err(GitResetHeadError::UpdateHeadRef(_)) ); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit1.id().clone()), "view shouldn't be updated on failed export" ); // Import the HEAD moved by external process git::import_head(tx.repo_mut()).unwrap(); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit5.id().clone()) ); // commit5 -> commit3 (= commit4's parent) git::reset_head(tx.repo_mut(), &commit4).unwrap(); assert_eq!( tx.repo().git_head(), RefTarget::normal(commit3.id().clone()) ); } fn get_index_state(workspace_root: &Path) -> String { let git_repo = gix::open(workspace_root).unwrap(); let index = git_repo.index().unwrap(); index .entries() .iter() .map(|entry| { format!( "{:?} {} {:?}\n", entry.flags.stage(), entry.path_in(index.path_backing()), entry.mode ) }) .join("") } #[test] fn test_reset_head_with_index() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); let git_repo = testutils::git::init(&workspace_root); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); let mut_repo = tx.repo_mut(); let root_commit_id = repo.store().root_commit_id(); let tree_id = repo.store().empty_merged_tree_id(); let commit1 = mut_repo .new_commit(vec![root_commit_id.clone()], tree_id.clone()) .write() .unwrap(); let commit2 = mut_repo .new_commit(vec![commit1.id().clone()], tree_id.clone()) .write() .unwrap(); // Set Git HEAD to commit2's parent (i.e. commit1) git::reset_head(tx.repo_mut(), &commit2).unwrap(); insta::assert_snapshot!(get_index_state(&workspace_root), @""); // Add "staged changes" to the Git index { let mut index_manager = testutils::git::IndexManager::new(&git_repo); index_manager.add_file("file.txt", b"i am a file\n"); index_manager.sync_index(); } insta::assert_snapshot!(get_index_state(&workspace_root), @"Unconflicted file.txt Mode(FILE)"); // Reset head and the Git index git::reset_head(tx.repo_mut(), &commit2).unwrap(); insta::assert_snapshot!(get_index_state(&workspace_root), @""); } #[test] fn test_reset_head_with_index_no_conflict() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); gix::init(&workspace_root).unwrap(); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); let mut_repo = tx.repo_mut(); // Build tree containing every mode of file let tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/normal-file"), "file\n", ); testutils::write_executable_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/executable-file"), "file\n", ); testutils::write_symlink( &mut tree_builder, RepoPath::from_internal_string("some/dir/symlink"), "./normal-file", ); tree_builder.set( RepoPathBuf::from_internal_string("some/dir/commit"), TreeValue::GitSubmodule(testutils::write_random_commit(mut_repo).id().clone()), ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let parent_commit = mut_repo .new_commit(vec![repo.store().root_commit_id().clone()], tree_id.clone()) .write() .unwrap(); let wc_commit = mut_repo .new_commit(vec![parent_commit.id().clone()], tree_id.clone()) .write() .unwrap(); // Reset head to working copy commit git::reset_head(mut_repo, &wc_commit).unwrap(); // Git index should contain all files from the tree. // `Mode(DIR | SYMLINK)` actually means `MODE(COMMIT)`, as in a git submodule. insta::assert_snapshot!(get_index_state(&workspace_root), @r" Unconflicted some/dir/commit Mode(DIR | SYMLINK) Unconflicted some/dir/executable-file Mode(FILE | FILE_EXECUTABLE) Unconflicted some/dir/normal-file Mode(FILE) Unconflicted some/dir/symlink Mode(SYMLINK) "); } #[test] fn test_reset_head_with_index_merge_conflict() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); gix::init(&workspace_root).unwrap(); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); let mut_repo = tx.repo_mut(); // Build conflict trees containing every mode of file let base_tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/normal-file"), "base\n", ); testutils::write_executable_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/executable-file"), "base\n", ); testutils::write_symlink( &mut tree_builder, RepoPath::from_internal_string("some/dir/symlink"), "./normal-file", ); tree_builder.set( RepoPathBuf::from_internal_string("some/dir/commit"), TreeValue::GitSubmodule(testutils::write_random_commit(mut_repo).id().clone()), ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let left_tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/normal-file"), "left\n", ); testutils::write_executable_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/executable-file"), "left\n", ); testutils::write_symlink( &mut tree_builder, RepoPath::from_internal_string("some/dir/symlink"), "./executable-file", ); tree_builder.set( RepoPathBuf::from_internal_string("some/dir/commit"), TreeValue::GitSubmodule(testutils::write_random_commit(mut_repo).id().clone()), ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let right_tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/normal-file"), "right\n", ); testutils::write_executable_file( &mut tree_builder, RepoPath::from_internal_string("some/dir/executable-file"), "right\n", ); testutils::write_symlink( &mut tree_builder, RepoPath::from_internal_string("some/dir/symlink"), "./commit", ); tree_builder.set( RepoPathBuf::from_internal_string("some/dir/commit"), TreeValue::GitSubmodule(testutils::write_random_commit(mut_repo).id().clone()), ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let base_commit = mut_repo .new_commit( vec![repo.store().root_commit_id().clone()], base_tree_id.clone(), ) .write() .unwrap(); let left_commit = mut_repo .new_commit(vec![base_commit.id().clone()], left_tree_id.clone()) .write() .unwrap(); let right_commit = mut_repo .new_commit(vec![base_commit.id().clone()], right_tree_id.clone()) .write() .unwrap(); // Create working copy commit with resolution of conflict by taking the right // tree. This shouldn't affect the index, since the index is based on the parent // commit. let wc_commit = mut_repo .new_commit( vec![left_commit.id().clone(), right_commit.id().clone()], right_tree_id.clone(), ) .write() .unwrap(); // Reset head to working copy commit with merge conflict git::reset_head(mut_repo, &wc_commit).unwrap(); // Index should contain conflicted files from merge of parent commits. // `Mode(DIR | SYMLINK)` actually means `MODE(COMMIT)`, as in a git submodule. insta::assert_snapshot!(get_index_state(&workspace_root), @r" Base some/dir/commit Mode(DIR | SYMLINK) Ours some/dir/commit Mode(DIR | SYMLINK) Theirs some/dir/commit Mode(DIR | SYMLINK) Base some/dir/executable-file Mode(FILE | FILE_EXECUTABLE) Ours some/dir/executable-file Mode(FILE | FILE_EXECUTABLE) Theirs some/dir/executable-file Mode(FILE | FILE_EXECUTABLE) Base some/dir/normal-file Mode(FILE) Ours some/dir/normal-file Mode(FILE) Theirs some/dir/normal-file Mode(FILE) Base some/dir/symlink Mode(SYMLINK) Ours some/dir/symlink Mode(SYMLINK) Theirs some/dir/symlink Mode(SYMLINK) "); } #[test] fn test_reset_head_with_index_file_directory_conflict() { // Create colocated workspace let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let workspace_root = temp_dir.path().join("repo"); gix::init(&workspace_root).unwrap(); let (_workspace, repo) = Workspace::init_external_git(&settings, &workspace_root, &workspace_root.join(".git")) .unwrap(); let mut tx = repo.start_transaction(); let mut_repo = tx.repo_mut(); // Build conflict trees containing file-directory conflict let left_tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("test/dir/file"), "dir\n", ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let right_tree_id = { let mut tree_builder = TreeBuilder::new(repo.store().clone(), repo.store().empty_tree_id().clone()); testutils::write_normal_file( &mut tree_builder, RepoPath::from_internal_string("test"), "file\n", ); MergedTreeId::resolved(tree_builder.write_tree().unwrap()) }; let left_commit = mut_repo .new_commit( vec![repo.store().root_commit_id().clone()], left_tree_id.clone(), ) .write() .unwrap(); let right_commit = mut_repo .new_commit( vec![repo.store().root_commit_id().clone()], right_tree_id.clone(), ) .write() .unwrap(); let wc_commit = mut_repo .new_commit( vec![left_commit.id().clone(), right_commit.id().clone()], repo.store().empty_merged_tree_id().clone(), ) .write() .unwrap(); // Reset head to working copy commit with file-directory conflict git::reset_head(mut_repo, &wc_commit).unwrap(); // Only the file should be added to the index (the tree should be skipped). insta::assert_snapshot!(get_index_state(&workspace_root), @"Theirs test Mode(FILE)"); } #[test] fn test_init() { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let git_repo_dir = temp_dir.path().join("git"); let jj_repo_dir = temp_dir.path().join("jj"); let git_repo = testutils::git::init_bare(git_repo_dir); let initial_git_commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); std::fs::create_dir(&jj_repo_dir).unwrap(); let repo = &ReadonlyRepo::init( &settings, &jj_repo_dir, &|settings, store_path| { Ok(Box::new(GitBackend::init_external( settings, store_path, git_repo.path(), )?)) }, Signer::from_settings(&settings).unwrap(), ReadonlyRepo::default_op_store_initializer(), ReadonlyRepo::default_op_heads_store_initializer(), ReadonlyRepo::default_index_store_initializer(), ReadonlyRepo::default_submodule_store_initializer(), ) .unwrap(); // The refs were *not* imported -- it's the caller's responsibility to import // any refs they care about. assert!(!repo.view().heads().contains(&jj_id(initial_git_commit))); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_empty_repo(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = get_git_settings(subprocess); let mut tx = test_data.repo.start_transaction(); let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); // No default bookmark and no refs assert_eq!(stats.default_branch, None); assert!(stats.import_stats.abandoned_commits.is_empty()); assert_eq!(*tx.repo().view().git_refs(), btreemap! {}); assert_eq!(tx.repo().view().bookmarks().count(), 0); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_initial_commit_head_is_not_set(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = GitSettings { auto_local_bookmark: true, ..get_git_settings(subprocess) }; let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); let mut tx = test_data.repo.start_transaction(); let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); // No default bookmark because the origin repo's HEAD wasn't set assert_eq!(stats.default_branch, None); assert!(stats.import_stats.abandoned_commits.is_empty()); let repo = tx.commit("test").unwrap(); // The initial commit is visible after git_fetch(). let view = repo.view(); assert!(view.heads().contains(&jj_id(initial_git_commit))); let initial_commit_target = RefTarget::normal(jj_id(initial_git_commit)); let initial_commit_remote_ref = RemoteRef { target: initial_commit_target.clone(), state: RemoteRefState::Tracked, }; assert_eq!( *view.git_refs(), btreemap! { "refs/remotes/origin/main".into() => initial_commit_target.clone(), } ); assert_eq!( view.bookmarks().collect::>(), btreemap! { "main".as_ref() => BookmarkTarget { local_target: &initial_commit_target, remote_refs: vec![ ("origin".as_ref(), &initial_commit_remote_ref), ], }, } ); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_initial_commit_head_is_set(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = GitSettings { auto_local_bookmark: true, ..get_git_settings(subprocess) }; let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); testutils::git::set_symbolic_reference(&test_data.origin_repo, "HEAD", "refs/heads/main"); let new_git_commit = empty_git_commit( &test_data.origin_repo, "refs/heads/main", &[initial_git_commit], ); test_data .origin_repo .reference( "refs/tags/v1.0", new_git_commit, gix::refs::transaction::PreviousValue::MustNotExist, "", ) .unwrap(); let mut tx = test_data.repo.start_transaction(); let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); assert_eq!(stats.default_branch, Some("main".into())); assert!(stats.import_stats.abandoned_commits.is_empty()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_success(subprocess: bool) { let mut test_data = GitRepoData::create(); let git_settings = GitSettings { auto_local_bookmark: true, ..get_git_settings(subprocess) }; let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); let mut tx = test_data.repo.start_transaction(); git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); test_data.repo = tx.commit("test").unwrap(); testutils::git::set_symbolic_reference(&test_data.origin_repo, "HEAD", "refs/heads/main"); let new_git_commit = empty_git_commit( &test_data.origin_repo, "refs/heads/main", &[initial_git_commit], ); test_data .origin_repo .reference( "refs/tags/v1.0", new_git_commit, gix::refs::transaction::PreviousValue::MustNotExist, "", ) .unwrap(); let mut tx = test_data.repo.start_transaction(); let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); // The default bookmark is "main" assert_eq!(stats.default_branch, Some("main".into())); assert!(stats.import_stats.abandoned_commits.is_empty()); let repo = tx.commit("test").unwrap(); // The new commit is visible after we fetch again let view = repo.view(); assert!(view.heads().contains(&jj_id(new_git_commit))); let new_commit_target = RefTarget::normal(jj_id(new_git_commit)); let new_commit_remote_ref = RemoteRef { target: new_commit_target.clone(), state: RemoteRefState::Tracked, }; assert_eq!( *view.git_refs(), btreemap! { "refs/remotes/origin/main".into() => new_commit_target.clone(), "refs/tags/v1.0".into() => new_commit_target.clone(), } ); assert_eq!( view.bookmarks().collect::>(), btreemap! { "main".as_ref() => BookmarkTarget { local_target: &new_commit_target, remote_refs: vec![ ("origin".as_ref(), &new_commit_remote_ref), ], }, } ); assert_eq!( *view.tags(), btreemap! { "v1.0".into() => new_commit_target.clone(), } ); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_prune_deleted_ref(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = GitSettings { auto_local_bookmark: true, ..get_git_settings(subprocess) }; let commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); let mut tx = test_data.repo.start_transaction(); git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); // Test the setup assert!(tx.repo().get_local_bookmark("main".as_ref()).is_present()); assert!(tx .repo() .get_remote_bookmark(remote_symbol("main", "origin")) .is_present()); test_data .origin_repo .find_reference("refs/heads/main") .unwrap() .delete() .unwrap(); // After re-fetching, the bookmark should be deleted let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); assert_eq!(stats.import_stats.abandoned_commits, vec![jj_id(commit)]); assert!(tx.repo().get_local_bookmark("main".as_ref()).is_absent()); assert!(tx .repo_mut() .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_no_default_branch(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = GitSettings { auto_local_bookmark: true, ..get_git_settings(subprocess) }; let initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); let mut tx = test_data.repo.start_transaction(); git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); empty_git_commit( &test_data.origin_repo, "refs/heads/main", &[initial_git_commit], ); // It's actually not enough to have a detached HEAD, it also needs to point to a // commit without a bookmark (that's possibly a bug in Git *and* libgit2), so // we point it to initial_git_commit. testutils::git::set_head_to_id(&test_data.origin_repo, initial_git_commit); let stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[StringPattern::everything()], &git_settings, ) .unwrap(); // There is no default bookmark assert_eq!(stats.default_branch, None); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_empty_refspecs(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = get_git_settings(subprocess); empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); // Base refspecs shouldn't be respected let mut tx = test_data.repo.start_transaction(); git_fetch(tx.repo_mut(), "origin".as_ref(), &[], &git_settings).unwrap(); assert!(tx .repo_mut() .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); // No remote refs should have been fetched git::import_refs(tx.repo_mut(), &git_settings).unwrap(); assert!(tx .repo_mut() .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_fetch_no_such_remote(subprocess: bool) { let test_data = GitRepoData::create(); let git_settings = get_git_settings(subprocess); let mut tx = test_data.repo.start_transaction(); let result = git_fetch( tx.repo_mut(), "invalid-remote".as_ref(), &[StringPattern::everything()], &git_settings, ); assert!(matches!(result, Err(GitFetchError::NoSuchRemote(_)))); } #[test] fn test_fetch_multiple_branches() { let test_data = GitRepoData::create(); let _initial_git_commit = empty_git_commit(&test_data.origin_repo, "refs/heads/main", &[]); let git_settings = GitSettings { auto_local_bookmark: true, ..Default::default() }; let mut tx = test_data.repo.start_transaction(); let fetch_stats = git_fetch( tx.repo_mut(), "origin".as_ref(), &[ StringPattern::Exact("main".to_string()), StringPattern::Exact("noexist1".to_string()), StringPattern::Exact("noexist2".to_string()), ], &git_settings, ) .unwrap(); assert_eq!( fetch_stats .import_stats .changed_remote_bookmarks .iter() .map(|(symbol, _)| symbol) .collect_vec(), [remote_symbol("main", "origin")] ); } struct PushTestSetup { source_repo_dir: PathBuf, jj_repo: Arc, main_commit: Commit, child_of_main_commit: Commit, parent_of_main_commit: Commit, sideways_commit: Commit, } /// Set up a situation where `main` is at `main_commit`, the child of /// `parent_of_main_commit`, both in the source repo and in jj's clone of the /// repo. In jj's clone, there are also two more commits, `child_of_main_commit` /// and `sideways_commit`, arranged as follows: /// /// o child_of_main_commit /// o main_commit /// o parent_of_main_commit /// | o sideways_commit /// |/ /// ~ root fn set_up_push_repos(settings: &UserSettings, temp_dir: &TempDir) -> PushTestSetup { let source_repo_dir = temp_dir.path().join("source"); let clone_repo_dir = temp_dir.path().join("clone"); let jj_repo_dir = temp_dir.path().join("jj"); let source_repo = testutils::git::init_bare(&source_repo_dir); let parent_of_initial_git_commit = empty_git_commit(&source_repo, "refs/heads/main", &[]); let initial_git_commit = empty_git_commit( &source_repo, "refs/heads/main", &[parent_of_initial_git_commit], ); let clone_repo = testutils::git::clone(&clone_repo_dir, source_repo_dir.to_str().unwrap(), None); std::fs::create_dir(&jj_repo_dir).unwrap(); let jj_repo = ReadonlyRepo::init( settings, &jj_repo_dir, &|settings, store_path| { Ok(Box::new(GitBackend::init_external( settings, store_path, clone_repo.path(), )?)) }, Signer::from_settings(settings).unwrap(), ReadonlyRepo::default_op_store_initializer(), ReadonlyRepo::default_op_heads_store_initializer(), ReadonlyRepo::default_index_store_initializer(), ReadonlyRepo::default_submodule_store_initializer(), ) .unwrap(); get_git_backend(&jj_repo) .import_head_commits(&[jj_id(initial_git_commit)]) .unwrap(); let main_commit = jj_repo .store() .get_commit(&jj_id(initial_git_commit)) .unwrap(); let parent_of_main_commit = jj_repo .store() .get_commit(&jj_id(parent_of_initial_git_commit)) .unwrap(); let mut tx = jj_repo.start_transaction(); let sideways_commit = write_random_commit(tx.repo_mut()); let child_of_main_commit = create_random_commit(tx.repo_mut()) .set_parents(vec![main_commit.id().clone()]) .write() .unwrap(); tx.repo_mut().set_git_ref_target( "refs/remotes/origin/main".as_ref(), RefTarget::normal(main_commit.id().clone()), ); tx.repo_mut().set_remote_bookmark( remote_symbol("main", "origin"), RemoteRef { target: RefTarget::normal(main_commit.id().clone()), // Caller expects the main bookmark is tracked. The corresponding local bookmark will // be created (or left as deleted) by caller. state: RemoteRefState::Tracked, }, ); let jj_repo = tx.commit("test").unwrap(); PushTestSetup { source_repo_dir, jj_repo, main_commit, child_of_main_commit, parent_of_main_commit, sideways_commit, } } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_bookmarks_success(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let mut setup = set_up_push_repos(&settings, &temp_dir); let clone_repo = get_git_repo(&setup.jj_repo); let mut tx = setup.jj_repo.start_transaction(); let git_settings = get_git_settings(subprocess); let targets = GitBranchPushTargets { branch_updates: vec![( "main".into(), BookmarkPushUpdate { old_target: Some(setup.main_commit.id().clone()), new_target: Some(setup.child_of_main_commit.id().clone()), }, )], }; let result = git::push_branches( tx.repo_mut(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ); assert_eq!( result.unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); // Check that the ref got updated in the source repo let source_repo = testutils::git::open(&setup.source_repo_dir); let new_target = source_repo.find_reference("refs/heads/main").unwrap(); let new_oid = git_id(&setup.child_of_main_commit); assert_eq!(new_target.target().id(), new_oid); // Check that the ref got updated in the cloned repo. This just tests our // assumptions about libgit2 because we want the refs/remotes/origin/main // bookmark to be updated. let new_target = clone_repo .find_reference("refs/remotes/origin/main") .unwrap(); assert_eq!(new_target.target().id(), new_oid); // Check that the repo view got updated let view = tx.repo().view(); assert_eq!( *view.get_git_ref("refs/remotes/origin/main".as_ref()), RefTarget::normal(setup.child_of_main_commit.id().clone()), ); assert_eq!( *view.get_remote_bookmark(remote_symbol("main", "origin")), RemoteRef { target: RefTarget::normal(setup.child_of_main_commit.id().clone()), state: RemoteRefState::Tracked, }, ); // Check that the repo view reflects the changes in the Git repo setup.jj_repo = tx.commit("test").unwrap(); let mut tx = setup.jj_repo.start_transaction(); git::import_refs(tx.repo_mut(), &GitSettings::default()).unwrap(); assert!(!tx.repo().has_changes()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_bookmarks_deletion(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let mut setup = set_up_push_repos(&settings, &temp_dir); let clone_repo = get_git_repo(&setup.jj_repo); let mut tx = setup.jj_repo.start_transaction(); let git_settings = get_git_settings(subprocess); let source_repo = testutils::git::open(&setup.source_repo_dir); // Test the setup assert!(source_repo.find_reference("refs/heads/main").is_ok()); let targets = GitBranchPushTargets { branch_updates: vec![( "main".into(), BookmarkPushUpdate { old_target: Some(setup.main_commit.id().clone()), new_target: None, }, )], }; let result = git::push_branches( tx.repo_mut(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ); assert_eq!( result.unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); // Check that the ref got deleted in the source repo assert!(source_repo.find_reference("refs/heads/main").is_err()); // Check that the ref got deleted in the cloned repo. This just tests our // assumptions about libgit2 because we want the refs/remotes/origin/main // bookmark to be deleted. assert!(clone_repo .find_reference("refs/remotes/origin/main") .is_err()); // Check that the repo view got updated let view = tx.repo().view(); assert!(view .get_git_ref("refs/remotes/origin/main".as_ref()) .is_absent()); assert!(view .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); // Check that the repo view reflects the changes in the Git repo setup.jj_repo = tx.commit("test").unwrap(); let mut tx = setup.jj_repo.start_transaction(); git::import_refs(tx.repo_mut(), &GitSettings::default()).unwrap(); assert!(!tx.repo().has_changes()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_bookmarks_mixed_deletion_and_addition(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let mut setup = set_up_push_repos(&settings, &temp_dir); let mut tx = setup.jj_repo.start_transaction(); let git_settings = get_git_settings(subprocess); let targets = GitBranchPushTargets { branch_updates: vec![ ( "main".into(), BookmarkPushUpdate { old_target: Some(setup.main_commit.id().clone()), new_target: None, }, ), ( "topic".into(), BookmarkPushUpdate { old_target: None, new_target: Some(setup.child_of_main_commit.id().clone()), }, ), ], }; let result = git::push_branches( tx.repo_mut(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ); assert_eq!( result.unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into(), "refs/heads/topic".into()], ..Default::default() } ); // Check that the topic ref got updated in the source repo let source_repo = testutils::git::open(&setup.source_repo_dir); let new_target = source_repo.find_reference("refs/heads/topic").unwrap(); assert_eq!( new_target.target().id(), git_id(&setup.child_of_main_commit) ); // Check that the main ref got deleted in the source repo assert!(source_repo.find_reference("refs/heads/main").is_err()); // Check that the repo view got updated let view = tx.repo().view(); assert!(view .get_git_ref("refs/remotes/origin/main".as_ref()) .is_absent()); assert!(view .get_remote_bookmark(remote_symbol("main", "origin")) .is_absent()); assert_eq!( *view.get_git_ref("refs/remotes/origin/topic".as_ref()), RefTarget::normal(setup.child_of_main_commit.id().clone()), ); assert_eq!( *view.get_remote_bookmark(remote_symbol("topic", "origin")), RemoteRef { target: RefTarget::normal(setup.child_of_main_commit.id().clone()), state: RemoteRefState::Tracked, }, ); // Check that the repo view reflects the changes in the Git repo setup.jj_repo = tx.commit("test").unwrap(); let mut tx = setup.jj_repo.start_transaction(); git::import_refs(tx.repo_mut(), &GitSettings::default()).unwrap(); assert!(!tx.repo().has_changes()); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_bookmarks_not_fast_forward(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let mut tx = setup.jj_repo.start_transaction(); let git_settings = get_git_settings(subprocess); let targets = GitBranchPushTargets { branch_updates: vec![( "main".into(), BookmarkPushUpdate { old_target: Some(setup.main_commit.id().clone()), new_target: Some(setup.sideways_commit.id().clone()), }, )], }; let result = git::push_branches( tx.repo_mut(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ); assert_eq!( result.unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); // Check that the ref got updated in the source repo let source_repo = testutils::git::open(&setup.source_repo_dir); let new_target = source_repo.find_reference("refs/heads/main").unwrap(); assert_eq!(new_target.target().id(), git_id(&setup.sideways_commit)); } // TODO(ilyagr): More tests for push safety checks were originally planned. We // may want to add tests for when a bookmark unexpectedly moved backwards or // unexpectedly does not exist for bookmark deletion. #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_unexpectedly_moved_sideways_on_remote(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); // The main bookmark is actually at `main_commit` on the remote. If we expect // it to be at `sideways_commit`, it unexpectedly moved sideways from our // perspective. // // We cannot delete it or move it anywhere else. However, "moving" it to the // same place it already is is OK, following the behavior in // `test_merge_ref_targets`. // // For each test, we check that the push succeeds if and only if the bookmark // conflict `jj git fetch` would generate resolves to the push destination. let attempt_push_expecting_sideways = |target: Option| { let targets = [GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: Some(setup.sideways_commit.id().clone()), new_target: target, }]; git::push_updates( setup.jj_repo.as_ref(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ) }; assert_eq!( push_status_rejected_references(attempt_push_expecting_sideways(None).unwrap()), vec!["refs/heads/main".to_owned()], ); assert_eq!( push_status_rejected_references( attempt_push_expecting_sideways(Some(setup.child_of_main_commit.id().clone())).unwrap() ), vec!["refs/heads/main".to_owned()] ); // Here, the local bookmark hasn't moved from `sideways_commit` from our // perspective, but it moved to `main` on the remote. So, the conflict // resolves to `main`. // // `jj` should not actually attempt a push in this case, but if it did, the // push should fail. assert_eq!( push_status_rejected_references( attempt_push_expecting_sideways(Some(setup.sideways_commit.id().clone())).unwrap() ), vec!["refs/heads/main".to_owned()] ); assert_eq!( push_status_rejected_references( attempt_push_expecting_sideways(Some(setup.parent_of_main_commit.id().clone())) .unwrap() ), vec!["refs/heads/main".to_owned()] ); // Moving the bookmark to the same place it already is is OK. assert_eq!( attempt_push_expecting_sideways(Some(setup.main_commit.id().clone())).unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_unexpectedly_moved_forward_on_remote(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); // The main bookmark is actually at `main_commit` on the remote. If we // expected it to be at `parent_of_commit`, it unexpectedly moved forward // from our perspective. // // We cannot delete it or move it sideways. (TODO: Moving it backwards is // also disallowed; there is currently no test for this). However, "moving" // it *forwards* is OK. This is allowed *only* in this test, i.e. if the // actual location is the descendant of the expected location, and the new // location is the descendant of that. // // For each test, we check that the push succeeds if and only if the bookmark // conflict `jj git fetch` would generate resolves to the push destination. let attempt_push_expecting_parent = |target: Option| { let targets = [GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: Some(setup.parent_of_main_commit.id().clone()), new_target: target, }]; git::push_updates( setup.jj_repo.as_ref(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ) }; assert_eq!( push_status_rejected_references(attempt_push_expecting_parent(None).unwrap()), ["refs/heads/main"].map(GitRefNameBuf::from) ); assert_eq!( push_status_rejected_references( attempt_push_expecting_parent(Some(setup.sideways_commit.id().clone())).unwrap() ), ["refs/heads/main"].map(GitRefNameBuf::from) ); // Here, the local bookmark hasn't moved from `parent_of_main_commit`, but it // moved to `main` on the remote. So, the conflict resolves to `main`. // // `jj` should not actually attempt a push in this case, but if it did, the push // should fail. assert_eq!( push_status_rejected_references( attempt_push_expecting_parent(Some(setup.parent_of_main_commit.id().clone())).unwrap() ), ["refs/heads/main"].map(GitRefNameBuf::from) ); if subprocess { // git is strict about honouring the expected location on --force-with-lease assert_eq!( push_status_rejected_references( attempt_push_expecting_parent(Some(setup.child_of_main_commit.id().clone())) .unwrap() ), ["refs/heads/main"].map(GitRefNameBuf::from) ); } else { // Moving the bookmark *forwards* is OK, as an exception matching our bookmark // conflict resolution rules assert_eq!( attempt_push_expecting_parent(Some(setup.child_of_main_commit.id().clone())).unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); } } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_unexpectedly_exists_on_remote(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); // The main bookmark is actually at `main_commit` on the remote. In this test, // we expect it to not exist on the remote at all. // // We cannot move the bookmark backwards or sideways, but we *can* move it // forward (as a special case). // // For each test, we check that the push succeeds if and only if the bookmark // conflict `jj git fetch` would generate resolves to the push destination. let attempt_push_expecting_absence = |target: Option| { let targets = [GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: None, new_target: target, }]; git::push_updates( setup.jj_repo.as_ref(), &git_settings, "origin".as_ref(), &targets, git::RemoteCallbacks::default(), ) }; assert_eq!( push_status_rejected_references( attempt_push_expecting_absence(Some(setup.parent_of_main_commit.id().clone())).unwrap() ), ["refs/heads/main"].map(GitRefNameBuf::from) ); if subprocess { // Git is strict with enforcing the expected location assert_eq!( push_status_rejected_references( attempt_push_expecting_absence(Some(setup.child_of_main_commit.id().clone())) .unwrap() ), ["refs/heads/main"].map(GitRefNameBuf::from) ); } else { // In git2: We *can* move the bookmark forward even if we didn't expect it to // exist assert_eq!( attempt_push_expecting_absence(Some(setup.child_of_main_commit.id().clone())).unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); } } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_success(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); let clone_repo = get_git_repo(&setup.jj_repo); let result = git::push_updates( setup.jj_repo.as_ref(), &git_settings, "origin".as_ref(), &[GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: Some(setup.main_commit.id().clone()), new_target: Some(setup.child_of_main_commit.id().clone()), }], git::RemoteCallbacks::default(), ); assert_eq!( result.unwrap(), GitPushStats { pushed: vec!["refs/heads/main".into()], ..Default::default() } ); // Check that the ref got updated in the source repo let source_repo = testutils::git::open(&setup.source_repo_dir); let new_target = source_repo.find_reference("refs/heads/main").unwrap(); let new_oid = git_id(&setup.child_of_main_commit); assert_eq!(new_target.target().id(), new_oid); // Check that the ref got updated in the cloned repo. This just tests our // assumptions about libgit2 because we want the refs/remotes/origin/main // bookmark to be updated. let new_target = clone_repo .find_reference("refs/remotes/origin/main") .unwrap(); assert_eq!(new_target.target().id(), new_oid); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_no_such_remote(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); let result = git::push_updates( setup.jj_repo.as_ref(), &git_settings, "invalid-remote".as_ref(), &[GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: Some(setup.main_commit.id().clone()), new_target: Some(setup.child_of_main_commit.id().clone()), }], git::RemoteCallbacks::default(), ); assert!(matches!(result, Err(GitPushError::NoSuchRemote(_)))); } #[cfg_attr(feature = "git2", test_case(false; "use git2 for remote calls"))] #[test_case(true; "spawn a git subprocess for remote calls")] fn test_push_updates_invalid_remote(subprocess: bool) { let settings = testutils::user_settings(); let temp_dir = testutils::new_temp_dir(); let setup = set_up_push_repos(&settings, &temp_dir); let git_settings = get_git_settings(subprocess); let result = git::push_updates( setup.jj_repo.as_ref(), &git_settings, "http://invalid-remote".as_ref(), &[GitRefUpdate { qualified_name: "refs/heads/main".into(), expected_current_target: Some(setup.main_commit.id().clone()), new_target: Some(setup.child_of_main_commit.id().clone()), }], git::RemoteCallbacks::default(), ); assert!(matches!(result, Err(GitPushError::NoSuchRemote(_)))); } #[test] fn test_bulk_update_extra_on_import_refs() { let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); let count_extra_tables = || { let extra_dir = test_repo.repo_path().join("store").join("extra"); extra_dir .read_dir() .unwrap() .filter(|entry| entry.as_ref().unwrap().metadata().unwrap().is_file()) .count() }; let import_refs = |repo: &Arc| { let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); tx.commit("test").unwrap() }; // Extra metadata table shouldn't be created per read_commit() call. The number // of the table files should be way smaller than the number of the heads. let mut commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); for _ in 1..10 { commit = empty_git_commit(&git_repo, "refs/heads/main", &[commit]); } let repo = import_refs(repo); assert_eq!(count_extra_tables(), 2); // empty + imported_heads == 2 // Noop import shouldn't create a table file. let repo = import_refs(&repo); assert_eq!(count_extra_tables(), 2); // Importing new head should add exactly one table file. for _ in 0..10 { commit = empty_git_commit(&git_repo, "refs/heads/main", &[commit]); } let repo = import_refs(&repo); assert_eq!(count_extra_tables(), 3); drop(repo); // silence clippy } #[test] fn test_rewrite_imported_commit() { let git_settings = GitSettings::default(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; let git_repo = get_git_repo(repo); // Import git commit, which generates change id from the commit id. let git_commit = empty_git_commit(&git_repo, "refs/heads/main", &[]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &git_settings).unwrap(); tx.repo_mut().rebase_descendants().unwrap(); let repo = tx.commit("test").unwrap(); let imported_commit = repo.store().get_commit(&jj_id(git_commit)).unwrap(); // Try to create identical commit with different change id. let mut tx = repo.start_transaction(); let authored_commit = tx .repo_mut() .new_commit( imported_commit.parent_ids().to_vec(), imported_commit.tree_id().clone(), ) .set_author(imported_commit.author().clone()) .set_committer(imported_commit.committer().clone()) .set_description(imported_commit.description()) .write() .unwrap(); let repo = tx.commit("test").unwrap(); // Imported commit shouldn't be reused, and the timestamp of the authored // commit should be adjusted to create new commit. assert_ne!(imported_commit.id(), authored_commit.id()); assert_ne!( imported_commit.committer().timestamp, authored_commit.committer().timestamp, ); // The index should be consistent with the store. assert_eq!( repo.resolve_change_id(imported_commit.change_id()), Some(vec![imported_commit.id().clone()]), ); assert_eq!( repo.resolve_change_id(authored_commit.change_id()), Some(vec![authored_commit.id().clone()]), ); } #[test] fn test_concurrent_write_commit() { let settings = &testutils::user_settings(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let test_env = &test_repo.env; let repo = &test_repo.repo; // Try to create identical commits with different change ids. Timestamp of the // commits should be adjusted such that each commit has a unique commit id. let num_thread = 8; let (sender, receiver) = mpsc::channel(); thread::scope(|s| { let barrier = Arc::new(Barrier::new(num_thread)); for i in 0..num_thread { let repo = test_env.load_repo_at_head(settings, test_repo.repo_path()); // unshare loader let barrier = barrier.clone(); let sender = sender.clone(); s.spawn(move || { barrier.wait(); let mut tx = repo.start_transaction(); let commit = create_rooted_commit(tx.repo_mut()) .set_description("racy commit") .write() .unwrap(); tx.commit(format!("writer {i}")).unwrap(); sender .send((commit.id().clone(), commit.change_id().clone())) .unwrap(); }); } }); drop(sender); let mut commit_change_ids: BTreeMap> = BTreeMap::new(); for (commit_id, change_id) in receiver { commit_change_ids .entry(commit_id) .or_default() .insert(change_id); } // Ideally, each commit should have unique commit/change ids. assert_eq!(commit_change_ids.len(), num_thread); // All unique commits should be preserved. let repo = repo.reload_at_head().unwrap(); for (commit_id, change_ids) in &commit_change_ids { let commit = repo.store().get_commit(commit_id).unwrap(); assert_eq!(commit.id(), commit_id); assert!(change_ids.contains(commit.change_id())); } // The index should be consistent with the store. for commit_id in commit_change_ids.keys() { assert!(repo.index().has_id(commit_id)); let commit = repo.store().get_commit(commit_id).unwrap(); assert_eq!( repo.resolve_change_id(commit.change_id()), Some(vec![commit_id.clone()]), ); } } #[test] fn test_concurrent_read_write_commit() { let settings = &testutils::user_settings(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let test_env = &test_repo.env; let repo = &test_repo.repo; // Create unique commits and load them concurrently. In this test, we assume // that writer doesn't fall back to timestamp adjustment, so the expected // commit ids are static. If reader could interrupt in the timestamp // adjustment loop, this assumption wouldn't apply. let commit_ids = [ "c5c6efd6ac240102e7f047234c3cade55eedd621", "9f7a96a6c9d044b228f3321a365bdd3514e6033a", "aa7867ad0c566df5bbb708d8d6ddc88eefeea0ff", "930a76e333d5cc17f40a649c3470cb99aae24a0c", "88e9a719df4f0cc3daa740b814e271341f6ea9f4", "4883bdc57448a53b4eef1af85e34b85b9ee31aee", "308345f8d058848e83beed166704faac2ecd4541", "9e35ff61ea8d1d4ef7f01edc5fd23873cc301b30", "8010ac8c65548dd619e7c83551d983d724dda216", "bbe593d556ea31acf778465227f340af7e627b2b", "2f6800f4b8e8fc4c42dc0e417896463d13673654", "a3a7e4fcddeaa11bb84f66f3428f107f65eb3268", "96e17ff3a7ee1b67ddfa5619b2bf5380b80f619a", "34613f7609524c54cc990ada1bdef3dcad0fd29f", "95867e5aed6b62abc2cd6258da9fee8873accfd3", "7635ce107ae7ba71821b8cd74a1405ca6d9e49ac", ] .into_iter() .map(CommitId::from_hex) .collect_vec(); let num_reader_thread = 8; thread::scope(|s| { let barrier = Arc::new(Barrier::new(commit_ids.len() + num_reader_thread)); // Writer assigns random change id for (i, commit_id) in commit_ids.iter().enumerate() { let repo = test_env.load_repo_at_head(settings, test_repo.repo_path()); // unshare loader let barrier = barrier.clone(); s.spawn(move || { barrier.wait(); let mut tx = repo.start_transaction(); let commit = create_rooted_commit(tx.repo_mut()) .set_description(format!("commit {i}")) .write() .unwrap(); tx.commit(format!("writer {i}")).unwrap(); assert_eq!(commit.id(), commit_id); }); } // Reader may generate change id (if not yet assigned by the writer) for i in 0..num_reader_thread { let mut repo = test_env.load_repo_at_head(settings, test_repo.repo_path()); // unshare loader let barrier = barrier.clone(); let mut pending_commit_ids = commit_ids.clone(); pending_commit_ids.rotate_left(i); // start lookup from different place s.spawn(move || { barrier.wait(); // This loop should finish within a couple of retries, but terminate in case // it doesn't. for _ in 0..100 { if pending_commit_ids.is_empty() { break; } repo = repo.reload_at_head().unwrap(); let git_backend = get_git_backend(&repo); let mut tx = repo.start_transaction(); pending_commit_ids = pending_commit_ids .into_iter() .filter_map(|commit_id| { match git_backend.import_head_commits([&commit_id]) { Ok(()) => { // update index as git::import_refs() would do let commit = repo.store().get_commit(&commit_id).unwrap(); tx.repo_mut().add_head(&commit).unwrap(); None } Err(BackendError::ObjectNotFound { .. }) => Some(commit_id), Err(err) => { eprintln!( "import error in reader {i} (maybe lock contention?): {}", iter::successors( Some(&err as &dyn std::error::Error), |e| e.source(), ) .join(": ") ); Some(commit_id) } } }) .collect_vec(); if tx.repo().has_changes() { tx.commit(format!("reader {i}")).unwrap(); } thread::yield_now(); } if !pending_commit_ids.is_empty() { // It's not an error if some of the readers couldn't observe the commits. It's // unlikely, but possible if the git backend had strong negative object cache // for example. eprintln!( "reader {i} couldn't observe the following commits: \ {pending_commit_ids:#?}" ); } }); } }); // The index should be consistent with the store. let repo = repo.reload_at_head().unwrap(); for commit_id in &commit_ids { assert!(repo.index().has_id(commit_id)); let commit = repo.store().get_commit(commit_id).unwrap(); assert_eq!( repo.resolve_change_id(commit.change_id()), Some(vec![commit_id.clone()]), ); } } fn create_rooted_commit(mut_repo: &mut MutableRepo) -> CommitBuilder<'_> { let signature = Signature { name: "Test User".to_owned(), email: "test.user@example.com".to_owned(), timestamp: Timestamp { // avoid underflow during timestamp adjustment timestamp: MillisSinceEpoch(1_000_000), tz_offset: 0, }, }; mut_repo .new_commit( vec![mut_repo.store().root_commit_id().clone()], mut_repo.store().empty_merged_tree_id(), ) .set_author(signature.clone()) .set_committer(signature) } #[test] fn test_shallow_commits_lack_parents() { let settings = testutils::user_settings(); let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let test_env = &test_repo.env; let repo = &test_repo.repo; let git_repo = get_git_repo(repo); // D E (`main`) // | | // B C // shallow boundary // | / // A // | // git_root let git_root = empty_git_commit(&git_repo, "refs/heads/main", &[]); let a = empty_git_commit(&git_repo, "refs/heads/main", &[git_root]); let b = empty_git_commit(&git_repo, "refs/heads/feature", &[a]); let c = empty_git_commit(&git_repo, "refs/heads/main", &[a]); let d = empty_git_commit(&git_repo, "refs/heads/feature", &[b]); let e = empty_git_commit(&git_repo, "refs/heads/main", &[c]); testutils::git::set_symbolic_reference(&git_repo, "HEAD", "refs/heads/main"); let make_shallow = |repo, mut shallow_commits: Vec<_>| { let shallow_file = get_git_backend(repo).git_repo().shallow_file(); shallow_commits.sort(); let mut buf = Vec::::new(); for commit in shallow_commits { writeln!(buf, "{commit}").unwrap(); } fs::write(shallow_file, buf).unwrap(); // Reload the repo to invalidate mtime-based in-memory cache test_env.load_repo_at_head(&settings, test_repo.repo_path()) }; let repo = make_shallow(repo, vec![b, c]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &GitSettings::default()).unwrap(); let repo = tx.commit("import").unwrap(); let store = repo.store(); let root = store.root_commit_id(); let expected_heads = hashset! { jj_id(d), jj_id(e), }; assert_eq!(*repo.view().heads(), expected_heads); let parents = |store: &Arc, commit| { let commit = store.get_commit(&jj_id(commit)).unwrap(); commit.parent_ids().to_vec() }; assert_eq!( parents(store, b), vec![root.clone()], "shallow commits have the root commit as a parent" ); assert_eq!( parents(store, c), vec![root.clone()], "shallow commits have the root commit as a parent" ); // deepen the shallow clone let repo = make_shallow(&repo, vec![a]); let mut tx = repo.start_transaction(); git::import_refs(tx.repo_mut(), &GitSettings::default()).unwrap(); let repo = tx.commit("import").unwrap(); let store = repo.store(); let root = store.root_commit_id(); assert_eq!( parents(store, a), vec![root.clone()], "shallow commits have the root commit as a parent" ); assert_eq!( parents(store, b), vec![jj_id(a)], "unshallowed commits have parents" ); assert_eq!( parents(store, c), vec![jj_id(a)], "unshallowed commits have correct parents" ); // FIXME: new ancestors should be indexed assert!(!repo.index().has_id(&jj_id(a))); } #[test] fn test_remote_remove_refs() { let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; git::add_remote(repo.store(), "foo".as_ref(), "https://example.com/").unwrap(); // Reload after Git configuration change. let repo = &test_repo .env .load_repo_at_head(&testutils::user_settings(), test_repo.repo_path()); let git_repo = get_git_repo(repo); empty_git_commit(&git_repo, "refs/remotes/foo/a", &[]); empty_git_commit(&git_repo, "refs/remotes/foo/x/y", &[]); let commit_foobar_a = empty_git_commit(&git_repo, "refs/remotes/foobar/a", &[]); let mut tx = repo.start_transaction(); git::remove_remote(tx.repo_mut(), "foo".as_ref()).unwrap(); let repo = &tx.commit("remove").unwrap(); let git_repo = get_git_repo(repo); assert!(git_repo .try_find_reference("refs/remotes/foo/a") .unwrap() .is_none()); assert!(git_repo .try_find_reference("refs/remotes/foo/x/y") .unwrap() .is_none()); assert_eq!( git_repo .find_reference("refs/remotes/foobar/a") .unwrap() .id(), commit_foobar_a, ); } #[test] fn test_remote_rename_refs() { let test_repo = TestRepo::init_with_backend(TestRepoBackend::Git); let repo = &test_repo.repo; git::add_remote(repo.store(), "foo".as_ref(), "https://example.com/").unwrap(); // Reload after Git configuration change. let repo = &test_repo .env .load_repo_at_head(&testutils::user_settings(), test_repo.repo_path()); let git_repo = get_git_repo(repo); let commit_foo_a = empty_git_commit(&git_repo, "refs/remotes/foo/a", &[]); let commit_foo_x_y = empty_git_commit(&git_repo, "refs/remotes/foo/x/y", &[]); let commit_foobar_a = empty_git_commit(&git_repo, "refs/remotes/foobar/a", &[]); let mut tx = repo.start_transaction(); git::rename_remote(tx.repo_mut(), "foo".as_ref(), "bar".as_ref()).unwrap(); let repo = &tx.commit("rename").unwrap(); let git_repo = get_git_repo(repo); assert!(git_repo .try_find_reference("refs/remotes/foo/a") .unwrap() .is_none()); assert!(git_repo .try_find_reference("refs/remotes/foo/x/y") .unwrap() .is_none()); assert_eq!( git_repo.find_reference("refs/remotes/bar/a").unwrap().id(), commit_foo_a, ); assert_eq!( git_repo .find_reference("refs/remotes/bar/x/y") .unwrap() .id(), commit_foo_x_y, ); assert_eq!( git_repo .find_reference("refs/remotes/foobar/a") .unwrap() .id(), commit_foobar_a, ); }