// Copyright 2021 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // // https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. use std::path::Path; use jujutsu_lib::backend::{CommitId, MillisSinceEpoch, Signature, Timestamp}; use jujutsu_lib::commit_builder::CommitBuilder; use jujutsu_lib::matchers::{FilesMatcher, Matcher}; use jujutsu_lib::op_store::{RefTarget, WorkspaceId}; use jujutsu_lib::repo::RepoRef; use jujutsu_lib::repo_path::RepoPath; use jujutsu_lib::revset::{ self, optimize, parse, resolve_symbol, RevsetError, RevsetExpression, RevsetWorkspaceContext, }; use jujutsu_lib::testutils::{CommitGraphBuilder, TestRepo, TestWorkspace}; use jujutsu_lib::workspace::Workspace; use jujutsu_lib::{git, testutils}; use test_case::test_case; #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_resolve_symbol_root(use_git: bool) { let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; assert_eq!( resolve_symbol(repo.as_repo_ref(), "root", None), Ok(vec![repo.store().root_commit_id().clone()]) ); } #[test] fn test_resolve_symbol_commit_id() { let settings = testutils::user_settings(); // Test only with git so we can get predictable commit ids let test_repo = TestRepo::init(true); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let signature = Signature { name: "test".to_string(), email: "test".to_string(), timestamp: Timestamp { timestamp: MillisSinceEpoch(0), tz_offset: 0, }, }; let mut commits = vec![]; for i in &[1, 167, 895] { let commit = CommitBuilder::for_new_commit( &settings, vec![repo.store().root_commit_id().clone()], repo.store().empty_tree_id().clone(), ) .set_description(format!("test {}", i)) .set_author(signature.clone()) .set_committer(signature.clone()) .write_to_repo(mut_repo); commits.push(commit); } let repo = tx.commit(); // Test the test setup assert_eq!( commits[0].id().hex(), "0454de3cae04c46cda37ba2e8873b4c17ff51dcb" ); assert_eq!( commits[1].id().hex(), "045f56cd1b17e8abde86771e2705395dcde6a957" ); assert_eq!( commits[2].id().hex(), "0468f7da8de2ce442f512aacf83411d26cd2e0cf" ); // Test lookup by full commit id let repo_ref = repo.as_repo_ref(); assert_eq!( resolve_symbol(repo_ref, "0454de3cae04c46cda37ba2e8873b4c17ff51dcb", None), Ok(vec![commits[0].id().clone()]) ); assert_eq!( resolve_symbol(repo_ref, "045f56cd1b17e8abde86771e2705395dcde6a957", None), Ok(vec![commits[1].id().clone()]) ); assert_eq!( resolve_symbol(repo_ref, "0468f7da8de2ce442f512aacf83411d26cd2e0cf", None), Ok(vec![commits[2].id().clone()]) ); // Test commit id prefix assert_eq!( resolve_symbol(repo_ref, "046", None), Ok(vec![commits[2].id().clone()]) ); assert_eq!( resolve_symbol(repo_ref, "04", None), Err(RevsetError::AmbiguousCommitIdPrefix("04".to_string())) ); assert_eq!( resolve_symbol(repo_ref, "", None), Err(RevsetError::AmbiguousCommitIdPrefix("".to_string())) ); assert_eq!( resolve_symbol(repo_ref, "040", None), Err(RevsetError::NoSuchRevision("040".to_string())) ); // Test non-hex string assert_eq!( resolve_symbol(repo_ref, "foo", None), Err(RevsetError::NoSuchRevision("foo".to_string())) ); } #[test] fn test_resolve_symbol_change_id() { // Test only with git so we can get predictable change ids let test_repo = TestRepo::init(true); let repo = &test_repo.repo; let git_repo = repo.store().git_repo().unwrap(); // Add some commits that will end up having change ids with common prefixes let empty_tree_id = git_repo.treebuilder(None).unwrap().write().unwrap(); let git_author = git2::Signature::new( "git author", "git.author@example.com", &git2::Time::new(1000, 60), ) .unwrap(); let git_committer = git2::Signature::new( "git committer", "git.committer@example.com", &git2::Time::new(2000, -480), ) .unwrap(); let git_tree = git_repo.find_tree(empty_tree_id).unwrap(); let mut git_commit_ids = vec![]; for i in &[133, 664, 840] { let git_commit_id = git_repo .commit( Some(&format!("refs/heads/branch{}", i)), &git_author, &git_committer, &format!("test {}", i), &git_tree, &[], ) .unwrap(); git_commit_ids.push(git_commit_id); } let mut tx = repo.start_transaction("test"); git::import_refs(tx.mut_repo(), &git_repo).unwrap(); let repo = tx.commit(); // Test the test setup assert_eq!( hex::encode(git_commit_ids[0]), // "04e12a5467bba790efb88a9870894ec208b16bf1" reversed "8fd68d104372910e19511df709e5dde62a548720" ); assert_eq!( hex::encode(git_commit_ids[1]), // "040b3ba3a51d8edbc4c5855cbd09de71d4c29cca" reversed "5339432b8e7b90bd3aa1a323db71b8a5c5dcd020" ); assert_eq!( hex::encode(git_commit_ids[2]), // "04e1c7082e4e34f3f371d8a1a46770b861b9b547" reversed "e2ad9d861d0ee625851b8ecfcf2c727410e38720" ); // Test lookup by full change id let repo_ref = repo.as_repo_ref(); assert_eq!( resolve_symbol(repo_ref, "04e12a5467bba790efb88a9870894ec2", None), Ok(vec![CommitId::from_hex( "8fd68d104372910e19511df709e5dde62a548720" )]) ); assert_eq!( resolve_symbol(repo_ref, "040b3ba3a51d8edbc4c5855cbd09de71", None), Ok(vec![CommitId::from_hex( "5339432b8e7b90bd3aa1a323db71b8a5c5dcd020" )]) ); assert_eq!( resolve_symbol(repo_ref, "04e1c7082e4e34f3f371d8a1a46770b8", None), Ok(vec![CommitId::from_hex( "e2ad9d861d0ee625851b8ecfcf2c727410e38720" )]) ); // Test change id prefix assert_eq!( resolve_symbol(repo_ref, "04e12", None), Ok(vec![CommitId::from_hex( "8fd68d104372910e19511df709e5dde62a548720" )]) ); assert_eq!( resolve_symbol(repo_ref, "04e1c", None), Ok(vec![CommitId::from_hex( "e2ad9d861d0ee625851b8ecfcf2c727410e38720" )]) ); assert_eq!( resolve_symbol(repo_ref, "04e1", None), Err(RevsetError::AmbiguousChangeIdPrefix("04e1".to_string())) ); assert_eq!( resolve_symbol(repo_ref, "", None), // Commit id is checked first, so this is considered an ambiguous commit id Err(RevsetError::AmbiguousCommitIdPrefix("".to_string())) ); assert_eq!( resolve_symbol(repo_ref, "04e13", None), Err(RevsetError::NoSuchRevision("04e13".to_string())) ); // Test non-hex string assert_eq!( resolve_symbol(repo_ref, "foo", None), Err(RevsetError::NoSuchRevision("foo".to_string())) ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_resolve_symbol_checkout(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let ws1 = WorkspaceId::new("ws1".to_string()); let ws2 = WorkspaceId::new("ws2".to_string()); // With no workspaces, no variation can be resolved assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@", None), Err(RevsetError::NoSuchRevision("@".to_string())) ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@", Some(&ws1)), Err(RevsetError::NoSuchRevision("@".to_string())) ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "ws1@", Some(&ws1)), Err(RevsetError::NoSuchRevision("ws1@".to_string())) ); // Add some workspaces mut_repo .set_wc_commit(ws1.clone(), commit1.id().clone()) .unwrap(); mut_repo.set_wc_commit(ws2, commit2.id().clone()).unwrap(); // @ cannot be resolved without a default workspace ID assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@", None), Err(RevsetError::NoSuchRevision("@".to_string())) ); // Can resolve "@" shorthand with a default workspace ID assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@", Some(&ws1)), Ok(vec![commit1.id().clone()]) ); // Can resolve an explicit checkout assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "ws2@", Some(&ws1)), Ok(vec![commit2.id().clone()]) ); } #[test] fn test_resolve_symbol_git_refs() { let settings = testutils::user_settings(); let test_repo = TestRepo::init(true); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); // Create some commits and refs to work with and so the repo is not empty let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); mut_repo.set_git_ref( "refs/heads/branch1".to_string(), RefTarget::Normal(commit1.id().clone()), ); mut_repo.set_git_ref( "refs/heads/branch2".to_string(), RefTarget::Normal(commit2.id().clone()), ); mut_repo.set_git_ref( "refs/heads/conflicted".to_string(), RefTarget::Conflict { removes: vec![commit2.id().clone()], adds: vec![commit1.id().clone(), commit3.id().clone()], }, ); mut_repo.set_git_ref( "refs/tags/tag1".to_string(), RefTarget::Normal(commit2.id().clone()), ); mut_repo.set_git_ref( "refs/tags/remotes/origin/branch1".to_string(), RefTarget::Normal(commit3.id().clone()), ); // Nonexistent ref assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "nonexistent", None), Err(RevsetError::NoSuchRevision("nonexistent".to_string())) ); // Full ref mut_repo.set_git_ref( "refs/heads/branch".to_string(), RefTarget::Normal(commit4.id().clone()), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "refs/heads/branch", None), Ok(vec![commit4.id().clone()]) ); // Qualified with only heads/ mut_repo.set_git_ref( "refs/heads/branch".to_string(), RefTarget::Normal(commit5.id().clone()), ); mut_repo.set_git_ref( "refs/tags/branch".to_string(), RefTarget::Normal(commit4.id().clone()), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "heads/branch", None), Ok(vec![commit5.id().clone()]) ); // Unqualified branch name mut_repo.set_git_ref( "refs/heads/branch".to_string(), RefTarget::Normal(commit3.id().clone()), ); mut_repo.set_git_ref( "refs/tags/branch".to_string(), RefTarget::Normal(commit4.id().clone()), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "branch", None), Ok(vec![commit3.id().clone()]) ); // Unqualified tag name mut_repo.set_git_ref( "refs/tags/tag".to_string(), RefTarget::Normal(commit4.id().clone()), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "tag", None), Ok(vec![commit4.id().clone()]) ); // Unqualified remote-tracking branch name mut_repo.set_git_ref( "refs/remotes/origin/remote-branch".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "origin/remote-branch", None), Ok(vec![commit2.id().clone()]) ); // Cannot shadow checkout ("@") or root symbols let ws_id = WorkspaceId::default(); mut_repo .set_wc_commit(ws_id.clone(), commit1.id().clone()) .unwrap(); mut_repo.set_git_ref("@".to_string(), RefTarget::Normal(commit2.id().clone())); mut_repo.set_git_ref("root".to_string(), RefTarget::Normal(commit3.id().clone())); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@", Some(&ws_id)), Ok(vec![mut_repo .view() .get_wc_commit_id(&ws_id) .unwrap() .clone()]) ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "root", None), Ok(vec![mut_repo.store().root_commit().id().clone()]) ); // Conflicted ref resolves to its "adds" assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "refs/heads/conflicted", None), Ok(vec![commit1.id().clone(), commit3.id().clone()]) ); } fn resolve_commit_ids(repo: RepoRef, revset_str: &str) -> Vec { let expression = optimize(parse(revset_str, None).unwrap()); expression .evaluate(repo, None) .unwrap() .iter() .commit_ids() .collect() } fn resolve_commit_ids_in_workspace( repo: RepoRef, revset_str: &str, workspace: &Workspace, cwd: Option<&Path>, ) -> Vec { let workspace_ctx = RevsetWorkspaceContext { cwd: cwd.unwrap_or_else(|| workspace.workspace_root()), workspace_id: workspace.workspace_id(), workspace_root: workspace.workspace_root(), }; let expression = optimize(parse(revset_str, Some(&workspace_ctx)).unwrap()); expression .evaluate(repo, Some(&workspace_ctx)) .unwrap() .iter() .commit_ids() .collect() } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_root_and_checkout(use_git: bool) { let settings = testutils::user_settings(); let test_workspace = TestWorkspace::init(&settings, use_git); let repo = &test_workspace.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let root_commit = repo.store().root_commit(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); // Can find the root commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "root"), vec![root_commit.id().clone()] ); // Can find the current checkout mut_repo .set_wc_commit(WorkspaceId::default(), commit1.id().clone()) .unwrap(); assert_eq!( resolve_commit_ids_in_workspace( mut_repo.as_repo_ref(), "@", &test_workspace.workspace, None, ), vec![commit1.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_heads(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); // Heads of an empty set is an empty set assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads(none())"), vec![] ); // Heads of the root is the root assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads(root)"), vec![root_commit.id().clone()] ); // Heads of a single commit is that commit assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("heads({})", commit2.id().hex()) ), vec![commit2.id().clone()] ); // Heads of a parent and a child is the child assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("heads({} | {})", commit2.id().hex(), commit3.id().hex()) ), vec![commit3.id().clone()] ); // Heads of a grandparent and a grandchild is the grandchild (unlike Mercurial's // heads() revset, which would include both) assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("heads({} | {})", commit1.id().hex(), commit3.id().hex()) ), vec![commit3.id().clone()] ); // Heads of all commits is the set of heads in the repo assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads(all())"), resolve_commit_ids(mut_repo.as_repo_ref(), "heads()") ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_roots(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); // Roots of an empty set is an empty set assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "roots(none())"), vec![] ); // Roots of the root is the root assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "roots(root)"), vec![root_commit.id().clone()] ); // Roots of a single commit is that commit assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("roots({})", commit2.id().hex()) ), vec![commit2.id().clone()] ); // Roots of a parent and a child is the parent assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("roots({} | {})", commit2.id().hex(), commit3.id().hex()) ), vec![commit2.id().clone()] ); // Roots of a grandparent and a grandchild is the grandparent (unlike // Mercurial's roots() revset, which would include both) assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("roots({} | {})", commit1.id().hex(), commit3.id().hex()) ), vec![commit1.id().clone()] ); // Roots of all commits is the root commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "roots(all())"), vec![root_commit.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_parents(use_git: bool) { let settings = testutils::user_settings(); let test_workspace = TestWorkspace::init(&settings, use_git); let repo = &test_workspace.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.initial_commit(); let commit4 = graph_builder.commit_with_parents(&[&commit2, &commit3]); let commit5 = graph_builder.commit_with_parents(&[&commit2]); // The root commit has no parents assert_eq!(resolve_commit_ids(mut_repo.as_repo_ref(), "root-"), vec![]); // Can find parents of the current checkout mut_repo .set_wc_commit(WorkspaceId::default(), commit2.id().clone()) .unwrap(); assert_eq!( resolve_commit_ids_in_workspace( mut_repo.as_repo_ref(), "@-", &test_workspace.workspace, None, ), vec![commit1.id().clone()] ); // Can find parents of a merge commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), &format!("{}-", commit4.id().hex())), vec![commit3.id().clone(), commit2.id().clone()] ); // Parents of all commits in input are returned assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("({} | {})-", commit2.id().hex(), commit3.id().hex()) ), vec![commit1.id().clone(), root_commit.id().clone()] ); // Parents already in input set are returned assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("({} | {})-", commit1.id().hex(), commit2.id().hex()) ), vec![commit1.id().clone(), root_commit.id().clone()] ); // Parents shared among commits in input are not repeated assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("({} | {})-", commit4.id().hex(), commit5.id().hex()) ), vec![commit3.id().clone(), commit2.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_children(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit3.id().clone(), commit4.id().clone()]) .write_to_repo(mut_repo); // Can find children of the root commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "root+"), vec![commit1.id().clone()] ); // Children of all commits in input are returned, including those already in the // input set assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("({} | {})+", commit1.id().hex(), commit2.id().hex()) ), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone() ] ); // Children shared among commits in input are not repeated assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("({} | {})+", commit3.id().hex(), commit4.id().hex()) ), vec![commit5.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_ancestors(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit3]); // The ancestors of the root commit is just the root commit itself assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), ":root"), vec![root_commit.id().clone()] ); // Can find ancestors of a specific commit. Commits reachable via multiple paths // are not repeated. assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), &format!(":{}", commit4.id().hex())), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), root_commit.id().clone(), ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_range(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit3]); // The range from the root to the root is empty (because the left side of the // range is exclusive) assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "root..root"), vec![] ); // Linear range assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}..{}", commit1.id().hex(), commit3.id().hex()) ), vec![commit3.id().clone(), commit2.id().clone()] ); // Empty range (descendant first) assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}..{}", commit3.id().hex(), commit1.id().hex()) ), vec![] ); // Range including a merge assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}..{}", commit1.id().hex(), commit4.id().hex()) ), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone() ] ); // Sibling commits assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}..{}", commit2.id().hex(), commit3.id().hex()) ), vec![commit3.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_dag_range(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit_id = repo.store().root_commit_id().clone(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit1]); let commit5 = graph_builder.commit_with_parents(&[&commit3, &commit4]); // Can get DAG range of just the root commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "root:root"), vec![root_commit_id.clone()] ); // Linear range assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}:{}", root_commit_id.hex(), commit2.id().hex()) ), vec![commit2.id().clone(), commit1.id().clone(), root_commit_id] ); // Empty range assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}:{}", commit2.id().hex(), commit4.id().hex()) ), vec![] ); // Including a merge assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}:{}", commit1.id().hex(), commit5.id().hex()) ), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), ] ); // Including a merge, but ancestors only from one side assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{}:{}", commit2.id().hex(), commit5.id().hex()) ), vec![ commit5.id().clone(), commit3.id().clone(), commit2.id().clone(), ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_connected(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit_id = repo.store().root_commit_id().clone(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit1]); let commit5 = graph_builder.commit_with_parents(&[&commit3, &commit4]); // Connecting an empty set yields an empty set assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "connected(none())"), vec![] ); // Can connect just the root commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "connected(root)"), vec![root_commit_id.clone()] ); // Can connect linearly assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!( "connected({} | {})", root_commit_id.hex(), commit2.id().hex() ) ), vec![commit2.id().clone(), commit1.id().clone(), root_commit_id] ); // Siblings don't get connected assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("connected({} | {})", commit2.id().hex(), commit4.id().hex()) ), vec![commit4.id().clone(), commit2.id().clone()] ); // Including a merge assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("connected({} | {})", commit1.id().hex(), commit5.id().hex()) ), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), ] ); // Including a merge, but ancestors only from one side assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("connected({} | {})", commit2.id().hex(), commit5.id().hex()) ), vec![ commit5.id().clone(), commit3.id().clone(), commit2.id().clone(), ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_descendants(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let root_commit_id = repo.store().root_commit_id().clone(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit3.id().clone(), commit4.id().clone()]) .write_to_repo(mut_repo); // The descendants of the root commit are all the commits in the repo assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "root:"), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), root_commit_id, ] ); // Can find descendants of a specific commit assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), &format!("{}:", commit2.id().hex())), vec![ commit5.id().clone(), commit3.id().clone(), commit2.id().clone(), ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_none(use_git: bool) { let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; // none() is empty (doesn't include the checkout, for example) assert_eq!(resolve_commit_ids(repo.as_repo_ref(), "none()"), vec![]); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_all(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let root_commit_id = repo.store().root_commit_id().clone(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); 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(&[&commit2, &commit3]); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "all()"), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), root_commit_id, ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_visible_heads(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit1]); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads()"), vec![commit3.id().clone(), commit2.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_public_heads(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.initial_commit(); // Can get public heads with root commit as only public head assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "public_heads()"), vec![root_commit.id().clone()] ); // Can get public heads with a single public head mut_repo.add_public_head(&commit1); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "public_heads()"), vec![commit1.id().clone()] ); // Can get public heads with multiple public head mut_repo.add_public_head(&commit2); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "public_heads()"), vec![commit2.id().clone(), commit1.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_git_refs(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); // Can get git refs when there are none assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_refs()"), vec![] ); // Can get a mix of git refs mut_repo.set_git_ref( "refs/heads/branch1".to_string(), RefTarget::Normal(commit1.id().clone()), ); mut_repo.set_git_ref( "refs/tags/tag1".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_refs()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Two refs pointing to the same commit does not result in a duplicate in the // revset mut_repo.set_git_ref( "refs/tags/tag2".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_refs()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Can get git refs when there are conflicted refs mut_repo.set_git_ref( "refs/heads/branch1".to_string(), RefTarget::Conflict { removes: vec![commit1.id().clone()], adds: vec![commit2.id().clone(), commit3.id().clone()], }, ); mut_repo.set_git_ref( "refs/tags/tag1".to_string(), RefTarget::Conflict { removes: vec![commit2.id().clone()], adds: vec![commit3.id().clone(), commit4.id().clone()], }, ); mut_repo.remove_git_ref("refs/tags/tag2"); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_refs()"), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone() ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_git_head(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); // Can get git head when it's not set assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_head()"), vec![] ); mut_repo.set_git_head(commit1.id().clone()); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "git_head()"), vec![commit1.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_branches(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); // Can get branches when there are none assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "branches()"), vec![] ); // Can get a few branches mut_repo.set_local_branch( "branch1".to_string(), RefTarget::Normal(commit1.id().clone()), ); mut_repo.set_local_branch( "branch2".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "branches()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Two branches pointing to the same commit does not result in a duplicate in // the revset mut_repo.set_local_branch( "branch3".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "branches()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Can get branches when there are conflicted refs mut_repo.set_local_branch( "branch1".to_string(), RefTarget::Conflict { removes: vec![commit1.id().clone()], adds: vec![commit2.id().clone(), commit3.id().clone()], }, ); mut_repo.set_local_branch( "branch2".to_string(), RefTarget::Conflict { removes: vec![commit2.id().clone()], adds: vec![commit3.id().clone(), commit4.id().clone()], }, ); mut_repo.remove_local_branch("branch3"); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "branches()"), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone() ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_remote_branches(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, repo).write_to_repo(mut_repo); // Can get branches when there are none assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "remote_branches()"), vec![] ); // Can get a few branches mut_repo.set_remote_branch( "branch1".to_string(), "origin".to_string(), RefTarget::Normal(commit1.id().clone()), ); mut_repo.set_remote_branch( "branch2".to_string(), "private".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "remote_branches()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Two branches pointing to the same commit does not result in a duplicate in // the revset mut_repo.set_remote_branch( "branch3".to_string(), "origin".to_string(), RefTarget::Normal(commit2.id().clone()), ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "remote_branches()"), vec![commit2.id().clone(), commit1.id().clone()] ); // The commits don't have to be in the current set of heads to be included. mut_repo.remove_head(commit2.id()); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "remote_branches()"), vec![commit2.id().clone(), commit1.id().clone()] ); // Can get branches when there are conflicted refs mut_repo.set_remote_branch( "branch1".to_string(), "origin".to_string(), RefTarget::Conflict { removes: vec![commit1.id().clone()], adds: vec![commit2.id().clone(), commit3.id().clone()], }, ); mut_repo.set_remote_branch( "branch2".to_string(), "private".to_string(), RefTarget::Conflict { removes: vec![commit2.id().clone()], adds: vec![commit3.id().clone(), commit4.id().clone()], }, ); mut_repo.remove_remote_branch("branch3", "origin"); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "remote_branches()"), vec![ commit4.id().clone(), commit3.id().clone(), commit2.id().clone() ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_merges(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.initial_commit(); let commit3 = graph_builder.initial_commit(); let commit4 = graph_builder.commit_with_parents(&[&commit1, &commit2]); let commit5 = graph_builder.commit_with_parents(&[&commit1, &commit2, &commit3]); // Finds all merges by default assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "merges()"), vec![commit5.id().clone(), commit4.id().clone(),] ); // Searches only among candidates if specified assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} & merges()", commit5.id().hex()) ), vec![commit5.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_description(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let commit1 = testutils::create_random_commit(&settings, repo) .set_description("commit 1".to_string()) .write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .set_description("commit 2".to_string()) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit2.id().clone()]) .set_description("commit 3".to_string()) .write_to_repo(mut_repo); // Can find multiple matches assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "description(commit)"), vec![ commit3.id().clone(), commit2.id().clone(), commit1.id().clone() ] ); // Can find a unique match assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "description(\"commit 2\")"), vec![commit2.id().clone()] ); // Searches only among candidates if specified assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), "heads() & description(\"commit 2\")" ), vec![] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_author(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let timestamp = Timestamp { timestamp: MillisSinceEpoch(0), tz_offset: 0, }; let commit1 = testutils::create_random_commit(&settings, repo) .set_author(Signature { name: "name1".to_string(), email: "email1".to_string(), timestamp: timestamp.clone(), }) .write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .set_author(Signature { name: "name2".to_string(), email: "email2".to_string(), timestamp: timestamp.clone(), }) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit2.id().clone()]) .set_author(Signature { name: "name3".to_string(), email: "email3".to_string(), timestamp, }) .write_to_repo(mut_repo); // Can find multiple matches assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "author(name)"), vec![ commit3.id().clone(), commit2.id().clone(), commit1.id().clone() ] ); // Can find a unique match by either name or email assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "author(\"name2\")"), vec![commit2.id().clone()] ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "author(\"name3\")"), vec![commit3.id().clone()] ); // Searches only among candidates if specified assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads() & author(\"name2\")"), vec![] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_committer(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let timestamp = Timestamp { timestamp: MillisSinceEpoch(0), tz_offset: 0, }; let commit1 = testutils::create_random_commit(&settings, repo) .set_committer(Signature { name: "name1".to_string(), email: "email1".to_string(), timestamp: timestamp.clone(), }) .write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit1.id().clone()]) .set_committer(Signature { name: "name2".to_string(), email: "email2".to_string(), timestamp: timestamp.clone(), }) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, repo) .set_parents(vec![commit2.id().clone()]) .set_committer(Signature { name: "name3".to_string(), email: "email3".to_string(), timestamp, }) .write_to_repo(mut_repo); // Can find multiple matches assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "committer(name)"), vec![ commit3.id().clone(), commit2.id().clone(), commit1.id().clone() ] ); // Can find a unique match by either name or email assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "committer(\"name2\")"), vec![commit2.id().clone()] ); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "committer(\"name3\")"), vec![commit3.id().clone()] ); // Searches only among candidates if specified assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "heads() & committer(\"name2\")"), vec![] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_union(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit3]); let commit5 = graph_builder.commit_with_parents(&[&commit2]); // Union between ancestors assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} | :{}", commit4.id().hex(), commit5.id().hex()) ), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), root_commit.id().clone() ] ); // Unioning can add back commits removed by difference assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!( "(:{} ~ :{}) | :{}", commit4.id().hex(), commit2.id().hex(), commit5.id().hex() ) ), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone(), commit2.id().clone(), commit1.id().clone(), root_commit.id().clone(), ] ); // Unioning of disjoint sets assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!( "(:{} ~ :{}) | {}", commit4.id().hex(), commit2.id().hex(), commit5.id().hex(), ) ), vec![ commit5.id().clone(), commit4.id().clone(), commit3.id().clone() ] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_intersection(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit3]); let commit5 = graph_builder.commit_with_parents(&[&commit2]); // Intersection between ancestors assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} & :{}", commit4.id().hex(), commit5.id().hex()) ), vec![ commit2.id().clone(), commit1.id().clone(), root_commit.id().clone() ] ); // Intersection of disjoint sets assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("{} & {}", commit4.id().hex(), commit2.id().hex()) ), vec![] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_evaluate_expression_difference(use_git: bool) { let settings = testutils::user_settings(); let test_repo = TestRepo::init(use_git); let repo = &test_repo.repo; let root_commit = repo.store().root_commit(); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let mut graph_builder = CommitGraphBuilder::new(&settings, mut_repo); let commit1 = graph_builder.initial_commit(); let commit2 = graph_builder.commit_with_parents(&[&commit1]); let commit3 = graph_builder.commit_with_parents(&[&commit2]); let commit4 = graph_builder.commit_with_parents(&[&commit3]); let commit5 = graph_builder.commit_with_parents(&[&commit2]); // Difference between ancestors assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} ~ :{}", commit4.id().hex(), commit5.id().hex()) ), vec![commit4.id().clone(), commit3.id().clone()] ); assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} ~ :{}", commit5.id().hex(), commit4.id().hex()) ), vec![commit5.id().clone()] ); assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!(":{} ~ :{}", commit4.id().hex(), commit2.id().hex()) ), vec![commit4.id().clone(), commit3.id().clone()] ); // Associativity assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!( ":{} ~ {} ~ {}", commit4.id().hex(), commit2.id().hex(), commit3.id().hex() ) ), vec![ commit4.id().clone(), commit1.id().clone(), root_commit.id().clone(), ] ); // Subtracting a difference does not add back any commits assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!( "(:{} ~ :{}) ~ (:{} ~ :{})", commit4.id().hex(), commit1.id().hex(), commit3.id().hex(), commit1.id().hex(), ) ), vec![commit4.id().clone()] ); } #[test_case(false ; "local backend")] #[test_case(true ; "git backend")] fn test_filter_by_diff(use_git: bool) { let settings = testutils::user_settings(); let test_workspace = TestWorkspace::init(&settings, use_git); let repo = &test_workspace.repo; let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let added_clean_clean = RepoPath::from_internal_string("added_clean_clean"); let added_modified_clean = RepoPath::from_internal_string("added_modified_clean"); let added_modified_removed = RepoPath::from_internal_string("added_modified_removed"); let tree1 = testutils::create_tree( repo, &[ (&added_clean_clean, "1"), (&added_modified_clean, "1"), (&added_modified_removed, "1"), ], ); let tree2 = testutils::create_tree( repo, &[ (&added_clean_clean, "1"), (&added_modified_clean, "2"), (&added_modified_removed, "2"), ], ); let tree3 = testutils::create_tree( repo, &[ (&added_clean_clean, "1"), (&added_modified_clean, "2"), // added_modified_removed, ], ); let commit1 = CommitBuilder::for_new_commit( &settings, vec![repo.store().root_commit_id().clone()], tree1.id().clone(), ) .write_to_repo(mut_repo); let commit2 = CommitBuilder::for_new_commit(&settings, vec![commit1.id().clone()], tree2.id().clone()) .write_to_repo(mut_repo); let commit3 = CommitBuilder::for_new_commit(&settings, vec![commit2.id().clone()], tree3.id().clone()) .write_to_repo(mut_repo); // matcher API: let resolve = |file_path: &RepoPath| -> Vec { let repo_ref = mut_repo.as_repo_ref(); let matcher = FilesMatcher::new([file_path.clone()].into()); let candidates = RevsetExpression::all().evaluate(repo_ref, None).unwrap(); let commit_ids = revset::filter_by_diff(repo_ref, &matcher as &dyn Matcher, candidates) .iter() .commit_ids() .collect(); commit_ids }; assert_eq!(resolve(&added_clean_clean), vec![commit1.id().clone()]); assert_eq!( resolve(&added_modified_clean), vec![commit2.id().clone(), commit1.id().clone()] ); assert_eq!( resolve(&added_modified_removed), vec![ commit3.id().clone(), commit2.id().clone(), commit1.id().clone() ] ); // file() revset: assert_eq!( resolve_commit_ids_in_workspace( mut_repo.as_repo_ref(), r#"file("repo/added_clean_clean")"#, &test_workspace.workspace, Some(test_workspace.workspace.workspace_root().parent().unwrap()), ), vec![commit1.id().clone()] ); assert_eq!( resolve_commit_ids_in_workspace( mut_repo.as_repo_ref(), &format!(r#"{}: & file("added_modified_clean")"#, commit2.id().hex()), &test_workspace.workspace, Some(test_workspace.workspace.workspace_root()), ), vec![commit2.id().clone()] ); }