mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

revset: extract helper function that tests diff from parent revision

Browse source
This commit is contained in:
Yuya Nishihara 2022-11-15 16:50:25 +09:00
parent c7145a2ed9
commit 230ac043ff
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/src/revset.rs
View file

@ -1657,16 +1657,18 @@ pub fn filter_by_diff<'revset, 'repo: 'revset>(
) -> Box<dyn Revset<'repo> + 'revset> {
Box::new(FilterRevset {
candidates,
predicate: Box::new(move |entry| {
let commit = repo.store().get_commit(&entry.commit_id()).unwrap();
let parents = commit.parents();
let from_tree = rewrite::merge_commit_trees(repo, &parents);
let to_tree = commit.tree();
from_tree.diff(&to_tree, matcher.borrow()).next().is_some()
}),
predicate: Box::new(move |entry| has_diff_from_parent(repo, entry, matcher.borrow())),
})
}
fn has_diff_from_parent(repo: RepoRef<'_>, entry: &IndexEntry<'_>, matcher: &dyn Matcher) -> bool {
let commit = repo.store().get_commit(&entry.commit_id()).unwrap();
let parents = commit.parents();
let from_tree = rewrite::merge_commit_trees(repo, &parents);
let to_tree = commit.tree();
from_tree.diff(&to_tree, matcher).next().is_some()
}
#[cfg(test)]
mod tests {
use super::*;