feat(smartlog): Introduce SmartlogVariant

As implemented, these variants don't actually do anything. That will change
with the next commit, as we use the variants to decide what commits to render
and how to render them.

Author: claytonrcarter

git-branchless/src/commands/smartlog.rs

@@ -25,7 +25,7 @@ use lib::core::node_descriptors::{
 };
 use lib::git::{GitRunInfo, Repo};
 
-pub use graph::{make_smartlog_graph, SmartlogGraph};
+pub use graph::{make_custom_smartlog_graph, make_smartlog_graph, SmartlogGraph, SmartlogVariant};
 pub use render::{render_graph, SmartlogOptions};
 
 use crate::opts::Revset;
@@ -211,7 +211,23 @@ mod graph {
         }
     }
 
-    /// Construct the smartlog graph for the repo.
+    /// What kind of smartlog is desired?
+    #[derive(Debug)]
+    pub enum SmartlogVariant {
+        /// A smartlog with all commits connected back to the main branch.
+        Connected,
+
+        /// A smartlog with only the specified set of a commits.
+        Sparse,
+    }
+
+    impl Default for SmartlogVariant {
+        fn default() -> Self {
+            SmartlogVariant::Connected
+        }
+    }
+
+    /// Construct the default smartlog graph for the repo.
     #[instrument]
     pub fn make_smartlog_graph<'repo>(
         effects: &Effects,
@@ -220,13 +236,41 @@ mod graph {
         event_replayer: &EventReplayer,
         event_cursor: EventCursor,
         commits: &CommitSet,
+    ) -> eyre::Result<SmartlogGraph<'repo>> {
+        make_custom_smartlog_graph(
+            effects,
+            repo,
+            dag,
+            event_replayer,
+            event_cursor,
+            commits,
+            SmartlogVariant::default(),
+        )
+    }
+
+    /// Construct a specific kind of smartlog graph for the repo.
+    #[instrument]
+    pub fn make_custom_smartlog_graph<'repo>(
+        effects: &Effects,
+        repo: &'repo Repo,
+        dag: &Dag,
+        event_replayer: &EventReplayer,
+        event_cursor: EventCursor,
+        commits: &CommitSet,
+        smartlog_variant: SmartlogVariant,
     ) -> eyre::Result<SmartlogGraph<'repo>> {
         let (effects, _progress) = effects.start_operation(OperationType::MakeGraph);
 
         let mut graph = {
             let (effects, _progress) = effects.start_operation(OperationType::WalkCommits);
 
             let public_commits = dag.query_public_commits()?;
+
+            let commits = match smartlog_variant {
+                SmartlogVariant::Connected => commits,
+                SmartlogVariant::Sparse => commits,
+            };
+
             for oid in commit_set_to_vec(commits)? {
                 mark_commit_reachable(repo, oid)?;
             }
@@ -557,9 +601,9 @@ pub fn smartlog(
         &references_snapshot,
     )?;
 
-    let revset = match revset {
-        Some(revset) => revset.clone(),
-        None => Revset::default(),
+    let (revset, smartlog_variant) = match revset {
+        Some(revset) => (revset.clone(), SmartlogVariant::Sparse),
+        None => (Revset::default(), SmartlogVariant::Connected),
     };
 
     let commits = match resolve_commits(effects, &repo, &mut dag, &[revset], resolve_revset_options)
@@ -577,13 +621,14 @@ pub fn smartlog(
         }
     };
 
-    let graph = make_smartlog_graph(
+    let graph = make_custom_smartlog_graph(
         effects,
         &repo,
         &dag,
         &event_replayer,
         event_cursor,
         &commits,
+        smartlog_variant,
     )?;
 
     let lines = render_graph(

git-branchless/src/opts.rs

@@ -8,7 +8,7 @@ use std::str::FromStr;
 
 /// A revset expression. Can be a commit hash, branch name, or one of the
 /// various revset functions.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Revset(pub String);
 
 impl FromStr for Revset {