Merge pull request #7 from ErichDonGubler/files-args

ErichDonGubler · Jul 11, 2023 · ab3b46a · ab3b46a
2 parents 0c472d8 + 8b76dc2
commit ab3b46a
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 10 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,4 +1,5 @@
 use std::{
+    ffi::OsStr,
     io::{self, Cursor},
     process::{exit, Command, ExitStatus, Output},
 };
@@ -76,9 +77,10 @@ impl From<ExecuteError<RunErrorKind>> for Error {
 
 pub type Result<T> = std::result::Result<T, Error>;
 
-pub fn show_graph<'a, I>(format: Option<String>, object_names: I) -> Result<()>
+pub fn show_graph<'a, Os, Fs>(format: Option<String>, object_names: Os, files: Fs) -> Result<()>
 where
-    I: IntoIterator<Item = &'a str> + Clone,
+    Os: IntoIterator<Item = &'a str> + Clone,
+    Fs: IntoIterator<Item = &'a OsStr> + Clone,
 {
     let merge_base = {
         let mut output = stdout_lines(EasyCommand::new_with("git", |cmd| {
@@ -123,6 +125,7 @@ where
             .arg(format!("^{merge_base}^@"))
             .args(object_names.clone().into_iter())
             .arg("--") // Make it unambiguous that we're specifying branches first
+            .args(files)
     })
     .spawn_and_wait()
     .map_err(Into::into)

diff --git a/src/main.rs b/src/main.rs
@@ -1,5 +1,5 @@
 // TODO: move to `src/bin.rs`
-use std::process::Command;
+use std::{ffi::OsString, process::Command};
 
 use clap::Parser;
 use ezcmd::EasyCommand;
@@ -24,15 +24,21 @@ enum Subcommand {
         base: Option<String>,
         #[clap(flatten)]
         config: PresetConfig,
+        #[clap(flatten)]
+        files: FileSelection,
     },
     /// Display local branches and, optionally, their upstreams.
     Locals {
         #[clap(flatten)]
         config: PresetConfig,
+        #[clap(flatten)]
+        files: FileSelection,
     },
     Select {
         /// Additional branches to include.
         branches: Vec<String>,
+        #[clap(flatten)]
+        files: FileSelection,
     },
 }
 
@@ -49,6 +55,13 @@ struct PresetConfig {
     select_last_tag: bool,
 }
 
+#[derive(Debug, Parser)]
+struct FileSelection {
+    /// Files by which to filter history.
+    #[clap(raw(true))]
+    files: Vec<OsString>,
+}
+
 fn main() {
     run(|| {
         let Args { format, subcommand } = Args::parse();
@@ -59,6 +72,7 @@ fn main() {
                 select_pushes: false,
                 select_last_tag: false,
             },
+            files: FileSelection { files: vec![] },
         });
         let current_branch = || {
             stdout_lines(EasyCommand::new_with("git", |cmd| {
@@ -115,8 +129,12 @@ fn main() {
 
             Ok(branches)
         };
-        let branches = match subcommand {
-            Subcommand::Stack { base, config } => {
+        let (branches, files) = match subcommand {
+            Subcommand::Stack {
+                base,
+                config,
+                files: FileSelection { files },
+            } => {
                 let specified_base = base
                     .map(Ok)
                     .or_else(|| git_config("glimpse.base").transpose())
@@ -127,7 +145,7 @@ fn main() {
                     default
                 });
 
-                if let Some(current_branch) = current_branch()? {
+                let branches = if let Some(current_branch) = current_branch()? {
                     let mut config = config;
                     if current_branch == base {
                         config.select_upstreams = true;
@@ -142,12 +160,23 @@ fn main() {
                     let mut branches = branches(&config, &|cmd| cmd.arg(base))?;
                     branches.push("HEAD".to_owned());
                     branches
-                }
+                };
+                (branches, files)
             }
-            Subcommand::Locals { config } => branches(&config, &|cmd| cmd)?,
-            Subcommand::Select { branches } => branches,
+            Subcommand::Locals {
+                config,
+                files: FileSelection { files },
+            } => (branches(&config, &|cmd| cmd)?, files),
+            Subcommand::Select {
+                branches,
+                files: FileSelection { files },
+            } => (branches, files),
         };
         log::debug!("showing graph for branches {branches:?}");
-        show_graph(format, branches.iter().map(|s| s.as_str()))
+        show_graph(
+            format,
+            branches.iter().map(|s| s.as_str()),
+            files.iter().map(|f| f.as_os_str()),
+        )
     })
 }