feat(revset): use hints to optimize revset evals

Author: claytonrcarter

git-branchless-revset/src/builtins.rs

@@ -199,7 +199,12 @@ fn fn_heads(ctx: &mut Context, name: &str, args: &[Expr], _: &Option<&CommitSet>
 }
 
 #[instrument]
-fn fn_branches(ctx: &mut Context, name: &str, args: &[Expr], _: &Option<&CommitSet>) -> EvalResult {
+fn fn_branches(
+    ctx: &mut Context,
+    name: &str,
+    args: &[Expr],
+    commitset_hint: &Option<&CommitSet>,
+) -> EvalResult {
     let pattern = match eval0_or_1_pattern(ctx, name, args)? {
         Some(pattern) => pattern,
         None => return Ok(ctx.dag.branch_commits.clone()),
@@ -212,7 +217,10 @@ fn fn_branches(ctx: &mut Context, name: &str, args: &[Expr], _: &Option<&CommitS
         .map_err(EvalError::OtherError)?
         .branch_oid_to_names;
 
-    let commitset_hint = ctx.dag.branch_commits.clone();
+    let commitset_hint = match commitset_hint {
+        Some(hint) => hint.intersection(&ctx.dag.branch_commits),
+        None => ctx.dag.branch_commits.clone(),
+    };
     let branch_commits = make_pattern_matcher(
         ctx,
         name,
@@ -362,7 +370,12 @@ fn make_pattern_matcher(
 }
 
 #[instrument]
-fn fn_message(ctx: &mut Context, name: &str, args: &[Expr], _: &Option<&CommitSet>) -> EvalResult {
+fn fn_message(
+    ctx: &mut Context,
+    name: &str,
+    args: &[Expr],
+    commits_to_match: &Option<&CommitSet>,
+) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
         ctx,
@@ -384,7 +397,7 @@ fn fn_message(ctx: &mut Context, name: &str, args: &[Expr], _: &Option<&CommitSe
             };
             Ok(pattern.matches_text(message))
         }),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -393,7 +406,7 @@ fn fn_path_changed(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -420,7 +433,7 @@ fn fn_path_changed(
             });
             Ok(result)
         }),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -429,7 +442,7 @@ fn fn_author_name(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -442,7 +455,7 @@ fn fn_author_name(
                 None => Ok(false),
             },
         ),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -451,7 +464,7 @@ fn fn_author_email(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -464,7 +477,7 @@ fn fn_author_email(
                 None => Ok(false),
             },
         ),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -473,7 +486,7 @@ fn fn_author_date(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -484,7 +497,7 @@ fn fn_author_date(
             let time = commit.get_author().get_time();
             Ok(pattern.matches_date(&time))
         }),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -493,7 +506,7 @@ fn fn_committer_name(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -506,7 +519,7 @@ fn fn_committer_name(
                 None => Ok(false),
             },
         ),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -515,7 +528,7 @@ fn fn_committer_email(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -528,7 +541,7 @@ fn fn_committer_email(
                 None => Ok(false),
             },
         ),
-        &None,
+        commits_to_match,
     )
 }
 
@@ -537,7 +550,7 @@ fn fn_committer_date(
     ctx: &mut Context,
     name: &str,
     args: &[Expr],
-    _: &Option<&CommitSet>,
+    commits_to_match: &Option<&CommitSet>,
 ) -> EvalResult {
     let pattern = eval1_pattern(ctx, name, args)?;
     make_pattern_matcher(
@@ -548,7 +561,7 @@ fn fn_committer_date(
             let time = commit.get_committer().get_time();
             Ok(pattern.matches_date(&time))
         }),
-        &None,
+        commits_to_match,
     )
 }