Add :rev(...) filter

Change: start-filter

Author: christian-schilling

Cargo.lock

@@ -31,6 +31,7 @@ handlebars = "4.3.5"
 hex = "0.4.3"
 hyper-reverse-proxy = "0.5.1"
 indoc = "1.0.7"
+itertools = "0.9"
 juniper = "0.15.10"
 lazy_static = "1.4.0"
 log = "0.4.17"

Cargo.toml

@@ -91,6 +91,17 @@ These filter do not modify git trees, but instead only operate on the commit gra
 Produce a filtered history that does not contain any merge commits. This is done by
 simply dropping all parents except the first on every commit.
 
+### Filter specific parts of the history **:rev(<sha_0>:filter_0,...,<sha_N>:filter_N)**
+Produce a history where the commits specified by `<sha_N>` are replaced by the result of applying
+`:filter_N` to it.
+
+It will appear like all *ancestors* of `<sha_N>` are also filtered with `<filter_N>`. If an
+ancestor also has a matching entry in the `:rev(...)` it's filter will *replace* `<filter_N>`
+for all further ancestors (and so on).
+
+This special value `0000000000000000000000000000000000000000` can be used as a `<sha_n>` to filter
+commits that don't match any of the other shas.
+
 Filter order matters
 --------------------
 

docs/src/reference/filters.md

@@ -18,6 +18,7 @@ char = {
 
 filter_spec = { (
     filter_group
+  | filter_rev
   | filter_presub
   | filter_subdir
   | filter_nop
@@ -32,6 +33,15 @@ filter_presub = { CMD_START ~ ":" ~ argument }
 filter = { CMD_START ~ cmd ~ "=" ~ (argument ~ ("," ~ argument)*)? }
 filter_noarg = { CMD_START ~ cmd }
 
+filter_rev = {
+    CMD_START ~ "rev" ~ "("
+    ~ NEWLINE*
+    ~ (argument ~ filter_spec)?
+    ~ (CMD_SEP+ ~ (argument ~ filter_spec))*
+    ~ NEWLINE*
+    ~ ")"
+}
+
 argument = { string | PATH }
 
 cmd = { ALNUM+ }

src/filter/grammar.pest

@@ -98,6 +98,7 @@ enum Op {
     Fold,
     Paths,
     Squash(Option<std::collections::HashMap<git2::Oid, (String, String, String)>>),
+    Rev(std::collections::HashMap<git2::Oid, Filter>),
     Linear,
 
     RegexReplace(regex::Regex, String),
@@ -194,6 +195,13 @@ fn nesting2(op: &Op) -> usize {
         Op::Workspace(_) => usize::MAX,
         Op::Chain(a, b) => 1 + nesting(*a).max(nesting(*b)),
         Op::Subtract(a, b) => 1 + nesting(*a).max(nesting(*b)),
+        Op::Rev(filters) => {
+            1 + filters
+                .values()
+                .map(|filter| nesting(*filter))
+                .max()
+                .unwrap_or(0)
+        }
         _ => 0,
     }
 }
@@ -223,6 +231,14 @@ fn spec2(op: &Op) -> String {
         Op::Exclude(b) => {
             format!(":exclude[{}]", spec(*b))
         }
+        Op::Rev(filters) => {
+            let mut v = filters
+                .iter()
+                .map(|(k, v)| format!("{}{}", k, spec(*v)))
+                .collect::<Vec<_>>();
+            v.sort();
+            format!(":rev({})", v.join(","))
+        }
         Op::Workspace(path) => {
             format!(":workspace={}", parse::quote(&path.to_string_lossy()))
         }
@@ -384,6 +400,32 @@ fn apply_to_commit2(
     rs_tracing::trace_scoped!("apply_to_commit", "spec": spec(filter), "commit": commit.id().to_string());
 
     let filtered_tree = match &to_op(filter) {
+        Op::Rev(filters) => {
+            let nf = *filters
+                .get(&git2::Oid::zero())
+                .unwrap_or(&to_filter(Op::Nop));
+
+            for (id, startfilter) in filters {
+                if *id == commit.id() {
+                    let mut f2 = filters.clone();
+                    f2.remove(id);
+                    f2.insert(git2::Oid::zero(), *startfilter);
+                    let op = if f2.len() == 1 {
+                        to_op(*startfilter)
+                    } else {
+                        Op::Rev(f2)
+                    };
+                    if let Some(start) = apply_to_commit2(&op, &commit, transaction)? {
+                        transaction.insert(filter, commit.id(), start, true);
+                        return Ok(Some(start));
+                    } else {
+                        return Ok(None);
+                    }
+                }
+            }
+
+            apply(transaction, nf, commit.tree()?)?
+        }
         Op::Squash(Some(ids)) => {
             if let Some(_) = ids.get(&commit.id()) {
                 commit.tree()?
@@ -619,7 +661,7 @@ fn apply2<'a>(
         Op::Squash(None) => Ok(tree),
         Op::Squash(Some(_)) => Err(josh_error("not applicable to tree")),
         Op::Linear => Ok(tree),
-
+        Op::Rev(_) => Err(josh_error("not applicable to tree")),
         Op::RegexReplace(regex, replacement) => {
             tree::regex_replace(tree.id(), &regex, &replacement, transaction)
         }
@@ -712,7 +754,11 @@ pub fn unapply<'a>(
     parent_tree: git2::Tree<'a>,
 ) -> JoshResult<git2::Tree<'a>> {
     if let Ok(inverted) = invert(filter) {
-        let matching = apply(transaction, chain(filter, inverted), parent_tree.clone())?;
+        let matching = apply(
+            transaction,
+            chain(invert(inverted)?, inverted),
+            parent_tree.clone(),
+        )?;
         let stripped = tree::subtract(transaction, parent_tree.id(), matching.id())?;
         let new_tree = apply(transaction, inverted, tree)?;
 
@@ -733,7 +779,8 @@ pub fn unapply<'a>(
     }
 
     if let Op::Chain(a, b) = to_op(filter) {
-        let p = apply(transaction, a, parent_tree.clone())?;
+        let i = if let Ok(i) = invert(a) { invert(i)? } else { a };
+        let p = apply(transaction, i, parent_tree.clone())?;
         return unapply(
             transaction,
             a,

src/filter/mod.rs

@@ -328,6 +328,7 @@ fn step(filter: Filter) -> Filter {
                 Op::Prefix(path)
             }
         }
+        Op::Rev(filters) => Op::Rev(filters.into_iter().map(|(i, f)| (i, step(f))).collect()),
         Op::Compose(filters) if filters.is_empty() => Op::Empty,
         Op::Compose(filters) if filters.len() == 1 => to_op(filters[0]),
         Op::Compose(mut filters) => {
@@ -426,6 +427,7 @@ pub fn invert(filter: Filter) -> JoshResult<Filter> {
         Op::File(path) => Some(Op::File(path)),
         Op::Prefix(path) => Some(Op::Subdir(path)),
         Op::Glob(pattern) => Some(Op::Glob(pattern)),
+        Op::Rev(_) => Some(Op::Nop),
         _ => None,
     };
 

src/filter/opt.rs

@@ -1,5 +1,6 @@
 use super::*;
 use indoc::{formatdoc, indoc};
+use itertools::Itertools;
 
 fn make_op(args: &[&str]) -> JoshResult<Op> {
     match args {
@@ -103,6 +104,17 @@ fn parse_item(pair: pest::iterators::Pair<Rule>) -> JoshResult<Op> {
                 _ => Err(josh_error("parse_item: no match {:?}")),
             }
         }
+        Rule::filter_rev => {
+            let v: Vec<_> = pair.into_inner().map(|x| unquote(x.as_str())).collect();
+
+            let hm = v
+                .iter()
+                .tuples()
+                .map(|(oid, filter)| Ok((git2::Oid::from_str(oid)?, parse(filter)?)))
+                .collect::<JoshResult<_>>()?;
+
+            Ok(Op::Rev(hm))
+        }
         _ => Err(josh_error("parse_item: no match")),
     }
 }