Remove parents from Apply struct

vlad-ivanov-name · christian-schilling · commit 47c500a8a2d8 · 2025-11-10T07:26:47.000Z
With the new per_rev_filter function, we no longer need parents in Apply
diff --git a/josh-core/src/filter/mod.rs b/josh-core/src/filter/mod.rs
@@ -71,7 +71,6 @@ pub struct Apply<'a> {
     pub author: Option<(String, String)>,
     pub committer: Option<(String, String)>,
     pub message: Option<String>,
-    pub parents: Option<Vec<git2::Oid>>,
 }
 
 impl<'a> Clone for Apply<'a> {
@@ -81,7 +80,6 @@ impl<'a> Clone for Apply<'a> {
             author: self.author.clone(),
             committer: self.committer.clone(),
             message: self.message.clone(),
-            parents: self.parents.clone(),
         }
     }
 }
@@ -93,7 +91,6 @@ impl<'a> Apply<'a> {
             author: None,
             committer: None,
             message: None,
-            parents: None,
         }
     }
 
@@ -108,7 +105,6 @@ impl<'a> Apply<'a> {
             author,
             committer,
             message,
-            parents: None,
         }
     }
 
@@ -131,7 +127,6 @@ impl<'a> Apply<'a> {
             author,
             committer,
             message,
-            parents: None,
         })
     }
 
@@ -141,7 +136,6 @@ impl<'a> Apply<'a> {
             author: Some(author),
             committer: self.committer,
             message: self.message,
-            parents: self.parents,
         }
     }
 
@@ -151,7 +145,6 @@ impl<'a> Apply<'a> {
             author: self.author,
             committer: Some(committer),
             message: self.message,
-            parents: self.parents,
         }
     }
 
@@ -161,7 +154,6 @@ impl<'a> Apply<'a> {
             author: self.author,
             committer: self.committer,
             message: Some(message),
-            parents: self.parents,
         }
     }
 
@@ -171,17 +163,6 @@ impl<'a> Apply<'a> {
             author: self.author,
             committer: self.committer,
             message: self.message,
-            parents: self.parents,
-        }
-    }
-
-    pub fn with_parents(self, parents: Vec<git2::Oid>) -> Self {
-        Apply {
-            tree: self.tree,
-            author: self.author,
-            committer: self.committer,
-            message: self.message,
-            parents: Some(parents),
         }
     }
 
@@ -866,16 +847,7 @@ fn apply_to_commit2(
                 }
             }
 
-            let filtered_parent_ids = commit
-                .parents()
-                .map(|x| transaction.get(filter, x.id()))
-                .collect::<Option<Vec<_>>>();
-            let filtered_parent_ids = some_or!(filtered_parent_ids, { return Ok(None) });
-            apply(
-                transaction,
-                nf,
-                Apply::from_commit(commit)?.with_parents(filtered_parent_ids),
-            )?
+            apply(transaction, nf, Apply::from_commit(commit)?)?
         }
         Op::Squash(Some(ids)) => {
             if let Some(sq) = ids.get(&LazyRef::Resolved(commit.id())) {
@@ -1053,18 +1025,7 @@ fn apply_to_commit2(
 
             return per_rev_filter(transaction, commit, filter, commit_filter, parent_filters);
         }
-        _ => {
-            let filtered_parent_ids = commit
-                .parent_ids()
-                .map(|x| transaction.get(filter, x))
-                .collect::<Option<Vec<_>>>();
-            let filtered_parent_ids = some_or!(filtered_parent_ids, { return Ok(None) });
-            apply(
-                transaction,
-                filter,
-                Apply::from_commit(commit)?.with_parents(filtered_parent_ids),
-            )?
-        }
+        _ => apply(transaction, filter, Apply::from_commit(commit)?)?,
     };
 
     let tree_data = rewrite_data;
@@ -1538,11 +1499,7 @@ fn per_rev_filter(
 
     let filtered_parent_ids: Vec<_> = normal_parents.into_iter().chain(extra_parents).collect();
 
-    let mut tree_data = apply(
-        transaction,
-        commit_filter,
-        Apply::from_commit(commit)?.with_parents(filtered_parent_ids.clone()),
-    )?;
+    let mut tree_data = apply(transaction, commit_filter, Apply::from_commit(commit)?)?;
 
     if let Some((pin_subtract, pin_overlay)) = pin_details {
         let with_exclude = tree::subtract(transaction, tree_data.tree().id(), pin_subtract)?;
diff --git a/tests/proxy/workspace_invalid_trailing_slash.t b/tests/proxy/workspace_invalid_trailing_slash.t
@@ -277,6 +277,8 @@ Flushed credential cache
       |   |   `-- 8233465e92d353e2ef47c02dc568ea44a32339
       |   |-- 70
       |   |   `-- 5dcb4e33bd0dd3f95d5831fc8dc8a41ca3e566
+      |   |-- 7b
+      |   |   `-- 418ed7c356797b1a8eef3ff949632495d273c6
       |   |-- 7d
       |   |   `-- 5816334652b9738e33e4ceaf925573c3414e0c
       |   |-- 85
@@ -295,6 +297,8 @@ Flushed credential cache
       |   |   `-- 613be55337cdfab189935d8dbd1d4f427ef75e
       |   |-- b7
       |   |   `-- 8eb888451be077531b50794384c2faec025765
+      |   |-- cd
+      |   |   `-- 9ae8cb61e7d1aaa7b90766ff9aa9b3dc78c856
       |   |-- db
       |   |   `-- 9120ba624b0afe79d37a5a262d8deb14e13707
       |   |-- f0
@@ -308,4 +312,4 @@ Flushed credential cache
           |-- namespaces
           `-- tags
   
-  69 directories, 56 files
+  71 directories, 58 files
diff --git a/tests/proxy/workspace_tags.t b/tests/proxy/workspace_tags.t
@@ -343,6 +343,8 @@
       |   |   `-- 2a35c53f4e5901c9cc083a94b417c15837cad8
       |   |-- 22
       |   |   `-- b3eaf7b374287220ac787fd2bce5958b69115c
+      |   |-- 23
+      |   |   `-- f7e90462b3fc5db0a26335139e1fe83d04d2cd
       |   |-- 26
       |   |   `-- 6864a895cac573b04a44bd40ee3bd8fe458a5f
       |   |-- 2c
@@ -377,18 +379,25 @@
       |   |   `-- 0f21b330a3d45f363fcde6bfb57eed22948cb6
       |   |-- 83
       |   |   `-- 3812f1557e561166754add564fe32228dd1703
+      |   |-- 96
+      |   |   `-- f5351b972284f81d7246836f82f6be06c6631f
       |   |-- 98
       |   |   `-- 84cc2efe368ea0aa9d912fa596b26c5d75dbee
       |   |-- 9c
       |   |   `-- f258b407cd9cdba97e16a293582b29d302b796
       |   |-- 9f
       |   |   `-- 8daab1754f04fbe8aaac6fcbb44c8324df09eb
+      |   |-- a0
+      |   |   `-- 28e4ad33176e7db6f3d4a5fc7e92257cfe213e
       |   |-- a3
       |   |   `-- d19dcb2f51fa1efd55250f60df559c2b8270b8
       |   |-- a4
-      |   |   `-- 1772e0c7cdad1a13b7a7bc38c0d382a5a827ce
+      |   |   |-- 1772e0c7cdad1a13b7a7bc38c0d382a5a827ce
+      |   |   `-- 8223bf4fc7801a0322b4ecaa5ed6a2c5dce7f1
       |   |-- b0
       |   |   `-- fdeb65d9b9069015ef9c0f735a4f6f2f28fe77
+      |   |-- b1
+      |   |   `-- c1b15558aebbce0682f25933cb729e9acd209c
       |   |-- b6
       |   |   `-- c8440fe2cd36638ddb6b3505c1e8f2202f6191
       |   |-- b8
@@ -407,8 +416,12 @@
       |   |   `-- d2a4d6db7addc2b087dcdb3e63785d3315c00e
       |   |-- d7
       |   |   `-- 330ea337031af43ba1cf6982a873a40b9170ac
+      |   |-- e2
+      |   |   `-- 5d071c2db414f24473e3768c063dbcf8c55d04
       |   |-- ea
       |   |   `-- 1ae75547e348b07cb28a721a06ef6580ff67f0
+      |   |-- ed
+      |   |   `-- 8ae0c02d30bd34d7a8584cb0930d0d7a58df26
       |   |-- f2
       |   |   |-- 257977b96d2272be155d6699046148e477e9fb
       |   |   `-- 7e0d18d976fd84da0a9e260989ecb6edaa593f
@@ -423,6 +436,6 @@
           |-- namespaces
           `-- tags
   
-  101 directories, 92 files
+  107 directories, 99 files
 
 $ cat ${TESTTMP}/josh-proxy.out

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ pub struct Apply<'a> {`
`71`	`71`	`pub author: Option<(String, String)>,`
`72`	`72`	`pub committer: Option<(String, String)>,`
`73`	`73`	`pub message: Option<String>,`
`74`		`- pub parents: Option<Vec<git2::Oid>>,`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`impl<'a> Clone for Apply<'a> {`
`@@ -81,7 +80,6 @@ impl<'a> Clone for Apply<'a> {`
`81`	`80`	`author: self.author.clone(),`
`82`	`81`	`committer: self.committer.clone(),`
`83`	`82`	`message: self.message.clone(),`
`84`		`- parents: self.parents.clone(),`
`85`	`83`	`}`
`86`	`84`	`}`
`87`	`85`	`}`
`@@ -93,7 +91,6 @@ impl<'a> Apply<'a> {`
`93`	`91`	`author: None,`
`94`	`92`	`committer: None,`
`95`	`93`	`message: None,`
`96`		`- parents: None,`
`97`	`94`	`}`
`98`	`95`	`}`
`99`	`96`
`@@ -108,7 +105,6 @@ impl<'a> Apply<'a> {`
`108`	`105`	`author,`
`109`	`106`	`committer,`
`110`	`107`	`message,`
`111`		`- parents: None,`
`112`	`108`	`}`
`113`	`109`	`}`
`114`	`110`
`@@ -131,7 +127,6 @@ impl<'a> Apply<'a> {`
`131`	`127`	`author,`
`132`	`128`	`committer,`
`133`	`129`	`message,`
`134`		`- parents: None,`
`135`	`130`	`})`
`136`	`131`	`}`
`137`	`132`
`@@ -141,7 +136,6 @@ impl<'a> Apply<'a> {`
`141`	`136`	`author: Some(author),`
`142`	`137`	`committer: self.committer,`
`143`	`138`	`message: self.message,`
`144`		`- parents: self.parents,`
`145`	`139`	`}`
`146`	`140`	`}`
`147`	`141`
`@@ -151,7 +145,6 @@ impl<'a> Apply<'a> {`
`151`	`145`	`author: self.author,`
`152`	`146`	`committer: Some(committer),`
`153`	`147`	`message: self.message,`
`154`		`- parents: self.parents,`
`155`	`148`	`}`
`156`	`149`	`}`
`157`	`150`
`@@ -161,7 +154,6 @@ impl<'a> Apply<'a> {`
`161`	`154`	`author: self.author,`
`162`	`155`	`committer: self.committer,`
`163`	`156`	`message: Some(message),`
`164`		`- parents: self.parents,`
`165`	`157`	`}`
`166`	`158`	`}`
`167`	`159`
`@@ -171,17 +163,6 @@ impl<'a> Apply<'a> {`
`171`	`163`	`author: self.author,`
`172`	`164`	`committer: self.committer,`
`173`	`165`	`message: self.message,`
`174`		`- parents: self.parents,`
`175`		`- }`
`176`		`- }`
`177`		`-`
`178`		`- pub fn with_parents(self, parents: Vec<git2::Oid>) -> Self {`
`179`		`- Apply {`
`180`		`- tree: self.tree,`
`181`		`- author: self.author,`
`182`		`- committer: self.committer,`
`183`		`- message: self.message,`
`184`		`- parents: Some(parents),`
`185`	`166`	`}`
`186`	`167`	`}`
`187`	`168`
`@@ -866,16 +847,7 @@ fn apply_to_commit2(`
`866`	`847`	`}`
`867`	`848`	`}`
`868`	`849`
`869`		`- let filtered_parent_ids = commit`
`870`		`- .parents()`
`871`		`- .map(\|x\| transaction.get(filter, x.id()))`
`872`		`- .collect::<Option<Vec<_>>>();`
`873`		`- let filtered_parent_ids = some_or!(filtered_parent_ids, { return Ok(None) });`
`874`		`- apply(`
`875`		`- transaction,`
`876`		`- nf,`
`877`		`- Apply::from_commit(commit)?.with_parents(filtered_parent_ids),`
`878`		`- )?`
	`850`	`+ apply(transaction, nf, Apply::from_commit(commit)?)?`
`879`	`851`	`}`
`880`	`852`	`Op::Squash(Some(ids)) => {`
`881`	`853`	`if let Some(sq) = ids.get(&LazyRef::Resolved(commit.id())) {`
`@@ -1053,18 +1025,7 @@ fn apply_to_commit2(`
`1053`	`1025`
`1054`	`1026`	`return per_rev_filter(transaction, commit, filter, commit_filter, parent_filters);`
`1055`	`1027`	`}`
`1056`		`- _ => {`
`1057`		`- let filtered_parent_ids = commit`
`1058`		`- .parent_ids()`
`1059`		`- .map(\|x\| transaction.get(filter, x))`
`1060`		`- .collect::<Option<Vec<_>>>();`
`1061`		`- let filtered_parent_ids = some_or!(filtered_parent_ids, { return Ok(None) });`
`1062`		`- apply(`
`1063`		`- transaction,`
`1064`		`- filter,`
`1065`		`- Apply::from_commit(commit)?.with_parents(filtered_parent_ids),`
`1066`		`- )?`
`1067`		`- }`
	`1028`	`+ _ => apply(transaction, filter, Apply::from_commit(commit)?)?,`
`1068`	`1029`	`};`
`1069`	`1030`
`1070`	`1031`	`let tree_data = rewrite_data;`
`@@ -1538,11 +1499,7 @@ fn per_rev_filter(`
`1538`	`1499`
`1539`	`1500`	`let filtered_parent_ids: Vec<_> = normal_parents.into_iter().chain(extra_parents).collect();`
`1540`	`1501`
`1541`		`- let mut tree_data = apply(`
`1542`		`- transaction,`
`1543`		`- commit_filter,`
`1544`		`- Apply::from_commit(commit)?.with_parents(filtered_parent_ids.clone()),`
`1545`		`- )?;`
	`1502`	`+ let mut tree_data = apply(transaction, commit_filter, Apply::from_commit(commit)?)?;`
`1546`	`1503`
`1547`	`1504`	`if let Some((pin_subtract, pin_overlay)) = pin_details {`
`1548`	`1505`	`let with_exclude = tree::subtract(transaction, tree_data.tree().id(), pin_subtract)?;`