// 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 jujube_lib::commit_builder::CommitBuilder; use jujube_lib::repo::RepoRef; use jujube_lib::revset::{ evaluate_expression, parse, resolve_symbol, RevsetError, RevsetExpression, RevsetParseError, }; use jujube_lib::store::{CommitId, MillisSinceEpoch, Signature, Timestamp}; use jujube_lib::testutils; use test_case::test_case; #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_resolve_symbol_root(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); assert_eq!( resolve_symbol(repo.as_repo_ref(), "root").unwrap(), repo.store().root_commit() ); } #[test] fn test_resolve_symbol_commit_id() { let settings = testutils::user_settings(); // Test only with git so we can get predictable commit ids let (_temp_dir, repo) = testutils::init_repo(&settings, true); 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, repo.store(), 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); } // 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 = mut_repo.as_repo_ref(); assert_eq!( resolve_symbol(repo_ref, "0454de3cae04c46cda37ba2e8873b4c17ff51dcb").unwrap(), commits[0] ); assert_eq!( resolve_symbol(repo_ref, "045f56cd1b17e8abde86771e2705395dcde6a957").unwrap(), commits[1] ); assert_eq!( resolve_symbol(repo_ref, "0468f7da8de2ce442f512aacf83411d26cd2e0cf").unwrap(), commits[2] ); // Test commit id prefix assert_eq!(resolve_symbol(repo_ref, "046").unwrap(), commits[2]); assert_eq!( resolve_symbol(repo_ref, "04"), Err(RevsetError::AmbiguousCommitIdPrefix("04".to_string())) ); assert_eq!( resolve_symbol(repo_ref, ""), Err(RevsetError::AmbiguousCommitIdPrefix("".to_string())) ); assert_eq!( resolve_symbol(repo_ref, "040"), Err(RevsetError::NoSuchRevision("040".to_string())) ); // Test non-hex string assert_eq!( resolve_symbol(repo_ref, "foo"), Err(RevsetError::NoSuchRevision("foo".to_string())) ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_resolve_symbol_checkout(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); mut_repo.set_checkout(commit1.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@").unwrap(), commit1 ); mut_repo.set_checkout(commit2.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@").unwrap(), commit2 ); tx.discard(); } #[test] fn test_resolve_symbol_git_refs() { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, true); 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.insert_git_ref("refs/heads/branch1".to_string(), commit1.id().clone()); mut_repo.insert_git_ref("refs/heads/branch2".to_string(), commit2.id().clone()); mut_repo.insert_git_ref("refs/tags/tag1".to_string(), commit2.id().clone()); mut_repo.insert_git_ref( "refs/tags/remotes/origin/branch1".to_string(), commit3.id().clone(), ); // Non-existent ref assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "non-existent"), Err(RevsetError::NoSuchRevision("non-existent".to_string())) ); // Full ref mut_repo.insert_git_ref("refs/heads/branch".to_string(), commit4.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "refs/heads/branch").unwrap(), commit4 ); // Qualified with only heads/ mut_repo.insert_git_ref("refs/heads/branch".to_string(), commit5.id().clone()); mut_repo.insert_git_ref("refs/tags/branch".to_string(), commit4.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "heads/branch").unwrap(), commit5 ); // Unqualified branch name mut_repo.insert_git_ref("refs/heads/branch".to_string(), commit3.id().clone()); mut_repo.insert_git_ref("refs/tags/branch".to_string(), commit4.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "branch").unwrap(), commit3 ); // Unqualified tag name mut_repo.insert_git_ref("refs/tags/tag".to_string(), commit4.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "tag").unwrap(), commit4 ); // Unqualified remote-tracking branch name mut_repo.insert_git_ref( "refs/remotes/origin/remote-branch".to_string(), commit2.id().clone(), ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "origin/remote-branch").unwrap(), commit2 ); // Cannot shadow checkout ("@") or root symbols mut_repo.insert_git_ref("@".to_string(), commit2.id().clone()); mut_repo.insert_git_ref("root".to_string(), commit3.id().clone()); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "@").unwrap().id(), mut_repo.view().checkout() ); assert_eq!( resolve_symbol(mut_repo.as_repo_ref(), "root").unwrap(), mut_repo.store().root_commit() ); tx.discard(); } #[test] fn test_parse_revset() { assert_eq!(parse("@"), Ok(RevsetExpression::Symbol("@".to_string()))); assert_eq!( parse("foo"), Ok(RevsetExpression::Symbol("foo".to_string())) ); assert_eq!( parse("(foo)"), Ok(RevsetExpression::Symbol("foo".to_string())) ); assert_eq!( parse(":@"), Ok(RevsetExpression::Parents(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse(":(@)"), Ok(RevsetExpression::Parents(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse("*:@"), Ok(RevsetExpression::Ancestors(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse(" *:@ "), Ok(RevsetExpression::Ancestors(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse(" description( arg1 , arg2 ) - parents( arg1 ) - all_heads( ) "), Ok(RevsetExpression::Difference( Box::new(RevsetExpression::Difference( Box::new(RevsetExpression::Description { needle: "arg1".to_string(), base_expression: Box::new(RevsetExpression::Symbol("arg2".to_string())) }), Box::new(RevsetExpression::Parents(Box::new( RevsetExpression::Symbol("arg1".to_string()) ))) )), Box::new(RevsetExpression::AllHeads) )) ); } #[test] fn test_parse_revset_function() { assert_eq!( parse("parents(@)"), Ok(RevsetExpression::Parents(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse("parents((@))"), Ok(RevsetExpression::Parents(Box::new( RevsetExpression::Symbol("@".to_string()) ))) ); assert_eq!( parse("parents(\"@\")"), Err(RevsetParseError::InvalidFunctionArguments { name: "parents".to_string(), message: "Expected function argument of type expression, found: \"@\"".to_string() }) ); assert_eq!( parse("ancestors(parents(@))"), Ok(RevsetExpression::Ancestors(Box::new( RevsetExpression::Parents(Box::new(RevsetExpression::Symbol("@".to_string()))) ))) ); assert_eq!( parse("parents(@"), Err(RevsetParseError::SyntaxError( "Failed to parse revset \"parents(@\" past position 7".to_string() )) ); assert_eq!( parse("parents(@,@)"), Err(RevsetParseError::InvalidFunctionArguments { name: "parents".to_string(), message: "Expected 1 argument".to_string() }) ); assert_eq!( parse("description(foo,bar)"), Ok(RevsetExpression::Description { needle: "foo".to_string(), base_expression: Box::new(RevsetExpression::Symbol("bar".to_string())) }) ); assert_eq!( parse("description(foo(),bar)"), Err(RevsetParseError::InvalidFunctionArguments { name: "description".to_string(), message: "Expected function argument of type string, found: foo()".to_string() }) ); assert_eq!( parse("description((foo),bar)"), Err(RevsetParseError::InvalidFunctionArguments { name: "description".to_string(), message: "Expected function argument of type string, found: (foo)".to_string() }) ); assert_eq!( parse("description(\"(foo)\",bar)"), Ok(RevsetExpression::Description { needle: "(foo)".to_string(), base_expression: Box::new(RevsetExpression::Symbol("bar".to_string())) }) ); } fn resolve_commit_ids(repo: RepoRef, revset_str: &str) -> Vec { let expression = parse(revset_str).unwrap(); evaluate_expression(repo, &expression) .unwrap() .iter() .map(|entry| entry.commit_id()) .collect() } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_root_and_checkout(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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_checkout(commit1.id().clone()); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "@"), vec![commit1.id().clone()] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_parents(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); 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).write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit2.id().clone(), commit3.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); // 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_checkout(commit2.id().clone()); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), ":@"), 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!(":*:{}", 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()] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_ancestors(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); 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(), commit3.id().clone()]) .write_to_repo(mut_repo); // 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(), ] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_all_heads(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let wc_commit = repo.working_copy_locked().current_commit(); 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); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "all_heads()"), vec![commit2.id().clone(), wc_commit.id().clone()] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_public_heads(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); // Can get public heads with root commit as only public head assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "public_heads()"), // TODO: This should include the root commit vec![] ); // 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()] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_obsolete(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); let mut tx = repo.start_transaction("test"); let mut_repo = tx.mut_repo(); let root_commit = repo.store().root_commit(); let wc_commit = repo.working_copy_locked().current_commit(); let commit1 = testutils::create_random_commit(&settings, &repo).write_to_repo(mut_repo); let commit2 = testutils::create_random_commit(&settings, &repo) .set_predecessors(vec![commit1.id().clone()]) .set_change_id(commit1.change_id().clone()) .write_to_repo(mut_repo); let commit3 = testutils::create_random_commit(&settings, &repo) .set_predecessors(vec![commit2.id().clone()]) .set_change_id(commit2.change_id().clone()) .write_to_repo(mut_repo); let commit4 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit3.id().clone()]) .set_pruned(true) .write_to_repo(mut_repo); assert_eq!( resolve_commit_ids(mut_repo.as_repo_ref(), "non_obsolete_heads()"), vec![commit3.id().clone(), wc_commit.id().clone()] ); assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("non_obsolete_heads({})", commit4.id().hex()) ), vec![commit3.id().clone()] ); assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), &format!("non_obsolete_heads({})", commit1.id().hex()) ), vec![root_commit.id().clone()] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_description(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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 in given base set if specified assert_eq!( resolve_commit_ids( mut_repo.as_repo_ref(), "description(\"commit 2\",all_heads())" ), vec![] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_union(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); 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![commit3.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); // 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() ] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_intersection(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); 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![commit3.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); // 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![] ); tx.discard(); } #[test_case(false ; "local store")] #[test_case(true ; "git store")] fn test_evaluate_expression_difference(use_git: bool) { let settings = testutils::user_settings(); let (_temp_dir, repo) = testutils::init_repo(&settings, use_git); 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); 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![commit3.id().clone()]) .write_to_repo(mut_repo); let commit5 = testutils::create_random_commit(&settings, &repo) .set_parents(vec![commit2.id().clone()]) .write_to_repo(mut_repo); // 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()] ); tx.discard(); }