// Copyright 2025 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. //! Test that optimized revset evaluates to the same result as the original //! expression. //! //! Use `PROPTEST_CASES=10000` to increase the number of test cases to run. //! The default is `256`, which might be too small to catch edge-case bugs. //! use std::sync::Arc; use futures::TryStreamExt as _; use itertools::Itertools as _; use jj_lib::backend::CommitId; use jj_lib::commit::Commit; use jj_lib::config::ConfigLayer; use jj_lib::config::ConfigSource; use jj_lib::repo::MutableRepo; use jj_lib::repo::Repo; use jj_lib::revset::ResolvedRevsetExpression; use jj_lib::revset::RevsetExpression; use jj_lib::revset::RevsetFilterPredicate; use jj_lib::rewrite::RebaseOptions; use jj_lib::rewrite::RebasedCommit; use jj_lib::settings::UserSettings; use pollster::FutureExt as _; use proptest::prelude::*; use testutils::CommitBuilderExt as _; use testutils::TestRepo; use testutils::TestResult; fn stable_settings() -> UserSettings { let mut config = testutils::base_user_config(); let mut layer = ConfigLayer::empty(ConfigSource::User); layer .set_value("debug.commit-timestamp", "2001-02-03T04:05:06+07:00") .unwrap(); config.add_layer(layer); UserSettings::from_config(config).unwrap() } fn write_new_commit<'a>( repo: &mut MutableRepo, desc: &str, parents: impl IntoIterator, ) -> Commit { let parents = parents.into_iter().map(|c| c.id().clone()).collect(); let tree = repo.store().empty_merged_tree(); repo.new_commit(parents, tree) .set_description(desc) .write_unwrap() } fn rebase_descendants(repo: &mut MutableRepo) -> Vec { let immutable = RevsetExpression::none(); let options = RebaseOptions::default(); let mut commits = Vec::new(); repo.rebase_descendants_with_options(&immutable, &options, |_, rebased| match rebased { RebasedCommit::Rewritten(commit) => commits.push(commit), RebasedCommit::Abandoned { .. } => {} }) .block_on() .unwrap(); commits } /// Strategy to generate arbitrary revset expressions. fn arb_expression( known_commits: Vec, visible_heads: Vec>, ) -> impl Strategy> { // https://proptest-rs.github.io/proptest/proptest/tutorial/recursive.html let max_commits = known_commits.len(); let leaf_expr = prop_oneof![ Just(RevsetExpression::none()), Just(RevsetExpression::all()), Just(RevsetExpression::visible_heads()), Just(RevsetExpression::root()), Just(RevsetExpression::forks()), proptest::sample::subsequence(known_commits, 1..=5.min(max_commits)) .prop_map(RevsetExpression::commits), // Use merges() as a filter that isn't constant. Since we don't have an // optimization rule that rewrites filter predicates, we wouldn't have // to add various filter predicates. Just(RevsetExpression::filter( RevsetFilterPredicate::ParentCount(2..u32::MAX) )), ]; leaf_expr.prop_recursive( 10, // depth 100, // total nodes 2, // unary or binary move |expr| { // This table includes redundant expressions (e.g. parents() and // ancestors()) if they are common, which will probably make them be // more weighted? prop_oneof![ // Ancestors expr.clone().prop_map(|x| x.parents()), expr.clone().prop_map(|x| x.ancestors()), (expr.clone(), 0..5_u64).prop_map(|(x, d)| x.ancestors_range(0..d)), // Descendants expr.clone().prop_map(|x| x.children()), expr.clone().prop_map(|x| x.descendants()), (expr.clone(), 0..5_u64).prop_map(|(x, d)| x.descendants_range(0..d)), // First ancestors expr.clone().prop_map(|x| x.first_ancestors_at(1)), expr.clone().prop_map(|x| x.first_ancestors()), (expr.clone(), 0..5_u64).prop_map(|(x, d)| x.first_ancestors_range(0..d)), // Range (expr.clone(), expr.clone()).prop_map(|(x, y)| x.range(&y)), // DagRange (expr.clone(), expr.clone()).prop_map(|(x, y)| x.dag_range_to(&y)), expr.clone().prop_map(|x| x.connected()), // Reachable (expr.clone(), expr.clone()).prop_map(|(x, y)| x.reachable(&y)), // Heads expr.clone().prop_map(|x| x.heads()), // Roots expr.clone().prop_map(|x| x.roots()), // ForkPoint expr.clone().prop_map(|x| x.fork_point()), // MergePoint expr.clone().prop_map(|x| x.merge_point()), // Latest (expr.clone(), 0..5_usize).prop_map(|(x, n)| x.latest(n)), // AtOperation (or WithinVisibility) ( expr.clone(), proptest::sample::select(visible_heads.clone()) ) .prop_map(|(candidates, visible_heads)| Arc::new( RevsetExpression::WithinVisibility { candidates, visible_heads } )), // Coalesce (in binary form) [expr.clone(), expr.clone()].prop_map(|xs| RevsetExpression::coalesce(&xs)), // General set operations expr.clone().prop_map(|x| x.negated()), (expr.clone(), expr.clone()).prop_map(|(x, y)| x.union(&y)), (expr.clone(), expr.clone()).prop_map(|(x, y)| x.intersection(&y)), (expr.clone(), expr.clone()).prop_map(|(x, y)| x.minus(&y)), ] }, ) } fn verify_optimized( repo: &dyn Repo, expression: &Arc, ) -> Result<(), TestCaseError> { let optimized_revset = expression.clone().evaluate(repo).unwrap(); let unoptimized_revset = expression.clone().evaluate_unoptimized(repo).unwrap(); let optimized_ids: Vec<_> = optimized_revset.stream().try_collect().block_on().unwrap(); let unoptimized_ids: Vec<_> = unoptimized_revset .stream() .try_collect() .block_on() .unwrap(); prop_assert_eq!(optimized_ids, unoptimized_ids); Ok(()) } #[test] fn test_mostly_linear() -> TestResult { let settings = stable_settings(); let test_repo = TestRepo::init_with_settings(&settings); let repo = test_repo.repo; // 8 9 // 6 7 // |/| // 4 5 // 3 | // 1 2 // |/ // 0 let mut tx = repo.start_transaction(); let commit0 = repo.store().root_commit(); let commit1 = write_new_commit(tx.repo_mut(), "1", [&commit0]); let commit2 = write_new_commit(tx.repo_mut(), "2", [&commit0]); let commit3 = write_new_commit(tx.repo_mut(), "3", [&commit1]); let commit4 = write_new_commit(tx.repo_mut(), "4", [&commit3]); let commit5 = write_new_commit(tx.repo_mut(), "5", [&commit2]); let commit6 = write_new_commit(tx.repo_mut(), "6", [&commit4]); let commit7 = write_new_commit(tx.repo_mut(), "7", [&commit4, &commit5]); let commit8 = write_new_commit(tx.repo_mut(), "8", [&commit6]); let commit9 = write_new_commit(tx.repo_mut(), "9", [&commit7]); let commits = vec![ commit0, commit1, commit2, commit3, commit4, commit5, commit6, commit7, commit8, commit9, ]; let repo = tx.commit("a").block_on()?; // Commit ids for reference insta::assert_snapshot!( commits.iter().map(|c| format!("{:<2} {}\n", c.description(), c.id())).join(""), @" 00000000000000000000 1 78f823b31f2c4a77030b 2 1ba216c17ef680561823 3 c2c719328d78654d9f8e 4 d6b40f7dfac149c7181c 5 c682b87d91a8940f71d5 6 456fe15ac6ebfdf56219 7 d2bba8ce1ce80751aab5 8 536f4a045e558c9927a5 9 6ab43bd6d94bdaff491f "); let commit_ids = commits.iter().map(|c| c.id().clone()).collect_vec(); let visible_heads = vec![ vec![commit_ids[0].clone()], vec![commit_ids[8].clone(), commit_ids[9].clone()], ]; proptest!(|(expression in arb_expression(commit_ids, visible_heads))| { verify_optimized(repo.as_ref(), &expression)?; }); Ok(()) } #[test] fn test_weird_merges() -> TestResult { let settings = stable_settings(); let test_repo = TestRepo::init_with_settings(&settings); let repo = test_repo.repo; // 8 // /|\ // 4 5 6 7 // |X| |/ // 1 2 3 // \|/ // 0 let mut tx = repo.start_transaction(); let commit0 = repo.store().root_commit(); let commit1 = write_new_commit(tx.repo_mut(), "1", [&commit0]); let commit2 = write_new_commit(tx.repo_mut(), "2", [&commit0]); let commit3 = write_new_commit(tx.repo_mut(), "3", [&commit0]); let commit4 = write_new_commit(tx.repo_mut(), "4", [&commit1, &commit2]); let commit5 = write_new_commit(tx.repo_mut(), "5", [&commit1, &commit2]); let commit6 = write_new_commit(tx.repo_mut(), "6", [&commit3]); let commit7 = write_new_commit(tx.repo_mut(), "7", [&commit3]); let commit8 = write_new_commit(tx.repo_mut(), "8", [&commit5, &commit6, &commit7]); let commits = vec![ commit0, commit1, commit2, commit3, commit4, commit5, commit6, commit7, commit8, ]; let repo = tx.commit("a").block_on()?; // Commit ids for reference insta::assert_snapshot!( commits.iter().map(|c| format!("{:<2} {}\n", c.description(), c.id())).join(""), @" 00000000000000000000 1 78f823b31f2c4a77030b 2 1ba216c17ef680561823 3 83a7b5b8138c9428d837 4 43a3ed8115915cb0ebe0 5 aec384ff4d34c039e4db 6 d80cec48faa50bf2ac56 7 2667f762c099ffcda2f0 8 54feb3e8186bc4450be4 "); let commit_ids = commits.iter().map(|c| c.id().clone()).collect_vec(); let visible_heads = vec![ vec![commit_ids[0].clone()], vec![commit_ids[4].clone(), commit_ids[8].clone()], ]; proptest!(|(expression in arb_expression(commit_ids, visible_heads))| { verify_optimized(repo.as_ref(), &expression)?; }); Ok(()) } #[test] fn test_feature_branches() -> TestResult { let settings = stable_settings(); let test_repo = TestRepo::init_with_settings(&settings); let repo = test_repo.repo; // 9 // |\ // 8 \ // |\ \ // | 7 | // |/ | // 6 | // |\ 5 // | | 4 // | | 3 // | 2 | // | 1 | // | |/ // |/ // 0 // Fetch branch 2 and 5 let mut tx = repo.start_transaction(); let commit0 = repo.store().root_commit(); let commit1 = write_new_commit(tx.repo_mut(), "1", [&commit0]); let commit2 = write_new_commit(tx.repo_mut(), "2", [&commit1]); let commit3 = write_new_commit(tx.repo_mut(), "3", [&commit0]); let commit4 = write_new_commit(tx.repo_mut(), "4", [&commit3]); let commit5 = write_new_commit(tx.repo_mut(), "5", [&commit4]); let repo = tx.commit("a").block_on()?; // Merge branch 2 let mut tx = repo.start_transaction(); let commit6 = write_new_commit(tx.repo_mut(), "6", [&commit0, &commit2]); let repo = tx.commit("a").block_on()?; // Fetch merged branch 7 let mut tx = repo.start_transaction(); let commit7 = write_new_commit(tx.repo_mut(), "7", [&commit6]); let commit8 = write_new_commit(tx.repo_mut(), "8", [&commit6, &commit7]); let repo = tx.commit("a").block_on()?; // Merge branch 5 let mut tx = repo.start_transaction(); let commit9 = write_new_commit(tx.repo_mut(), "9", [&commit8, &commit5]); let commits = vec![ commit0, commit1, commit2, commit3, commit4, commit5, commit6, commit7, commit8, commit9, ]; let repo = tx.commit("a").block_on()?; // Commit ids for reference insta::assert_snapshot!( commits.iter().map(|c| format!("{:<2} {}\n", c.description(), c.id())).join(""), @" 00000000000000000000 1 78f823b31f2c4a77030b 2 6323cf55a45bcc85315d 3 83a7b5b8138c9428d837 4 93731ec1a14276206ba7 5 c388b47bd72fcfee9e3c 6 da751caa45bda2e3d526 7 45a86fae2b51ec68f8c0 8 9f83496b963cbaf8cb7a 9 998a24ecd56446732f55 "); let commit_ids = commits.iter().map(|c| c.id().clone()).collect_vec(); let visible_heads = vec![ vec![commit_ids[0].clone()], vec![commit_ids[2].clone(), commit_ids[5].clone()], vec![commit_ids[5].clone(), commit_ids[6].clone()], vec![commit_ids[5].clone(), commit_ids[8].clone()], vec![commit_ids[9].clone()], ]; proptest!(|(expression in arb_expression(commit_ids, visible_heads))| { verify_optimized(repo.as_ref(), &expression)?; }); Ok(()) } #[test] fn test_rewritten() -> TestResult { let settings = stable_settings(); let test_repo = TestRepo::init_with_settings(&settings); let repo = test_repo.repo; // 5 // |\ // 4 | 3 // | |/ // 1 2 // |/ // 0 let mut tx = repo.start_transaction(); let commit0 = repo.store().root_commit(); let commit1 = write_new_commit(tx.repo_mut(), "1", [&commit0]); let commit2 = write_new_commit(tx.repo_mut(), "2", [&commit0]); let commit3 = write_new_commit(tx.repo_mut(), "3", [&commit2]); let commit4 = write_new_commit(tx.repo_mut(), "4", [&commit1]); let commit5 = write_new_commit(tx.repo_mut(), "5", [&commit4, &commit2]); let mut commits = vec![commit0, commit1, commit2, commit3, commit4, commit5]; let repo = tx.commit("a").block_on()?; // Rewrite 2, rebase 3 and 5 let mut tx = repo.start_transaction(); let commit2b = tx .repo_mut() .rewrite_commit(&commits[2]) .set_description("2b") .write_unwrap(); commits.push(commit2b); commits.extend(rebase_descendants(tx.repo_mut())); let repo = tx.commit("b").block_on()?; // Abandon 4, rebase 5 let mut tx = repo.start_transaction(); tx.repo_mut().record_abandoned_commit(&commits[4]); commits.extend(rebase_descendants(tx.repo_mut())); let repo = tx.commit("c").block_on()?; // Commit ids for reference insta::assert_snapshot!( commits.iter().map(|c| format!("{:<2} {}\n", c.description(), c.id())).join(""), @" 00000000000000000000 1 78f823b31f2c4a77030b 2 1ba216c17ef680561823 3 068410d7a4a5b7052c18 4 8ee10ec699f52df8c624 5 32bd65d7134884955150 2b a7d217f53df0908d3f7a 3 c199d1c8c617cf15893f 5 5fc1da61558a03f69a8d 5 cb81e73e341e59553ff6 "); let commit_ids = commits.iter().map(|c| c.id().clone()).collect_vec(); let visible_heads = vec![ vec![commit_ids[0].clone()], vec![commit_ids[3].clone(), commit_ids[5].clone()], vec![commit_ids[7].clone(), commit_ids[8].clone()], vec![commit_ids[7].clone(), commit_ids[9].clone()], ]; proptest!(|(expression in arb_expression(commit_ids, visible_heads))| { verify_optimized(repo.as_ref(), &expression)?; }); Ok(()) }