Skip to content

Add support for printing filters from trees #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
Merged

Add support for printing filters from trees #1616

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions josh-filter/src/bin/josh-filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,25 @@ fn run_filter(args: Vec<String>) -> josh_core::JoshResult<i32> {
return Ok(0);
}
let specstr = args.get_one::<String>("filter").unwrap();
let is_from_file = args.get_one::<String>("file").is_some();
let specstr = args
.get_one::<String>("file")
.and_then(|f| read_to_string(f).ok())
.unwrap_or(specstr.to_string());

let mut filterobj = josh_core::filter::parse(&specstr)?;
let repo = git2::Repository::open_from_env()?;
let repo_path = repo.path().to_path_buf();

let repo_path = {
let repo = git2::Repository::open_from_env()?;
repo.path().to_path_buf()
// If the filter spec doesn't contain a colon and it's not from a file,
// treat it as a SHA and read from tree
let mut filterobj = if specstr.contains(':') || is_from_file {
josh_core::filter::parse(&specstr)?
} else {
// Try to parse as SHA and read filter from tree
let tree_oid = git2::Oid::from_str(&specstr.trim()).map_err(|_| {
josh_core::josh_error(&format!("Invalid filter spec or SHA: {}", specstr))
})?;
josh_core::filter::persist::from_tree(&repo, tree_oid)?
};

if !args.get_flag("no-cache") {
Expand Down