Merge pull request #1720 from neithernut/traverse-broaden-with-tips-ends

Allow `topo::Builder::with_tips` and `with_ends` for non-default pred

Author: Byron

gix-traverse/src/commit/topo/init.rs

@@ -45,23 +45,6 @@ where
         }
     }
 
-    /// Add commits to start reading from.
-    ///
-    /// The behavior is similar to specifying additional `ends` in `git rev-list --topo-order ^ends tips`.
-    pub fn with_tips(mut self, tips: impl IntoIterator<Item = impl Into<ObjectId>>) -> Self {
-        self.tips.extend(tips.into_iter().map(Into::into));
-        self
-    }
-
-    /// Add commits ending the traversal.
-    ///
-    /// These commits themselves will not be read, i.e. the behavior is similar to specifying additional
-    /// `ends` in `git rev-list --topo-order ^ends tips`.
-    pub fn with_ends(mut self, ends: impl IntoIterator<Item = impl Into<ObjectId>>) -> Self {
-        self.ends.extend(ends.into_iter().map(Into::into));
-        self
-    }
-
     /// Set a `predicate` to filter out revisions from the walk. Can be used to
     /// implement e.g. filtering on paths or time. This does *not* exclude the
     /// parent(s) of a revision that is excluded. Specify a revision as an 'end'
@@ -87,6 +70,23 @@ where
     Find: gix_object::Find,
     Predicate: FnMut(&oid) -> bool,
 {
+    /// Add commits to start reading from.
+    ///
+    /// The behavior is similar to specifying additional `ends` in `git rev-list --topo-order ^ends tips`.
+    pub fn with_tips(mut self, tips: impl IntoIterator<Item = impl Into<ObjectId>>) -> Self {
+        self.tips.extend(tips.into_iter().map(Into::into));
+        self
+    }
+
+    /// Add commits ending the traversal.
+    ///
+    /// These commits themselves will not be read, i.e. the behavior is similar to specifying additional
+    /// `ends` in `git rev-list --topo-order ^ends tips`.
+    pub fn with_ends(mut self, ends: impl IntoIterator<Item = impl Into<ObjectId>>) -> Self {
+        self.ends.extend(ends.into_iter().map(Into::into));
+        self
+    }
+
     /// Set the `sorting` to use for the topological walk.
     pub fn sorting(mut self, sorting: Sorting) -> Self {
         self.sorting = sorting;