Skip to content

Commit b8ff019

Browse files
Implement :from filter
Change: from-filter
1 parent 673489f commit b8ff019

File tree

6 files changed

+137
-2
lines changed

6 files changed

+137
-2
lines changed

docs/src/reference/filters.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ commits that don't match any of the other shas.
114114
Produce the history that would be the result of pushing the passed branches with the
115115
passed filters into the upstream.
116116

117+
### Start filtering from a specific commit **:from(<sha>:filter)**
118+
119+
Produce a history that keeps the original history leading up to the specified commit `<sha>` unchanged,
120+
but applies the given `:filter` to all commits from that commit onwards.
121+
117122
### Prune trivial merge commits **:prune=trivial-merge**
118123

119124
Produce a history that skips all merge commits whose tree is identical to the first parents

josh-core/src/filter/grammar.pest

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ filter_spec = { (
2424
filter_group
2525
| filter_message
2626
| filter_rev
27+
| filter_from
28+
| filter_concat
2729
| filter_join
2830
| filter_replace
2931
| filter_squash
@@ -51,6 +53,24 @@ filter_rev = {
5153
~ ")"
5254
}
5355

56+
filter_from = {
57+
CMD_START ~ "from" ~ "("
58+
~ NEWLINE*
59+
~ (rev ~ filter_spec)?
60+
~ (CMD_SEP+ ~ (rev ~ filter_spec))*
61+
~ NEWLINE*
62+
~ ")"
63+
}
64+
65+
filter_concat = {
66+
CMD_START ~ "from" ~ "("
67+
~ NEWLINE*
68+
~ (rev ~ filter_spec)?
69+
~ (CMD_SEP+ ~ (rev ~ filter_spec))*
70+
~ NEWLINE*
71+
~ ")"
72+
}
73+
5474
filter_join = {
5575
CMD_START ~ "join" ~ "("
5676
~ NEWLINE*
@@ -60,7 +80,6 @@ filter_join = {
6080
~ ")"
6181
}
6282

63-
6483
filter_replace = {
6584
CMD_START ~ "replace" ~ "("
6685
~ NEWLINE*

josh-core/src/filter/mod.rs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ enum Op {
160160
Pattern(String),
161161
Message(String),
162162

163+
HistoryConcat(LazyRef, Filter),
164+
163165
Compose(Vec<Filter>),
164166
Chain(Filter, Filter),
165167
Subtract(Filter, Filter),
@@ -308,6 +310,13 @@ fn lazy_refs2(op: &Op) -> Vec<String> {
308310
av
309311
}
310312
Op::Rev(filters) => lazy_refs2(&Op::Join(filters.clone())),
313+
Op::HistoryConcat(r, _) => {
314+
let mut lr = Vec::new();
315+
if let LazyRef::Lazy(s) = r {
316+
lr.push(s.to_owned());
317+
}
318+
lr
319+
}
311320
Op::Join(filters) => {
312321
let mut lr = lazy_refs2(&Op::Compose(filters.values().copied().collect()));
313322
lr.extend(filters.keys().filter_map(|x| {
@@ -367,6 +376,19 @@ fn resolve_refs2(refs: &std::collections::HashMap<String, git2::Oid>, op: &Op) -
367376
.collect();
368377
Op::Rev(lr)
369378
}
379+
Op::HistoryConcat(r, filter) => {
380+
let f = resolve_refs(refs, *filter);
381+
let resolved_ref = if let LazyRef::Lazy(s) = r {
382+
if let Some(res) = refs.get(s) {
383+
LazyRef::Resolved(*res)
384+
} else {
385+
r.clone()
386+
}
387+
} else {
388+
r.clone()
389+
};
390+
Op::HistoryConcat(resolved_ref, f)
391+
}
370392
Op::Join(filters) => {
371393
let lr = filters
372394
.iter()
@@ -502,6 +524,9 @@ fn spec2(op: &Op) -> String {
502524
Op::Message(m) => {
503525
format!(":{}", parse::quote(m))
504526
}
527+
Op::HistoryConcat(r, filter) => {
528+
format!(":concat({}{})", r.to_string(), spec(*filter))
529+
}
505530
}
506531
}
507532

@@ -974,6 +999,24 @@ fn apply_to_commit2(
974999
&std::collections::HashMap::<String, &dyn strfmt::DisplayStr>::new(),
9751000
)?),
9761001
},
1002+
Op::HistoryConcat(r, f) => {
1003+
if let LazyRef::Resolved(c) = r {
1004+
let a = apply_to_commit2(&to_op(*f), &repo.find_commit(*c)?, transaction)?;
1005+
let a = some_or!(a, { return Ok(None) });
1006+
if commit.id() == a {
1007+
transaction.insert(filter, commit.id(), *c, true);
1008+
return Ok(Some(*c));
1009+
}
1010+
} else {
1011+
return Err(josh_error("unresolved lazy ref"));
1012+
}
1013+
RewriteData {
1014+
tree: commit.tree()?,
1015+
message: None,
1016+
author: None,
1017+
committer: None,
1018+
}
1019+
}
9771020
_ => RewriteData {
9781021
tree: apply(transaction, filter, commit.tree()?)?,
9791022
message: None,
@@ -1019,6 +1062,7 @@ fn apply2<'a>(
10191062
let repo = transaction.repo();
10201063
match op {
10211064
Op::Nop => Ok(tree),
1065+
Op::HistoryConcat(..) => Ok(tree),
10221066
Op::Empty => Ok(tree::empty(repo)),
10231067
Op::Fold => Ok(tree),
10241068
Op::Squash(None) => Ok(tree),

josh-core/src/filter/parse.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,31 @@ fn parse_item(pair: pest::iterators::Pair<Rule>) -> JoshResult<Op> {
144144

145145
Ok(Op::Rev(hm))
146146
}
147+
Rule::filter_from => {
148+
let v: Vec<_> = pair.into_inner().map(|x| x.as_str()).collect();
149+
150+
if v.len() == 2 {
151+
let oid = LazyRef::parse(v[0])?;
152+
let filter = parse(v[1])?;
153+
Ok(Op::Chain(
154+
filter,
155+
filter::to_filter(Op::HistoryConcat(oid, filter)),
156+
))
157+
} else {
158+
Err(josh_error("wrong argument count for :from"))
159+
}
160+
}
161+
Rule::filter_concat => {
162+
let v: Vec<_> = pair.into_inner().map(|x| x.as_str()).collect();
163+
164+
if v.len() == 2 {
165+
let oid = LazyRef::parse(v[0])?;
166+
let filter = parse(v[1])?;
167+
Ok(Op::HistoryConcat(oid, filter))
168+
} else {
169+
Err(josh_error("wrong argument count for :concat"))
170+
}
171+
}
147172
Rule::filter_replace => {
148173
let replacements = pair
149174
.into_inner()

tests/filter/concat.t

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
$ export TESTTMP=${PWD}
2+
3+
$ cd ${TESTTMP}
4+
$ git init -q libs 1> /dev/null
5+
$ cd libs
6+
7+
$ mkdir sub1
8+
$ echo contents1 > sub1/file1
9+
$ git add sub1
10+
$ git commit -m "add file1" 1> /dev/null
11+
12+
$ echo contents2 > sub1/file2
13+
$ git add sub1
14+
$ git commit -m "add file2" 1> /dev/null
15+
$ git update-ref refs/heads/from_here HEAD
16+
17+
18+
$ mkdir sub2
19+
$ echo contents1 > sub2/file3
20+
$ git add sub2
21+
$ git commit -m "add file3" 1> /dev/null
22+
23+
$ josh-filter ":\"x\""
24+
25+
$ git log --graph --pretty=%s:%H HEAD
26+
* add file3:667a912db7482f3c8023082c9b4c7b267792633a
27+
* add file2:81b10fb4984d20142cd275b89c91c346e536876a
28+
* add file1:bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
29+
30+
$ git log --graph --pretty=%s:%H FILTERED_HEAD
31+
* x:9d117d96dfdba145df43ebe37d9e526acac4b17c
32+
* x:b232aa8eefaadfb5e38b3ad7355118aa59fb651e
33+
* x:6b4d1f87c2be08f7d0f9d40b6679aab612e259b1
34+
35+
$ josh-filter -p ":from(81b10fb4984d20142cd275b89c91c346e536876a:\"x\")"
36+
:"x":concat(81b10fb4984d20142cd275b89c91c346e536876a:"x")
37+
$ josh-filter ":from(81b10fb4984d20142cd275b89c91c346e536876a:\"x\")"
38+
39+
$ git log --graph --pretty=%s FILTERED_HEAD
40+
* x
41+
* add file2
42+
* add file1

tests/proxy/workspace_errors.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Error in filter
106106
remote: 1 | a/b = :b/sub2
107107
remote: | ^---
108108
remote: |
109-
remote: = expected EOI, filter_group, filter_subdir, filter_nop, filter_presub, filter, filter_noarg, filter_message, filter_rev, filter_join, filter_replace, or filter_squash
109+
remote: = expected EOI, filter_group, filter_subdir, filter_nop, filter_presub, filter, filter_noarg, filter_message, filter_rev, filter_from, filter_concat, filter_join, filter_replace, or filter_squash
110110
remote:
111111
remote: a/b = :b/sub2
112112
remote: c = :/sub1

0 commit comments

Comments
 (0)