Skip to content

Unify workspace and hook per rev filter #1574

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 9, 2025
Merged

Unify workspace and hook per rev filter #1574

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
85 changes: 30 additions & 55 deletions josh-core/src/filter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,22 @@ fn resolve_workspace_redirect<'a>(
}

fn get_workspace<'a>(repo: &'a git2::Repository, tree: &'a git2::Tree<'a>, path: &Path) -> Filter {
let ws_path = normalize_path(&path.join("workspace.josh"));
let path = if let Some((_, path)) = resolve_workspace_redirect(repo, &tree, path) {
path
} else {
path.to_owned()
};
let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
let base = to_filter(Op::Subdir(path.to_owned()));
let wsj_file = chain(base, wsj_file);
compose(
wsj_file,
compose(get_filter(repo, tree, &path.join("workspace.josh")), base),
)
}

fn get_filter<'a>(repo: &'a git2::Repository, tree: &'a git2::Tree<'a>, path: &Path) -> Filter {
let ws_path = normalize_path(path);
let ws_id = ok_or!(tree.get_path(&ws_path), {
return to_filter(Op::Empty);
})
Expand Down Expand Up @@ -1548,40 +1563,22 @@ fn apply_to_commit2(
}
}

let commit_filter = filter;

let cw = get_workspace(repo, &commit.tree()?, ws_path);
let commit_filter = get_workspace(repo, &commit.tree()?, &ws_path);

let parent_filters = commit
.parents()
.map(|parent| {
rs_tracing::trace_scoped!("parent", "id": parent.id().to_string());

let p = if let Some((_, p)) =
resolve_workspace_redirect(repo, &parent.tree()?, ws_path)
{
p
} else {
ws_path.clone()
};

let pcw = get_workspace(
repo,
&parent.tree().unwrap_or_else(|_| tree::empty(repo)),
&p,
&ws_path,
);
Ok((parent, pcw))
})
.collect::<JoshResult<Vec<_>>>()?;

return per_rev_filter(
transaction,
commit,
filter,
commit_filter,
cw,
parent_filters,
);
return per_rev_filter(transaction, commit, filter, commit_filter, parent_filters);
}
Op::Fold => {
let filtered_parent_ids = commit
Expand All @@ -1607,7 +1604,6 @@ fn apply_to_commit2(
}
Op::Hook(hook) => {
let commit_filter = transaction.lookup_filter_hook(&hook, commit.id())?;
let cw = commit_filter;

let parent_filters = commit
.parents()
Expand All @@ -1617,14 +1613,7 @@ fn apply_to_commit2(
})
.collect::<JoshResult<Vec<_>>>()?;

return per_rev_filter(
transaction,
commit,
filter,
commit_filter,
cw,
parent_filters,
);
return per_rev_filter(transaction, commit, filter, commit_filter, parent_filters);
}
_ => {
let filtered_parent_ids = commit
Expand Down Expand Up @@ -1767,24 +1756,7 @@ fn apply2<'a>(transaction: &'a cache::Transaction, op: &Op, x: Apply<'a>) -> Jos
.with_tree(tree::invert_paths(transaction, "", x.tree().clone())?))
}

Op::Workspace(path) => {
let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
let base = to_filter(Op::Subdir(path.to_owned()));
let wsj_file = chain(base, wsj_file);

if let Some((redirect, _)) = resolve_workspace_redirect(repo, x.tree(), path) {
return apply(transaction, redirect, x.clone());
}

apply(
transaction,
compose(
wsj_file,
compose(get_workspace(repo, &x.tree(), path), base),
),
x,
)
}
Op::Workspace(path) => apply(transaction, get_workspace(repo, &x.tree(), &path), x),

Op::Compose(filters) => {
let filtered: Vec<_> = filters
Expand Down Expand Up @@ -1875,8 +1847,12 @@ fn unapply_workspace<'a>(
match op {
Op::Workspace(path) => {
let tree = pre_process_tree(transaction.repo(), tree)?;
let workspace = get_workspace(transaction.repo(), &tree, Path::new(""));
let original_workspace = get_workspace(transaction.repo(), &parent_tree, path);
let workspace = get_filter(transaction.repo(), &tree, Path::new("workspace.josh"));
let original_workspace = get_filter(
transaction.repo(),
&parent_tree,
&path.join("workspace.josh"),
);

let root = to_filter(Op::Subdir(path.to_owned()));
let wsj_file = to_filter(Op::File(Path::new("workspace.josh").to_owned()));
Expand Down Expand Up @@ -2071,15 +2047,14 @@ fn per_rev_filter(
commit: &git2::Commit,
filter: Filter,
commit_filter: Filter,
cw: Filter,
parent_filters: Vec<(git2::Commit, Filter)>,
) -> JoshResult<Option<git2::Oid>> {
// Compute the difference between the current commit's filter and each parent's filter.
// This determines what new content should be contributed by that parent in the filtered history.
let extra_parents = parent_filters
.into_iter()
.map(|(parent, pcw)| {
let f = opt::optimize(to_filter(Op::Subtract(cw, pcw)));
let f = opt::optimize(to_filter(Op::Subtract(commit_filter, pcw)));
apply_to_commit2(&to_op(f), &parent, transaction)
})
.collect::<JoshResult<Option<Vec<_>>>>()?;
Expand All @@ -2099,8 +2074,8 @@ fn per_rev_filter(

// Special case: `:pin` filter needs to be aware of filtered history
let pin_details = if let Some(&parent) = normal_parents.first() {
let legalized_a = legalize_pin(cw, &|f| f);
let legalized_b = legalize_pin(cw, &|f| to_filter(Op::Exclude(f)));
let legalized_a = legalize_pin(commit_filter, &|f| f);
let legalized_b = legalize_pin(commit_filter, &|f| to_filter(Op::Exclude(f)));

if legalized_a != legalized_b {
let pin_subtract = apply(
Expand Down