Rearange code

Split the code up into more logical related components.

Move josh-filter.rs to josh-cli crate
Those two make a lot of sense to be installed together.
Also we're considering to use the "josh-filter" crate name
to extract parts of josh-core.

Author: christian-schilling

Cargo.lock

@@ -5,7 +5,6 @@ members = [
     "hyper-reverse-proxy",
     "josh-core",
     "josh-cli",
-    "josh-filter",
     "josh-graphql",
     "josh-proxy",
     "josh-rpc",

Cargo.toml

@@ -9,7 +9,7 @@ history, taking a filter specification as argument.
 
 It can be installed with the following Cargo command, assuming Rust is installed:
 ```shell
-cargo install josh-filter --git https://github.com/josh-project/josh.git
+cargo install josh-cli --git https://github.com/josh-project/josh.git
 ```
 
 git-sync

docs/src/reference/cli.md

@@ -26,3 +26,7 @@ toml = { workspace = true }
 
 [features]
 incubating = []
+
+[[bin]]
+name = "josh-filter"
+path = "src/bin/josh-filter.rs"

josh-cli/Cargo.toml

@@ -193,13 +193,13 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
     };
 
     if !args.get_flag("no-cache") {
-        josh_core::cache_sled::sled_load(&repo_path)?;
+        josh_core::cache::sled_load(&repo_path)?;
     }
 
     let cache = std::sync::Arc::new(
-        josh_core::cache_stack::CacheStack::new()
-            .with_backend(josh_core::cache_sled::SledCacheBackend::default())
-            .with_backend(josh_core::cache_notes::NotesCacheBackend::new(&repo_path)?),
+        josh_core::cache::CacheStack::new()
+            .with_backend(josh_core::cache::SledCacheBackend::default())
+            .with_backend(josh_core::cache::NotesCacheBackend::new(&repo_path)?),
     );
 
     let mut transaction =
@@ -296,7 +296,7 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
             rs_tracing::close_trace_file!();
         }
         if args.get_flag("cache-stats") {
-            josh_core::cache_sled::sled_print_stats().expect("failed to collect cache stats");
+            josh_core::cache::sled_print_stats().expect("failed to collect cache stats");
         }
         if let Some(mempack) = mp {
             let mut buf = git2::Buf::new();

josh-filter/src/bin/josh-filter.rs josh-cli/src/bin/josh-filter.rsjosh-filter/src/bin/josh-filter.rs renamed to josh-cli/src/bin/josh-filter.rs

@@ -319,15 +319,15 @@ fn run_command(cli: &Cli) -> anyhow::Result<()> {
         repo.path().parent().unwrap().to_path_buf()
     };
 
-    josh_core::cache_sled::sled_load(&repo_path.join(".git"))
+    josh_core::cache::sled_load(&repo_path.join(".git"))
         .map_err(from_josh_err)
         .context("Failed to load sled cache")?;
 
     let cache = std::sync::Arc::new(
-        josh_core::cache_stack::CacheStack::new()
-            .with_backend(josh_core::cache_sled::SledCacheBackend::default())
+        josh_core::cache::CacheStack::new()
+            .with_backend(josh_core::cache::SledCacheBackend::default())
             .with_backend(
-                josh_core::cache_notes::NotesCacheBackend::new(&repo_path)
+                josh_core::cache::NotesCacheBackend::new(&repo_path)
                     .map_err(from_josh_err)
                     .context("Failed to create NotesCacheBackend")?,
             ),

josh-cli/src/bin/josh.rs

@@ -0,0 +1,58 @@
+use crate::filter::op::{LazyRef, Op};
+use crate::filter::opt;
+use crate::filter::persist::to_filter;
+use crate::filter::{Filter, MESSAGE_MATCH_ALL_REGEX};
+
+/// Create a no-op filter that passes everything through unchanged
+pub fn nop() -> Filter {
+    to_filter(Op::Nop)
+}
+
+/// Create an empty filter that matches nothing
+pub fn empty() -> Filter {
+    to_filter(Op::Empty)
+}
+
+/// Create a message filter that transforms commit messages
+pub fn message(m: &str) -> Filter {
+    to_filter(Op::Message(m.to_string(), MESSAGE_MATCH_ALL_REGEX.clone()))
+}
+
+/// Create a file filter that selects a single file
+pub fn file(path: impl Into<std::path::PathBuf>) -> Filter {
+    let p = path.into();
+    to_filter(Op::File(p.clone(), p))
+}
+
+/// Create a hook filter
+pub fn hook(h: &str) -> Filter {
+    to_filter(Op::Hook(h.to_string()))
+}
+
+/// Create a squash filter
+pub fn squash(ids: Option<&[(git2::Oid, Filter)]>) -> Filter {
+    if let Some(ids) = ids {
+        to_filter(Op::Squash(Some(
+            ids.iter()
+                .map(|(x, y)| (LazyRef::Resolved(*x), *y))
+                .collect(),
+        )))
+    } else {
+        to_filter(Op::Squash(None))
+    }
+}
+
+/// Create a filter that is the result of feeding the output of `first` into `second`
+pub fn chain(first: Filter, second: Filter) -> Filter {
+    opt::optimize(to_filter(Op::Chain(first, second)))
+}
+
+/// Create a filter that is the result of overlaying the output of `first` onto `second`
+pub fn compose(first: Filter, second: Filter) -> Filter {
+    opt::optimize(to_filter(Op::Compose(vec![first, second])))
+}
+
+/// Create a sequence_number filter used for tracking commit sequence numbers
+pub fn sequence_number() -> Filter {
+    Filter::from_oid(git2::Oid::zero())
+}