Implement :lookup filter

Change: lookup

Author: christian-schilling

josh-core/src/filter/mod.rs

@@ -297,6 +297,8 @@ enum Op {
     Prefix(std::path::PathBuf),
     Subdir(std::path::PathBuf),
     Workspace(std::path::PathBuf),
+    Lookup(std::path::PathBuf),
+    Lookup2(git2::Oid),
 
     Pattern(String),
     Message(String),
@@ -596,6 +598,12 @@ fn spec2(op: &Op) -> String {
         Op::Workspace(path) => {
             format!(":workspace={}", parse::quote_if(&path.to_string_lossy()))
         }
+        Op::Lookup(path) => {
+            format!(":lookup={}", parse::quote_if(&path.to_string_lossy()))
+        }
+        Op::Lookup2(oid) => {
+            format!(":lookup2={}", oid.to_string())
+        }
         Op::RegexReplace(replacements) => {
             let v = replacements
                 .iter()
@@ -1303,8 +1311,8 @@ 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"));
+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);
     })
@@ -1456,6 +1464,69 @@ fn apply_to_commit2(
                 Apply::from_commit(commit)?.with_parents(filtered_parent_ids),
             )?
         }
+        Op::Lookup(lookup_path) => {
+            let lookup_commit = if let Some(lookup_commit) =
+                apply_to_commit2(&Op::Subdir(lookup_path.clone()), &commit, transaction)?
+            {
+                lookup_commit
+            } else {
+                return Ok(None);
+            };
+
+            let op = Op::Lookup2(lookup_commit);
+
+            if let Some(start) = transaction.get(to_filter(op), commit.id()) {
+                transaction.insert(filter, commit.id(), start, true);
+                return Ok(Some(start));
+            } else {
+                return Ok(None);
+            }
+        }
+
+        Op::Lookup2(lookup_commit_id) => {
+            let lookup_commit = repo.find_commit(*lookup_commit_id)?;
+            for parent in lookup_commit.parents() {
+                let lookup_tree = lookup_commit.tree_id();
+                let cw = get_filter(
+                    repo,
+                    &repo.find_tree(lookup_tree)?,
+                    &std::path::PathBuf::new().join(commit.id().to_string()),
+                );
+                if cw != filter::empty() {
+                    if let Some(start) =
+                        apply_to_commit2(&Op::Lookup2(parent.id()), &commit, transaction)?
+                    {
+                        transaction.insert(filter, commit.id(), start, true);
+                        return Ok(Some(start));
+                    } else {
+                        return Ok(None);
+                    }
+                }
+                break;
+            }
+            let lookup_tree = lookup_commit.tree_id();
+            let cw = get_filter(
+                repo,
+                &repo.find_tree(lookup_tree)?,
+                &std::path::PathBuf::new().join(commit.id().to_string()),
+            );
+
+            if cw == filter::empty() {
+                // FIXME empty filter or no entry in table?
+                for parent in commit.parents() {
+                    if let Some(start) = apply_to_commit2(&op, &parent, transaction)? {
+                        transaction.insert(filter, commit.id(), start, true);
+                        return Ok(Some(start));
+                    } else {
+                        return Ok(None);
+                    }
+                }
+                return Ok(None);
+            }
+
+            Apply::from_commit(commit)?
+                .with_tree(apply(transaction, cw, Apply::from_commit(commit)?)?.into_tree())
+        }
         Op::Squash(Some(ids)) => {
             if let Some(sq) = ids.get(&LazyRef::Resolved(commit.id())) {
                 let oid = if let Some(oid) =
@@ -1582,7 +1653,7 @@ fn apply_to_commit2(
 
             let commit_filter = filter;
 
-            let cw = get_workspace(repo, &commit.tree()?, ws_path);
+            let cw = get_filter(repo, &commit.tree()?, &ws_path.join("workspace.josh"));
 
             let parent_filters = commit
                 .parents()
@@ -1597,10 +1668,10 @@ fn apply_to_commit2(
                         ws_path.clone()
                     };
 
-                    let pcw = get_workspace(
+                    let pcw = get_filter(
                         repo,
                         &parent.tree().unwrap_or_else(|_| tree::empty(repo)),
-                        &p,
+                        &p.join("workspace.josh"),
                     );
                     Ok((parent, pcw))
                 })
@@ -1737,6 +1808,8 @@ fn apply2<'a>(transaction: &'a cache::Transaction, op: &Op, x: Apply<'a>) -> Jos
         Op::Prune => Ok(x),
         Op::Unsign => Ok(x),
         Op::Rev(_) => Err(josh_error("not applicable to tree")),
+        Op::Lookup(_) => Err(josh_error("not applicable to tree")),
+        Op::Lookup2(_) => Err(josh_error("not applicable to tree")),
         Op::Join(_) => Err(josh_error("not applicable to tree")),
         Op::RegexReplace(replacements) => {
             let mut t = x.tree().clone();
@@ -1825,7 +1898,10 @@ fn apply2<'a>(transaction: &'a cache::Transaction, op: &Op, x: Apply<'a>) -> Jos
                 transaction,
                 compose(
                     wsj_file,
-                    compose(get_workspace(repo, &x.tree(), path), base),
+                    compose(
+                        get_filter(repo, &x.tree(), &path.join("workspace.josh")),
+                        base,
+                    ),
                 ),
                 x,
             )
@@ -1920,8 +1996,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()));

josh-core/src/filter/parse.rs

@@ -10,6 +10,7 @@ fn make_op(args: &[&str]) -> JoshResult<Op> {
         ["author", author, email] => Ok(Op::Author(author.to_string(), email.to_string())),
         ["committer", author, email] => Ok(Op::Committer(author.to_string(), email.to_string())),
         ["workspace", arg] => Ok(Op::Workspace(Path::new(arg).to_owned())),
+        ["lookup", arg] => Ok(Op::Lookup(Path::new(arg).to_owned())),
         ["prefix"] => Err(josh_error(indoc!(
             r#"
             Filter ":prefix" requires an argument.

tests/filter/lookup.t

@@ -0,0 +1,117 @@
+  $ export TERM=dumb
+  $ export RUST_LOG_STYLE=never
+
+  $ git init -q real_repo 1> /dev/null
+  $ cd real_repo
+
+  $ mkdir sub1
+  $ echo contents1 > sub1/file1
+  $ git add sub1
+  $ git commit -m "add file1" 1> /dev/null
+
+  $ mkdir sub1
+  mkdir: cannot create directory 'sub1': File exists
+  [1]
+  $ echo contents2 > sub1/file2
+  $ git add sub1
+  $ git commit -m "add file2" 1> /dev/null
+
+  $ git log --graph --pretty=%H
+  * 81b10fb4984d20142cd275b89c91c346e536876a
+  * bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
+
+  $ mkdir table
+  $ echo ":prefix=x" > table/81b10fb4984d20142cd275b89c91c346e536876a
+  $ echo ":prefix=y" > table/bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
+  $ git add table
+  $ git commit -m "add lookup table" 1> /dev/null
+
+
+  $ echo contents3 > sub1/file3
+  $ git add sub1
+  $ git commit -m "add file3" 1> /dev/null
+
+  $ git log --graph --pretty=%H
+  * 26e4c43675b985689e280bc42264a9226af76943
+  * 14c74c5eca73952b36d736034b388832748c49d6
+  * 81b10fb4984d20142cd275b89c91c346e536876a
+  * bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
+
+  $ josh-filter -s ":lookup=table" --update refs/heads/filtered
+  [1] :lookup=table
+  [2] :/table
+  [4] :lookup2=4880528e9d57aa5efc925e120a8077bfa37d778d
+
+  $ git log refs/heads/filtered --graph --pretty=%s
+  * add file2
+  * add file1
+  $ git diff ${EMPTY_TREE}..refs/heads/filtered
+  diff --git a/x/sub1/file1 b/x/sub1/file1
+  new file mode 100644
+  index 0000000..a024003
+  --- /dev/null
+  +++ b/x/sub1/file1
+  @@ -0,0 +1 @@
+  +contents1
+  diff --git a/x/sub1/file2 b/x/sub1/file2
+  new file mode 100644
+  index 0000000..6b46faa
+  --- /dev/null
+  +++ b/x/sub1/file2
+  @@ -0,0 +1 @@
+  +contents2
+  $ git diff ${EMPTY_TREE}..refs/heads/filtered~1
+  diff --git a/y/sub1/file1 b/y/sub1/file1
+  new file mode 100644
+  index 0000000..a024003
+  --- /dev/null
+  +++ b/y/sub1/file1
+  @@ -0,0 +1 @@
+  +contents1
+
+  $ echo ":prefix=z" > table/14c74c5eca73952b36d736034b388832748c49d6
+  $ echo ":prefix=z" > table/26e4c43675b985689e280bc42264a9226af76943
+  $ git add table
+  $ git commit -m "mod lookup table" 1> /dev/null
+  $ tree table
+  table
+  |-- 14c74c5eca73952b36d736034b388832748c49d6
+  |-- 26e4c43675b985689e280bc42264a9226af76943
+  |-- 81b10fb4984d20142cd275b89c91c346e536876a
+  `-- bb282e9cdc1b972fffd08fd21eead43bc0c83cb8
+  
+  1 directory, 4 files
+
+  $ josh-filter -s ":lookup=table" --update refs/heads/filtered
+  Warning: reference refs/heads/filtered wasn't updated
+  [2] :lookup=table
+  [3] :/table
+  [4] :lookup2=4880528e9d57aa5efc925e120a8077bfa37d778d
+  [5] :lookup2=ed934c124e28c83270d9cfbb011f3ceb46c0f69e
+  $ git log refs/heads/filtered --graph --pretty=%s
+  * add file2
+  * add file1
+
+  $ git diff ${EMPTY_TREE}..refs/heads/filtered
+  diff --git a/x/sub1/file1 b/x/sub1/file1
+  new file mode 100644
+  index 0000000..a024003
+  --- /dev/null
+  +++ b/x/sub1/file1
+  @@ -0,0 +1 @@
+  +contents1
+  diff --git a/x/sub1/file2 b/x/sub1/file2
+  new file mode 100644
+  index 0000000..6b46faa
+  --- /dev/null
+  +++ b/x/sub1/file2
+  @@ -0,0 +1 @@
+  +contents2
+  $ git diff ${EMPTY_TREE}..refs/heads/filtered~1
+  diff --git a/y/sub1/file1 b/y/sub1/file1
+  new file mode 100644
+  index 0000000..a024003
+  --- /dev/null
+  +++ b/y/sub1/file1
+  @@ -0,0 +1 @@
+  +contents1