Skip to content

Commit a51b15e

Browse files
christian-schillingchristian-schilling
committed
Implement :lookup filter
1 parent 810f7f0 commit a51b15e

File tree

4 files changed

+192
-0
lines changed

4 files changed

+192
-0
lines changed

‎josh-core/src/filter/mod.rs‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ enum Op {
317317
Prefix(std::path::PathBuf),
318318
Subdir(std::path::PathBuf),
319319
Workspace(std::path::PathBuf),
320+
Lookup(std::path::PathBuf),
321+
Lookup2(git2::Oid),
320322
Stored(std::path::PathBuf),
321323

322324
Pattern(String),
@@ -638,6 +640,12 @@ fn spec2(op: &Op) -> String {
638640
Op::Workspace(path) => {
639641
format!(":workspace={}", parse::quote_if(&path.to_string_lossy()))
640642
}
643+
Op::Lookup(path) => {
644+
format!(":lookup={}", parse::quote_if(&path.to_string_lossy()))
645+
}
646+
Op::Lookup2(oid) => {
647+
format!(":lookup2={}", oid.to_string())
648+
}
641649
Op::Stored(path) => {
642650
format!(":+{}", parse::quote_if(&path.to_string_lossy()))
643651
}
@@ -971,6 +979,69 @@ fn apply_to_commit2(
971979

972980
apply(transaction, nf, Apply::from_commit(commit)?)?
973981
}
982+
Op::Lookup(lookup_path) => {
983+
let lookup_commit = if let Some(lookup_commit) =
984+
apply_to_commit2(&Op::Subdir(lookup_path.clone()), &commit, transaction)?
985+
{
986+
lookup_commit
987+
} else {
988+
return Ok(None);
989+
};
990+
991+
let op = Op::Lookup2(lookup_commit);
992+
993+
if let Some(start) = transaction.get(to_filter(op), commit.id()) {
994+
transaction.insert(filter, commit.id(), start, true);
995+
return Ok(Some(start));
996+
} else {
997+
return Ok(None);
998+
}
999+
}
1000+
1001+
Op::Lookup2(lookup_commit_id) => {
1002+
let lookup_commit = repo.find_commit(*lookup_commit_id)?;
1003+
for parent in lookup_commit.parents() {
1004+
let lookup_tree = lookup_commit.tree_id();
1005+
let cw = get_filter(
1006+
repo,
1007+
&repo.find_tree(lookup_tree)?,
1008+
&std::path::PathBuf::new().join(commit.id().to_string()),
1009+
);
1010+
if cw != filter::empty() {
1011+
if let Some(start) =
1012+
apply_to_commit2(&Op::Lookup2(parent.id()), &commit, transaction)?
1013+
{
1014+
transaction.insert(filter, commit.id(), start, true);
1015+
return Ok(Some(start));
1016+
} else {
1017+
return Ok(None);
1018+
}
1019+
}
1020+
break;
1021+
}
1022+
let lookup_tree = lookup_commit.tree_id();
1023+
let cw = get_filter(
1024+
repo,
1025+
&repo.find_tree(lookup_tree)?,
1026+
&std::path::PathBuf::new().join(commit.id().to_string()),
1027+
);
1028+
1029+
if cw == filter::empty() {
1030+
// FIXME empty filter or no entry in table?
1031+
for parent in commit.parents() {
1032+
if let Some(start) = apply_to_commit2(&op, &parent, transaction)? {
1033+
transaction.insert(filter, commit.id(), start, true);
1034+
return Ok(Some(start));
1035+
} else {
1036+
return Ok(None);
1037+
}
1038+
}
1039+
return Ok(None);
1040+
}
1041+
1042+
Apply::from_commit(commit)?
1043+
.with_tree(apply(transaction, cw, Apply::from_commit(commit)?)?.into_tree())
1044+
}
9741045
Op::Squash(Some(ids)) => {
9751046
if let Some(sq) = ids.get(&LazyRef::Resolved(commit.id())) {
9761047
let oid = if let Some(oid) =
@@ -1665,6 +1736,8 @@ fn apply2<'a>(transaction: &'a cache::Transaction, op: &Op, x: Apply<'a>) -> Jos
16651736
Ok(x.with_tree(result_tree))
16661737
}
16671738
Op::Rev(_) => Err(josh_error("not applicable to tree")),
1739+
Op::Lookup(_) => Err(josh_error("not applicable to tree")),
1740+
Op::Lookup2(_) => Err(josh_error("not applicable to tree")),
16681741
Op::Join(_) => Err(josh_error("not applicable to tree")),
16691742
Op::RegexReplace(replacements) => {
16701743
let mut t = x.tree().clone();

‎josh-core/src/filter/parse.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ fn make_op(args: &[&str]) -> JoshResult<Op> {
1010
["author", author, email] => Ok(Op::Author(author.to_string(), email.to_string())),
1111
["committer", author, email] => Ok(Op::Committer(author.to_string(), email.to_string())),
1212
["workspace", arg] => Ok(Op::Workspace(Path::new(arg).to_owned())),
13+
["lookup", arg] => Ok(Op::Lookup(Path::new(arg).to_owned())),
1314
["prefix"] => Err(josh_error(indoc!(
1415
r#"
1516
Filter ":prefix" requires an argument.

‎josh-core/src/filter/persist.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ impl InMemoryBuilder {
335335
let blob = self.write_blob(hook.as_bytes());
336336
push_blob_entries(&mut entries, [("hook", blob)]);
337337
}
338+
&Op::Lookup(_) | &Op::Lookup2(_) => todo!(),
338339
}
339340

340341
let tree = gix_object::Tree { entries };

‎tests/filter/lookup.t‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
$ export TERM=dumb
2+
$ export RUST_LOG_STYLE=never
3+
4+
$ git init -q real_repo 1> /dev/null
5+
$ cd real_repo
6+
7+
$ mkdir sub1
8+
$ echo contents1 > sub1/file1
9+
$ git add sub1
10+
$ git commit -m "add file1" 1> /dev/null
11+
12+
$ mkdir sub1
13+
mkdir: cannot create directory 'sub1': File exists
14+
[1]
15+
$ echo contents2 > sub1/file2
16+
$ git add sub1
17+
$ git commit -m "add file2" 1> /dev/null
18+
19+
$ git log --graph --pretty=%H
20+
* 81b10fb4984d20142cd275b89c91c346e536876a
21+
* bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
22+
23+
$ mkdir table
24+
$ echo ":prefix=x" > table/81b10fb4984d20142cd275b89c91c346e536876a
25+
$ echo ":prefix=y" > table/bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
26+
$ git add table
27+
$ git commit -m "add lookup table" 1> /dev/null
28+
29+
30+
$ echo contents3 > sub1/file3
31+
$ git add sub1
32+
$ git commit -m "add file3" 1> /dev/null
33+
34+
$ git log --graph --pretty=%H
35+
* 26e4c43675b985689e280bc42264a9226af76943
36+
* 14c74c5eca73952b36d736034b388832748c49d6
37+
* 81b10fb4984d20142cd275b89c91c346e536876a
38+
* bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
39+
40+
$ josh-filter -s ":lookup=table" --update refs/heads/filtered
41+
[1] :lookup=table
42+
[2] :/table
43+
[4] :lookup2=4880528e9d57aa5efc925e120a8077bfa37d778d
44+
45+
$ git log refs/heads/filtered --graph --pretty=%s
46+
* add file2
47+
* add file1
48+
$ git diff ${EMPTY_TREE}..refs/heads/filtered
49+
diff --git a/x/sub1/file1 b/x/sub1/file1
50+
new file mode 100644
51+
index 0000000..a024003
52+
--- /dev/null
53+
+++ b/x/sub1/file1
54+
@@ -0,0 +1 @@
55+
+contents1
56+
diff --git a/x/sub1/file2 b/x/sub1/file2
57+
new file mode 100644
58+
index 0000000..6b46faa
59+
--- /dev/null
60+
+++ b/x/sub1/file2
61+
@@ -0,0 +1 @@
62+
+contents2
63+
$ git diff ${EMPTY_TREE}..refs/heads/filtered~1
64+
diff --git a/y/sub1/file1 b/y/sub1/file1
65+
new file mode 100644
66+
index 0000000..a024003
67+
--- /dev/null
68+
+++ b/y/sub1/file1
69+
@@ -0,0 +1 @@
70+
+contents1
71+
72+
$ echo ":prefix=z" > table/14c74c5eca73952b36d736034b388832748c49d6
73+
$ echo ":prefix=z" > table/26e4c43675b985689e280bc42264a9226af76943
74+
$ git add table
75+
$ git commit -m "mod lookup table" 1> /dev/null
76+
$ tree table
77+
table
78+
|-- 14c74c5eca73952b36d736034b388832748c49d6
79+
|-- 26e4c43675b985689e280bc42264a9226af76943
80+
|-- 81b10fb4984d20142cd275b89c91c346e536876a
81+
`-- bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
82+
83+
1 directory, 4 files
84+
85+
$ josh-filter -s ":lookup=table" --update refs/heads/filtered
86+
Warning: reference refs/heads/filtered wasn't updated
87+
[2] :lookup=table
88+
[3] :/table
89+
[4] :lookup2=4880528e9d57aa5efc925e120a8077bfa37d778d
90+
[5] :lookup2=ed934c124e28c83270d9cfbb011f3ceb46c0f69e
91+
$ git log refs/heads/filtered --graph --pretty=%s
92+
* add file2
93+
* add file1
94+
95+
$ git diff ${EMPTY_TREE}..refs/heads/filtered
96+
diff --git a/x/sub1/file1 b/x/sub1/file1
97+
new file mode 100644
98+
index 0000000..a024003
99+
--- /dev/null
100+
+++ b/x/sub1/file1
101+
@@ -0,0 +1 @@
102+
+contents1
103+
diff --git a/x/sub1/file2 b/x/sub1/file2
104+
new file mode 100644
105+
index 0000000..6b46faa
106+
--- /dev/null
107+
+++ b/x/sub1/file2
108+
@@ -0,0 +1 @@
109+
+contents2
110+
$ git diff ${EMPTY_TREE}..refs/heads/filtered~1
111+
diff --git a/y/sub1/file1 b/y/sub1/file1
112+
new file mode 100644
113+
index 0000000..a024003
114+
--- /dev/null
115+
+++ b/y/sub1/file1
116+
@@ -0,0 +1 @@
117+
+contents1

0 commit comments

Comments
 (0)